Skip to content

Commit 65e29da

Browse files
fix: use spotify formatter in hermetic build templates (#3752)
Prepares downstream repos for the linter upgrade from java-shared-config (googleapis/java-shared-config#1003)
1 parent 22a5b52 commit 65e29da

File tree

2 files changed

+9
-7
lines changed
  • hermetic_build/library_generation/owlbot/templates/java_library

2 files changed

+9
-7
lines changed

Diff for: hermetic_build/library_generation/owlbot/templates/java_library/.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
- uses: actions/setup-java@v4
105105
with:
106106
distribution: temurin
107-
java-version: 11
107+
java-version: 17
108108
- run: java -version
109109
- run: .kokoro/build.sh
110110
env:

Diff for: hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/build.sh

+8-6
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ set +e
5555
case ${JOB_TYPE} in
5656
test)
5757
echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
58-
mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
58+
mvn test -B -ntp -Dfmt.skip=true -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
5959
RETURN_CODE=$?
6060
;;
6161
lint)
62-
mvn com.coveo:fmt-maven-plugin:check -B -ntp
62+
mvn com.spotify.fmt:fmt-maven-plugin:check -B -ntp
6363
RETURN_CODE=$?
6464
;;
6565
javadoc)
66-
mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
66+
mvn javadoc:javadoc javadoc:test-javadoc -B -ntp -Dfmt.skip=true
6767
RETURN_CODE=$?
6868
;;
6969
integration)
@@ -75,13 +75,14 @@ integration)
7575
-Denforcer.skip=true \
7676
-Dcheckstyle.skip=true \
7777
-DskipUnitTests=true \
78+
-Dfmt.skip=true \
7879
-fae \
7980
verify
8081
RETURN_CODE=$?
8182
;;
8283
graalvm)
8384
# Run Unit and Integration Tests with Native Image
84-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
85+
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test -Dfmt.skip=true
8586
RETURN_CODE=$?
8687
;;
8788
samples)
@@ -105,6 +106,7 @@ samples)
105106
-DtrimStackTrace=false \
106107
-Dclirr.skip=true \
107108
-Denforcer.skip=true \
109+
-Dfmt.skip=true \
108110
-fae \
109111
verify
110112
RETURN_CODE=$?
@@ -114,7 +116,7 @@ samples)
114116
fi
115117
;;
116118
clirr)
117-
mvn -B -ntp -Denforcer.skip=true clirr:check
119+
mvn -B -ntp -Dfmt.skip=true -Denforcer.skip=true clirr:check
118120
RETURN_CODE=$?
119121
;;
120122
*)
@@ -136,4 +138,4 @@ then
136138
fi
137139

138140
echo "exiting with ${RETURN_CODE}"
139-
exit ${RETURN_CODE}
141+
exit ${RETURN_CODE}

0 commit comments

Comments
 (0)