SpringCloud/spring-cloud-dataflow-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use spring-boot:build-image for all Docker images (remove Jib) (#166)

Browse Source 
Partially resolves #156
This commit is contained in:
Chris Bono
2022-01-24 14:10:29 -06:00
committed by GitHub
parent 301ba872bb
commit 1e7eea200c
23 changed files with 141 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
.github/workflows/ci.yml vendored
View File

@@ -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 }}

7
dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml
View File

@@ -23,8 +23,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0</spring-cloud.version>
<docker.org>springcloudtask</docker.org>
<docker.version>${project.version}</docker.version>
</properties>
<modules>
@@ -84,6 +82,11 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<image>
<name>springcloudtask/${project.artifactId}:${project.version}</name>
</image>
</configuration>
</plugin>
</plugins>
</build>

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

@@ -26,8 +26,6 @@
</snapshotRepository>
</distributionManagement>
<properties>
<docker.org>springcloudstream</docker.org>
<docker.version>${project.version}</docker.version>
<skipTests>true</skipTests>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -121,21 +119,10 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>0.10.1</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>${docker.org}/${project.artifactId}:${docker.version}</image>
</to>
<container>
<useCurrentTimestamp>true</useCurrentTimestamp>
</container>
<image>
<name>springcloudstream/${project.artifactId}:${project.version}</name>
</image>
</configuration>
</plugin>
</plugins>

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

@@ -26,8 +26,6 @@
</snapshotRepository>
</distributionManagement>
<properties>
<docker.org>springcloudstream</docker.org>
<docker.version>${project.version}</docker.version>
<skipTests>true</skipTests>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -131,21 +129,10 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>0.10.1</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>${docker.org}/${project.artifactId}:${docker.version}</image>
</to>
<container>
<useCurrentTimestamp>true</useCurrentTimestamp>
</container>
<image>
<name>springcloudstream/${project.artifactId}:${project.version}</name>
</image>
</configuration>
</plugin>
<plugin>

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

@@ -26,8 +26,6 @@
</snapshotRepository>
</distributionManagement>
<properties>
<docker.org>springcloudstream</docker.org>
<docker.version>${project.version}</docker.version>
<skipTests>true</skipTests>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -131,21 +129,10 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>0.10.1</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>${docker.org}/${project.artifactId}:${docker.version}</image>
</to>
<container>
<useCurrentTimestamp>true</useCurrentTimestamp>
</container>
<image>
<name>springcloudstream/${project.artifactId}:${project.version}</name>
</image>
</configuration>
</plugin>
<plugin>

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

@@ -26,8 +26,6 @@
</snapshotRepository>
</distributionManagement>
<properties>
<docker.org>springcloudstream</docker.org>
<docker.version>${project.version}</docker.version>
<skipTests>true</skipTests>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -121,21 +119,10 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>0.10.1</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>${docker.org}/${project.artifactId}:${docker.version}</image>
</to>
<container>
<useCurrentTimestamp>true</useCurrentTimestamp>
</container>
<image>
<name>springcloudstream/${project.artifactId}:${project.version}</name>
</image>
</configuration>
</plugin>
</plugins>

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

@@ -19,8 +19,6 @@
<module>usage-detail-sender</module>
</modules>
<properties>
<docker.org>springcloudstream</docker.org>
<docker.version>${project.version}</docker.version>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.0</spring-cloud.version>
</properties>
@@ -42,21 +40,10 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>${docker.org}/${project.artifactId}:${docker.version}</image>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
</image>
</configuration>
</plugin>
</plugins>

19
function-samples/uppercase-processor/pom.xml
View File

@@ -125,25 +125,12 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/${project.artifactId}</image>
<tags>
<tag>1.0.0-SNAPSHOT</tag>
</tags>
</to>
<image>
<name>springcloudstream/${project.artifactId}:${project.version}</name>
</image>
</configuration>
</plugin>
</plugins>
</build>

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

@@ -120,58 +120,15 @@
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0.0</version>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>${project.build.outputDirectory}/META-INF/spring-configuration-metadata-encoded.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.33.0</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<images>
<image>
<name>springcloudtask/${project.artifactId}</name>
<build>
<tags>
<tag>latest</tag>
<tag>${project.version}</tag>
</tags>
<from>springcloud/baseimage:1.0.0</from>
<volumes>
<volume>/tmp</volume>
</volumes>
<labels>
<org.springframework.cloud.dataflow.spring-configuration-metadata.json>
${org.springframework.cloud.dataflow.spring.configuration.metadata.json}
</org.springframework.cloud.dataflow.spring-configuration-metadata.json>
</labels>
<entryPoint>
<exec>
<arg>java</arg>
<arg>-jar</arg>
<arg>/maven/task-demo-metrics-prometheus.jar</arg>
</exec>
</entryPoint>
<assembly>
<descriptor>assembly.xml</descriptor>
</assembly>
</build>
</image>
</images>
<image>
<name>springcloudtask/${project.artifactId}:${project.version}</name>
<bindings>
<binding>/tmp:/tmp</binding>
</bindings>
</image>
</configuration>
</plugin>
</plugins>

15
monitoring-samples/task-apps/task-demo-metrics-prometheus/src/main/docker/assembly.xml
View File

@@ -1,15 +0,0 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>task-demo-metrics-prometheus</id>
<dependencySets>
<dependencySet>
<includes>
<include>io.spring.task:task-demo-metrics-prometheus</include>
</includes>
<outputDirectory>.</outputDirectory>
<outputFileNameMapping>task-demo-metrics-prometheus.jar</outputFileNameMapping>
</dependencySet>
</dependencySets>
</assembly>

32
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-click-ingest/pom.xml
View File

@@ -130,31 +130,15 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.2.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<labels>
<org.springframework.cloud.dataflow.spring-configuration-metadata.json>
${org.springframework.cloud.dataflow.spring.configuration.metadata.json}
</org.springframework.cloud.dataflow.spring-configuration-metadata.json>
<configuration-properties.outbound-ports>${configuration-properties.outbound-ports}</configuration-properties.outbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.outbound-ports="${configuration-properties.outbound-ports}"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<plugin>

29
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-clicks-and-region-ingest/pom.xml
View File

@@ -132,28 +132,15 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.2.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<labels>
<configuration-properties.outbound-ports>${configuration-properties.outbound-ports}</configuration-properties.outbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.outbound-ports="${configuration-properties.outbound-ports}"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<plugin>

32
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-region-ingest/pom.xml
View File

@@ -136,31 +136,15 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.2.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<labels>
<org.springframework.cloud.dataflow.spring-configuration-metadata.json>
${org.springframework.cloud.dataflow.spring.configuration.metadata.json}
</org.springframework.cloud.dataflow.spring-configuration-metadata.json>
<configuration-properties.outbound-ports>${configuration-properties.outbound-ports}</configuration-properties.outbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.outbound-ports="${configuration-properties.outbound-ports}"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<plugin>

29
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/pom.xml
View File

@@ -123,28 +123,15 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.2.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<labels>
<configuration-properties.inbound-ports>input</configuration-properties.inbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.inbound-ports=input
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<plugin>

30
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/pom.xml
View File

@@ -129,29 +129,15 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.2.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<labels>
<configuration-properties.inbound-ports>${configuration-properties.inbound-ports}</configuration-properties.inbound-ports>
<configuration-properties.outbound-ports>${configuration-properties.outbound-ports}</configuration-properties.outbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.inbound-ports="${configuration-properties.inbound-ports}",configuration-properties.outbound-ports="${configuration-properties.outbound-ports}"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<plugin>

29
multi-io-samples/purchase-orders/http-purchase-orders/pom.xml
View File

@@ -113,28 +113,15 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.0.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<labels>
<configuration-properties.outbound-ports>${configuration-properties.outbound-ports}</configuration-properties.outbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.outbound-ports="${configuration-properties.outbound-ports}"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<plugin>

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

@@ -190,60 +190,17 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.0.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<labels>
<org.springframework.cloud.dataflow.spring-configuration-metadata.json>
${org.springframework.cloud.dataflow.spring.configuration.metadata.json}
</org.springframework.cloud.dataflow.spring-configuration-metadata.json>
<configuration-properties.inbound-ports>input1,input2,input3</configuration-properties.inbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.inbound-ports="input1,input2,input3"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<!--
Use of properties-maven-plugin to load the encoded metadata properties created by the jib-maven-plugin
Use: Use: ./mvnw clean install jib:dockerBuild or ./mvnw clean install jib:build
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0.0</version>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>
${project.build.outputDirectory}/META-INF/spring-configuration-metadata-encoded.properties
</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-app-starter-metadata-maven-plugin</artifactId>

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

@@ -190,60 +190,17 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.0.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<labels>
<org.springframework.cloud.dataflow.spring-configuration-metadata.json>
${org.springframework.cloud.dataflow.spring.configuration.metadata.json}
</org.springframework.cloud.dataflow.spring-configuration-metadata.json>
<configuration-properties.inbound-ports>input1,input2,input3</configuration-properties.inbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.inbound-ports="input1,input2,input3"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<!--
Use of properties-maven-plugin to load the encoded metadata properties created by the jib-maven-plugin
Use: Use: ./mvnw clean install jib:dockerBuild or ./mvnw clean install jib:build
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0.0</version>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>
${project.build.outputDirectory}/META-INF/spring-configuration-metadata-encoded.properties
</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-app-starter-metadata-maven-plugin</artifactId>

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

@@ -195,60 +195,17 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.0.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<labels>
<org.springframework.cloud.dataflow.spring-configuration-metadata.json>
${org.springframework.cloud.dataflow.spring.configuration.metadata.json}
</org.springframework.cloud.dataflow.spring-configuration-metadata.json>
<configuration-properties.outbound-ports>output1,output2,output3</configuration-properties.outbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.outbound-ports="output1,output2,output3"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<!--
Use of properties-maven-plugin to load the encoded metadata properties created by the jib-maven-plugin
Use: Use: ./mvnw clean install jib:dockerBuild or ./mvnw clean install jib:build
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0.0</version>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>
${project.build.outputDirectory}/META-INF/spring-configuration-metadata-encoded.properties
</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-app-starter-metadata-maven-plugin</artifactId>

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

@@ -195,60 +195,17 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<from>
<image>springcloud/openjdk</image>
</from>
<to>
<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
<tags>
<tag>1.0.0-SNAPSHOT</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<labels>
<org.springframework.cloud.dataflow.spring-configuration-metadata.json>
${org.springframework.cloud.dataflow.spring.configuration.metadata.json}
</org.springframework.cloud.dataflow.spring-configuration-metadata.json>
<configuration-properties.outbound-ports>output1,output2,output3</configuration-properties.outbound-ports>
</labels>
</container>
<image>
<name>springcloudstream/multi-io-sample-${project.artifactId}:${project.version}</name>
<env>
<BP_IMAGE_LABELS>
configuration-properties.outbound-ports="output1,output2,output3"
</BP_IMAGE_LABELS>
</env>
</image>
</configuration>
</plugin>
<!--
Use of properties-maven-plugin to load the encoded metadata properties created by the jib-maven-plugin
Use: Use: ./mvnw clean install jib:dockerBuild or ./mvnw clean install jib:build
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0.0</version>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>
${project.build.outputDirectory}/META-INF/spring-configuration-metadata-encoded.properties
</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-app-starter-metadata-maven-plugin</artifactId>

5
scenario-task/pom.xml
View File

@@ -99,6 +99,11 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<image>
<name>springcloudtask/${project.artifactId}:${project.version}</name>
</image>
</configuration>
</plugin>
</plugins>
</build>

5
timestamp-batch/pom.xml
View File

@@ -80,6 +80,11 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<image>
<name>springcloudtask/${project.artifactId}:${project.version}</name>
</image>
</configuration>
</plugin>
</plugins>
</build>

5
timestamp-task/pom.xml
View File

@@ -71,6 +71,11 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<image>
<name>springcloudtask/${project.artifactId}:${project.version}</name>
</image>
</configuration>
</plugin>
</plugins>
</build>