Consolidate version numbers to 2.0.0(-SNAPSHOT)

Partially resolves #156

.github/workflows/ci.yml

@@ -65,7 +65,7 @@ jobs:
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-images: >-
-            springcloudstream/multi-io-sample-http-purchase-orders:1.0.0-SNAPSHOT
+            springcloudstream/multi-io-sample-http-purchase-orders:2.0.0-SNAPSHOT
 
   user-clicks-per-region-12x:
     runs-on: ubuntu-latest
@@ -81,11 +81,11 @@ jobs:
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-images: >-
-            springcloudstream/multi-io-sample-http-click-ingest:1.2.0-SNAPSHOT
+            springcloudstream/multi-io-sample-http-click-ingest:2.0.0-SNAPSHOT
-            springcloudstream/multi-io-sample-http-region-ingest:1.2.0-SNAPSHOT
+            springcloudstream/multi-io-sample-http-region-ingest:2.0.0-SNAPSHOT
-            springcloudstream/multi-io-sample-http-clicks-and-region-ingest:1.2.0-SNAPSHOT
+            springcloudstream/multi-io-sample-http-clicks-and-region-ingest:2.0.0-SNAPSHOT
-            springcloudstream/multi-io-sample-user-clicks-per-region-processor:1.2.0-SNAPSHOT
+            springcloudstream/multi-io-sample-user-clicks-per-region-processor:2.0.0-SNAPSHOT
-            springcloudstream/multi-io-sample-log-user-clicks-per-region:1.2.0-SNAPSHOT
+            springcloudstream/multi-io-sample-log-user-clicks-per-region:2.0.0-SNAPSHOT
 
   function-samples:
     runs-on: ubuntu-latest
@@ -112,7 +112,7 @@ jobs:
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-images: >-
-            springcloudstream/uppercase-processor:1.0.0-SNAPSHOT
+            springcloudstream/uppercase-processor:2.0.0-SNAPSHOT
 
   stream-dev-guides-standalone-stream-kafka:
     runs-on: ubuntu-latest
@@ -128,9 +128,9 @@ jobs:
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-images: >-
-            springcloudstream/usage-detail-sender-kafka:0.0.1-SNAPSHOT
+            springcloudstream/usage-detail-sender-kafka:2.0.0-SNAPSHOT
-            springcloudstream/usage-cost-processor-kafka:0.0.1-SNAPSHOT
+            springcloudstream/usage-cost-processor-kafka:2.0.0-SNAPSHOT
-            springcloudstream/usage-cost-logger-kafka:0.0.1-SNAPSHOT
+            springcloudstream/usage-cost-logger-kafka:2.0.0-SNAPSHOT
 
   stream-dev-guides-standalone-stream-rabbitmq:
     runs-on: ubuntu-latest
@@ -147,9 +147,9 @@ jobs:
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-images: >-
-            springcloudstream/usage-detail-sender-rabbit:0.0.1-SNAPSHOT
+            springcloudstream/usage-detail-sender-rabbit:2.0.0-SNAPSHOT
-            springcloudstream/usage-cost-processor-rabbit:0.0.1-SNAPSHOT
+            springcloudstream/usage-cost-processor-rabbit:2.0.0-SNAPSHOT
-            springcloudstream/usage-cost-logger-rabbit:0.0.1-SNAPSHOT
+            springcloudstream/usage-cost-logger-rabbit:2.0.0-SNAPSHOT
 
   batch-dev-guides-batchsamples:
     runs-on: ubuntu-latest
@@ -158,15 +158,15 @@ jobs:
       - uses: ./.github/actions/build-sample-app
         with:
           app-dir: 'dataflow-website/batch-developer-guides/batch/batchsamples'
-          mvn-build-commands: '-B clean install spring-boot:build-image -Dspring-boot.build-image.imageName=springcloudtask/billsetuptask:0.0.1-SNAPSHOT'
+          mvn-build-commands: '-B clean install spring-boot:build-image -Dspring-boot.build-image.imageName=springcloudtask/billsetuptask:2.0.0-SNAPSHOT'
           artifactory-publish: ${{ inputs.maven-build-only != true }}
           jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
           docker-push: ${{ inputs.maven-build-only != true }}
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-images: >-
-            springcloudtask/billsetuptask:0.0.1-SNAPSHOT
+            springcloudtask/billsetuptask:2.0.0-SNAPSHOT
-  
+
   stream-dev-guides-composed-http-transformer-kafka:
     runs-on: ubuntu-latest
     steps:
@@ -181,7 +181,7 @@ jobs:
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-images: >-
-            springcloudstream/composed-http-transformer-kafka:0.0.1-SNAPSHOT
+            springcloudstream/composed-http-transformer-kafka:2.0.0-SNAPSHOT
 
   stream-dev-guides-composed-http-transformer-kotlin-kafka:
     runs-on: ubuntu-latest
@@ -197,7 +197,7 @@ jobs:
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-images: >-
-            springcloudstream/composed-http-transformer-kotlin-kafka:0.0.1-SNAPSHOT
+            springcloudstream/composed-http-transformer-kotlin-kafka:2.0.0-SNAPSHOT
 
   stream-dev-guides-composed-http-transformer-rabbitmq:
     runs-on: ubuntu-latest
@@ -213,7 +213,7 @@ jobs:
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-images: >-
-            springcloudstream/composed-http-transformer-rabbitmq:0.0.1-SNAPSHOT            
+            springcloudstream/composed-http-transformer-rabbitmq:2.0.0-SNAPSHOT            
 
   stream-dev-guides-composed-http-transformer-kotlin-rabbitmq:
     runs-on: ubuntu-latest
@@ -229,7 +229,7 @@ jobs:
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-images: >-
-            springcloudstream/composed-http-transformer-kotlin-rabbitmq:0.0.1-SNAPSHOT
+            springcloudstream/composed-http-transformer-kotlin-rabbitmq:2.0.0-SNAPSHOT
 
   task-demo-metrics-prometheus:
     runs-on: ubuntu-latest
@@ -245,7 +245,7 @@ jobs:
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-images: >-
-            springcloudtask/task-demo-metrics-prometheus:0.0.4-SNAPSHOT
+            springcloudtask/task-demo-metrics-prometheus:2.0.0-SNAPSHOT
 
   scenario-task:
     runs-on: ubuntu-latest
@@ -254,14 +254,14 @@ jobs:
       - uses: ./.github/actions/build-sample-app
         with:
           app-dir: 'scenario-task'
-          mvn-build-commands: '-B clean install spring-boot:build-image -Dspring-boot.build-image.imageName=springcloudtask/scenario-task:0.0.1-SNAPSHOT'
+          mvn-build-commands: '-B clean install spring-boot:build-image -Dspring-boot.build-image.imageName=springcloudtask/scenario-task:2.0.0-SNAPSHOT'
           artifactory-publish: ${{ inputs.maven-build-only != true }}
           jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
           docker-push: ${{ inputs.maven-build-only != true }}
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-images: >-
-            springcloudtask/scenario-task:0.0.1-SNAPSHOT
+            springcloudtask/scenario-task:2.0.0-SNAPSHOT
 
   timestamp-task:
     runs-on: ubuntu-latest
@@ -270,14 +270,14 @@ jobs:
       - uses: ./.github/actions/build-sample-app
         with:
           app-dir: 'timestamp-task'
-          mvn-build-commands: '-B clean install spring-boot:build-image -Dspring-boot.build-image.imageName=springcloudtask/timestamp-task:1.0.0'
+          mvn-build-commands: '-B clean install spring-boot:build-image -Dspring-boot.build-image.imageName=springcloudtask/timestamp-task:2.0.0'
           artifactory-publish: ${{ inputs.maven-build-only != true }}
           jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
           docker-push: ${{ inputs.maven-build-only != true }}
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-images: >-
-            springcloudtask/timestamp-task:1.0.0
+            springcloudtask/timestamp-task:2.0.0
 
   timestamp-batch:
     runs-on: ubuntu-latest
@@ -286,11 +286,11 @@ jobs:
       - uses: ./.github/actions/build-sample-app
         with:
           app-dir: 'timestamp-batch'
-          mvn-build-commands: '-B clean install spring-boot:build-image -Dspring-boot.build-image.imageName=springcloudtask/timestamp-batch-task:1.0.0'
+          mvn-build-commands: '-B clean install spring-boot:build-image -Dspring-boot.build-image.imageName=springcloudtask/timestamp-batch-task:2.0.0'
           artifactory-publish: ${{ inputs.maven-build-only != true }}
           jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
           docker-push: ${{ inputs.maven-build-only != true }}
           docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
           docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
           docker-images: >-
-            springcloudtask/timestamp-batch-task:1.0.0
+            springcloudtask/timestamp-batch-task:2.0.0

batch/file-ingest/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.spring.cloud.dataflow.ingest</groupId>
     <artifactId>ingest</artifactId>
-    <version>1.0.0.BUILD-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>

custom-dataflow-builds/dataflow-server-21x/build.gradle

@@ -15,7 +15,7 @@ ext {
 apply plugin: 'io.spring.dependency-management'
 
 group = 'com.example'
-version = '0.0.1-SNAPSHOT'
+version = '2.0.0-SNAPSHOT'
 sourceCompatibility = '1.8'
 
 repositories {

custom-dataflow-builds/dataflow-server-21x/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>custom-dataflow-server-maven</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>custom-dataflow-server</name>
 	<description>Demo project for Spring Boot</description>
 

custom-dataflow-builds/dataflow-server-21x/test/build-and-compare

@@ -10,7 +10,7 @@ pushd ..
 popd
 
 echo "Diff gradle build"
-diff <(unzip -l spring-cloud-dataflow-server-2.1.2.RELEASE.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../build/libs/custom-dataflow-server-gradle-0.0.1-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)
+diff <(unzip -l spring-cloud-dataflow-server-2.1.2.RELEASE.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../build/libs/custom-dataflow-server-gradle-2.0.0-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)
 
 echo "Diff maven build"
-diff <(unzip -l spring-cloud-dataflow-server-2.1.2.RELEASE.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../target/custom-dataflow-server-maven-0.0.1-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)
+diff <(unzip -l spring-cloud-dataflow-server-2.1.2.RELEASE.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../target/custom-dataflow-server-maven-2.0.0-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)

custom-dataflow-builds/dataflow-server-22x/build.gradle

@@ -15,7 +15,7 @@ ext {
 apply plugin: 'io.spring.dependency-management'
 
 group = 'com.example'
-version = '0.0.1-SNAPSHOT'
+version = '2.0.0-SNAPSHOT'
 sourceCompatibility = '1.8'
 
 repositories {

custom-dataflow-builds/dataflow-server-22x/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>custom-dataflow-server-maven</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>custom-dataflow-server</name>
 	<description>Demo project for Spring Boot</description>
 

custom-dataflow-builds/dataflow-server-22x/test/build-and-compare

@@ -10,7 +10,7 @@ pushd ..
 popd
 
 echo "Diff gradle build"
-diff <(unzip -l spring-cloud-dataflow-server-2.2.0.RELEASE.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../build/libs/custom-dataflow-server-gradle-0.0.1-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)
+diff <(unzip -l spring-cloud-dataflow-server-2.2.0.RELEASE.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../build/libs/custom-dataflow-server-gradle-2.0.0-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)
 
 echo "Diff maven build"
-diff <(unzip -l spring-cloud-dataflow-server-2.2.0.RELEASE.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../target/custom-dataflow-server-maven-0.0.1-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)
+diff <(unzip -l spring-cloud-dataflow-server-2.2.0.RELEASE.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../target/custom-dataflow-server-maven-2.0.0-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)

custom-dataflow-builds/dataflow-server-25x/build.gradle

@@ -19,7 +19,7 @@ ext {
 apply plugin: 'io.spring.dependency-management'
 
 group = 'com.example'
-version = '0.0.1-SNAPSHOT'
+version = '2.0.0-SNAPSHOT'
 sourceCompatibility = '1.8'
 
 repositories {

custom-dataflow-builds/dataflow-server-25x/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>custom-dataflow-server-maven</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>custom-dataflow-server</name>
 	<description>Demo project for Spring Boot</description>
 

custom-dataflow-builds/dataflow-server-25x/test/build-and-compare

@@ -11,7 +11,7 @@ pushd ..
 popd
 
 echo "Diff gradle build"
-diff <(unzip -l spring-cloud-dataflow-server-$version.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../build/libs/custom-dataflow-server-gradle-0.0.1-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)
+diff <(unzip -l spring-cloud-dataflow-server-$version.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../build/libs/custom-dataflow-server-gradle-2.0.0-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)
 
 echo "Diff maven build"
-diff <(unzip -l spring-cloud-dataflow-server-$version.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../target/custom-dataflow-server-maven-0.0.1-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)
+diff <(unzip -l spring-cloud-dataflow-server-$version.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../target/custom-dataflow-server-maven-2.0.0-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)

custom-dataflow-builds/dataflow-server-25x/test/compare

@@ -3,7 +3,7 @@ version=2.5.0.RELEASE
 cd "$(dirname "$0")"
 
 echo "Diff gradle build"
-diff <(unzip -l spring-cloud-dataflow-server-$version.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../build/libs/custom-dataflow-server-gradle-0.0.1-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)
+diff <(unzip -l spring-cloud-dataflow-server-$version.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../build/libs/custom-dataflow-server-gradle-2.0.0-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)
 
 echo "Diff maven build"
-diff <(unzip -l spring-cloud-dataflow-server-$version.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../target/custom-dataflow-server-maven-0.0.1-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)
+diff <(unzip -l spring-cloud-dataflow-server-$version.jar|grep BOOT-INF/lib|awk '{print $4}'|sort) <(unzip -l ../target/custom-dataflow-server-maven-2.0.0-SNAPSHOT.jar|grep BOOT-INF/lib|awk '{print $4}'|sort)

dataflow-migrate-schedules/pom.xml

@@ -11,14 +11,14 @@
 	</parent>
 	<groupId>io.spring</groupId>
 	<artifactId>migrateschedule</artifactId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>Schedule CD Migrator</name>
 	<description>Migrates SCDF Schedules so that SchedulerTaskLauncher is no longer required.</description>
 
 	<properties>
 		<java.version>1.8</java.version>
 		<spring-cloud-data-flow.version>2.5.0.BUILD-SNAPSHOT</spring-cloud-data-flow.version>
-		<deployer.version>2.3.0.BUILD-SNAPSHOT</deployer.version>
+		<deployer.version>2.0.0-SNAPSHOT</deployer.version>
 	</properties>
 
 	<dependencyManagement>

dataflow-migrate-schedules/scripts/runKubernetesMigration.sh

@@ -1,4 +1,4 @@
 export spring_profiles_active=kubernetes
 export spring_autoconfigure_exclude=org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeployerAutoConfiguration
 
-java -jar ./target/migrateschedule-1.0.0.BUILD-SNAPSHOT.jar $*
+java -jar ./target/migrateschedule-2.0.0-SNAPSHOT.jar $*

dataflow-template-example/README.adoc

@@ -16,5 +16,5 @@ In order to get everything running we need to setup the following server instanc
 
 Configure the example application in `DataflowTemplateApplication.java`. Then build
 using `$ mvn clean package` and run using
-`$ java -jar target/dataflow-template-1.0.0.BUILD-SNAPSHOT.jar`
+`$ java -jar target/dataflow-template-2.0.0-SNAPSHOT.jar`
 

dataflow-template-example/pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud.samples</groupId>
 	<artifactId>dataflow-template</artifactId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>ldapserver</name>

dataflow-template-load-generator/README.adoc

@@ -18,5 +18,5 @@ In order to get everything running we need to setup the following server instanc
 
 Configure the example application in `DataflowTemplateApplication.java`. Then build
 using `$ mvn clean package` and run using
-`$ java -jar target/dataflow-template-load-generator-1.0.0.BUILD-SNAPSHOT.jar`
+`$ java -jar target/dataflow-template-load-generator-2.0.0-SNAPSHOT.jar`
 

dataflow-template-load-generator/pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud.samples</groupId>
 	<artifactId>dataflow-template-load-generator</artifactId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>ldapserver</name>

dataflow-website/batch-developer-guides/batch/batchsamples/README.adoc

@@ -32,14 +32,14 @@ NOTE: You can modify the docker org and version by applying the following: `-Ddo
 
 Assuming you are using Mariadb
 ```
-$ java -jar target/billsetuptask-0.0.1-SNAPSHOT.jar --spring.datasource.url=jdbc:mariadb://localhost:3306/<your database>?useSSL=false --spring.datasource.username=<user> --spring.datasource.password=<password> --spring.datasource.driverClassName=org.mariadb.jdbc.Driver
+$ java -jar target/billsetuptask-2.0.0-SNAPSHOT.jar --spring.datasource.url=jdbc:mariadb://localhost:3306/<your database>?useSSL=false --spring.datasource.username=<user> --spring.datasource.password=<password> --spring.datasource.driverClassName=org.mariadb.jdbc.Driver
 ```
 
 === To execute billrun locally
 
 Assuming you are using Mariadb, this app will load data from the usageinfo.txt file found in the classpath (included in the jar).
 ```
-$ java -jar target/billrun-0.0.1-SNAPSHOT.jar --spring.datasource.url=--spring.datasource.url=jdbc:mariadb://localhost:3306/<your database>?useSSL=false --spring.datasource.username=<user> --spring.datasource.password=<password> --spring.datasource.driverClassName=org.mariadb.jdbc.Driver
+$ java -jar target/billrun-2.0.0-SNAPSHOT.jar --spring.datasource.url=--spring.datasource.url=jdbc:mariadb://localhost:3306/<your database>?useSSL=false --spring.datasource.username=<user> --spring.datasource.password=<password> --spring.datasource.driverClassName=org.mariadb.jdbc.Driver
 ```
 If you wish to read a directory containing the data you can use the following command line argument:
 `--usage.file.name=file://<location of json file to upload>`

dataflow-website/batch-developer-guides/batch/batchsamples/billrun/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>spring-cloud-task-edu-samples</artifactId>
 		<groupId>io.spring</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>billrun</artifactId>

dataflow-website/batch-developer-guides/batch/batchsamples/billsetuptask/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>spring-cloud-task-edu-samples</artifactId>
 		<groupId>io.spring</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>billsetuptask</artifactId>

dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml

@@ -7,7 +7,7 @@
 
 	<artifactId>spring-cloud-task-edu-samples</artifactId>
 	<groupId>io.spring</groupId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Task EDU Samples</name>
 

dataflow-website/recipes/file-ingest/file-to-jdbc/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.spring.cloud.dataflow.ingest</groupId>
     <artifactId>ingest</artifactId>
-    <version>1.0.0.BUILD-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>

dataflow-website/recipes/kinesisdemo/README.adoc

@@ -34,9 +34,9 @@ Open two different terminals and start the producer and consumer as follows:
 
 [source,bash,options=nowrap,subs=attributes]
 ----
-java -jar kinesisproducer/target/kinesisproducer-0.0.1-SNAPSHOT.jar
+java -jar kinesisproducer/target/kinesisproducer-2.0.0-SNAPSHOT.jar
 
-java -jar kinesisconsumer/target/kinesisconsumer-0.0.1-SNAPSHOT.jar
+java -jar kinesisconsumer/target/kinesisconsumer-2.0.0-SNAPSHOT.jar
 ----
 
 ## Results

dataflow-website/recipes/kinesisdemo/kinesisconsumer/pom.xml

@@ -5,11 +5,11 @@
 	<parent>
 		<artifactId>kinesisdemo</artifactId>
 		<groupId>com.example</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>kinesisconsumer</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>kinesisconsumer</name>
 	<description>Demo project for Spring Boot</description>
 

dataflow-website/recipes/kinesisdemo/kinesisproducer/pom.xml

@@ -5,11 +5,11 @@
 	<parent>
 		<artifactId>kinesisdemo</artifactId>
 		<groupId>com.example</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>kinesisproducer</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>kinesisproducer</name>
 	<description>Demo project for Spring Boot</description>
 

dataflow-website/recipes/kinesisdemo/pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.example</groupId>
 	<artifactId>kinesisdemo</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>

dataflow-website/recipes/scaling/scdf-alert-webhook/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>io.spring.cloud.dataflow.alert.webhook</groupId>
 	<artifactId>scdf-alert-webhook</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>scdf-alert-webhook</name>
 	<description>Demo project for Spring Boot</description>
 

dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/pom.xml

@@ -10,7 +10,7 @@
   </parent>
   <groupId>io.spring.dataflow.sample</groupId>
   <artifactId>composed-http-transformer-kafka</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>composed-http-transformer-kafka</name>
   <description>Spring Cloud Stream Http Transformer Kafka Binder Application</description>
   <distributionManagement>

dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/pom.xml

@@ -10,7 +10,7 @@
   </parent>
   <groupId>io.spring.dataflow.sample</groupId>
   <artifactId>composed-http-transformer-kotlin-kafka</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>composed-http-transformer-kotlin-kafka</name>
   <description>Spring Cloud Stream Http Transformer Kotlin Processor with Kafka Binder Application</description>
   <distributionManagement>

dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/pom.xml

@@ -10,7 +10,7 @@
   </parent>
   <groupId>io.spring.dataflow.sample</groupId>
   <artifactId>composed-http-transformer-kotlin-rabbitmq</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>http-transformer-kotlin-rabbitmq</name>
   <description>Spring Cloud Stream Http Transformer Kotlin Processor with Rabbit Binder Application</description>
   <distributionManagement>

dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/pom.xml

@@ -10,7 +10,7 @@
   </parent>
   <groupId>io.spring.dataflow.sample</groupId>
   <artifactId>composed-http-transformer-rabbitmq</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>composed-http-transformer-rabbitmq</name>
   <description>Spring Cloud Stream Http Transformer Rabbit Binder Application</description>
   <distributionManagement>

dataflow-website/stream-developer-guides/streams/standalone-stream-sample/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.spring.dataflow.sample</groupId>
     <artifactId>usage-cost-stream-sample</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <parent>
         <groupId>org.springframework.boot</groupId>

dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-logger/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.spring.dataflow.sample</groupId>
 		<artifactId>usage-cost-stream-sample</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 

dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-processor/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.spring.dataflow.sample</groupId>
 		<artifactId>usage-cost-stream-sample</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>usage-cost-processor-${binder}</artifactId>

dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-detail-sender/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.spring.dataflow.sample</groupId>
 		<artifactId>usage-cost-stream-sample</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>usage-detail-sender-${binder}</artifactId>

dataflow-zuul/README.adoc

@@ -18,5 +18,5 @@ In order to get everything running we need to setup the following server instanc
 == Build + Run
 
 Build the sample using `$ mvn clean package` and run using
-`$ java -jar target/dataflow-zuul-1.0.0.BUILD-SNAPSHOT.jar`
+`$ java -jar target/dataflow-zuul-2.0.0-SNAPSHOT.jar`
 

dataflow-zuul/pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud.samples</groupId>
 	<artifactId>dataflow-zuul</artifactId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>ldapserver</name>

function-samples/README.adoc

@@ -13,13 +13,13 @@ cd http-ingest
 ./mvnw clean package
 ```
 
-At this step, the artifact `http-ingest-1.0.0.BUILD-SNAPSHOT.jar` is available.
+At this step, the artifact `http-ingest-2.0.0-SNAPSHOT.jar` is available.
 
 You can register this artifact as the Spring Cloud Data Flow `Source` application as follows,
 From the Spring Cloud Data Flow shell,
 
 ```
-dataflow:>app register --name http-ingest --type source --uri file://<Your local parent directory to the forked github repo>/spring-cloud-dataflow-samples/kafka-samples/http-ingest/target/http-ingest-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:>app register --name http-ingest --type source --uri file://<Your local parent directory to the forked github repo>/spring-cloud-dataflow-samples/kafka-samples/http-ingest/target/http-ingest-2.0.0-SNAPSHOT.jar
 Successfully registered application 'source:http-ingest'
 ```
 
@@ -30,14 +30,14 @@ cd kstreams-word-count
 ./mvnw clean package
 ```
 
-After this step, the artifact `kstreams-word-count-1.0.0.BUILD-SNAPSHOT.jar` is available.
+After this step, the artifact `kstreams-word-count-2.0.0-SNAPSHOT.jar` is available.
 
 You can register this artifact as the Spring Cloud Data Flow `Processor` application as follows:
 
 From the Spring Cloud Data Flow shell,
 
 ```
-dataflow:>app register --name kstream-word-count --type processor --uri file://<Your local parent directory to the forked github repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-word-count/target/kstreams-word-count-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:>app register --name kstream-word-count --type processor --uri file://<Your local parent directory to the forked github repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-word-count/target/kstreams-word-count-2.0.0-SNAPSHOT.jar
 Successfully registered application 'processor:kstream-word-count'
 ```
 
@@ -86,7 +86,7 @@ You can register this artifact as the Spring Cloud Data Flow `Source` applicatio
 From the Spring Cloud Data Flow shell,
 
 ```
-dataflow:>app register --name http-ingest --type source --uri file://<Your local parent directory to the forked github repo>/spring-cloud-dataflow-samples/kafka-samples/http-ingest/target/http-ingest-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:>app register --name http-ingest --type source --uri file://<Your local parent directory to the forked github repo>/spring-cloud-dataflow-samples/kafka-samples/http-ingest/target/http-ingest-2.0.0-SNAPSHOT.jar
 Successfully registered application 'source:http-ingest'
 ```
 
@@ -137,7 +137,7 @@ cd kstreams-join-user-clicks-and-region
 Register this Kafka Streams application as `app` type:
 
 ```
-dataflow:> app register --name join-user-clicks-and-regions --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:> app register --name join-user-clicks-and-regions --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-2.0.0-SNAPSHOT.jar
 
 ```
 
@@ -151,7 +151,7 @@ cd kstreams-log-user-clicks-per-region
 ```
 
 ```
-dataflow:> app register --name log-user-clicks-per-region --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:> app register --name log-user-clicks-per-region --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-2.0.0-SNAPSHOT.jar
 
 ```
 

function-samples/http-click-ingest/pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>org.springframework.cloud.dataflow.samples</groupId>
   <artifactId>http-click-ingest</artifactId>
-  <version>1.0.2.BUILD-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>http-ingest</name>
   <description>Http click ingest application</description>
 

function-samples/http-region-ingest/pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>org.springframework.cloud.dataflow.samples</groupId>
   <artifactId>http-region-ingest</artifactId>
-  <version>1.0.1.BUILD-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>http-region-ingest</name>
   <description>Http region ingest application</description>
 

function-samples/kstreams-join-user-clicks-and-region/README.adoc

@@ -11,5 +11,5 @@ To build this application:
 Register this KStream application as `app` type:
 
 ```
-dataflow:> app register --name join-user-clicks-and-regions --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:> app register --name join-user-clicks-and-regions --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-2.0.0-SNAPSHOT.jar
 ```

function-samples/kstreams-join-user-clicks-and-region/pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>org.springframework.cloud.dataflow.samples</groupId>
 	<artifactId>kstreams-join-user-clicks-and-region</artifactId>
-	<version>1.0.1.BUILD-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>kstreams-join-user-clicks-and-region</name>

function-samples/kstreams-log-user-clicks-per-region/README.adoc

@@ -10,5 +10,5 @@ To build this application:
 To register this application from Spring Cloud Data Flow shell:
 
 ```
-dataflow:> app register --name log-user-clicks-per-region --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:> app register --name log-user-clicks-per-region --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-2.0.0-SNAPSHOT.jar
 ```

function-samples/kstreams-log-user-clicks-per-region/pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>org.springframework.cloud.dataflow.samples</groupId>
   <artifactId>kstreams-log-user-clicks-per-region</artifactId>
-  <version>1.0.1.BUILD-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>kstreams-log-user-clicks-per-region</name>
 
   <dependencyManagement>

function-samples/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud.dataflow.samples</groupId>
 	<artifactId>function-samples-parent</artifactId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>http-click-ingest</module>

function-samples/transform-user-clicks-per-region/README.adoc

@@ -10,5 +10,5 @@ To build this application:
 To register this application from Spring Cloud Data Flow shell:
 
 ```
-dataflow:> app register --name log-user-clicks-per-region --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:> app register --name log-user-clicks-per-region --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-2.0.0-SNAPSHOT.jar
 ```

function-samples/transform-user-clicks-per-region/pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>org.springframework.cloud.dataflow.samples</groupId>
   <artifactId>transform-user-clicks-per-region</artifactId>
-  <version>1.0.1.BUILD-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>transform-user-clicks-per-region</name>
 
   <dependencyManagement>

function-samples/uppercase-processor/pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>org.springframework.cloud.dataflow.samples</groupId>
   <artifactId>uppercase-processor</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>uppercase-processor</name>
   <description>Uppercase processor application</description>
 

javadsl/pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.example</groupId>
 	<artifactId>scdfdsl</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>scdfdsl</name>

kafka-samples/README.adoc

@@ -13,13 +13,13 @@ cd http-ingest
 ./mvnw clean package
 ```
 
-At this step, the artifact `http-ingest-1.0.0.BUILD-SNAPSHOT.jar` is available.
+At this step, the artifact `http-ingest-2.0.0-SNAPSHOT.jar` is available.
 
 You can register this artifact as the Spring Cloud Data Flow `Source` application as follows,
 From the Spring Cloud Data Flow shell,
 
 ```
-dataflow:>app register --name http-ingest --type source --uri file://<Your local parent directory to the forked github repo>/spring-cloud-dataflow-samples/kafka-samples/http-ingest/target/http-ingest-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:>app register --name http-ingest --type source --uri file://<Your local parent directory to the forked github repo>/spring-cloud-dataflow-samples/kafka-samples/http-ingest/target/http-ingest-2.0.0-SNAPSHOT.jar
 Successfully registered application 'source:http-ingest'
 ```
 
@@ -30,14 +30,14 @@ cd kstreams-word-count
 ./mvnw clean package
 ```
 
-After this step, the artifact `kstreams-word-count-1.0.0.BUILD-SNAPSHOT.jar` is available.
+After this step, the artifact `kstreams-word-count-2.0.0-SNAPSHOT.jar` is available.
 
 You can register this artifact as the Spring Cloud Data Flow `Processor` application as follows:
 
 From the Spring Cloud Data Flow shell,
 
 ```
-dataflow:>app register --name kstream-word-count --type processor --uri file://<Your local parent directory to the forked github repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-word-count/target/kstreams-word-count-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:>app register --name kstream-word-count --type processor --uri file://<Your local parent directory to the forked github repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-word-count/target/kstreams-word-count-2.0.0-SNAPSHOT.jar
 Successfully registered application 'processor:kstream-word-count'
 ```
 
@@ -86,7 +86,7 @@ You can register this artifact as the Spring Cloud Data Flow `Source` applicatio
 From the Spring Cloud Data Flow shell,
 
 ```
-dataflow:>app register --name http-ingest --type source --uri file://<Your local parent directory to the forked github repo>/spring-cloud-dataflow-samples/kafka-samples/http-ingest/target/http-ingest-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:>app register --name http-ingest --type source --uri file://<Your local parent directory to the forked github repo>/spring-cloud-dataflow-samples/kafka-samples/http-ingest/target/http-ingest-2.0.0-SNAPSHOT.jar
 Successfully registered application 'source:http-ingest'
 ```
 
@@ -137,7 +137,7 @@ cd kstreams-join-user-clicks-and-region
 Register this Kafka Streams application as `app` type:
 
 ```
-dataflow:> app register --name join-user-clicks-and-regions --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:> app register --name join-user-clicks-and-regions --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-2.0.0-SNAPSHOT.jar
 
 ```
 
@@ -151,7 +151,7 @@ cd kstreams-log-user-clicks-per-region
 ```
 
 ```
-dataflow:> app register --name log-user-clicks-per-region --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:> app register --name log-user-clicks-per-region --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-2.0.0-SNAPSHOT.jar
 
 ```
 

kafka-samples/http-ingest/pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>org.springframework.cloud.dataflow.samples</groupId>
   <artifactId>http-ingest</artifactId>
-  <version>1.0.0.BUILD-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>http-ingest</name>
   <description>Http ingest application</description>
 

kafka-samples/kstreams-join-user-clicks-and-region/README.adoc

@@ -11,5 +11,5 @@ To build this application:
 Register this KStream application as `app` type:
 
 ```
-dataflow:> app register --name join-user-clicks-and-regions --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:> app register --name join-user-clicks-and-regions --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-2.0.0-SNAPSHOT.jar
 ```

kafka-samples/kstreams-join-user-clicks-and-region/pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>org.springframework.cloud.dataflow.samples</groupId>
 	<artifactId>kstreams-join-user-clicks-and-region</artifactId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>kstreams-join-user-clicks-and-region</name>

kafka-samples/kstreams-log-user-clicks-per-region/README.adoc

@@ -10,5 +10,5 @@ To build this application:
 To register this application from Spring Cloud Data Flow shell:
 
 ```
-dataflow:> app register --name log-user-clicks-per-region --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:> app register --name log-user-clicks-per-region --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-2.0.0-SNAPSHOT.jar
 ```

kafka-samples/kstreams-log-user-clicks-per-region/pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>org.springframework.cloud.dataflow.samples</groupId>
   <artifactId>kstreams-log-user-clicks-per-region</artifactId>
-  <version>1.0.0.BUILD-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>kstreams-log-user-clicks-per-region</name>
 
   <dependencyManagement>

kafka-samples/kstreams-word-count/pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>org.springframework.cloud.dataflow.samples</groupId>
 	<artifactId>kstreams-word-count</artifactId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>kstreams-word-count</name>

kafka-samples/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud.dataflow.samples</groupId>
 	<artifactId>kafka-samples-parent</artifactId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>http-ingest</module>

monitoring-samples/spring-cloud-dataflow-prometheus-service-discovery/pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-dataflow-prometheus-service-discovery</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-cloud-dataflow-prometheus-service-discovery</name>

monitoring-samples/stream-apps/demo-processor/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>demo-processor</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>demo-processor</name>
 	<description>Demo project for Spring Boot</description>
 

monitoring-samples/stream-apps/demo-sink/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>demo-sink</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>demo-sink</name>
 	<description>Demo project for Spring Boot</description>
 

monitoring-samples/stream-apps/demo-source/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>demo-source</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>demo-source</name>
 	<description>Demo project for Spring Boot</description>
 

monitoring-samples/task-apps/task-demo-metrics-influxdb/README.md

@@ -116,7 +116,7 @@ Run
 ./mvnw clean install
 ```
 
-Will produce `task-demo-metrics-influx-0.0.1-SNAPSHOT.jar` task application under the `target` folder.
+Will produce `task-demo-metrics-influx-2.0.0-SNAPSHOT.jar` task application under the `target` folder.
 
 ## Spring Cloud Data FLow server
 

monitoring-samples/task-apps/task-demo-metrics-influxdb/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.example.task</groupId>
 	<artifactId>task-demo-metrics-influx</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>task-demo-metrics-influx</name>
 	<description>Demo project for Spring Boot</description>
 

monitoring-samples/task-apps/task-demo-metrics-prometheus/README.md

@@ -183,7 +183,7 @@ Run
 ./mvnw clean install
 ```
 
-Will produce `task-demo-metrics-prometheus-0.0.4-SNAPSHOT.jar` task application under the `target` folder.
+Will produce `task-demo-metrics-prometheus-2.0.0-SNAPSHOT.jar` task application under the `target` folder.
 
 ## Spring Cloud Data FLow server
 

monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml

@@ -21,7 +21,7 @@
 	</parent>
 	<groupId>io.spring.task</groupId>
 	<artifactId>task-demo-metrics-prometheus</artifactId>
-	<version>0.0.4-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>task-demo-metrics-prometheus</name>
 	<description>Demo project for Spring Boot</description>
 

monitoring-samples/task-apps/task-demo-metrics-wavefront/README.md

@@ -86,7 +86,7 @@ Run
 ./mvnw clean install
 ```
 
-Will produce `task-demo-metrics-wavefront-0.0.1-SNAPSHOT.jar` task application under the `target` folder.
+Will produce `task-demo-metrics-wavefront-2.0.0-SNAPSHOT.jar` task application under the `target` folder.
 
 ## Spring Cloud Data Flow server
 

monitoring-samples/task-apps/task-demo-metrics-wavefront/pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>com.example.task</groupId>
 	<artifactId>task-demo-metrics-wavefront</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>task-demo-metrics-wavefront</name>
 	<description>Demo project for Spring Boot</description>
 

multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/README.adoc

@@ -10,5 +10,5 @@ To build this application:
 To register this application from Spring Cloud Data Flow shell:
 
 ```
-dataflow:> app register --name log-user-clicks-per-region --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:> app register --name log-user-clicks-per-region --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-2.0.0-SNAPSHOT.jar
 ```

multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/README.adoc

@@ -11,5 +11,5 @@ To build this application:
 Register this KStream application as `app` type:
 
 ```
-dataflow:> app register --name join-user-clicks-and-regions --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:> app register --name join-user-clicks-and-regions --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-2.0.0-SNAPSHOT.jar
 ```

multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>org.springframework.cloud.dataflow.samples</groupId>
   <artifactId>http-click-ingest</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>http-click-ingest</name>
   <description>Http click ingest application</description>
 

multi-io-samples/kafka-streams/user-clicks-per-region/http-clicks-and-region-ingest/pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>org.springframework.cloud.dataflow.samples</groupId>
   <artifactId>http-clicks-and-region-ingest</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>http-clicks-and-region-ingest</name>
   <description>Http clicks and region ingest application</description>
 

multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>org.springframework.cloud.dataflow.samples</groupId>
   <artifactId>http-region-ingest</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>http-region-ingest</name>
   <description>Http region ingest application</description>
 

multi-io-samples/kafka-streams/user-clicks-per-region/log-user-clicks-per-region/README.adoc

@@ -10,5 +10,5 @@ To build this application:
 To register this application from Spring Cloud Data Flow shell:
 
 ```
-dataflow:> app register --name log-user-clicks-per-region --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:> app register --name log-user-clicks-per-region --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-2.0.0-SNAPSHOT.jar
 ```

multi-io-samples/kafka-streams/user-clicks-per-region/log-user-clicks-per-region/pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>org.springframework.cloud.dataflow.samples</groupId>
   <artifactId>log-user-clicks-per-region</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>log-user-clicks-per-region</name>
 
   <dependencyManagement>

multi-io-samples/kafka-streams/user-clicks-per-region/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud.dataflow.samples</groupId>
 	<artifactId>user-clicks-per-region</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>http-click-ingest</module>

multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/README.adoc

@@ -11,5 +11,5 @@ To build this application:
 Register this KStream application as `app` type:
 
 ```
-dataflow:> app register --name join-user-clicks-and-regions --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-1.0.0.BUILD-SNAPSHOT.jar
+dataflow:> app register --name join-user-clicks-and-regions --type app --uri file://<local parent directory of this git repo>/spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-2.0.0-SNAPSHOT.jar
 ```

multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>org.springframework.cloud.dataflow.samples</groupId>
 	<artifactId>user-clicks-per-region-processor</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>user-clicks-per-region-processor</name>

multi-io-samples/purchase-orders/http-purchase-orders/pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>org.springframework.cloud.dataflow.samples</groupId>
   <artifactId>http-purchase-orders</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>http-purchase-orders</name>
   <description>Http purchase order application</description>
 

multi-io-samples/ticktock/multi-input-log-kafka/pom.xml

@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.springframework.cloud.stream.app</groupId>
 	<artifactId>multi-input-log-kafka</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>multi-input-log-kafka</name>
 	<description>Spring Cloud Stream Multi Input Log Sink Kafka Binder Application
 	</description>

multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml

@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.springframework.cloud.stream.app</groupId>
 	<artifactId>multi-input-log-rabbit</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>multi-input-log-rabbit</name>
 	<description>Spring Cloud Stream Multi Input Log Sink Rabbit Binder Application
 	</description>

multi-io-samples/ticktock/multi-output-time-kafka/pom.xml

@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.springframework.cloud.stream.app</groupId>
 	<artifactId>multi-output-time-kafka</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>multi-output-time-kafka</name>
 	<description>Spring Cloud Stream Multi Output Time Source Kafka Binder Application
 	</description>

multi-io-samples/ticktock/multi-output-time-rabbit/pom.xml

@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.springframework.cloud.stream.app</groupId>
 	<artifactId>multi-output-time-rabbit</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>multi-output-time-rabbit</name>
 	<description>Spring Cloud Stream Multi Output Time Source Rabbit Binder Application
 	</description>

multi-io-samples/ticktock/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud.dataflow.samples</groupId>
 	<artifactId>ticktock</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>multi-output-time-rabbit</module>

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-dataflow-samples</artifactId>
 	<groupId>org.springframework.cloud</groupId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 
 	<description>Spring Cloud Data Flow Samples</description>
 	<properties>

scenario-task/README.adoc

@@ -19,7 +19,7 @@ Allows user to test various success and failures scenarios when task-batch apps
 
 ### Command Line
 ```
-java -jar scenario-task-0.0.1-SNAPSHOT.jar
+java -jar scenario-task-2.0.0-SNAPSHOT.jar
 ```
 
 ### Docker
@@ -59,12 +59,12 @@ export spring_datasource_url=jdbc:<your db>
 export spring_datasource_username=<your username>
 export spring_datasource_password=<your password>
 export spring_datasource_driverClassName=<your driver>
-java -jar scenario-task-0.0.1-SNAPSHOT.jar --io.spring.failBatch=true --io.spring.jobName=testSamp1
+java -jar scenario-task-2.0.0-SNAPSHOT.jar --io.spring.failBatch=true --io.spring.jobName=testSamp1
 ```
 Now looking at our results we see that the `ExpectedException` has been thrown as expected, the Job has failed, but, the task has succeeded.
 So now let's let's launch our scenario-task again with the same settings.
 ```
-java -jar scenario-task-0.0.1-SNAPSHOT.jar --io.spring.failBatch=true --io.spring.jobName=testSamp1
+java -jar scenario-task-2.0.0-SNAPSHOT.jar --io.spring.failBatch=true --io.spring.jobName=testSamp1
 ```
 Now looking at our results we see that job succeeded and the task succeeded.
 This is because our scenario-task saw that for this job instance the first run
@@ -83,12 +83,12 @@ export spring_datasource_url=jdbc:<your db>
 export spring_datasource_username=<your username>
 export spring_datasource_password=<your password>
 export spring_datasource_driverClassName=<your driver>
-java -jar scenario-task-0.0.1-SNAPSHOT.jar --io.spring.failBatch=true --io.spring.jobName=testSamp2 --spring.cloud.task.batch.fail-on-job-failure=true
+java -jar scenario-task-2.0.0-SNAPSHOT.jar --io.spring.failBatch=true --io.spring.jobName=testSamp2 --spring.cloud.task.batch.fail-on-job-failure=true
 ```
 Now looking at our results we see that the `ExpectedException` has been thrown as expected, the Job has failed, and the task has failed.
 So now let's let's launch our scenario-task again with the same settings.
 ```
-java -jar scenario-task-0.0.1-SNAPSHOT.jar --io.spring.failBatch=true --io.spring.jobName=testSamp2 --spring.cloud.task.batch.fail-on-job-failure=true
+java -jar scenario-task-2.0.0-SNAPSHOT.jar --io.spring.failBatch=true --io.spring.jobName=testSamp2 --spring.cloud.task.batch.fail-on-job-failure=true
 ```
 Now looking at our results we see that job succeeded and the task succeeded.
 This is because our scenario-task saw that for this job instance the first run
@@ -98,14 +98,14 @@ throw the `ExpectedException` again.   Thus, the job is successful.
 ### Successful Task Launch With No Job
 For this scenario we want launch the task that terminates successfully (exit code of 0) and have no associated batch job run.   Also, we want to set the name of our task-execution.
 ```
-java -jar scenario-task-0.0.1-SNAPSHOT.jar  --io.spring.launchBatchJob=false --spring.application.name=testTask1
+java -jar scenario-task-2.0.0-SNAPSHOT.jar  --io.spring.launchBatchJob=false --spring.application.name=testTask1
 ```
 We can see that the task launched and completed successfully with no associated batch job.
 
 ### Fail Task Launch With No Job
 For this scenario we want launch the task that terminates unsuccessfully (exit code of 1) and have no associated batch job run.   Also, we want to set the name of our task-execution.
 ```
-java -jar scenario-task-0.0.1-SNAPSHOT.jar  --io.spring.launchBatchJob=false --spring.application.name=testTask1 --io.spring.failTask=true
+java -jar scenario-task-2.0.0-SNAPSHOT.jar  --io.spring.launchBatchJob=false --spring.application.name=testTask1 --io.spring.failTask=true
 ```
 We can see that the task launched and failed because a `ExpectedException` was thrown.  Also, the task execution had no associated batch job.
 
@@ -116,7 +116,7 @@ This will test the fail and restart capabilities of an composed task.
 #### Register The Scenario Task Application
 Using The Spring Cloud Data Flow shell enter the following command:
 ```
-app register --name scenario --type task --uri maven://io.spring:scenario-task:0.0.1-SNAPSHOT
+app register --name scenario --type task --uri maven://io.spring:scenario-task:2.0.0-SNAPSHOT
 ```
 
 #### Create Composed Task Definition

scenario-task/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>io.spring</groupId>
 	<artifactId>scenario-task</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>scenario-task</name>
 	<description>Exercises failure and success conditions for task and batch.</description>
 
@@ -100,42 +100,6 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>io.fabric8</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.21.0</version>
-				<configuration>
-					<images>
-						<image>
-							<name>springcloudtask/${project.artifactId}</name>
-							<build>
-								<tags>
-									<tag>${project.version}</tag>
-								</tags>
-								<from>springcloud/openjdk:2.0.0.RELEASE</from>
-								<volumes>
-									<volume>/tmp</volume>
-								</volumes>
-								<env>
-									<LANG>C.UTF-8</LANG>
-								</env>
-								<entryPoint>
-									<exec>
-										<arg>java</arg>
-										<arg>-jar</arg>
-										<arg>/maven/scenario-task.jar</arg>
-									</exec>
-								</entryPoint>
-								<assembly>
-									<name>maven</name>
-									<descriptor>assembly.xml</descriptor>
-									<targetDir>/</targetDir>
-								</assembly>
-							</build>
-						</image>
-					</images>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 

security-ldap-uaa-example/README.adoc

@@ -41,7 +41,7 @@ Please ensure you have the following 3 items installed:
 $ git clone https://github.com/spring-cloud/spring-cloud-dataflow-samples.git
 $ cd spring-cloud-dataflow-samples/security-ldap-uaa-example
 $ ./mvnw clean package
-$ java -jar target/ldapserver-uaa-1.0.0.BUILD-SNAPSHOT.jar
+$ java -jar target/ldapserver-uaa-2.0.0-SNAPSHOT.jar
 ----
 
 ==== Download + Start UAA Server
@@ -56,7 +56,7 @@ $ git clone https://github.com/pivotal/uaa-bundled.git
 $ cd uaa-bundled
 $ export CLOUD_FOUNDRY_CONFIG_PATH=/path/to/dev/security-ldap-uaa-example
 $ ./mvnw clean package
-$ java -jar target/uaa-bundled-1.0.0.BUILD-SNAPSHOT.jar
+$ java -jar target/uaa-bundled-2.0.0-SNAPSHOT.jar
 ----
 
 ==== Prepare UAA Server

security-ldap-uaa-example/pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.hillert.scdf</groupId>
 	<artifactId>ldapserver-uaa</artifactId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>ldapserver</name>

spring-cloud-stream-function-bindings/log-sink/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>log-sink</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>log-sink</name>
 	<description>Demo project for Spring Boot</description>
 

spring-cloud-stream-function-bindings/time-source/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>time-source</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>time-source</name>
 	<description>Demo project for Spring Boot</description>
 

src/main/asciidoc/batch/file-ingest-sftp/local.adoc

@@ -25,7 +25,7 @@ $ cd batch/file-ingest
 $ mvn clean package
 ```
 NOTE: For convenience, you can skip this step.
-The jar is published to the  https://repo.spring.io/libs-snapshot-local/io/spring/cloud/dataflow/ingest/ingest/1.0.0.BUILD-SNAPSHOT/[Spring Maven repository]
+The jar is published to the  https://repo.spring.io/libs-snapshot-local/io/spring/cloud/dataflow/ingest/ingest/2.0.0-SNAPSHOT/[Spring Maven repository]
 +
 
 . Create the data directories
@@ -56,7 +56,7 @@ dataflow:>app register --name task-launcher --type sink --uri maven://org.spring
 Successfully registered application 'sink:task-launcher'
 ----
 +
-. Register and create the file ingest task. If you're using the published jar, set `--uri maven://io.spring.cloud.dataflow.ingest:ingest:1.0.0.BUILD-SNAPSHOT`:
+. Register and create the file ingest task. If you're using the published jar, set `--uri maven://io.spring.cloud.dataflow.ingest:ingest:2.0.0-SNAPSHOT`:
 [source,console,options=nowrap]
 dataflow:>app register --name fileIngest --type task --uri file:///path/to/target/ingest-X.X.X.jar
 Successfully registered application 'task:fileIngest'

src/main/asciidoc/batch/file-ingest-sftp/pcf.adoc

@@ -47,7 +47,7 @@ One way to do this is to set deployment properties when creating and deploying t
 
 The source code for the <<Batch File Ingest>> batch job is located in `batch/file-ingest`.
 The resulting executable jar file must be available in a location that is accessible to your Cloud Foundry instance, such as an HTTP server or Maven repository.
-For convenience, the jar is published to the  https://repo.spring.io/libs-snapshot-local/io/spring/cloud/dataflow/ingest/ingest/1.0.0.BUILD-SNAPSHOT/[Spring Maven repository]
+For convenience, the jar is published to the  https://repo.spring.io/libs-snapshot-local/io/spring/cloud/dataflow/ingest/ingest/2.0.0-SNAPSHOT/[Spring Maven repository]
 
 . Create the remote directory
 +
@@ -85,7 +85,7 @@ Successfully registered application 'sink:task-launcher'
 +
 . Register and create the file ingest task:
 [source,console,options=nowrap]
-dataflow:>app register --name fileIngest --type task --uri maven://io.spring.cloud.dataflow.ingest:ingest:1.0.0.BUILD-SNAPSHOT
+dataflow:>app register --name fileIngest --type task --uri maven://io.spring.cloud.dataflow.ingest:ingest:2.0.0-SNAPSHOT
 Successfully registered application 'task:fileIngest'
 dataflow:>task create fileIngestTask --definition fileIngest
 Created new task 'fileIngestTask'

src/main/asciidoc/datascience/species-prediction/main.adoc

@@ -49,11 +49,11 @@ dataflow:>stream list
 
 [source,console,options=nowrap]
 ----
-2016-02-18 06:36:45.396  INFO 31194 --- [nio-9393-exec-1] o.s.c.d.d.l.OutOfProcessModuleDeployer   : deploying module org.springframework.cloud.stream.module:log-sink:jar:exec:1.0.0.BUILD-SNAPSHOT instance 0
+2016-02-18 06:36:45.396  INFO 31194 --- [nio-9393-exec-1] o.s.c.d.d.l.OutOfProcessModuleDeployer   : deploying module org.springframework.cloud.stream.module:log-sink:jar:exec:2.0.0-SNAPSHOT instance 0
    Logs will be in /var/folders/c3/ctx7_rns6x30tq7rb76wzqwr0000gp/T/spring-cloud-data-flow-3038434123335455382/pmmlTest-1455806205386/pmmlTest.log
-2016-02-18 06:36:45.402  INFO 31194 --- [nio-9393-exec-1] o.s.c.d.d.l.OutOfProcessModuleDeployer   : deploying module org.springframework.cloud.stream.module:pmml-processor:jar:exec:1.0.0.BUILD-SNAPSHOT instance 0
+2016-02-18 06:36:45.402  INFO 31194 --- [nio-9393-exec-1] o.s.c.d.d.l.OutOfProcessModuleDeployer   : deploying module org.springframework.cloud.stream.module:pmml-processor:jar:exec:2.0.0-SNAPSHOT instance 0
    Logs will be in /var/folders/c3/ctx7_rns6x30tq7rb76wzqwr0000gp/T/spring-cloud-data-flow-3038434123335455382/pmmlTest-1455806205386/pmmlTest.pmml
-2016-02-18 06:36:45.407  INFO 31194 --- [nio-9393-exec-1] o.s.c.d.d.l.OutOfProcessModuleDeployer   : deploying module org.springframework.cloud.stream.module:http-source:jar:exec:1.0.0.BUILD-SNAPSHOT instance 0
+2016-02-18 06:36:45.407  INFO 31194 --- [nio-9393-exec-1] o.s.c.d.d.l.OutOfProcessModuleDeployer   : deploying module org.springframework.cloud.stream.module:http-source:jar:exec:2.0.0-SNAPSHOT instance 0
    Logs will be in /var/folders/c3/ctx7_rns6x30tq7rb76wzqwr0000gp/T/spring-cloud-data-flow-3038434123335455382/pmmlTest-1455806205386/pmmlTest.http
 ----
 +

src/main/asciidoc/functions/main.adoc

@@ -40,7 +40,7 @@ dataflow:>app register --name function-runner --type processor --uri maven://org
 . Create and deploy the following stream
 +
 ```
-dataflow:>stream create foo --definition "http --server.port=9001 | function-runner --function.className=com.example.functions.CharCounter --function.location=file:///<PATH/TO/SPRING-CLOUD-FUNCTION>/spring-cloud-function-samples/function-sample/target/spring-cloud-function-sample-1.0.0.BUILD-SNAPSHOT.jar | log" --deploy
+dataflow:>stream create foo --definition "http --server.port=9001 | function-runner --function.className=com.example.functions.CharCounter --function.location=file:///<PATH/TO/SPRING-CLOUD-FUNCTION>/spring-cloud-function-samples/function-sample/target/spring-cloud-function-sample-2.0.0-SNAPSHOT.jar | log" --deploy
 
 ```
 +

src/main/asciidoc/javadsl/main.adoc

@@ -72,7 +72,7 @@ Another useful class is the `DeploymentPropertiesBuilder` which aids in the crea
 This sample demonstrates the use of the local Data Flow Server, but you can pass in the option `--uri` to point to another Data Flow server instance that is running elsewhere.
 [source,bash]
 ----
-$ java -jar target/scdfdsl-0.0.1-SNAPSHOT.jar
+$ java -jar target/scdfdsl-2.0.0-SNAPSHOT.jar
 ----
 You will then see the following output.
 [source,bash]
@@ -139,7 +139,7 @@ different ways to authorize the sample application (i.e. the client).
 Use basic authentication:
 [source,bash,options="nowrap"]
 ----
-$ java -jar target/scdfdsl-0.0.1-SNAPSHOT.jar \
+$ java -jar target/scdfdsl-2.0.0-SNAPSHOT.jar \
   --spring.cloud.dataflow.client.authentication.basic.username=user \
   --spring.cloud.dataflow.client.authentication.basic.password=password
 ----
@@ -147,7 +147,7 @@ $ java -jar target/scdfdsl-0.0.1-SNAPSHOT.jar \
 Use OAuth client settings (UAA is used as the identity provider in this sample):
 [source,bash,options="nowrap"]
 ----
-$ java -jar target/scdfdsl-0.0.1-SNAPSHOT.jar \
+$ java -jar target/scdfdsl-2.0.0-SNAPSHOT.jar \
   --spring.cloud.dataflow.client.authentication.client-id=dataflow \
   --spring.cloud.dataflow.client.authentication.client-secret=secret \
   --spring.cloud.dataflow.client.authentication.token-uri=http://localhost:8080/uaa/oauth/token \
@@ -158,7 +158,7 @@ $ java -jar target/scdfdsl-0.0.1-SNAPSHOT.jar \
 Use OAuth access token:
 [source,bash,options="nowrap"]
 ----
-$ java -jar target/scdfdsl-0.0.1-SNAPSHOT.jar \
+$ java -jar target/scdfdsl-2.0.0-SNAPSHOT.jar \
   --spring.cloud.dataflow.client.authentication.access-token=849228ed663e450ab5051c998eb71a4a
 ----
 

src/main/asciidoc/streaming/cassandra/http-to-cassandra/local.adoc

@@ -56,9 +56,9 @@ dataflow:>stream list
 
 [source,console,options=nowrap]
 ----
-2015-12-15 15:52:31.576  INFO 18337 --- [nio-9393-exec-1] o.s.c.d.a.s.l.OutOfProcessModuleDeployer : deploying module org.springframework.cloud.stream.module:cassandra-sink:jar:exec:1.0.0.BUILD-SNAPSHOT instance 0
+2015-12-15 15:52:31.576  INFO 18337 --- [nio-9393-exec-1] o.s.c.d.a.s.l.OutOfProcessModuleDeployer : deploying module org.springframework.cloud.stream.module:cassandra-sink:jar:exec:2.0.0-SNAPSHOT instance 0
    Logs will be in /var/folders/c3/ctx7_rns6x30tq7rb76wzqwr0000gp/T/spring-cloud-data-flow-284240942697761420/cassandrastream.cassandra
-2015-12-15 15:52:31.583  INFO 18337 --- [nio-9393-exec-1] o.s.c.d.a.s.l.OutOfProcessModuleDeployer : deploying module org.springframework.cloud.stream.module:http-source:jar:exec:1.0.0.BUILD-SNAPSHOT instance 0
+2015-12-15 15:52:31.583  INFO 18337 --- [nio-9393-exec-1] o.s.c.d.a.s.l.OutOfProcessModuleDeployer : deploying module org.springframework.cloud.stream.module:http-source:jar:exec:2.0.0-SNAPSHOT instance 0
    Logs will be in /var/folders/c3/ctx7_rns6x30tq7rb76wzqwr0000gp/T/spring-cloud-data-flow-284240942697761420/cassandrastream.http
 ----
 +

src/main/asciidoc/streaming/custom-apps/celsius-converter-processor/main.adoc

@@ -76,7 +76,7 @@ $./mvnw clean package
 . Run the Application standalone
 +
 ```
-java -jar target/celsius-converter-processor-0.0.1-SNAPSHOT.jar
+java -jar target/celsius-converter-processor-2.0.0-SNAPSHOT.jar
 ```
 +
 If all goes well, we should have a running standalone Spring Boot Application.

timestamp-batch/README.adoc

@@ -30,7 +30,7 @@ This is a Spring Cloud Task application that executes two simple Spring Batch Jo
 === Command line
 [source,shell,indent=2]
 ----
-java -jar target/timestamp-batch-task-1.0.0.jar
+java -jar target/timestamp-batch-task-2.0.0.jar
 ----
 
 === Docker

timestamp-batch/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>io.spring</groupId>
 	<artifactId>timestamp-batch-task</artifactId>
-	<version>1.0.0</version>
+	<version>2.0.0</version>
 	<name>timestamp-task</name>
 	<description>Simple Timestamp sample.</description>
 
@@ -81,42 +81,6 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>io.fabric8</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.21.0</version>
-				<configuration>
-					<images>
-						<image>
-							<name>springcloudtask/${project.artifactId}</name>
-							<build>
-								<tags>
-									<tag>${project.version}</tag>
-								</tags>
-								<from>springcloud/openjdk:2.0.0.RELEASE</from>
-								<volumes>
-									<volume>/tmp</volume>
-								</volumes>
-								<env>
-									<LANG>C.UTF-8</LANG>
-								</env>
-								<entryPoint>
-									<exec>
-										<arg>java</arg>
-										<arg>-jar</arg>
-										<arg>/maven/timestamp-batch-task.jar</arg>
-									</exec>
-								</entryPoint>
-								<assembly>
-									<name>maven</name>
-									<descriptor>assembly.xml</descriptor>
-									<targetDir>/</targetDir>
-								</assembly>
-							</build>
-						</image>
-					</images>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>