chore: use mvnw for all builds (#592)

GoogleCloudPlatform · Oct 14, 2024 · 4f5e375 · 4f5e375
1 parent 78049cc
commit 4f5e375
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -194,11 +194,6 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}
         repository: ${{ github.event.pull_request.head.repo.full_name }}
 
-    - name: Setup Maven Action
-      uses: s4u/setup-maven-action@a37cecafbf1e8d86c1c93d51054a63e228b96b3e
-      with:
-        java-version: 17
-
     - name: Set up GraalVM
       uses: graalvm/setup-graalvm@22cc13fe88ef133134b3798e128fb208df55e1f5 # v1.2.3
       with:
@@ -272,11 +267,6 @@ jobs:
           distribution: 'zulu'
           java-version: 8
 
-      - name: Setup Maven Action
-        uses: s4u/setup-maven-action@a37cecafbf1e8d86c1c93d51054a63e228b96b3e
-        with:
-          java-version: 8
-
       - id: 'auth'
         name: Authenticate to Google Cloud
         uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -24,12 +24,12 @@ cd ${scriptDir}/..
 source ${scriptDir}/common.sh
 
 # Print out Maven & Java version
-mvn -version
+./mvnw -version
 echo ${JOB_TYPE}
 
 # attempt to install 3 times with exponential backoff (starting with 10 seconds)
 retry_with_backoff 3 10 \
-  mvn install -B -V -ntp \
+  ./mvnw install -B -V -ntp \
     -DskipTests=true \
     -Dclirr.skip=true \
     -Denforcer.skip=true \
@@ -42,19 +42,19 @@ set +e
 
 case ${JOB_TYPE} in
 test)
-    mvn test -B -ntp -Pcoverage -Dclirr.skip=true -Denforcer.skip=true
+    ./mvnw test -B -ntp -Pcoverage -Dclirr.skip=true -Denforcer.skip=true
     RETURN_CODE=$?
     ;;
 lint)
-    mvn com.coveo:fmt-maven-plugin:check -B -ntp
+    ./mvnw com.coveo:fmt-maven-plugin:check -B -ntp
     RETURN_CODE=$?
     ;;
 javadoc)
-    mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
+    ./mvnw javadoc:javadoc javadoc:test-javadoc -B -ntp
     RETURN_CODE=$?
     ;;
 integration)
-    mvn -B ${INTEGRATION_TEST_ARGS} \
+    ./mvnw -B ${INTEGRATION_TEST_ARGS} \
       -ntp \
       -Penable-integration-tests \
       -DtrimStackTrace=false \
@@ -66,12 +66,12 @@ integration)
     ;;
 graalvm)
     # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
+    ./mvnw -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
     RETURN_CODE=$?
     ;;
 graalvm17)
     # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
+    ./mvnw -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
     RETURN_CODE=$?
     ;;
 samples)
@@ -90,7 +90,7 @@ samples)
         done
 
         pushd ${SAMPLES_DIR}
-        mvn -B \
+        ./mvnw -B \
           -ntp \
           -DtrimStackTrace=false \
           -Dclirr.skip=true \
@@ -104,7 +104,7 @@ samples)
     fi
     ;;
 clirr)
-    mvn -B -ntp -Denforcer.skip=true clirr:check
+    ./mvnw -B -ntp -Denforcer.skip=true clirr:check
     RETURN_CODE=$?
     ;;
 *)