Skip to content

Commit 2903fef

Browse files
authored
build: add clirr check (#380)
* build: add clirr check * build: fix checkstyle source directories
1 parent 7609b38 commit 2903fef

4 files changed

Lines changed: 50 additions & 2 deletions

File tree

google-auth-library-java/.kokoro/build.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ cd github/google-auth-library-java/
2121
java -version
2222
echo $JOB_TYPE
2323

24-
mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
24+
mvn install -B -V \
25+
-DskipTests=true \
26+
-Dclirr.skip \
27+
-Dmaven.javadoc.skip=true
2528

2629
case ${JOB_TYPE} in
2730
test)
@@ -37,6 +40,9 @@ javadoc)
3740
integration)
3841
mvn -B -pl ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -fae verify
3942
;;
43+
clirr)
44+
mvn -B clirr:check
45+
;;
4046
*)
4147
;;
4248
esac

google-auth-library-java/.kokoro/dependencies.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,7 @@ echo $JOB_TYPE
2323

2424
export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
2525

26-
mvn install -DskipTests=true -B -V
26+
mvn install -B -V \
27+
-Dclirr.skip=true \
28+
-DskipTests=true
2729
mvn -B dependency:analyze -DfailOnWarning=true
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
5+
env_vars: {
6+
key: "TRAMPOLINE_IMAGE"
7+
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
8+
}
9+
10+
env_vars: {
11+
key: "JOB_TYPE"
12+
value: "clirr"
13+
}

google-auth-library-java/pom.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,11 @@
208208
<verbose>true</verbose>
209209
</configuration>
210210
</plugin>
211+
<plugin>
212+
<groupId>org.codehaus.mojo</groupId>
213+
<artifactId>clirr-maven-plugin</artifactId>
214+
<version>2.8</version>
215+
</plugin>
211216
</plugins>
212217
</pluginManagement>
213218
<plugins>
@@ -255,6 +260,13 @@
255260
<violationSeverity>error</violationSeverity>
256261
<failsOnError>true</failsOnError>
257262
<includeTestSourceDirectory>true</includeTestSourceDirectory>
263+
<!-- Explicitly set the source directory to avoid running checkstyle on generated sources. -->
264+
<sourceDirectories>
265+
<sourceDirectory>src/main</sourceDirectory>
266+
</sourceDirectories>
267+
<testSourceDirectories>
268+
<testSourceDirectory>src/test</testSourceDirectory>
269+
</testSourceDirectories>
258270
</configuration>
259271
</execution>
260272
</executions>
@@ -286,6 +298,21 @@
286298
</execution>
287299
</executions>
288300
</plugin>
301+
<plugin>
302+
<groupId>org.codehaus.mojo</groupId>
303+
<artifactId>clirr-maven-plugin</artifactId>
304+
<configuration>
305+
<ignoredDifferencesFile>clirr-ignored-differences.xml</ignoredDifferencesFile>
306+
<logResults>true</logResults>
307+
</configuration>
308+
<executions>
309+
<execution>
310+
<goals>
311+
<goal>check</goal>
312+
</goals>
313+
</execution>
314+
</executions>
315+
</plugin>
289316
</plugins>
290317
</build>
291318

0 commit comments

Comments
 (0)