From e42c2888a347dbba7bbcc40ea59e7f801ad2373c Mon Sep 17 00:00:00 2001
From: Christian Tzolov <christian.tzolov@gmail.com>
Date: Thu, 7 Nov 2019 16:28:04 +0100
Subject: [PATCH] udate task-apps pom dependencies and docs

---
 .../task-demo-metrics-influxdb/README.md      | 21 ++++++++++---------
 .../task-demo-metrics-influxdb/pom.xml        |  6 +++---
 .../task-demo-metrics-prometheus/README.md    |  8 -------
 .../task-demo-metrics-prometheus/pom.xml      | 11 ++--------
 4 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/monitoring-samples/task-apps/task-demo-metrics-influxdb/README.md b/monitoring-samples/task-apps/task-demo-metrics-influxdb/README.md
index 8012e53..6e7ea59 100644
--- a/monitoring-samples/task-apps/task-demo-metrics-influxdb/README.md
+++ b/monitoring-samples/task-apps/task-demo-metrics-influxdb/README.md
@@ -10,17 +10,18 @@ Otherwise follow the instructions below to build your own `monitorable` Task fro
 
 Bootstrap by follow the [Task development instructions](https://docs.spring.io/spring-cloud-task/docs/2.0.0.RELEASE/reference/htmlsingle/#getting-started-developing-first-task) and then: 
 
-* Set the parent POM version of Boot to 2.2.0.M6 or latest
+* Set the parent POM version of Boot to 2.2.1.RELEASE or latest
 
 ```xml
 <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.2.0.M6</version>
+    <version>2.2.1.RELEASE</version>
     <relativePath/>
 </parent>
 ``` 
-* Make sure that `spring-cloud-dependencies` version `Hoxton.M2` or newer are imported: 
+
+* Make sure that `spring-cloud-dependencies` version `Hoxton.RC1` or newer are imported: 
 
 ```xml
 <dependencyManagement>
@@ -28,7 +29,7 @@ Bootstrap by follow the [Task development instructions](https://docs.spring.io/s
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-dependencies</artifactId>
-            <version>Hoxton.M2</version>
+            <version>Hoxton.RC1</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
@@ -36,31 +37,31 @@ Bootstrap by follow the [Task development instructions](https://docs.spring.io/s
 ```
 
 * Add dependencies to enable the `Spring Cloud Task` (and optionally `Spring Task Batch`) functionality and to configure the jdbc dependencies for the task repository.
-Use version `2.2.0.M2` or newer! 
+Use version `2.2.0.RC1` or newer! 
 
 ```xml
 <dependencies>
     <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-starter-task</artifactId>
-        <version>2.2.0.M2</version>
+        <version>2.2.0.RC1</version>
     </dependency>
     <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-task-core</artifactId>
-        <version>2.2.0.M2</version>
+        <version>2.2.0.RC1</version>
     </dependency>
     
     <!-- Required when Spring Batch is used -->
     <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-task-batch</artifactId>
-        <version>2.2.0.M2</version>
+        <version>2.2.0.RC1</version>
     </dependency>
     <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-task-stream</artifactId>
-        <version>2.2.0.M2</version>
+        <version>2.2.0.RC1</version>
     </dependency>
 </dependencies>
 
@@ -69,7 +70,7 @@ Use version `2.2.0.M2` or newer!
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-task-dependencies</artifactId>
-            <version>2.2.0.M2</version>
+            <version>2.2.0.RC1</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
diff --git a/monitoring-samples/task-apps/task-demo-metrics-influxdb/pom.xml b/monitoring-samples/task-apps/task-demo-metrics-influxdb/pom.xml
index b81aea0..96d9c7f 100644
--- a/monitoring-samples/task-apps/task-demo-metrics-influxdb/pom.xml
+++ b/monitoring-samples/task-apps/task-demo-metrics-influxdb/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.M6</version>
+		<version>2.2.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example.task</groupId>
@@ -16,8 +16,8 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Hoxton.M2</spring-cloud.version>
-		<spring-cloud-task.version>2.2.0.M2</spring-cloud-task.version>
+		<spring-cloud.version>Hoxton.RC1</spring-cloud.version>
+		<spring-cloud-task.version>2.2.0.RC1</spring-cloud-task.version>
 	</properties>
 
 	<dependencies>
diff --git a/monitoring-samples/task-apps/task-demo-metrics-prometheus/README.md b/monitoring-samples/task-apps/task-demo-metrics-prometheus/README.md
index a024212..c3c8ee6 100644
--- a/monitoring-samples/task-apps/task-demo-metrics-prometheus/README.md
+++ b/monitoring-samples/task-apps/task-demo-metrics-prometheus/README.md
@@ -93,14 +93,6 @@ Use version `2.2.0.RC1` or newer!
 
 * Add dependencies to configure Micrometer integration: 
 
-The Micrometer library uses the actuator internally: 
-```xml
-<dependency>
-    <groupId>org.springframework.boot</groupId>
-    <artifactId>spring-boot-starter-actuator</artifactId>
-</dependency>
-```
-
 To enable Prometheus metrics collection add:
 
 ```xml
diff --git a/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml b/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml
index e7acc96..8f62828 100644
--- a/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml
+++ b/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml
@@ -76,21 +76,14 @@
 			<optional>true</optional>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>org.springframework.boot</groupId>-->
-<!--			<artifactId>spring-boot-actuator-autoconfigure</artifactId>-->
-<!--		</dependency>-->
-
 		<!-- Enable Prometheus metrics collection (via Prometheus RSocket Proxy) -->
+		<!-- Internally it imports the org.springframework.boot:spring-boot-actuator-autoconfigure dependency -->
 		<dependency>
 			<groupId>io.micrometer.prometheus</groupId>
 			<artifactId>prometheus-rsocket-spring</artifactId>
 			<version>${prometheus-rsocket-spring.version}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>io.micrometer.prometheus</groupId>
 			<artifactId>prometheus-rsocket-client</artifactId>