From 33b0148a75525a57382f890b29bc18dc53da468e Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Tue, 22 Apr 2025 11:29:29 -0400 Subject: [PATCH 1/3] fix: use spotify formatter in hermetic build templates --- .../owlbot/templates/java_library/.kokoro/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/build.sh b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/build.sh index afcccadd9d..5fe69910fa 100755 --- a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/build.sh +++ b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/build.sh @@ -59,7 +59,7 @@ test) RETURN_CODE=$? ;; lint) - mvn com.coveo:fmt-maven-plugin:check -B -ntp + mvn com.spotify.fmt:fmt-maven-plugin:check -B -ntp RETURN_CODE=$? ;; javadoc) @@ -136,4 +136,4 @@ then fi echo "exiting with ${RETURN_CODE}" -exit ${RETURN_CODE} \ No newline at end of file +exit ${RETURN_CODE} From 019e3c7a74a8eb021d75504b5e74c202de4daaa5 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Tue, 22 Apr 2025 11:58:42 -0400 Subject: [PATCH 2/3] chore: use java 17 in lint job --- .../owlbot/templates/java_library/.github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hermetic_build/library_generation/owlbot/templates/java_library/.github/workflows/ci.yaml b/hermetic_build/library_generation/owlbot/templates/java_library/.github/workflows/ci.yaml index 50487eeb3b..321dd096a2 100644 --- a/hermetic_build/library_generation/owlbot/templates/java_library/.github/workflows/ci.yaml +++ b/hermetic_build/library_generation/owlbot/templates/java_library/.github/workflows/ci.yaml @@ -104,7 +104,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 11 + java-version: 17 - run: java -version - run: .kokoro/build.sh env: From c8a3f24bc1e6794d64ad08ec5958da42033d62aa Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Tue, 22 Apr 2025 12:00:12 -0400 Subject: [PATCH 3/3] chore: skip fmt check in other ci jobs --- .../owlbot/templates/java_library/.kokoro/build.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/build.sh b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/build.sh index 5fe69910fa..5223b6b6ae 100755 --- a/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/build.sh +++ b/hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/build.sh @@ -55,7 +55,7 @@ set +e case ${JOB_TYPE} in test) echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}" - mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT} + mvn test -B -ntp -Dfmt.skip=true -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT} RETURN_CODE=$? ;; lint) @@ -63,7 +63,7 @@ lint) RETURN_CODE=$? ;; javadoc) - mvn javadoc:javadoc javadoc:test-javadoc -B -ntp + mvn javadoc:javadoc javadoc:test-javadoc -B -ntp -Dfmt.skip=true RETURN_CODE=$? ;; integration) @@ -75,13 +75,14 @@ integration) -Denforcer.skip=true \ -Dcheckstyle.skip=true \ -DskipUnitTests=true \ + -Dfmt.skip=true \ -fae \ verify RETURN_CODE=$? ;; graalvm) # Run Unit and Integration Tests with Native Image - mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test -Dfmt.skip=true RETURN_CODE=$? ;; samples) @@ -105,6 +106,7 @@ samples) -DtrimStackTrace=false \ -Dclirr.skip=true \ -Denforcer.skip=true \ + -Dfmt.skip=true \ -fae \ verify RETURN_CODE=$? @@ -114,7 +116,7 @@ samples) fi ;; clirr) - mvn -B -ntp -Denforcer.skip=true clirr:check + mvn -B -ntp -Dfmt.skip=true -Denforcer.skip=true clirr:check RETURN_CODE=$? ;; *)