[CI] Remove Maven offline

spring-cloud · Oct 3, 2024 · f2da1a9 · f2da1a9
1 parent 86c3d15
commit f2da1a9
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -30,7 +30,7 @@ jobs:
         run: |          
           if [ "${{ inputs.version }}" == "" ]; then
             ./mvnw help:evaluate -Dexpression=project.version -s .settings.xml > /dev/null
-            VERSION=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)
+            VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
             echo "::notice::VERSION=$VERSION"
             echo "VERSION=$VERSION" >> $GITHUB_ENV
           else

diff --git a/.github/workflows/build-snapshot-worker.yml b/.github/workflows/build-snapshot-worker.yml
@@ -62,11 +62,11 @@ jobs:
         jfrog mvn -s .settings.xml install -Pfull,docs -B
         jfrog mvn -s .settings.xml install -pl spring-cloud-dataflow-package -B
         jfrog rt build-publish        
-        PROJECT_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)
+        PROJECT_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$PROJECT_VERSION >> $GITHUB_ENV
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main >> $GITHUB_ENV
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
-        echo BUILD_ZOO_HANDLER_spring_cloud_skipper_version=$(./mvnw help:evaluate -o -Dexpression=spring-cloud-skipper.version -pl spring-cloud-dataflow-parent -q -DforceStdout) >> $GITHUB_ENV
+        echo BUILD_ZOO_HANDLER_spring_cloud_skipper_version=$(./mvnw help:evaluate -Dexpression=spring-cloud-skipper.version -pl spring-cloud-dataflow-parent -q -DforceStdout) >> $GITHUB_ENV
 #        echo "Determine project version"
 #        set +e
 #        echo "::info ::Project version=$PROJECT_VERSION"

diff --git a/.github/workflows/ci-images.yml b/.github/workflows/ci-images.yml
@@ -31,7 +31,7 @@ jobs:
         run: |
           ./mvnw --version 
           ./mvnw help:evaluate -s .settings.xml -Dexpression=project.version > /dev/null
-          echo "VERSIONS=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)" >> $GITHUB_ENV
+          echo "VERSIONS=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
       - name: Version from Input
         if: ${{ inputs.version != null && inputs.version != '' }}
         shell: bash

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -57,7 +57,7 @@ jobs:
         echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
         echo "::notice::$(./mvnw --version)"
         ./mvnw help:evaluate -s .settings.xml -Dexpression=project.version
-        echo spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout) >> $GITHUB_ENV
+        echo spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
 #       build and publish
     - name: Build and Publish
       shell: bash
@@ -68,7 +68,7 @@ jobs:
         jfrog mvn -s .settings.xml install -pl spring-cloud-dataflow-package -B
         jfrog rt build-publish
         export JFROG_CLI_BUILD_NAME="${JFROG_CLI_BUILD_NAME/spring-cloud-dataflow/spring-cloud-skipper}"
-        PROJECT_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)
+        PROJECT_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
 #        set +e
 #        echo "::info ::Project version=$PROJECT_VERSION"
 #        SKIPPER_DOCS_PATTERN=$(.github/workflows/skipper-docs-name.sh $PROJECT_VERSION libs-snapshot-local)

diff --git a/.github/workflows/export-app-versions.sh b/.github/workflows/export-app-versions.sh
@@ -2,16 +2,16 @@
 set +e
 ./mvnw --version
 ./mvnw help:evaluate -Dexpression=project.version > /dev/null
-DATAFLOW_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)
+DATAFLOW_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
 RC=$?
 if ((RC!=0)); then
     echo "DATAFLOW_VERSION=$DATAFLOW_VERSION"
     exit $RC
 fi
 echo "DATAFLOW_VERSION=$DATAFLOW_VERSION"
-SKIPPER_VERSION=$(./mvnw help:evaluate -Dexpression=spring-cloud-skipper.version  -pl spring-cloud-dataflow-parent -o -q -DforceStdout)
+SKIPPER_VERSION=$(./mvnw help:evaluate -Dexpression=spring-cloud-skipper.version  -pl spring-cloud-dataflow-parent -q -DforceStdout)
 if [[ "$SKIPPER_VERSION" = *"ERROR"* ]]; then
-    SKIPPER_VERSION=$(./mvnw help:evaluate -Dexpression=spring-cloud-skipper.version -o -q -DforceStdout)
+    SKIPPER_VERSION=$(./mvnw help:evaluate -Dexpression=spring-cloud-skipper.version -q -DforceStdout)
 fi
 RC=$?
 if ((RC!=0)); then

diff --git a/.github/workflows/milestone-worker.yml b/.github/workflows/milestone-worker.yml
@@ -68,7 +68,7 @@ jobs:
           -Dartifactory.publish.artifacts=false \
           -DnewVersion='${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-'${BUILD_ZOO_HANDLER_milestone_version} \
           -B
-        BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout) >> $GITHUB_ENV
+        BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version >> $GITHUB_ENV
         echo "::notice ::set dataflow.version=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version}"        
         jfrog mvn versions:set-property \
@@ -96,7 +96,7 @@ jobs:
         ./spring-cloud-dataflow-package/set-package-version.sh
         jfrog mvn -gs .github/settings.xml -Pstagingmilestone,full,deploymentfiles,docs -B install -DskipTests 
         jfrog rt build-publish
-        PROJECT_VERSION=$(./mvnw -gs .github/settings.xml -Pstagingmilestone help:evaluate -Dexpression=project.version -o -q -DforceStdout)
+        PROJECT_VERSION=$(./mvnw -gs .github/settings.xml -Pstagingmilestone help:evaluate -Dexpression=project.version -q -DforceStdout)
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$PROJECT_VERSION >> $GITHUB_ENV
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main-milestone >> $GITHUB_ENV
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV

diff --git a/.github/workflows/next-dev-version-worker.yml b/.github/workflows/next-dev-version-worker.yml
@@ -65,7 +65,7 @@ jobs:
           -Dartifactory.publish.artifacts=false \
           -DnewVersion='${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion}-SNAPSHOT' \
           -B
-        BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)
+        BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version >> $GITHUB_ENV
         echo "::notice ::set dataflow.version=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version}"        
         jfrog mvn versions:set-property \

diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -71,7 +71,7 @@ jobs:
             -Dproperty=skipper.version \
             -DnewVersion=${{ inputs.version }} \
             -B
-          spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)
+          spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
           echo "spring_cloud_dataflow_version=$spring_cloud_dataflow_version" >> $GITHUB_ENV
           echo "::notice ::set dataflow.version=${spring_cloud_dataflow_version}"
           echo "::notice ::build-clean"

diff --git a/.github/workflows/release-worker.yml b/.github/workflows/release-worker.yml
@@ -69,7 +69,7 @@ jobs:
             -Dartifactory.publish.artifacts=false \
             -DnewVersion='${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}' \
             -B
-          BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)
+          BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
           echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version >> $GITHUB_ENV
           echo "::notice ::set dataflow.version=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version}"
           jfrog mvn versions:set-property \
@@ -106,7 +106,7 @@ jobs:
           jfrog mvn -gs .github/settings.xml -Pstagingrelease,full,deploymentfiles,docs -B install -DskipTests
           echo "::notice ::build-publish"
           jfrog rt build-publish
-          PROJECT_VERSION=$(./mvnw -gs .github/settings.xml -Pstagingrelease help:evaluate -Dexpression=project.version -o -q -DforceStdout)
+          PROJECT_VERSION=$(./mvnw -gs .github/settings.xml -Pstagingrelease help:evaluate -Dexpression=project.version -q -DforceStdout)
           spring_cloud_dataflow_version=$PROJECT_VERSION
           echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$spring_cloud_dataflow_version >> $GITHUB_ENV
           echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main-release >> $GITHUB_ENV

diff --git a/build-carvel-package.sh b/build-carvel-package.sh
@@ -9,8 +9,8 @@ SCDIR=$(realpath $(dirname "$(readlink -f "${BASH_SOURCE[0]}")"))
 set -euxo pipefail
 pushd $SCDIR > /dev/null
 ./mvnw help:evaluate -Dexpression=project.version > /dev/null
-export DATAFLOW_VERSION=$(./mvnw help:evaluate -o -Dexpression=project.version -q -DforceStdout)
-export SKIPPER_VERSION=$(./mvnw help:evaluate -o -Dexpression=spring-cloud-skipper.version -pl spring-cloud-dataflow-parent -q -DforceStdout)
+export DATAFLOW_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
+export SKIPPER_VERSION=$(./mvnw help:evaluate -Dexpression=spring-cloud-skipper.version -pl spring-cloud-dataflow-parent -q -DforceStdout)
 
 if [ "$PACKAGE_VERSION" = "" ]; then
   export PACKAGE_VERSION=$DATAFLOW_VERSION

diff --git a/spring-cloud-dataflow-package/set-package-version.sh b/spring-cloud-dataflow-package/set-package-version.sh
@@ -8,7 +8,7 @@ ROOT=$(realpath $SCDIR/..)
 if [ "$PACKAGE_VERSION" = "" ]; then
     pushd $ROOT > /dev/null
     ./mvnw help:evaluate -s .settings.xml -Dexpression=project.version > /dev/null
-    PACKAGE_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)
+    PACKAGE_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
     popd > /dev/null
 fi
 echo "PACKAGE_VERSION=$PACKAGE_VERSION"

diff --git a/src/deploy/images/build-grafana-image.sh b/src/deploy/images/build-grafana-image.sh
@@ -8,7 +8,7 @@ PROJECT_DIR=$(realpath $SCDIR/../../..)
 pushd $PROJECT_DIR || exit
     if [ "$DATAFLOW_VERSION" = "" ]; then
         ./mvnw help:evaluatev -s .settings.xml -Dexpression=project.version > /dev/null
-        SCDF_VER=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)
+        SCDF_VER=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
     else
         SCDF_VER=$DATAFLOW_VERSION
     fi

diff --git a/src/scripts/create-carvel-package.sh b/src/scripts/create-carvel-package.sh
@@ -15,7 +15,7 @@ if [ "$VERSION" = "" ] || [ "$SKIPPER_VERSION" = "" ]; then
     ./mvnw -s .settings.xml help:evaluate -Dexpression=project.version > /dev/null
 fi
 if [ "$VERSION" = "" ]; then
-    export VERSION=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)
+    export VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
 fi
 if [ "$DATAFLOW_VERSION" = "" ]; then
     export DATAFLOW_VERSION=$VERSION

diff --git a/src/scripts/has-javadoc.sh b/src/scripts/has-javadoc.sh
@@ -35,15 +35,15 @@ function check_jars() {
     fi
 }
 ./mvnw help:evaluate -Dexpression=project.version > /dev/null
-VERSION=$(./mvnw help:evaluate -Dexpression=project.version -o -q -DforceStdout)
+VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
 FILES=$(find . -name "pom.xml" -type f)
 MVNV=$(realpath ./mvnw)
 for file in $FILES; do
     if [[ "$file" != *"/target/"* ]]; then
         COUNT_FOUND=$((1 + COUNT_FOUND))
         DIR=$(dirname "$file")
         pushd "$DIR" > /dev/null || exit 1
-            PACKAGING=$($MVNV help:evaluate -Dexpression=project.packaging -o -q -DforceStdout)
+            PACKAGING=$($MVNV help:evaluate -Dexpression=project.packaging -q -DforceStdout)
         popd > /dev/null || exit 1
         if [ "$PACKAGING" == "jar" ]; then
             FILE=$(find $DIR/target -name "*-${VERSION}.jar" 2> /dev/null)