From 96c487a8207893a053a9b269b0b8545b02be8b39 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Mon, 24 Jan 2022 09:18:13 -0600 Subject: [PATCH] Consolidate version numbers to 2.0.0(-SNAPSHOT) Partially resolves #156 --- .github/workflows/ci.yml | 54 +++++++++---------- batch/file-ingest/pom.xml | 2 +- .../dataflow-server-21x/build.gradle | 2 +- .../dataflow-server-21x/pom.xml | 2 +- .../test/build-and-compare | 4 +- .../dataflow-server-22x/build.gradle | 2 +- .../dataflow-server-22x/pom.xml | 2 +- .../test/build-and-compare | 4 +- .../dataflow-server-25x/build.gradle | 2 +- .../dataflow-server-25x/pom.xml | 2 +- .../test/build-and-compare | 4 +- .../dataflow-server-25x/test/compare | 4 +- dataflow-migrate-schedules/pom.xml | 4 +- .../scripts/runKubernetesMigration.sh | 2 +- dataflow-template-example/README.adoc | 2 +- dataflow-template-example/pom.xml | 2 +- dataflow-template-load-generator/README.adoc | 2 +- dataflow-template-load-generator/pom.xml | 2 +- .../batch/batchsamples/README.adoc | 4 +- .../batch/batchsamples/billrun/pom.xml | 2 +- .../batch/batchsamples/billsetuptask/pom.xml | 2 +- .../batch/batchsamples/pom.xml | 2 +- .../recipes/file-ingest/file-to-jdbc/pom.xml | 2 +- .../recipes/kinesisdemo/README.adoc | 4 +- .../kinesisdemo/kinesisconsumer/pom.xml | 4 +- .../kinesisdemo/kinesisproducer/pom.xml | 4 +- dataflow-website/recipes/kinesisdemo/pom.xml | 2 +- .../scaling/scdf-alert-webhook/pom.xml | 2 +- .../composed-http-transformer-kafka/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../streams/standalone-stream-sample/pom.xml | 2 +- .../usage-cost-logger/pom.xml | 2 +- .../usage-cost-processor/pom.xml | 2 +- .../usage-detail-sender/pom.xml | 2 +- dataflow-zuul/README.adoc | 2 +- dataflow-zuul/pom.xml | 2 +- function-samples/README.adoc | 14 ++--- function-samples/http-click-ingest/pom.xml | 2 +- function-samples/http-region-ingest/pom.xml | 2 +- .../README.adoc | 2 +- .../pom.xml | 2 +- .../README.adoc | 2 +- .../pom.xml | 2 +- function-samples/pom.xml | 2 +- .../README.adoc | 2 +- .../transform-user-clicks-per-region/pom.xml | 2 +- function-samples/uppercase-processor/pom.xml | 2 +- javadsl/pom.xml | 2 +- kafka-samples/README.adoc | 14 ++--- kafka-samples/http-ingest/pom.xml | 2 +- .../README.adoc | 2 +- .../pom.xml | 2 +- .../README.adoc | 2 +- .../pom.xml | 2 +- kafka-samples/kstreams-word-count/pom.xml | 2 +- kafka-samples/pom.xml | 2 +- .../pom.xml | 2 +- .../stream-apps/demo-processor/pom.xml | 2 +- .../stream-apps/demo-sink/pom.xml | 2 +- .../stream-apps/demo-source/pom.xml | 2 +- .../task-demo-metrics-influxdb/README.md | 2 +- .../task-demo-metrics-influxdb/pom.xml | 2 +- .../task-demo-metrics-prometheus/README.md | 2 +- .../task-demo-metrics-prometheus/pom.xml | 2 +- .../task-demo-metrics-wavefront/README.md | 2 +- .../task-demo-metrics-wavefront/pom.xml | 2 +- .../log-user-clicks-per-region/README.adoc | 2 +- .../README.adoc | 2 +- .../http-click-ingest/pom.xml | 2 +- .../http-clicks-and-region-ingest/pom.xml | 2 +- .../http-region-ingest/pom.xml | 2 +- .../log-user-clicks-per-region/README.adoc | 2 +- .../log-user-clicks-per-region/pom.xml | 2 +- .../user-clicks-per-region/pom.xml | 2 +- .../README.adoc | 2 +- .../user-clicks-per-region-processor/pom.xml | 2 +- .../http-purchase-orders/pom.xml | 2 +- .../ticktock/multi-input-log-kafka/pom.xml | 2 +- .../ticktock/multi-input-log-rabbit/pom.xml | 2 +- .../ticktock/multi-output-time-kafka/pom.xml | 2 +- .../ticktock/multi-output-time-rabbit/pom.xml | 2 +- multi-io-samples/ticktock/pom.xml | 2 +- pom.xml | 2 +- scenario-task/README.adoc | 16 +++--- scenario-task/pom.xml | 38 +------------ security-ldap-uaa-example/README.adoc | 4 +- security-ldap-uaa-example/pom.xml | 2 +- .../log-sink/pom.xml | 2 +- .../time-source/pom.xml | 2 +- .../batch/file-ingest-sftp/local.adoc | 4 +- .../asciidoc/batch/file-ingest-sftp/pcf.adoc | 4 +- .../datascience/species-prediction/main.adoc | 6 +-- src/main/asciidoc/functions/main.adoc | 2 +- src/main/asciidoc/javadsl/main.adoc | 8 +-- .../cassandra/http-to-cassandra/local.adoc | 4 +- .../celsius-converter-processor/main.adoc | 2 +- timestamp-batch/README.adoc | 2 +- timestamp-batch/pom.xml | 38 +------------ timestamp-task/README.adoc | 2 +- timestamp-task/pom.xml | 38 +------------ transition-sample/Dockerfile | 4 +- transition-sample/README.adoc | 2 +- transition-sample/pom.xml | 2 +- 105 files changed, 169 insertions(+), 277 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b0f1f5..35da726 100644 --- a/.github/workflows/ci.yml +++ b/.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-region-ingest:1.2.0-SNAPSHOT - springcloudstream/multi-io-sample-http-clicks-and-region-ingest:1.2.0-SNAPSHOT - springcloudstream/multi-io-sample-user-clicks-per-region-processor:1.2.0-SNAPSHOT - springcloudstream/multi-io-sample-log-user-clicks-per-region:1.2.0-SNAPSHOT + springcloudstream/multi-io-sample-http-click-ingest:2.0.0-SNAPSHOT + springcloudstream/multi-io-sample-http-region-ingest:2.0.0-SNAPSHOT + springcloudstream/multi-io-sample-http-clicks-and-region-ingest:2.0.0-SNAPSHOT + springcloudstream/multi-io-sample-user-clicks-per-region-processor:2.0.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-cost-processor-kafka:0.0.1-SNAPSHOT - springcloudstream/usage-cost-logger-kafka:0.0.1-SNAPSHOT + springcloudstream/usage-detail-sender-kafka:2.0.0-SNAPSHOT + springcloudstream/usage-cost-processor-kafka:2.0.0-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-cost-processor-rabbit:0.0.1-SNAPSHOT - springcloudstream/usage-cost-logger-rabbit:0.0.1-SNAPSHOT + springcloudstream/usage-detail-sender-rabbit:2.0.0-SNAPSHOT + springcloudstream/usage-cost-processor-rabbit:2.0.0-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 \ No newline at end of file diff --git a/batch/file-ingest/pom.xml b/batch/file-ingest/pom.xml index aa5a611..deb51af 100644 --- a/batch/file-ingest/pom.xml +++ b/batch/file-ingest/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.spring.cloud.dataflow.ingest ingest - 1.0.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT org.springframework.boot spring-boot-starter-parent diff --git a/custom-dataflow-builds/dataflow-server-21x/build.gradle b/custom-dataflow-builds/dataflow-server-21x/build.gradle index ccd2bc8..b8cb26f 100644 --- a/custom-dataflow-builds/dataflow-server-21x/build.gradle +++ b/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 { diff --git a/custom-dataflow-builds/dataflow-server-21x/pom.xml b/custom-dataflow-builds/dataflow-server-21x/pom.xml index b5284e6..91c40b8 100644 --- a/custom-dataflow-builds/dataflow-server-21x/pom.xml +++ b/custom-dataflow-builds/dataflow-server-21x/pom.xml @@ -10,7 +10,7 @@ com.example custom-dataflow-server-maven - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT custom-dataflow-server Demo project for Spring Boot diff --git a/custom-dataflow-builds/dataflow-server-21x/test/build-and-compare b/custom-dataflow-builds/dataflow-server-21x/test/build-and-compare index 458523d..ed48bd0 100755 --- a/custom-dataflow-builds/dataflow-server-21x/test/build-and-compare +++ b/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) diff --git a/custom-dataflow-builds/dataflow-server-22x/build.gradle b/custom-dataflow-builds/dataflow-server-22x/build.gradle index 1366624..d7809b0 100644 --- a/custom-dataflow-builds/dataflow-server-22x/build.gradle +++ b/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 { diff --git a/custom-dataflow-builds/dataflow-server-22x/pom.xml b/custom-dataflow-builds/dataflow-server-22x/pom.xml index b82fa97..c7b8ac9 100644 --- a/custom-dataflow-builds/dataflow-server-22x/pom.xml +++ b/custom-dataflow-builds/dataflow-server-22x/pom.xml @@ -10,7 +10,7 @@ com.example custom-dataflow-server-maven - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT custom-dataflow-server Demo project for Spring Boot diff --git a/custom-dataflow-builds/dataflow-server-22x/test/build-and-compare b/custom-dataflow-builds/dataflow-server-22x/test/build-and-compare index f2fb469..b900d5c 100755 --- a/custom-dataflow-builds/dataflow-server-22x/test/build-and-compare +++ b/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) diff --git a/custom-dataflow-builds/dataflow-server-25x/build.gradle b/custom-dataflow-builds/dataflow-server-25x/build.gradle index 9dfcc47..9bc21ff 100644 --- a/custom-dataflow-builds/dataflow-server-25x/build.gradle +++ b/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 { diff --git a/custom-dataflow-builds/dataflow-server-25x/pom.xml b/custom-dataflow-builds/dataflow-server-25x/pom.xml index 8fac13f..5d7489f 100644 --- a/custom-dataflow-builds/dataflow-server-25x/pom.xml +++ b/custom-dataflow-builds/dataflow-server-25x/pom.xml @@ -10,7 +10,7 @@ com.example custom-dataflow-server-maven - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT custom-dataflow-server Demo project for Spring Boot diff --git a/custom-dataflow-builds/dataflow-server-25x/test/build-and-compare b/custom-dataflow-builds/dataflow-server-25x/test/build-and-compare index 024ff23..3b3f532 100755 --- a/custom-dataflow-builds/dataflow-server-25x/test/build-and-compare +++ b/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) diff --git a/custom-dataflow-builds/dataflow-server-25x/test/compare b/custom-dataflow-builds/dataflow-server-25x/test/compare index 82c512c..0fe5bf9 100755 --- a/custom-dataflow-builds/dataflow-server-25x/test/compare +++ b/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) diff --git a/dataflow-migrate-schedules/pom.xml b/dataflow-migrate-schedules/pom.xml index 842bfc7..2790e2c 100644 --- a/dataflow-migrate-schedules/pom.xml +++ b/dataflow-migrate-schedules/pom.xml @@ -11,14 +11,14 @@ io.spring migrateschedule - 1.0.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT Schedule CD Migrator Migrates SCDF Schedules so that SchedulerTaskLauncher is no longer required. 1.8 2.5.0.BUILD-SNAPSHOT - 2.3.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT diff --git a/dataflow-migrate-schedules/scripts/runKubernetesMigration.sh b/dataflow-migrate-schedules/scripts/runKubernetesMigration.sh index 7824423..0a19ea0 100755 --- a/dataflow-migrate-schedules/scripts/runKubernetesMigration.sh +++ b/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 $* diff --git a/dataflow-template-example/README.adoc b/dataflow-template-example/README.adoc index da3b7d0..dcb82e7 100644 --- a/dataflow-template-example/README.adoc +++ b/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` diff --git a/dataflow-template-example/pom.xml b/dataflow-template-example/pom.xml index 1740efc..83b6822 100644 --- a/dataflow-template-example/pom.xml +++ b/dataflow-template-example/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud.samples dataflow-template - 1.0.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT jar ldapserver diff --git a/dataflow-template-load-generator/README.adoc b/dataflow-template-load-generator/README.adoc index 24eaaca..bb90d09 100644 --- a/dataflow-template-load-generator/README.adoc +++ b/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` diff --git a/dataflow-template-load-generator/pom.xml b/dataflow-template-load-generator/pom.xml index 06d6cc4..27b43fd 100644 --- a/dataflow-template-load-generator/pom.xml +++ b/dataflow-template-load-generator/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud.samples dataflow-template-load-generator - 1.0.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT jar ldapserver diff --git a/dataflow-website/batch-developer-guides/batch/batchsamples/README.adoc b/dataflow-website/batch-developer-guides/batch/batchsamples/README.adoc index a78d7b5..c8995f7 100644 --- a/dataflow-website/batch-developer-guides/batch/batchsamples/README.adoc +++ b/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/?useSSL=false --spring.datasource.username= --spring.datasource.password= --spring.datasource.driverClassName=org.mariadb.jdbc.Driver +$ java -jar target/billsetuptask-2.0.0-SNAPSHOT.jar --spring.datasource.url=jdbc:mariadb://localhost:3306/?useSSL=false --spring.datasource.username= --spring.datasource.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/?useSSL=false --spring.datasource.username= --spring.datasource.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/?useSSL=false --spring.datasource.username= --spring.datasource.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://` diff --git a/dataflow-website/batch-developer-guides/batch/batchsamples/billrun/pom.xml b/dataflow-website/batch-developer-guides/batch/batchsamples/billrun/pom.xml index 0c85e99..6259614 100644 --- a/dataflow-website/batch-developer-guides/batch/batchsamples/billrun/pom.xml +++ b/dataflow-website/batch-developer-guides/batch/batchsamples/billrun/pom.xml @@ -6,7 +6,7 @@ spring-cloud-task-edu-samples io.spring - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT billrun diff --git a/dataflow-website/batch-developer-guides/batch/batchsamples/billsetuptask/pom.xml b/dataflow-website/batch-developer-guides/batch/batchsamples/billsetuptask/pom.xml index 5326f9d..e9e54ee 100644 --- a/dataflow-website/batch-developer-guides/batch/batchsamples/billsetuptask/pom.xml +++ b/dataflow-website/batch-developer-guides/batch/batchsamples/billsetuptask/pom.xml @@ -6,7 +6,7 @@ spring-cloud-task-edu-samples io.spring - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT billsetuptask diff --git a/dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml b/dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml index 0a4cc95..89e1202 100644 --- a/dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml +++ b/dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml @@ -7,7 +7,7 @@ spring-cloud-task-edu-samples io.spring - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT pom Spring Cloud Task EDU Samples diff --git a/dataflow-website/recipes/file-ingest/file-to-jdbc/pom.xml b/dataflow-website/recipes/file-ingest/file-to-jdbc/pom.xml index a0e7605..67b3a4e 100644 --- a/dataflow-website/recipes/file-ingest/file-to-jdbc/pom.xml +++ b/dataflow-website/recipes/file-ingest/file-to-jdbc/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.spring.cloud.dataflow.ingest ingest - 1.0.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT org.springframework.boot spring-boot-starter-parent diff --git a/dataflow-website/recipes/kinesisdemo/README.adoc b/dataflow-website/recipes/kinesisdemo/README.adoc index 0141548..90af1ac 100644 --- a/dataflow-website/recipes/kinesisdemo/README.adoc +++ b/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 diff --git a/dataflow-website/recipes/kinesisdemo/kinesisconsumer/pom.xml b/dataflow-website/recipes/kinesisdemo/kinesisconsumer/pom.xml index cd657e9..d2572e3 100644 --- a/dataflow-website/recipes/kinesisdemo/kinesisconsumer/pom.xml +++ b/dataflow-website/recipes/kinesisdemo/kinesisconsumer/pom.xml @@ -5,11 +5,11 @@ kinesisdemo com.example - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT kinesisconsumer - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT kinesisconsumer Demo project for Spring Boot diff --git a/dataflow-website/recipes/kinesisdemo/kinesisproducer/pom.xml b/dataflow-website/recipes/kinesisdemo/kinesisproducer/pom.xml index 35f5bbe..5b877c3 100644 --- a/dataflow-website/recipes/kinesisdemo/kinesisproducer/pom.xml +++ b/dataflow-website/recipes/kinesisdemo/kinesisproducer/pom.xml @@ -5,11 +5,11 @@ kinesisdemo com.example - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT kinesisproducer - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT kinesisproducer Demo project for Spring Boot diff --git a/dataflow-website/recipes/kinesisdemo/pom.xml b/dataflow-website/recipes/kinesisdemo/pom.xml index 52969e5..3c38d19 100644 --- a/dataflow-website/recipes/kinesisdemo/pom.xml +++ b/dataflow-website/recipes/kinesisdemo/pom.xml @@ -5,7 +5,7 @@ com.example kinesisdemo - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT pom diff --git a/dataflow-website/recipes/scaling/scdf-alert-webhook/pom.xml b/dataflow-website/recipes/scaling/scdf-alert-webhook/pom.xml index ecec9a5..1c31105 100644 --- a/dataflow-website/recipes/scaling/scdf-alert-webhook/pom.xml +++ b/dataflow-website/recipes/scaling/scdf-alert-webhook/pom.xml @@ -10,7 +10,7 @@ io.spring.cloud.dataflow.alert.webhook scdf-alert-webhook - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT scdf-alert-webhook Demo project for Spring Boot diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/pom.xml b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/pom.xml index 74c5d55..e2e5e6c 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/pom.xml +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/pom.xml @@ -10,7 +10,7 @@ io.spring.dataflow.sample composed-http-transformer-kafka - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT composed-http-transformer-kafka Spring Cloud Stream Http Transformer Kafka Binder Application diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/pom.xml b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/pom.xml index 1e57aa2..b425c7a 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/pom.xml +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/pom.xml @@ -10,7 +10,7 @@ io.spring.dataflow.sample composed-http-transformer-kotlin-kafka - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT composed-http-transformer-kotlin-kafka Spring Cloud Stream Http Transformer Kotlin Processor with Kafka Binder Application diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/pom.xml b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/pom.xml index 621c696..c59f640 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/pom.xml +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/pom.xml @@ -10,7 +10,7 @@ io.spring.dataflow.sample composed-http-transformer-kotlin-rabbitmq - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT http-transformer-kotlin-rabbitmq Spring Cloud Stream Http Transformer Kotlin Processor with Rabbit Binder Application diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/pom.xml b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/pom.xml index 113c2ea..5086207 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/pom.xml +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/pom.xml @@ -10,7 +10,7 @@ io.spring.dataflow.sample composed-http-transformer-rabbitmq - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT composed-http-transformer-rabbitmq Spring Cloud Stream Http Transformer Rabbit Binder Application diff --git a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/pom.xml b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/pom.xml index 5d16f74..bf293a5 100644 --- a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/pom.xml +++ b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.spring.dataflow.sample usage-cost-stream-sample - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT pom org.springframework.boot diff --git a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-logger/pom.xml b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-logger/pom.xml index a05c31d..3bc53f3 100644 --- a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-logger/pom.xml +++ b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-logger/pom.xml @@ -5,7 +5,7 @@ io.spring.dataflow.sample usage-cost-stream-sample - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT .. diff --git a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-processor/pom.xml b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-processor/pom.xml index 8f4eb4a..98cf468 100644 --- a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-processor/pom.xml +++ b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-cost-processor/pom.xml @@ -5,7 +5,7 @@ io.spring.dataflow.sample usage-cost-stream-sample - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT .. usage-cost-processor-${binder} diff --git a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-detail-sender/pom.xml b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-detail-sender/pom.xml index ac9f375..56d0115 100644 --- a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-detail-sender/pom.xml +++ b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-detail-sender/pom.xml @@ -5,7 +5,7 @@ io.spring.dataflow.sample usage-cost-stream-sample - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT .. usage-detail-sender-${binder} diff --git a/dataflow-zuul/README.adoc b/dataflow-zuul/README.adoc index 4504668..3bbf0a0 100644 --- a/dataflow-zuul/README.adoc +++ b/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` diff --git a/dataflow-zuul/pom.xml b/dataflow-zuul/pom.xml index 55a44a8..b2d65c7 100644 --- a/dataflow-zuul/pom.xml +++ b/dataflow-zuul/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud.samples dataflow-zuul - 1.0.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT jar ldapserver diff --git a/function-samples/README.adoc b/function-samples/README.adoc index f72849a..ab5bc1b 100644 --- a/function-samples/README.adoc +++ b/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:///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:///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:///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:///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:///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:///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:///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:///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:///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:///spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-2.0.0-SNAPSHOT.jar ``` diff --git a/function-samples/http-click-ingest/pom.xml b/function-samples/http-click-ingest/pom.xml index 36e79f1..b7235bb 100644 --- a/function-samples/http-click-ingest/pom.xml +++ b/function-samples/http-click-ingest/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud.dataflow.samples http-click-ingest - 1.0.2.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT http-ingest Http click ingest application diff --git a/function-samples/http-region-ingest/pom.xml b/function-samples/http-region-ingest/pom.xml index 9ae62e4..f838ac4 100644 --- a/function-samples/http-region-ingest/pom.xml +++ b/function-samples/http-region-ingest/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud.dataflow.samples http-region-ingest - 1.0.1.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT http-region-ingest Http region ingest application diff --git a/function-samples/kstreams-join-user-clicks-and-region/README.adoc b/function-samples/kstreams-join-user-clicks-and-region/README.adoc index 7c0b711..9ce5229 100644 --- a/function-samples/kstreams-join-user-clicks-and-region/README.adoc +++ b/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:///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:///spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-2.0.0-SNAPSHOT.jar ``` diff --git a/function-samples/kstreams-join-user-clicks-and-region/pom.xml b/function-samples/kstreams-join-user-clicks-and-region/pom.xml index 14ee2b2..b8ce16f 100644 --- a/function-samples/kstreams-join-user-clicks-and-region/pom.xml +++ b/function-samples/kstreams-join-user-clicks-and-region/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud.dataflow.samples kstreams-join-user-clicks-and-region - 1.0.1.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT jar kstreams-join-user-clicks-and-region diff --git a/function-samples/kstreams-log-user-clicks-per-region/README.adoc b/function-samples/kstreams-log-user-clicks-per-region/README.adoc index 0d4695e..8506c2f 100644 --- a/function-samples/kstreams-log-user-clicks-per-region/README.adoc +++ b/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:///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:///spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-2.0.0-SNAPSHOT.jar ``` diff --git a/function-samples/kstreams-log-user-clicks-per-region/pom.xml b/function-samples/kstreams-log-user-clicks-per-region/pom.xml index ced1ab5..d8c59cc 100644 --- a/function-samples/kstreams-log-user-clicks-per-region/pom.xml +++ b/function-samples/kstreams-log-user-clicks-per-region/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud.dataflow.samples kstreams-log-user-clicks-per-region - 1.0.1.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT kstreams-log-user-clicks-per-region diff --git a/function-samples/pom.xml b/function-samples/pom.xml index 94c39ba..32cd463 100644 --- a/function-samples/pom.xml +++ b/function-samples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud.dataflow.samples function-samples-parent - 1.0.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT pom http-click-ingest diff --git a/function-samples/transform-user-clicks-per-region/README.adoc b/function-samples/transform-user-clicks-per-region/README.adoc index 0d4695e..8506c2f 100644 --- a/function-samples/transform-user-clicks-per-region/README.adoc +++ b/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:///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:///spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-2.0.0-SNAPSHOT.jar ``` diff --git a/function-samples/transform-user-clicks-per-region/pom.xml b/function-samples/transform-user-clicks-per-region/pom.xml index 67040f2..07f5524 100644 --- a/function-samples/transform-user-clicks-per-region/pom.xml +++ b/function-samples/transform-user-clicks-per-region/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud.dataflow.samples transform-user-clicks-per-region - 1.0.1.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT transform-user-clicks-per-region diff --git a/function-samples/uppercase-processor/pom.xml b/function-samples/uppercase-processor/pom.xml index f3f98de..c9a3c0d 100644 --- a/function-samples/uppercase-processor/pom.xml +++ b/function-samples/uppercase-processor/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud.dataflow.samples uppercase-processor - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT uppercase-processor Uppercase processor application diff --git a/javadsl/pom.xml b/javadsl/pom.xml index f765d28..20c429a 100644 --- a/javadsl/pom.xml +++ b/javadsl/pom.xml @@ -5,7 +5,7 @@ com.example scdfdsl - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT jar scdfdsl diff --git a/kafka-samples/README.adoc b/kafka-samples/README.adoc index f72849a..ab5bc1b 100644 --- a/kafka-samples/README.adoc +++ b/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:///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:///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:///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:///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:///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:///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:///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:///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:///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:///spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-2.0.0-SNAPSHOT.jar ``` diff --git a/kafka-samples/http-ingest/pom.xml b/kafka-samples/http-ingest/pom.xml index da5cc03..f243495 100644 --- a/kafka-samples/http-ingest/pom.xml +++ b/kafka-samples/http-ingest/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud.dataflow.samples http-ingest - 1.0.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT http-ingest Http ingest application diff --git a/kafka-samples/kstreams-join-user-clicks-and-region/README.adoc b/kafka-samples/kstreams-join-user-clicks-and-region/README.adoc index 7c0b711..9ce5229 100644 --- a/kafka-samples/kstreams-join-user-clicks-and-region/README.adoc +++ b/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:///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:///spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-2.0.0-SNAPSHOT.jar ``` diff --git a/kafka-samples/kstreams-join-user-clicks-and-region/pom.xml b/kafka-samples/kstreams-join-user-clicks-and-region/pom.xml index 8c93c15..cdce8c0 100644 --- a/kafka-samples/kstreams-join-user-clicks-and-region/pom.xml +++ b/kafka-samples/kstreams-join-user-clicks-and-region/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud.dataflow.samples kstreams-join-user-clicks-and-region - 1.0.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT jar kstreams-join-user-clicks-and-region diff --git a/kafka-samples/kstreams-log-user-clicks-per-region/README.adoc b/kafka-samples/kstreams-log-user-clicks-per-region/README.adoc index 0d4695e..8506c2f 100644 --- a/kafka-samples/kstreams-log-user-clicks-per-region/README.adoc +++ b/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:///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:///spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-2.0.0-SNAPSHOT.jar ``` diff --git a/kafka-samples/kstreams-log-user-clicks-per-region/pom.xml b/kafka-samples/kstreams-log-user-clicks-per-region/pom.xml index 9c7a24e..973699d 100644 --- a/kafka-samples/kstreams-log-user-clicks-per-region/pom.xml +++ b/kafka-samples/kstreams-log-user-clicks-per-region/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud.dataflow.samples kstreams-log-user-clicks-per-region - 1.0.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT kstreams-log-user-clicks-per-region diff --git a/kafka-samples/kstreams-word-count/pom.xml b/kafka-samples/kstreams-word-count/pom.xml index e0099b1..eb37a4b 100644 --- a/kafka-samples/kstreams-word-count/pom.xml +++ b/kafka-samples/kstreams-word-count/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud.dataflow.samples kstreams-word-count - 1.0.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT jar kstreams-word-count diff --git a/kafka-samples/pom.xml b/kafka-samples/pom.xml index b1c07ab..e896c07 100644 --- a/kafka-samples/pom.xml +++ b/kafka-samples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud.dataflow.samples kafka-samples-parent - 1.0.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT pom http-ingest diff --git a/monitoring-samples/spring-cloud-dataflow-prometheus-service-discovery/pom.xml b/monitoring-samples/spring-cloud-dataflow-prometheus-service-discovery/pom.xml index 641d34b..8de7d58 100644 --- a/monitoring-samples/spring-cloud-dataflow-prometheus-service-discovery/pom.xml +++ b/monitoring-samples/spring-cloud-dataflow-prometheus-service-discovery/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-dataflow-prometheus-service-discovery - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT jar spring-cloud-dataflow-prometheus-service-discovery diff --git a/monitoring-samples/stream-apps/demo-processor/pom.xml b/monitoring-samples/stream-apps/demo-processor/pom.xml index 41e3301..9eb4f5c 100644 --- a/monitoring-samples/stream-apps/demo-processor/pom.xml +++ b/monitoring-samples/stream-apps/demo-processor/pom.xml @@ -10,7 +10,7 @@ com.example demo-processor - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT demo-processor Demo project for Spring Boot diff --git a/monitoring-samples/stream-apps/demo-sink/pom.xml b/monitoring-samples/stream-apps/demo-sink/pom.xml index 98ac0f6..983b6fb 100644 --- a/monitoring-samples/stream-apps/demo-sink/pom.xml +++ b/monitoring-samples/stream-apps/demo-sink/pom.xml @@ -10,7 +10,7 @@ com.example demo-sink - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT demo-sink Demo project for Spring Boot diff --git a/monitoring-samples/stream-apps/demo-source/pom.xml b/monitoring-samples/stream-apps/demo-source/pom.xml index bae170f..eeb708a 100644 --- a/monitoring-samples/stream-apps/demo-source/pom.xml +++ b/monitoring-samples/stream-apps/demo-source/pom.xml @@ -10,7 +10,7 @@ com.example demo-source - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT demo-source Demo project for Spring Boot 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 6e7ea59..52c5037 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-influxdb/README.md +++ b/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 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 96d9c7f..a10982e 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-influxdb/pom.xml +++ b/monitoring-samples/task-apps/task-demo-metrics-influxdb/pom.xml @@ -10,7 +10,7 @@ com.example.task task-demo-metrics-influx - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT task-demo-metrics-influx Demo project for Spring Boot 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 c92ff51..4add9c4 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-prometheus/README.md +++ b/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 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 6c9bf6d..715ac8a 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml +++ b/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml @@ -21,7 +21,7 @@ io.spring.task task-demo-metrics-prometheus - 0.0.4-SNAPSHOT + 2.0.0-SNAPSHOT task-demo-metrics-prometheus Demo project for Spring Boot diff --git a/monitoring-samples/task-apps/task-demo-metrics-wavefront/README.md b/monitoring-samples/task-apps/task-demo-metrics-wavefront/README.md index 03631de..99c0883 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-wavefront/README.md +++ b/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 diff --git a/monitoring-samples/task-apps/task-demo-metrics-wavefront/pom.xml b/monitoring-samples/task-apps/task-demo-metrics-wavefront/pom.xml index 849f2c4..212a835 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-wavefront/pom.xml +++ b/monitoring-samples/task-apps/task-demo-metrics-wavefront/pom.xml @@ -11,7 +11,7 @@ com.example.task task-demo-metrics-wavefront - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT task-demo-metrics-wavefront Demo project for Spring Boot diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/README.adoc b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/README.adoc index 0d4695e..8506c2f 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/README.adoc +++ b/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:///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:///spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-2.0.0-SNAPSHOT.jar ``` diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/README.adoc b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/README.adoc index 7c0b711..9ce5229 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/README.adoc +++ b/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:///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:///spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-2.0.0-SNAPSHOT.jar ``` diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/pom.xml index 4932870..c175419 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud.dataflow.samples http-click-ingest - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT http-click-ingest Http click ingest application diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/http-clicks-and-region-ingest/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region/http-clicks-and-region-ingest/pom.xml index 6060148..744a1df 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/http-clicks-and-region-ingest/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/http-clicks-and-region-ingest/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud.dataflow.samples http-clicks-and-region-ingest - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT http-clicks-and-region-ingest Http clicks and region ingest application diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/pom.xml index 4674436..91b8b76 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud.dataflow.samples http-region-ingest - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT http-region-ingest Http region ingest application diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/log-user-clicks-per-region/README.adoc b/multi-io-samples/kafka-streams/user-clicks-per-region/log-user-clicks-per-region/README.adoc index 0d4695e..8506c2f 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/log-user-clicks-per-region/README.adoc +++ b/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:///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:///spring-cloud-dataflow-samples/kafka-samples/kstreams-log-user-clicks-per-region/target/kstreams-log-user-clicks-per-region-2.0.0-SNAPSHOT.jar ``` diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/log-user-clicks-per-region/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region/log-user-clicks-per-region/pom.xml index c998d96..d20983d 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/log-user-clicks-per-region/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/log-user-clicks-per-region/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud.dataflow.samples log-user-clicks-per-region - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT log-user-clicks-per-region diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region/pom.xml index 54fe396..4308c97 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud.dataflow.samples user-clicks-per-region - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT pom http-click-ingest diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/README.adoc b/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/README.adoc index 7c0b711..9ce5229 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/README.adoc +++ b/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:///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:///spring-cloud-dataflow-samples/kafka-samples/kstreams-join-user-clicks-and-region/target/kstreams-join-user-clicks-and-region-2.0.0-SNAPSHOT.jar ``` diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/pom.xml index 6c07feb..149fb89 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud.dataflow.samples user-clicks-per-region-processor - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT jar user-clicks-per-region-processor diff --git a/multi-io-samples/purchase-orders/http-purchase-orders/pom.xml b/multi-io-samples/purchase-orders/http-purchase-orders/pom.xml index ba05bd6..04664f8 100644 --- a/multi-io-samples/purchase-orders/http-purchase-orders/pom.xml +++ b/multi-io-samples/purchase-orders/http-purchase-orders/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud.dataflow.samples http-purchase-orders - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT http-purchase-orders Http purchase order application diff --git a/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml b/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml index bd667b5..3a3b3a5 100644 --- a/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml +++ b/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud.stream.app multi-input-log-kafka - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT multi-input-log-kafka Spring Cloud Stream Multi Input Log Sink Kafka Binder Application diff --git a/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml b/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml index 5ae587f..73279b7 100644 --- a/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml +++ b/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud.stream.app multi-input-log-rabbit - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT multi-input-log-rabbit Spring Cloud Stream Multi Input Log Sink Rabbit Binder Application diff --git a/multi-io-samples/ticktock/multi-output-time-kafka/pom.xml b/multi-io-samples/ticktock/multi-output-time-kafka/pom.xml index 6640ed4..2dbe171 100644 --- a/multi-io-samples/ticktock/multi-output-time-kafka/pom.xml +++ b/multi-io-samples/ticktock/multi-output-time-kafka/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud.stream.app multi-output-time-kafka - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT multi-output-time-kafka Spring Cloud Stream Multi Output Time Source Kafka Binder Application diff --git a/multi-io-samples/ticktock/multi-output-time-rabbit/pom.xml b/multi-io-samples/ticktock/multi-output-time-rabbit/pom.xml index 4c5df33..57f62b8 100644 --- a/multi-io-samples/ticktock/multi-output-time-rabbit/pom.xml +++ b/multi-io-samples/ticktock/multi-output-time-rabbit/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud.stream.app multi-output-time-rabbit - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT multi-output-time-rabbit Spring Cloud Stream Multi Output Time Source Rabbit Binder Application diff --git a/multi-io-samples/ticktock/pom.xml b/multi-io-samples/ticktock/pom.xml index 60af7b7..ecffafb 100644 --- a/multi-io-samples/ticktock/pom.xml +++ b/multi-io-samples/ticktock/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud.dataflow.samples ticktock - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT pom multi-output-time-rabbit diff --git a/pom.xml b/pom.xml index 6a4bda0..d10bd03 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 spring-cloud-dataflow-samples org.springframework.cloud - 1.0.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT Spring Cloud Data Flow Samples diff --git a/scenario-task/README.adoc b/scenario-task/README.adoc index d9d6095..d6182fe 100644 --- a/scenario-task/README.adoc +++ b/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: export spring_datasource_username= export spring_datasource_password= export spring_datasource_driverClassName= -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: export spring_datasource_username= export spring_datasource_password= export spring_datasource_driverClassName= -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 diff --git a/scenario-task/pom.xml b/scenario-task/pom.xml index 56f53e2..7d3cf9d 100644 --- a/scenario-task/pom.xml +++ b/scenario-task/pom.xml @@ -10,7 +10,7 @@ io.spring scenario-task - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT scenario-task Exercises failure and success conditions for task and batch. @@ -100,42 +100,6 @@ org.springframework.boot spring-boot-maven-plugin - - io.fabric8 - docker-maven-plugin - 0.21.0 - - - - springcloudtask/${project.artifactId} - - - ${project.version} - - springcloud/openjdk:2.0.0.RELEASE - - /tmp - - - C.UTF-8 - - - - java - -jar - /maven/scenario-task.jar - - - - maven - assembly.xml - / - - - - - - diff --git a/security-ldap-uaa-example/README.adoc b/security-ldap-uaa-example/README.adoc index ae02471..7c84451 100644 --- a/security-ldap-uaa-example/README.adoc +++ b/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 diff --git a/security-ldap-uaa-example/pom.xml b/security-ldap-uaa-example/pom.xml index fb42c2c..ff37c71 100644 --- a/security-ldap-uaa-example/pom.xml +++ b/security-ldap-uaa-example/pom.xml @@ -5,7 +5,7 @@ com.hillert.scdf ldapserver-uaa - 1.0.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT jar ldapserver diff --git a/spring-cloud-stream-function-bindings/log-sink/pom.xml b/spring-cloud-stream-function-bindings/log-sink/pom.xml index 4b97d9c..8c4635a 100644 --- a/spring-cloud-stream-function-bindings/log-sink/pom.xml +++ b/spring-cloud-stream-function-bindings/log-sink/pom.xml @@ -10,7 +10,7 @@ com.example log-sink - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT log-sink Demo project for Spring Boot diff --git a/spring-cloud-stream-function-bindings/time-source/pom.xml b/spring-cloud-stream-function-bindings/time-source/pom.xml index aed445b..180840b 100644 --- a/spring-cloud-stream-function-bindings/time-source/pom.xml +++ b/spring-cloud-stream-function-bindings/time-source/pom.xml @@ -10,7 +10,7 @@ com.example time-source - 0.0.1-SNAPSHOT + 2.0.0-SNAPSHOT time-source Demo project for Spring Boot diff --git a/src/main/asciidoc/batch/file-ingest-sftp/local.adoc b/src/main/asciidoc/batch/file-ingest-sftp/local.adoc index 7ab5da6..098280d 100644 --- a/src/main/asciidoc/batch/file-ingest-sftp/local.adoc +++ b/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' diff --git a/src/main/asciidoc/batch/file-ingest-sftp/pcf.adoc b/src/main/asciidoc/batch/file-ingest-sftp/pcf.adoc index c2a6d01..77b0ca4 100644 --- a/src/main/asciidoc/batch/file-ingest-sftp/pcf.adoc +++ b/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 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' diff --git a/src/main/asciidoc/datascience/species-prediction/main.adoc b/src/main/asciidoc/datascience/species-prediction/main.adoc index bbd2550..10a3215 100644 --- a/src/main/asciidoc/datascience/species-prediction/main.adoc +++ b/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 ---- + diff --git a/src/main/asciidoc/functions/main.adoc b/src/main/asciidoc/functions/main.adoc index 5f71fe4..6479dcb 100644 --- a/src/main/asciidoc/functions/main.adoc +++ b/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:////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:////spring-cloud-function-samples/function-sample/target/spring-cloud-function-sample-2.0.0-SNAPSHOT.jar | log" --deploy ``` + diff --git a/src/main/asciidoc/javadsl/main.adoc b/src/main/asciidoc/javadsl/main.adoc index 051abd1..961f36b 100644 --- a/src/main/asciidoc/javadsl/main.adoc +++ b/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 ---- diff --git a/src/main/asciidoc/streaming/cassandra/http-to-cassandra/local.adoc b/src/main/asciidoc/streaming/cassandra/http-to-cassandra/local.adoc index 6c498b9..8cf29ad 100644 --- a/src/main/asciidoc/streaming/cassandra/http-to-cassandra/local.adoc +++ b/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 ---- + diff --git a/src/main/asciidoc/streaming/custom-apps/celsius-converter-processor/main.adoc b/src/main/asciidoc/streaming/custom-apps/celsius-converter-processor/main.adoc index 49a9fcd..2b004d1 100644 --- a/src/main/asciidoc/streaming/custom-apps/celsius-converter-processor/main.adoc +++ b/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. diff --git a/timestamp-batch/README.adoc b/timestamp-batch/README.adoc index c7891c6..5349d11 100644 --- a/timestamp-batch/README.adoc +++ b/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 diff --git a/timestamp-batch/pom.xml b/timestamp-batch/pom.xml index e0bc40e..e851959 100644 --- a/timestamp-batch/pom.xml +++ b/timestamp-batch/pom.xml @@ -10,7 +10,7 @@ io.spring timestamp-batch-task - 1.0.0 + 2.0.0 timestamp-task Simple Timestamp sample. @@ -81,42 +81,6 @@ org.springframework.boot spring-boot-maven-plugin - - io.fabric8 - docker-maven-plugin - 0.21.0 - - - - springcloudtask/${project.artifactId} - - - ${project.version} - - springcloud/openjdk:2.0.0.RELEASE - - /tmp - - - C.UTF-8 - - - - java - -jar - /maven/timestamp-batch-task.jar - - - - maven - assembly.xml - / - - - - - - diff --git a/timestamp-task/README.adoc b/timestamp-task/README.adoc index ea80f39..a941c89 100644 --- a/timestamp-task/README.adoc +++ b/timestamp-task/README.adoc @@ -30,7 +30,7 @@ This is a Spring Cloud Task application that logs a timestamp. === Command line [source,shell,indent=2] ---- -java -jar target/timestamp-task-1.0.0.jar +java -jar target/timestamp-task-2.0.0.jar ---- === Docker diff --git a/timestamp-task/pom.xml b/timestamp-task/pom.xml index 6402f29..35e451f 100644 --- a/timestamp-task/pom.xml +++ b/timestamp-task/pom.xml @@ -10,7 +10,7 @@ io.spring timestamp-task - 1.0.0 + 2.0.0 timestamp-task Simple Timestamp sample. @@ -72,42 +72,6 @@ org.springframework.boot spring-boot-maven-plugin - - io.fabric8 - docker-maven-plugin - 0.21.0 - - - - springcloudtask/${project.artifactId} - - - ${project.version} - - springcloud/openjdk:2.0.0.RELEASE - - /tmp - - - C.UTF-8 - - - - java - -jar - /maven/timestamp-task.jar - - - - maven - assembly.xml - / - - - - - - diff --git a/transition-sample/Dockerfile b/transition-sample/Dockerfile index 78dbd79..8d1fce1 100644 --- a/transition-sample/Dockerfile +++ b/transition-sample/Dockerfile @@ -2,6 +2,6 @@ FROM java:8-alpine ARG JAR_FILE -ADD target/${JAR_FILE} taskapp-1.0.0.BUILD-SNAPSHOT.jar +ADD target/${JAR_FILE} taskapp-2.0.0-SNAPSHOT.jar -ENTRYPOINT ["java", "-jar", "/taskapp-1.0.0.BUILD-SNAPSHOT.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-jar", "/taskapp-2.0.0-SNAPSHOT.jar"] \ No newline at end of file diff --git a/transition-sample/README.adoc b/transition-sample/README.adoc index 889c31d..4bac596 100644 --- a/transition-sample/README.adoc +++ b/transition-sample/README.adoc @@ -20,4 +20,4 @@ To build the docker image: ``` === Running the Application -java -jar target/transition-sample-1.0.0.BUILD-SNAPSHOT.jar --taskapp.exitMessage= \ No newline at end of file +java -jar target/transition-sample-2.0.0-SNAPSHOT.jar --taskapp.exitMessage= \ No newline at end of file diff --git a/transition-sample/pom.xml b/transition-sample/pom.xml index f137b23..09024df 100644 --- a/transition-sample/pom.xml +++ b/transition-sample/pom.xml @@ -11,7 +11,7 @@ io.spring transition-sample - 1.0.0.BUILD-SNAPSHOT + 2.0.0-SNAPSHOT Transition Sample Application Returns exit message of the exitMessage property