From 1e7eea200ca5093fb6ad672c7450eb2445129259 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Mon, 24 Jan 2022 14:10:29 -0600 Subject: [PATCH] Use spring-boot:build-image for all Docker images (remove Jib) (#166) Partially resolves #156 --- .github/workflows/ci.yml | 30 +++++----- .../batch/batchsamples/pom.xml | 7 ++- .../composed-http-transformer-kafka/pom.xml | 19 +----- .../pom.xml | 19 +----- .../pom.xml | 19 +----- .../pom.xml | 19 +----- .../streams/standalone-stream-sample/pom.xml | 19 +----- function-samples/uppercase-processor/pom.xml | 19 +----- .../task-demo-metrics-prometheus/pom.xml | 59 +++---------------- .../src/main/docker/assembly.xml | 15 ----- .../http-click-ingest/pom.xml | 32 +++------- .../http-clicks-and-region-ingest/pom.xml | 29 +++------ .../http-region-ingest/pom.xml | 32 +++------- .../log-user-clicks-per-region/pom.xml | 29 +++------ .../user-clicks-per-region-processor/pom.xml | 30 +++------- .../http-purchase-orders/pom.xml | 29 +++------ .../ticktock/multi-input-log-kafka/pom.xml | 59 +++---------------- .../ticktock/multi-input-log-rabbit/pom.xml | 59 +++---------------- .../ticktock/multi-output-time-kafka/pom.xml | 59 +++---------------- .../ticktock/multi-output-time-rabbit/pom.xml | 59 +++---------------- scenario-task/pom.xml | 5 ++ timestamp-batch/pom.xml | 5 ++ timestamp-task/pom.xml | 5 ++ 23 files changed, 141 insertions(+), 516 deletions(-) delete mode 100644 monitoring-samples/task-apps/task-demo-metrics-prometheus/src/main/docker/assembly.xml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35da726..c8f1138 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,7 +51,7 @@ jobs: - uses: ./.github/actions/build-sample-app with: app-dir: 'multi-io-samples/ticktock' - mvn-build-commands: '-B clean install -Dmaven.javadoc.skip=true jib:dockerBuild -pl multi-output-time-rabbit,multi-input-log-rabbit,multi-output-time-kafka,multi-input-log-kafka' + mvn-build-commands: '-B clean install -Dmaven.javadoc.skip=true spring-boot:build-image -pl multi-output-time-rabbit,multi-input-log-rabbit,multi-output-time-kafka,multi-input-log-kafka' multi-io-http-purchase-orders: runs-on: ubuntu-latest @@ -60,7 +60,7 @@ jobs: - uses: ./.github/actions/build-sample-app with: app-dir: 'multi-io-samples/purchase-orders/http-purchase-orders' - mvn-build-commands: '-B clean install jib:dockerBuild' + mvn-build-commands: '-B clean install spring-boot:build-image' docker-push: ${{ inputs.maven-build-only != true }} docker-username: ${{ secrets.DOCKERHUB_USERNAME }} docker-password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -74,7 +74,7 @@ jobs: - uses: ./.github/actions/build-sample-app with: app-dir: 'multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x' - mvn-build-commands: '-B clean install jib:dockerBuild -pl http-click-ingest,http-region-ingest,http-clicks-and-region-ingest,user-clicks-per-region-processor,log-user-clicks-per-region' + mvn-build-commands: '-B clean install spring-boot:build-image -pl http-click-ingest,http-region-ingest,http-clicks-and-region-ingest,user-clicks-per-region-processor,log-user-clicks-per-region' artifactory-publish: ${{ inputs.maven-build-only != true }} jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} docker-push: ${{ inputs.maven-build-only != true }} @@ -105,7 +105,7 @@ jobs: - uses: ./.github/actions/build-sample-app with: app-dir: 'function-samples/uppercase-processor' - mvn-build-commands: '-B clean install jib:dockerBuild' + mvn-build-commands: '-B clean install spring-boot:build-image' artifactory-publish: ${{ inputs.maven-build-only != true }} jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} docker-push: ${{ inputs.maven-build-only != true }} @@ -121,7 +121,7 @@ jobs: - uses: ./.github/actions/build-sample-app with: app-dir: 'dataflow-website/stream-developer-guides/streams/standalone-stream-sample' - mvn-build-commands: '-B clean install jib:dockerBuild' + mvn-build-commands: '-B clean install spring-boot:build-image' artifactory-publish: ${{ inputs.maven-build-only != true }} jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} docker-push: ${{ inputs.maven-build-only != true }} @@ -139,7 +139,7 @@ jobs: - uses: ./.github/actions/build-sample-app with: app-dir: 'dataflow-website/stream-developer-guides/streams/standalone-stream-sample' - mvn-build-commands: '-B clean install -Prabbit jib:dockerBuild' + mvn-build-commands: '-B clean install -Prabbit spring-boot:build-image' artifactory-publish: ${{ inputs.maven-build-only != true }} jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} jf-mvn-build-commands: '-B clean install -Prabbit -DskipTests' @@ -158,7 +158,7 @@ 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:2.0.0-SNAPSHOT' + mvn-build-commands: '-B clean install spring-boot:build-image' artifactory-publish: ${{ inputs.maven-build-only != true }} jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} docker-push: ${{ inputs.maven-build-only != true }} @@ -174,7 +174,7 @@ jobs: - uses: ./.github/actions/build-sample-app with: app-dir: 'dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka' - mvn-build-commands: '-B clean install jib:dockerBuild' + mvn-build-commands: '-B clean install spring-boot:build-image' artifactory-publish: ${{ inputs.maven-build-only != true }} jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} docker-push: ${{ inputs.maven-build-only != true }} @@ -190,7 +190,7 @@ jobs: - uses: ./.github/actions/build-sample-app with: app-dir: 'dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka' - mvn-build-commands: '-B clean install jib:dockerBuild' + mvn-build-commands: '-B clean install spring-boot:build-image' artifactory-publish: ${{ inputs.maven-build-only != true }} jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} docker-push: ${{ inputs.maven-build-only != true }} @@ -206,7 +206,7 @@ jobs: - uses: ./.github/actions/build-sample-app with: app-dir: 'dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq' - mvn-build-commands: '-B clean install jib:dockerBuild' + mvn-build-commands: '-B clean install spring-boot:build-image' artifactory-publish: ${{ inputs.maven-build-only != true }} jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} docker-push: ${{ inputs.maven-build-only != true }} @@ -222,7 +222,7 @@ jobs: - uses: ./.github/actions/build-sample-app with: app-dir: 'dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq' - mvn-build-commands: '-B clean install jib:dockerBuild' + mvn-build-commands: '-B clean install spring-boot:build-image' artifactory-publish: ${{ inputs.maven-build-only != true }} jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} docker-push: ${{ inputs.maven-build-only != true }} @@ -238,7 +238,7 @@ jobs: - uses: ./.github/actions/build-sample-app with: app-dir: 'monitoring-samples/task-apps/task-demo-metrics-prometheus' - mvn-build-commands: '-B clean install docker:build' + mvn-build-commands: '-B clean install spring-boot:build-image' artifactory-publish: ${{ inputs.maven-build-only != true }} jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} docker-push: ${{ inputs.maven-build-only != true }} @@ -254,7 +254,7 @@ 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:2.0.0-SNAPSHOT' + mvn-build-commands: '-B clean install spring-boot:build-image' artifactory-publish: ${{ inputs.maven-build-only != true }} jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} docker-push: ${{ inputs.maven-build-only != true }} @@ -270,7 +270,7 @@ 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:2.0.0' + mvn-build-commands: '-B clean install spring-boot:build-image' artifactory-publish: ${{ inputs.maven-build-only != true }} jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} docker-push: ${{ inputs.maven-build-only != true }} @@ -286,7 +286,7 @@ 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:2.0.0' + mvn-build-commands: '-B clean install spring-boot:build-image' artifactory-publish: ${{ inputs.maven-build-only != true }} jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} docker-push: ${{ inputs.maven-build-only != true }} diff --git a/dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml b/dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml index 3f5fa0b..943130f 100644 --- a/dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml +++ b/dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml @@ -23,8 +23,6 @@ UTF-8 1.8 2021.0.0 - springcloudtask - ${project.version} @@ -84,6 +82,11 @@ org.springframework.boot spring-boot-maven-plugin + + + springcloudtask/${project.artifactId}:${project.version} + + 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 03d6ab1..925ec9d 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 @@ -26,8 +26,6 @@ - springcloudstream - ${project.version} true 1.8 UTF-8 @@ -121,21 +119,10 @@ org.springframework.boot spring-boot-maven-plugin - - - com.google.cloud.tools - jib-maven-plugin - 0.10.1 - - springcloud/openjdk - - - ${docker.org}/${project.artifactId}:${docker.version} - - - true - + + springcloudstream/${project.artifactId}:${project.version} + 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 0198c0c..69c261a 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 @@ -26,8 +26,6 @@ - springcloudstream - ${project.version} true 1.8 UTF-8 @@ -131,21 +129,10 @@ org.springframework.boot spring-boot-maven-plugin - - - com.google.cloud.tools - jib-maven-plugin - 0.10.1 - - springcloud/openjdk - - - ${docker.org}/${project.artifactId}:${docker.version} - - - true - + + springcloudstream/${project.artifactId}:${project.version} + 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 e26f184..9d66c41 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 @@ -26,8 +26,6 @@ - springcloudstream - ${project.version} true 1.8 UTF-8 @@ -131,21 +129,10 @@ org.springframework.boot spring-boot-maven-plugin - - - com.google.cloud.tools - jib-maven-plugin - 0.10.1 - - springcloud/openjdk - - - ${docker.org}/${project.artifactId}:${docker.version} - - - true - + + springcloudstream/${project.artifactId}:${project.version} + 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 937df34..dec1449 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 @@ -26,8 +26,6 @@ - springcloudstream - ${project.version} true 1.8 UTF-8 @@ -121,21 +119,10 @@ org.springframework.boot spring-boot-maven-plugin - - - com.google.cloud.tools - jib-maven-plugin - 0.10.1 - - springcloud/openjdk - - - ${docker.org}/${project.artifactId}:${docker.version} - - - true - + + springcloudstream/${project.artifactId}:${project.version} + 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 9a6f467..484f750 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 @@ -19,8 +19,6 @@ usage-detail-sender - springcloudstream - ${project.version} 1.8 2021.0.0 @@ -42,21 +40,10 @@ org.springframework.boot spring-boot-maven-plugin - - - com.google.cloud.tools - jib-maven-plugin - 2.0.0 - - springcloud/openjdk - - - ${docker.org}/${project.artifactId}:${docker.version} - - - USE_CURRENT_TIMESTAMP - + + springcloudstream/multi-io-sample-${project.artifactId}:${project.version} + diff --git a/function-samples/uppercase-processor/pom.xml b/function-samples/uppercase-processor/pom.xml index a970d82..f008cc7 100644 --- a/function-samples/uppercase-processor/pom.xml +++ b/function-samples/uppercase-processor/pom.xml @@ -125,25 +125,12 @@ org.springframework.boot spring-boot-maven-plugin - - - com.google.cloud.tools - jib-maven-plugin - 2.0.0 - - springcloud/openjdk - - - springcloudstream/${project.artifactId} - - 1.0.0-SNAPSHOT - - + + springcloudstream/${project.artifactId}:${project.version} + - - 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 0e1dd31..e9bf05a 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml +++ b/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml @@ -120,58 +120,15 @@ - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - - process-classes - - read-project-properties - - - - ${project.build.outputDirectory}/META-INF/spring-configuration-metadata-encoded.properties - - - - - - - io.fabric8 - docker-maven-plugin - 0.33.0 + org.springframework.boot + spring-boot-maven-plugin - - - springcloudtask/${project.artifactId} - - - latest - ${project.version} - - springcloud/baseimage:1.0.0 - - /tmp - - - - ${org.springframework.cloud.dataflow.spring.configuration.metadata.json} - - - - - java - -jar - /maven/task-demo-metrics-prometheus.jar - - - - assembly.xml - - - - + + springcloudtask/${project.artifactId}:${project.version} + + /tmp:/tmp + + diff --git a/monitoring-samples/task-apps/task-demo-metrics-prometheus/src/main/docker/assembly.xml b/monitoring-samples/task-apps/task-demo-metrics-prometheus/src/main/docker/assembly.xml deleted file mode 100644 index 1c3ff34..0000000 --- a/monitoring-samples/task-apps/task-demo-metrics-prometheus/src/main/docker/assembly.xml +++ /dev/null @@ -1,15 +0,0 @@ - - task-demo-metrics-prometheus - - - - io.spring.task:task-demo-metrics-prometheus - - . - task-demo-metrics-prometheus.jar - - - diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-click-ingest/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-click-ingest/pom.xml index 67eee1c..9a83a07 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-click-ingest/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-click-ingest/pom.xml @@ -130,31 +130,15 @@ org.springframework.boot spring-boot-maven-plugin - - - com.google.cloud.tools - jib-maven-plugin - 2.0.0 - - springcloud/openjdk - - - springcloudstream/multi-io-sample-${project.artifactId} - - 1.2.0-SNAPSHOT - - - - USE_CURRENT_TIMESTAMP - Docker - - - ${org.springframework.cloud.dataflow.spring.configuration.metadata.json} - - ${configuration-properties.outbound-ports} - - + + springcloudstream/multi-io-sample-${project.artifactId}:${project.version} + + + configuration-properties.outbound-ports="${configuration-properties.outbound-ports}" + + + diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-clicks-and-region-ingest/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-clicks-and-region-ingest/pom.xml index 5ac4392..125896d 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-clicks-and-region-ingest/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-clicks-and-region-ingest/pom.xml @@ -132,28 +132,15 @@ org.springframework.boot spring-boot-maven-plugin - - - com.google.cloud.tools - jib-maven-plugin - 2.0.0 - - springcloud/openjdk - - - springcloudstream/multi-io-sample-${project.artifactId} - - 1.2.0-SNAPSHOT - - - - USE_CURRENT_TIMESTAMP - Docker - - ${configuration-properties.outbound-ports} - - + + springcloudstream/multi-io-sample-${project.artifactId}:${project.version} + + + configuration-properties.outbound-ports="${configuration-properties.outbound-ports}" + + + diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-region-ingest/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-region-ingest/pom.xml index 65e7b8e..f6c5b30 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-region-ingest/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-region-ingest/pom.xml @@ -136,31 +136,15 @@ org.springframework.boot spring-boot-maven-plugin - - - com.google.cloud.tools - jib-maven-plugin - 2.0.0 - - springcloud/openjdk - - - springcloudstream/multi-io-sample-${project.artifactId} - - 1.2.0-SNAPSHOT - - - - USE_CURRENT_TIMESTAMP - Docker - - - ${org.springframework.cloud.dataflow.spring.configuration.metadata.json} - - ${configuration-properties.outbound-ports} - - + + springcloudstream/multi-io-sample-${project.artifactId}:${project.version} + + + configuration-properties.outbound-ports="${configuration-properties.outbound-ports}" + + + diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/pom.xml index f4de9e9..c49e748 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/pom.xml @@ -123,28 +123,15 @@ org.springframework.boot spring-boot-maven-plugin - - - com.google.cloud.tools - jib-maven-plugin - 2.0.0 - - springcloud/openjdk - - - springcloudstream/multi-io-sample-${project.artifactId} - - 1.2.0-SNAPSHOT - - - - USE_CURRENT_TIMESTAMP - Docker - - input - - + + springcloudstream/multi-io-sample-${project.artifactId}:${project.version} + + + configuration-properties.inbound-ports=input + + + diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/pom.xml index 2559e65..ab7f84f 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/pom.xml @@ -129,29 +129,15 @@ org.springframework.boot spring-boot-maven-plugin - - - com.google.cloud.tools - jib-maven-plugin - 2.0.0 - - springcloud/openjdk - - - springcloudstream/multi-io-sample-${project.artifactId} - - 1.2.0-SNAPSHOT - - - - USE_CURRENT_TIMESTAMP - Docker - - ${configuration-properties.inbound-ports} - ${configuration-properties.outbound-ports} - - + + springcloudstream/multi-io-sample-${project.artifactId}:${project.version} + + + configuration-properties.inbound-ports="${configuration-properties.inbound-ports}",configuration-properties.outbound-ports="${configuration-properties.outbound-ports}" + + + 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 43f3f93..7e96f33 100644 --- a/multi-io-samples/purchase-orders/http-purchase-orders/pom.xml +++ b/multi-io-samples/purchase-orders/http-purchase-orders/pom.xml @@ -113,28 +113,15 @@ org.springframework.boot spring-boot-maven-plugin - - - com.google.cloud.tools - jib-maven-plugin - 2.0.0 - - springcloud/openjdk - - - springcloudstream/multi-io-sample-${project.artifactId} - - 1.0.0-SNAPSHOT - - - - USE_CURRENT_TIMESTAMP - Docker - - ${configuration-properties.outbound-ports} - - + + springcloudstream/multi-io-sample-${project.artifactId}:${project.version} + + + configuration-properties.outbound-ports="${configuration-properties.outbound-ports}" + + + 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 730f75a..4f3cc9a 100644 --- a/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml +++ b/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml @@ -190,60 +190,17 @@ org.springframework.boot spring-boot-maven-plugin - - - - com.google.cloud.tools - jib-maven-plugin - 2.0.0 - - springcloud/openjdk - - - springcloudstream/multi-io-sample-${project.artifactId} - - 1.0.0-SNAPSHOT - - - - USE_CURRENT_TIMESTAMP - Docker - - - ${org.springframework.cloud.dataflow.spring.configuration.metadata.json} - - input1,input2,input3 - - + + springcloudstream/multi-io-sample-${project.artifactId}:${project.version} + + + configuration-properties.inbound-ports="input1,input2,input3" + + + - - - - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - - process-classes - - read-project-properties - - - - - ${project.build.outputDirectory}/META-INF/spring-configuration-metadata-encoded.properties - - - - - - - org.springframework.cloud spring-cloud-app-starter-metadata-maven-plugin 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 e2d62ea..53cc320 100644 --- a/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml +++ b/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml @@ -190,60 +190,17 @@ org.springframework.boot spring-boot-maven-plugin - - - - com.google.cloud.tools - jib-maven-plugin - 2.0.0 - - springcloud/openjdk - - - springcloudstream/multi-io-sample-${project.artifactId} - - 1.0.0-SNAPSHOT - - - - USE_CURRENT_TIMESTAMP - Docker - - - ${org.springframework.cloud.dataflow.spring.configuration.metadata.json} - - input1,input2,input3 - - + + springcloudstream/multi-io-sample-${project.artifactId}:${project.version} + + + configuration-properties.inbound-ports="input1,input2,input3" + + + - - - - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - - process-classes - - read-project-properties - - - - - ${project.build.outputDirectory}/META-INF/spring-configuration-metadata-encoded.properties - - - - - - - org.springframework.cloud spring-cloud-app-starter-metadata-maven-plugin 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 4a4fc61..50d4009 100644 --- a/multi-io-samples/ticktock/multi-output-time-kafka/pom.xml +++ b/multi-io-samples/ticktock/multi-output-time-kafka/pom.xml @@ -195,60 +195,17 @@ org.springframework.boot spring-boot-maven-plugin - - - - com.google.cloud.tools - jib-maven-plugin - 2.0.0 - - springcloud/openjdk - - - springcloudstream/multi-io-sample-${project.artifactId} - - 1.0.0-SNAPSHOT - - - - USE_CURRENT_TIMESTAMP - Docker - - - ${org.springframework.cloud.dataflow.spring.configuration.metadata.json} - - output1,output2,output3 - - + + springcloudstream/multi-io-sample-${project.artifactId}:${project.version} + + + configuration-properties.outbound-ports="output1,output2,output3" + + + - - - - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - - process-classes - - read-project-properties - - - - - ${project.build.outputDirectory}/META-INF/spring-configuration-metadata-encoded.properties - - - - - - - org.springframework.cloud spring-cloud-app-starter-metadata-maven-plugin 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 7018326..a7a8b92 100644 --- a/multi-io-samples/ticktock/multi-output-time-rabbit/pom.xml +++ b/multi-io-samples/ticktock/multi-output-time-rabbit/pom.xml @@ -195,60 +195,17 @@ org.springframework.boot spring-boot-maven-plugin - - - - com.google.cloud.tools - jib-maven-plugin - 2.0.0 - - springcloud/openjdk - - - springcloudstream/multi-io-sample-${project.artifactId} - - 1.0.0-SNAPSHOT - - - - USE_CURRENT_TIMESTAMP - Docker - - - ${org.springframework.cloud.dataflow.spring.configuration.metadata.json} - - output1,output2,output3 - - + + springcloudstream/multi-io-sample-${project.artifactId}:${project.version} + + + configuration-properties.outbound-ports="output1,output2,output3" + + + - - - - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - - process-classes - - read-project-properties - - - - - ${project.build.outputDirectory}/META-INF/spring-configuration-metadata-encoded.properties - - - - - - - org.springframework.cloud spring-cloud-app-starter-metadata-maven-plugin diff --git a/scenario-task/pom.xml b/scenario-task/pom.xml index 766bb51..4bfb92b 100644 --- a/scenario-task/pom.xml +++ b/scenario-task/pom.xml @@ -99,6 +99,11 @@ org.springframework.boot spring-boot-maven-plugin + + + springcloudtask/${project.artifactId}:${project.version} + + diff --git a/timestamp-batch/pom.xml b/timestamp-batch/pom.xml index b87e711..ba567ad 100644 --- a/timestamp-batch/pom.xml +++ b/timestamp-batch/pom.xml @@ -80,6 +80,11 @@ org.springframework.boot spring-boot-maven-plugin + + + springcloudtask/${project.artifactId}:${project.version} + + diff --git a/timestamp-task/pom.xml b/timestamp-task/pom.xml index b1bfc3e..1a068c4 100644 --- a/timestamp-task/pom.xml +++ b/timestamp-task/pom.xml @@ -71,6 +71,11 @@ org.springframework.boot spring-boot-maven-plugin + + + springcloudtask/${project.artifactId}:${project.version} + +