From da6beb0b0c777dd79a55def4e82be66027bbb5d7 Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Sat, 10 Dec 2022 10:52:50 +0200 Subject: [PATCH] Explicitly disable skipping for deploy-plugin on applications. --- .github/workflows/common.yml | 141 ++++++++-------- .../processor/bridge-processor/pom.xml | 8 + .../processor/filter-processor/pom.xml | 8 + .../processor/groovy-processor/pom.xml | 8 + .../header-enricher-processor/pom.xml | 8 + .../processor/http-request-processor/pom.xml | 8 + .../image-recognition-processor/pom.xml | 8 + .../object-detection-processor/pom.xml | 8 + .../processor/script-processor/pom.xml | 8 + .../semantic-segmentation-processor/pom.xml | 8 + .../processor/splitter-processor/pom.xml | 8 + .../processor/transform-processor/pom.xml | 8 + .../processor/twitter-trend-processor/pom.xml | 8 + applications/sink/analytics-sink/pom.xml | 8 + applications/sink/cassandra-sink/pom.xml | 8 + applications/sink/elasticsearch-sink/pom.xml | 8 + applications/sink/file-sink/pom.xml | 8 + applications/sink/ftp-sink/pom.xml | 8 + applications/sink/jdbc-sink/pom.xml | 8 + applications/sink/log-sink/pom.xml | 8 + applications/sink/mongodb-sink/pom.xml | 8 + applications/sink/mqtt-sink/pom.xml | 8 + applications/sink/pgcopy-sink/pom.xml | 8 + applications/sink/rabbit-sink/pom.xml | 8 + applications/sink/redis-sink/pom.xml | 8 + applications/sink/router-sink/pom.xml | 8 + applications/sink/rsocket-sink/pom.xml | 8 + applications/sink/s3-sink/pom.xml | 8 + applications/sink/sftp-sink/pom.xml | 8 + applications/sink/tcp-sink/pom.xml | 8 + applications/sink/throughput-sink/pom.xml | 8 + .../sink/twitter-message-sink/pom.xml | 8 + applications/sink/twitter-update-sink/pom.xml | 8 + applications/sink/wavefront-sink/pom.xml | 8 + applications/sink/websocket-sink/pom.xml | 8 + applications/sink/xmpp-sink/pom.xml | 8 + applications/sink/zeromq-sink/pom.xml | 8 + .../source/cdc-debezium-source/pom.xml | 8 + applications/source/file-source/pom.xml | 8 + applications/source/ftp-source/pom.xml | 8 + applications/source/http-source/pom.xml | 8 + applications/source/jdbc-source/pom.xml | 8 + applications/source/jms-source/pom.xml | 8 + .../source/load-generator-source/pom.xml | 8 + applications/source/mail-source/pom.xml | 8 + applications/source/mongodb-source/pom.xml | 8 + applications/source/mqtt-source/pom.xml | 8 + applications/source/rabbit-source/pom.xml | 8 + applications/source/s3-source/pom.xml | 8 + applications/source/sftp-source/pom.xml | 8 + applications/source/syslog-source/pom.xml | 8 + applications/source/tcp-source/pom.xml | 8 + applications/source/time-source/pom.xml | 8 + .../source/twitter-message-source/pom.xml | 8 + .../source/twitter-search-source/pom.xml | 8 + .../source/twitter-stream-source/pom.xml | 8 + applications/source/websocket-source/pom.xml | 8 + applications/source/xmpp-source/pom.xml | 8 + applications/source/zeromq-source/pom.xml | 8 + applications/stream-applications-core/pom.xml | 8 + build-app.sh | 152 +++++++++--------- build-folder.sh | 7 +- 62 files changed, 624 insertions(+), 148 deletions(-) diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index c724ab38..d3516cfd 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -480,73 +480,76 @@ jobs: DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }} MAVEN_THREADS: ${{ inputs.useMavenThreads }} run: ./publish-app.sh "stream-applications" "applications/source/${{ matrix.app }}" - release-train: - needs: - - core - - parameters - - scale-runners-up - runs-on: 'stream-ci' - steps: - - name: 'Configure: checkout stream-applications' - uses: actions/checkout@v3 - with: - ref: 'main' - - name: 'Configure: checkout stream-applications@${{ inputs.branch }}' - uses: actions/checkout@v3 - with: - ref: ${{ inputs.branch }} - path: 'stream-applications' - - name: Ensure scripts are executable - shell: bash - run: find . -type f -name "*.sh" -exec chmod a+x '{}' \; - - name: 'Configure: Install Java' - if: ${{ needs.parameters.outputs.jdk_build == '8' }} - uses: actions/setup-java@v1 - with: - java-version: ${{ needs.parameters.outputs.jdk_build }} - - name: 'Configure: Install GraalVM' - if: ${{ needs.parameters.outputs.jdk_build != '8' }} - uses: graalvm/setup-graalvm@v1 - with: - version: 'latest' - java-version: ${{ needs.parameters.outputs.jdk_build }} - # components: 'native-image' # add when starting native builds. - github-token: ${{ secrets.GITHUB_TOKEN }} - - name: 'Configure: cache for maven dependencies' - uses: actions/cache@v3 - with: - path: ~/.m2/repository - key: maven-repo-${{ hashFiles('**/pom.xml') }}-8-single-${{ inputs.branch }} - restore-keys: | - maven-repo-${{ hashFiles('**/pom.xml') }}-8-${{ inputs.branch }} - maven-repo-${{ hashFiles('**/pom.xml') }}-${{ inputs.branch }} - maven-repo-${{ inputs.branch }} - - name: 'Configure: Install Pack' - uses: ./.github/actions/install-pack - - name: 'Build: stream-applications-release-train' - shell: bash - env: - ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} - ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }} - MAVEN_THREADS: ${{ inputs.useMavenThreads }} - run: | - ROOT_DIR=$(realpath $PWD) - pushd stream-applications > /dev/null - echo "::notice ::building - stream-applications-release-train" - set -e - $ROOT_DIR/build-folder.sh stream-applications-release-train "install verify deploy" - set +e - echo "::notice ::stream-applications-release-train build completed" - popd > /dev/null - - name: 'Upload: Error logs' - if: ${{ failure() }} - uses: actions/upload-artifact@v3 - with: - name: '${{ matrix.app }}-surefire-reports' - path: '**/target/surefire-reports' - retention-days: 7 - if-no-files-found: ignore + release-train: + needs: + - core + - sinks + - sources + - processors + - parameters + - scale-runners-up + runs-on: 'stream-ci' + steps: + - name: 'Configure: checkout stream-applications' + uses: actions/checkout@v3 + with: + ref: 'main' + - name: 'Configure: checkout stream-applications@${{ inputs.branch }}' + uses: actions/checkout@v3 + with: + ref: ${{ inputs.branch }} + path: 'stream-applications' + - name: Ensure scripts are executable + shell: bash + run: find . -type f -name "*.sh" -exec chmod a+x '{}' \; + - name: 'Configure: Install Java' + if: ${{ needs.parameters.outputs.jdk_build == '8' }} + uses: actions/setup-java@v1 + with: + java-version: ${{ needs.parameters.outputs.jdk_build }} + - name: 'Configure: Install GraalVM' + if: ${{ needs.parameters.outputs.jdk_build != '8' }} + uses: graalvm/setup-graalvm@v1 + with: + version: 'latest' + java-version: ${{ needs.parameters.outputs.jdk_build }} + # components: 'native-image' # add when starting native builds. + github-token: ${{ secrets.GITHUB_TOKEN }} + - name: 'Configure: cache for maven dependencies' + uses: actions/cache@v3 + with: + path: ~/.m2/repository + key: maven-repo-${{ hashFiles('**/pom.xml') }}-8-single-${{ inputs.branch }} + restore-keys: | + maven-repo-${{ hashFiles('**/pom.xml') }}-8-${{ inputs.branch }} + maven-repo-${{ hashFiles('**/pom.xml') }}-${{ inputs.branch }} + maven-repo-${{ inputs.branch }} + - name: 'Configure: Install Pack' + uses: ./.github/actions/install-pack + - name: 'Build: stream-applications-release-train' + shell: bash + env: + ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} + ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} + DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }} + MAVEN_THREADS: ${{ inputs.useMavenThreads }} + run: | + ROOT_DIR=$(realpath $PWD) + pushd stream-applications > /dev/null + echo "::notice ::building - stream-applications-release-train" + set -e + $ROOT_DIR/build-folder.sh stream-applications-release-train "install verify deploy" + set +e + echo "::notice ::stream-applications-release-train build completed" + popd > /dev/null + - name: 'Upload: Error logs' + if: ${{ failure() }} + uses: actions/upload-artifact@v3 + with: + name: '${{ matrix.app }}-surefire-reports' + path: '**/target/surefire-reports' + retention-days: 7 + if-no-files-found: ignore rerun-jobs: if: ${{ failure() && github.run_attempt == '1' }} runs-on: ubuntu-latest @@ -581,7 +584,9 @@ jobs: runs-on: ubuntu-latest needs: - parameters - - release-train + - sinks + - sources + - processors concurrency: group: stream-apps-gh-runners cancel-in-progress: false diff --git a/applications/processor/bridge-processor/pom.xml b/applications/processor/bridge-processor/pom.xml index d8b2d659..637a9b2e 100644 --- a/applications/processor/bridge-processor/pom.xml +++ b/applications/processor/bridge-processor/pom.xml @@ -16,6 +16,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/processor/filter-processor/pom.xml b/applications/processor/filter-processor/pom.xml index be28fedc..8d12d12d 100644 --- a/applications/processor/filter-processor/pom.xml +++ b/applications/processor/filter-processor/pom.xml @@ -23,6 +23,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/processor/groovy-processor/pom.xml b/applications/processor/groovy-processor/pom.xml index 5af5b9c8..358d4dbc 100644 --- a/applications/processor/groovy-processor/pom.xml +++ b/applications/processor/groovy-processor/pom.xml @@ -66,6 +66,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/processor/header-enricher-processor/pom.xml b/applications/processor/header-enricher-processor/pom.xml index b5b64f9d..cbc3cc0c 100644 --- a/applications/processor/header-enricher-processor/pom.xml +++ b/applications/processor/header-enricher-processor/pom.xml @@ -28,6 +28,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/processor/http-request-processor/pom.xml b/applications/processor/http-request-processor/pom.xml index 4e9b2d0e..38e5d78f 100644 --- a/applications/processor/http-request-processor/pom.xml +++ b/applications/processor/http-request-processor/pom.xml @@ -36,6 +36,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/processor/image-recognition-processor/pom.xml b/applications/processor/image-recognition-processor/pom.xml index 2f9f6d6f..52f11904 100644 --- a/applications/processor/image-recognition-processor/pom.xml +++ b/applications/processor/image-recognition-processor/pom.xml @@ -28,6 +28,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/processor/object-detection-processor/pom.xml b/applications/processor/object-detection-processor/pom.xml index 773ea9be..b4d5138d 100644 --- a/applications/processor/object-detection-processor/pom.xml +++ b/applications/processor/object-detection-processor/pom.xml @@ -27,6 +27,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/processor/script-processor/pom.xml b/applications/processor/script-processor/pom.xml index b9a88774..9669d9d3 100644 --- a/applications/processor/script-processor/pom.xml +++ b/applications/processor/script-processor/pom.xml @@ -78,6 +78,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/processor/semantic-segmentation-processor/pom.xml b/applications/processor/semantic-segmentation-processor/pom.xml index 23ced293..d868a248 100644 --- a/applications/processor/semantic-segmentation-processor/pom.xml +++ b/applications/processor/semantic-segmentation-processor/pom.xml @@ -32,6 +32,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/processor/splitter-processor/pom.xml b/applications/processor/splitter-processor/pom.xml index 36aba343..acd98b57 100644 --- a/applications/processor/splitter-processor/pom.xml +++ b/applications/processor/splitter-processor/pom.xml @@ -27,6 +27,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/processor/transform-processor/pom.xml b/applications/processor/transform-processor/pom.xml index ffca380a..400d9d1a 100644 --- a/applications/processor/transform-processor/pom.xml +++ b/applications/processor/transform-processor/pom.xml @@ -23,6 +23,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/processor/twitter-trend-processor/pom.xml b/applications/processor/twitter-trend-processor/pom.xml index 9ee0bd2e..8256714e 100644 --- a/applications/processor/twitter-trend-processor/pom.xml +++ b/applications/processor/twitter-trend-processor/pom.xml @@ -41,6 +41,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/analytics-sink/pom.xml b/applications/sink/analytics-sink/pom.xml index 7284a1e2..f1bcfd0a 100644 --- a/applications/sink/analytics-sink/pom.xml +++ b/applications/sink/analytics-sink/pom.xml @@ -35,6 +35,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/cassandra-sink/pom.xml b/applications/sink/cassandra-sink/pom.xml index 8b5cb383..a2ce2fe7 100644 --- a/applications/sink/cassandra-sink/pom.xml +++ b/applications/sink/cassandra-sink/pom.xml @@ -23,6 +23,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/elasticsearch-sink/pom.xml b/applications/sink/elasticsearch-sink/pom.xml index 4bfed810..47d680d0 100644 --- a/applications/sink/elasticsearch-sink/pom.xml +++ b/applications/sink/elasticsearch-sink/pom.xml @@ -52,6 +52,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/file-sink/pom.xml b/applications/sink/file-sink/pom.xml index dd3e839c..1406fbaf 100644 --- a/applications/sink/file-sink/pom.xml +++ b/applications/sink/file-sink/pom.xml @@ -23,6 +23,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/ftp-sink/pom.xml b/applications/sink/ftp-sink/pom.xml index f78390a4..7846d6a3 100644 --- a/applications/sink/ftp-sink/pom.xml +++ b/applications/sink/ftp-sink/pom.xml @@ -23,6 +23,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/jdbc-sink/pom.xml b/applications/sink/jdbc-sink/pom.xml index 47964e1e..b2884d22 100644 --- a/applications/sink/jdbc-sink/pom.xml +++ b/applications/sink/jdbc-sink/pom.xml @@ -34,6 +34,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/log-sink/pom.xml b/applications/sink/log-sink/pom.xml index 0354b0e2..09df801a 100644 --- a/applications/sink/log-sink/pom.xml +++ b/applications/sink/log-sink/pom.xml @@ -34,6 +34,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/mongodb-sink/pom.xml b/applications/sink/mongodb-sink/pom.xml index 78122641..2f4d3955 100644 --- a/applications/sink/mongodb-sink/pom.xml +++ b/applications/sink/mongodb-sink/pom.xml @@ -28,6 +28,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/mqtt-sink/pom.xml b/applications/sink/mqtt-sink/pom.xml index b09a59df..e055bf2d 100644 --- a/applications/sink/mqtt-sink/pom.xml +++ b/applications/sink/mqtt-sink/pom.xml @@ -29,6 +29,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/pgcopy-sink/pom.xml b/applications/sink/pgcopy-sink/pom.xml index c4280afd..98665893 100644 --- a/applications/sink/pgcopy-sink/pom.xml +++ b/applications/sink/pgcopy-sink/pom.xml @@ -37,6 +37,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/rabbit-sink/pom.xml b/applications/sink/rabbit-sink/pom.xml index cc79026c..bbd3c375 100644 --- a/applications/sink/rabbit-sink/pom.xml +++ b/applications/sink/rabbit-sink/pom.xml @@ -53,6 +53,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/redis-sink/pom.xml b/applications/sink/redis-sink/pom.xml index 59113fe4..c9ecb132 100644 --- a/applications/sink/redis-sink/pom.xml +++ b/applications/sink/redis-sink/pom.xml @@ -62,6 +62,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/router-sink/pom.xml b/applications/sink/router-sink/pom.xml index 2737caf9..fa0341ab 100644 --- a/applications/sink/router-sink/pom.xml +++ b/applications/sink/router-sink/pom.xml @@ -70,6 +70,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/rsocket-sink/pom.xml b/applications/sink/rsocket-sink/pom.xml index da765719..27f4a981 100644 --- a/applications/sink/rsocket-sink/pom.xml +++ b/applications/sink/rsocket-sink/pom.xml @@ -33,6 +33,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/s3-sink/pom.xml b/applications/sink/s3-sink/pom.xml index f19c333e..bf0880bb 100644 --- a/applications/sink/s3-sink/pom.xml +++ b/applications/sink/s3-sink/pom.xml @@ -33,6 +33,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/sftp-sink/pom.xml b/applications/sink/sftp-sink/pom.xml index 7899d9ed..0bcfed68 100644 --- a/applications/sink/sftp-sink/pom.xml +++ b/applications/sink/sftp-sink/pom.xml @@ -23,6 +23,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/tcp-sink/pom.xml b/applications/sink/tcp-sink/pom.xml index b52f4b6a..1524503d 100644 --- a/applications/sink/tcp-sink/pom.xml +++ b/applications/sink/tcp-sink/pom.xml @@ -23,6 +23,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/throughput-sink/pom.xml b/applications/sink/throughput-sink/pom.xml index cf494473..bc30b0dd 100644 --- a/applications/sink/throughput-sink/pom.xml +++ b/applications/sink/throughput-sink/pom.xml @@ -35,6 +35,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/twitter-message-sink/pom.xml b/applications/sink/twitter-message-sink/pom.xml index 34d52486..c0180416 100644 --- a/applications/sink/twitter-message-sink/pom.xml +++ b/applications/sink/twitter-message-sink/pom.xml @@ -46,6 +46,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/twitter-update-sink/pom.xml b/applications/sink/twitter-update-sink/pom.xml index 740f0222..38cb78eb 100644 --- a/applications/sink/twitter-update-sink/pom.xml +++ b/applications/sink/twitter-update-sink/pom.xml @@ -46,6 +46,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/wavefront-sink/pom.xml b/applications/sink/wavefront-sink/pom.xml index e24ea120..e0fe81f3 100644 --- a/applications/sink/wavefront-sink/pom.xml +++ b/applications/sink/wavefront-sink/pom.xml @@ -28,6 +28,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/websocket-sink/pom.xml b/applications/sink/websocket-sink/pom.xml index 981adfd1..d0b30d7f 100644 --- a/applications/sink/websocket-sink/pom.xml +++ b/applications/sink/websocket-sink/pom.xml @@ -33,6 +33,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/xmpp-sink/pom.xml b/applications/sink/xmpp-sink/pom.xml index 6ffb2ace..f236a22f 100644 --- a/applications/sink/xmpp-sink/pom.xml +++ b/applications/sink/xmpp-sink/pom.xml @@ -46,6 +46,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/sink/zeromq-sink/pom.xml b/applications/sink/zeromq-sink/pom.xml index c6f9fa4e..1ca507ac 100644 --- a/applications/sink/zeromq-sink/pom.xml +++ b/applications/sink/zeromq-sink/pom.xml @@ -38,6 +38,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/cdc-debezium-source/pom.xml b/applications/source/cdc-debezium-source/pom.xml index 4ab98989..3a072b35 100644 --- a/applications/source/cdc-debezium-source/pom.xml +++ b/applications/source/cdc-debezium-source/pom.xml @@ -89,6 +89,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/file-source/pom.xml b/applications/source/file-source/pom.xml index 9e534729..c71f59ee 100644 --- a/applications/source/file-source/pom.xml +++ b/applications/source/file-source/pom.xml @@ -29,6 +29,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/ftp-source/pom.xml b/applications/source/ftp-source/pom.xml index 1805ed70..3f793037 100644 --- a/applications/source/ftp-source/pom.xml +++ b/applications/source/ftp-source/pom.xml @@ -34,6 +34,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/http-source/pom.xml b/applications/source/http-source/pom.xml index f5c0abaa..7350ba9d 100644 --- a/applications/source/http-source/pom.xml +++ b/applications/source/http-source/pom.xml @@ -33,6 +33,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/jdbc-source/pom.xml b/applications/source/jdbc-source/pom.xml index 652b878f..a3fe3858 100644 --- a/applications/source/jdbc-source/pom.xml +++ b/applications/source/jdbc-source/pom.xml @@ -38,6 +38,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/jms-source/pom.xml b/applications/source/jms-source/pom.xml index c5602e8a..4a4b9117 100644 --- a/applications/source/jms-source/pom.xml +++ b/applications/source/jms-source/pom.xml @@ -39,6 +39,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/load-generator-source/pom.xml b/applications/source/load-generator-source/pom.xml index 696029f8..fd6218a1 100644 --- a/applications/source/load-generator-source/pom.xml +++ b/applications/source/load-generator-source/pom.xml @@ -24,6 +24,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/mail-source/pom.xml b/applications/source/mail-source/pom.xml index 203c256d..ae2e205a 100644 --- a/applications/source/mail-source/pom.xml +++ b/applications/source/mail-source/pom.xml @@ -28,6 +28,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/mongodb-source/pom.xml b/applications/source/mongodb-source/pom.xml index 88c841bb..5c7f45b8 100644 --- a/applications/source/mongodb-source/pom.xml +++ b/applications/source/mongodb-source/pom.xml @@ -23,6 +23,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/mqtt-source/pom.xml b/applications/source/mqtt-source/pom.xml index 52698b0b..03066664 100644 --- a/applications/source/mqtt-source/pom.xml +++ b/applications/source/mqtt-source/pom.xml @@ -29,6 +29,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/rabbit-source/pom.xml b/applications/source/rabbit-source/pom.xml index 27e14948..0195ac42 100644 --- a/applications/source/rabbit-source/pom.xml +++ b/applications/source/rabbit-source/pom.xml @@ -45,6 +45,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/s3-source/pom.xml b/applications/source/s3-source/pom.xml index b73eb190..4b618b80 100644 --- a/applications/source/s3-source/pom.xml +++ b/applications/source/s3-source/pom.xml @@ -28,6 +28,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/sftp-source/pom.xml b/applications/source/sftp-source/pom.xml index 00271db2..03c284a3 100644 --- a/applications/source/sftp-source/pom.xml +++ b/applications/source/sftp-source/pom.xml @@ -34,6 +34,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/syslog-source/pom.xml b/applications/source/syslog-source/pom.xml index 1c75a3f4..8ca49c0e 100644 --- a/applications/source/syslog-source/pom.xml +++ b/applications/source/syslog-source/pom.xml @@ -23,6 +23,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/tcp-source/pom.xml b/applications/source/tcp-source/pom.xml index 377f1901..d474d97d 100644 --- a/applications/source/tcp-source/pom.xml +++ b/applications/source/tcp-source/pom.xml @@ -23,6 +23,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/time-source/pom.xml b/applications/source/time-source/pom.xml index 1e546b5a..7a904a54 100644 --- a/applications/source/time-source/pom.xml +++ b/applications/source/time-source/pom.xml @@ -29,6 +29,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/twitter-message-source/pom.xml b/applications/source/twitter-message-source/pom.xml index e3976e28..a20c00ef 100644 --- a/applications/source/twitter-message-source/pom.xml +++ b/applications/source/twitter-message-source/pom.xml @@ -41,6 +41,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/twitter-search-source/pom.xml b/applications/source/twitter-search-source/pom.xml index 901fff47..c6a073fa 100644 --- a/applications/source/twitter-search-source/pom.xml +++ b/applications/source/twitter-search-source/pom.xml @@ -40,6 +40,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/twitter-stream-source/pom.xml b/applications/source/twitter-stream-source/pom.xml index b19f5cf9..b2372e20 100644 --- a/applications/source/twitter-stream-source/pom.xml +++ b/applications/source/twitter-stream-source/pom.xml @@ -40,6 +40,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/websocket-source/pom.xml b/applications/source/websocket-source/pom.xml index b260f4fe..25eb4bcc 100644 --- a/applications/source/websocket-source/pom.xml +++ b/applications/source/websocket-source/pom.xml @@ -33,6 +33,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/xmpp-source/pom.xml b/applications/source/xmpp-source/pom.xml index 9f873231..dc7df034 100644 --- a/applications/source/xmpp-source/pom.xml +++ b/applications/source/xmpp-source/pom.xml @@ -46,6 +46,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/source/zeromq-source/pom.xml b/applications/source/zeromq-source/pom.xml index 3a85339a..464ac918 100644 --- a/applications/source/zeromq-source/pom.xml +++ b/applications/source/zeromq-source/pom.xml @@ -34,6 +34,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/applications/stream-applications-core/pom.xml b/applications/stream-applications-core/pom.xml index d60cbd72..b7caaf8f 100644 --- a/applications/stream-applications-core/pom.xml +++ b/applications/stream-applications-core/pom.xml @@ -89,6 +89,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + false + + org.springframework.cloud spring-cloud-dataflow-apps-docs-plugin diff --git a/build-app.sh b/build-app.sh index 214628ee..ffd7411c 100755 --- a/build-app.sh +++ b/build-app.sh @@ -6,7 +6,7 @@ function check_env() { eval ev='$'$1 if [ "$ev" == "" ]; then echo "$1 not defined" - if (( sourced != 0 )); then + if ((sourced != 0)); then return 1 else exit 1 @@ -15,7 +15,7 @@ function check_env() { } if [ "$2" == "" ]; then echo "Argument: required" - if((sourced > 0)); then + if ((sourced > 0)); then exit 0 else exit 1 @@ -28,82 +28,78 @@ set -e check_env ARTIFACTORY_USERNAME check_env ARTIFACTORY_PASSWORD -pushd "$PROJECT_FOLDER" > /dev/null - if [ "$VERBOSE" == "true" ]; then - MAVEN_OPT=--debug - fi - if [ "$MAVEN_OPT" == "" ]; then - MAVEN_OPT="-B -U" - else - MAVEN_OPT="$MAVEN_OPT -B -U" - fi - if [ "$VERSION" == "" ]; then - VERSION=$($SCDIR/mvn-get-version.sh) - fi - echo "Project Version:$VERSION" - if [ "$LOCAL" == "true" ]; then - MAVEN_GOAL="install verify" - else - MAVEN_GOAL="install verify deploy" - fi +pushd "$PROJECT_FOLDER" >/dev/null +if [ "$VERSION" == "" ]; then + VERSION=$($SCDIR/mvn-get-version.sh) +fi +popd >/dev/null +echo "Project Version:$VERSION" +if [ "$LOCAL" == "true" ]; then + MAVEN_GOAL="install verify" +else + MAVEN_GOAL="install verify deploy" +fi - if [[ "$VERSION" == "4."* ]]; then - JDKS="17" - if [ "$DEFAULT_JDK" == "" ]; then - DEFAULT_JDK=17 - fi - else - JDKS="8 11 17" - if [ "$DEFAULT_JDK" == "" ]; then - DEFAULT_JDK=11 - fi +if [[ "$VERSION" == "4."* ]]; then + JDKS="17" + if [ "$DEFAULT_JDK" == "" ]; then + DEFAULT_JDK=17 fi - pushd "$APP_FOLDER" > /dev/null - rm -rf apps - if [ -d "src/main/java" ]; then - echo "Deploying:$APP_FOLDER" - $PROJECT_FOLDER/mvnw $MAVEN_OPT -s $SCDIR/.settings.xml clean $MAVEN_GOAL -Pintegration - else - echo "Packaging:$APP_FOLDER" - $PROJECT_FOLDER/mvnw $MAVEN_OPT -s $SCDIR/.settings.xml clean install -Pintegration +else + JDKS="8 11 17" + if [ "$DEFAULT_JDK" == "" ]; then + DEFAULT_JDK=11 + fi +fi + +pushd "$APP_FOLDER" >/dev/null +rm -rf apps +echo "Deploying:$APP_FOLDER" +if [ -d "src/main/java" ]; then + echo "Deploying:$APP_FOLDER" + $SCDIR/build-folder.sh "." "$MAVEN_GOAL -Pintegration" +else + echo "Installing:$APP_FOLDER" + $SCDIR//build-folder.sh "." "clean install -Pintegration" +fi + +if [ ! -d apps ]; then + echo "Cannot find $APP_FOLDER/apps" + exit 2 +fi +pushd apps >/dev/null +APPS=$(find * -maxdepth 0 -type d) +for app in $APPS; do + echo "Removing jib-maven-plugin for:$APP_FOLDER/apps/$app" + $SCDIR/scripts/remove-jib-plugin.sh $app/pom.xml +done +for app in $APPS; do + pushd "$app" >/dev/null + FOLDER=$(pwd) + echo "Building:$FOLDER" + $SCDIR/build-folder.sh "." "$MAVEN_GOAL -Pintegration" + for v in $JDKS; do + echo "Pack:$app:$VERSION-jdk$v" + pack build \ + --path "target/$app-$VERSION.jar" \ + --builder gcr.io/paketo-buildpacks/builder:base \ + --env BP_JVM_VERSION=$v \ + --env BPE_APPEND_JDK_JAVA_OPTIONS=-Dfile.encoding=UTF-8 \ + --env BPE_APPEND_JDK_JAVA_OPTIONS=-Dsun.jnu.encoding \ + --env BPE_LC_ALL=en_US.utf8 \ + --env BPE_LANG=en_US.utf8 \ + "springcloudstream/$app:$VERSION-jdk$v" + echo "Created:springcloudstream/$app:$VERSION-jdk$v" + done + if [ "$DEFAULT_JDK" != "" ]; then + docker tag "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK" "springcloudstream/$app:$VERSION" + echo "Tagged:springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK as springcloudstream/$app:$VERSION" + if [ "$BRANCH" != "" ]; then + docker tag "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK" "springcloudstream/$app:$BRANCH" + echo "Tagged:springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK as springcloudstream/$app:$BRANCH" fi - if [ ! -d apps ]; then - echo "Cannot find $APP_FOLDER/apps" - exit 2 - fi - pushd apps > /dev/null - APPS=$(find * -maxdepth 0 -type d) - for app in $APPS; do - echo "Removing jib-maven-plugin for:$APP_FOLDER/apps/$app" - $SCDIR/scripts/remove-jib-plugin.sh $app/pom.xml - done - for app in $APPS; do - pushd "$app" > /dev/null - echo "Building:$APP_FOLDER/apps/$app" - ./mvnw $MAVEN_OPT -s $SCDIR/.settings.xml $MAVEN_GOAL -Pintegration - for v in $JDKS; do - echo "Pack:$app:$VERSION-jdk$v" - pack build \ - --path "target/$app-$VERSION.jar" \ - --builder gcr.io/paketo-buildpacks/builder:base \ - --env BP_JVM_VERSION=$v \ - --env BPE_APPEND_JDK_JAVA_OPTIONS=-Dfile.encoding=UTF-8 \ - --env BPE_APPEND_JDK_JAVA_OPTIONS=-Dsun.jnu.encoding \ - --env BPE_LC_ALL=en_US.utf8 \ - --env BPE_LANG=en_US.utf8 \ - "springcloudstream/$app:$VERSION-jdk$v" - echo "Created:springcloudstream/$app:$VERSION-jdk$v" - done - if [ "$DEFAULT_JDK" != "" ]; then - docker tag "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK" "springcloudstream/$app:$VERSION" - echo "Tagged:springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK as springcloudstream/$app:$VERSION" - if [ "$BRANCH" != "" ]; then - docker tag "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK" "springcloudstream/$app:$BRANCH" - echo "Tagged:springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK as springcloudstream/$app:$BRANCH" - fi - fi - popd > /dev/null - done - popd > /dev/null - popd > /dev/null -popd > /dev/null + fi + popd >/dev/null +done +popd >/dev/null +popd >/dev/null diff --git a/build-folder.sh b/build-folder.sh index 97c47071..2c47ed9b 100755 --- a/build-folder.sh +++ b/build-folder.sh @@ -1,4 +1,7 @@ #!/bin/bash +SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")") +SCDIR=$(realpath $SCDIR) + bold="\033[1m" red="\033[31m" dim="\033[2m" @@ -23,9 +26,9 @@ elif [ "$VERBOSE" == "false" ]; then MAVEN_OPTS="-q" fi if [ "$MAVEN_OPTS" == "" ]; then - MAVEN_OPTS="-s ./.settings.xml -B" + MAVEN_OPTS="-s $SCDIR/.settings.xml -B" else - MAVEN_OPTS="$MAVEN_OPTS -s ./.settings.xml -B" + MAVEN_OPTS="$MAVEN_OPTS -s $SCDIR/.settings.xml -B" fi if [ "$1" == "" ]; then