Skip to content

Commit e1790de

Browse files
committed
Debug Travis CI build
Make sure javadoc builds on JDK11. Add some trace to figure out why local jdk7 build differs from TRAVIS. Pin a modern protobuf version since there was an out of bounds decoder CVE in trusted-types/pom.xml.
1 parent 4b35ba0 commit e1790de

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

parent/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,13 @@ application while protecting against XSS.
171171
<!-- The Javadoc that ships with JDK 8 is spammy.
172172
http://docs.oracle.com/javase/8/docs/technotes/tools/unix/javadoc.html#BEJEFABE -->
173173
<additionalparam>-Xdoclint:-missing</additionalparam>
174+
<!-- workaround for https://bugs.openjdk.java.net/browse/JDK-8212233 -->
175+
<javaApiLinks>
176+
<property>
177+
<name>foo</name>
178+
<value>bar</value>
179+
</property>
180+
</javaApiLinks>
174181
</configuration>
175182
</plugin>
176183
<plugin>
@@ -234,6 +241,12 @@ application while protecting against XSS.
234241
<version>[2.0.1,)</version>
235242
<scope>provided</scope>
236243
</dependency>
244+
<dependency>
245+
<groupId>com.google.protobuf</groupId>
246+
<artifactId>protobuf-java</artifactId>
247+
<version>[3.7.0,)</version>
248+
<scope>provided</scope>
249+
</dependency>
237250
<dependency>
238251
<groupId>junit</groupId>
239252
<artifactId>junit</artifactId>

scripts/build_for_travis.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ if echo $TRAVIS_JDK_VERSION | egrep -q 'jdk[67]'; then
2020
COMMON_FLAGS="$COMMON_FLAGS -Dmaven.javadoc.skip=true"
2121
fi
2222

23+
echo "*** TRAVIS_JDK_VERSION=$TRAVIS_JDK_VERSION COMMON_FLAGS=($COMMON_FLAGS) IS_LEGACY=$IS_LEGACY"
2324

2425
mvn install -DskipTests=true $COMMON_FLAGS
2526

@@ -32,5 +33,5 @@ else
3233
mvn -f aggregate/pom.xml source:jar javadoc:jar verify $COMMON_FLAGS \
3334
&& mvn -Dguava.version=27.1-jre -f aggregate/pom.xml clean source:jar javadoc:jar verify $COMMON_FLAGS \
3435
&& mvn jacoco:report coveralls:report \
35-
&& mvn org.sonatype.ossindex.maven:ossindex-maven-plugin:audit $COMMON_FLAGS
36+
&& mvn org.sonatype.ossindex.maven:ossindex-maven-plugin:audit -f aggregate $COMMON_FLAGS
3637
fi

0 commit comments

Comments
 (0)