Fix CI build scripts that pick flags appropriate to each JDK

Author: mikesamuel

.travis.yml

@@ -9,8 +9,6 @@ jdk:
  - oraclejdk10
  - oraclejdk11
 
-# Additionally pass -Dgpg.skip to suppress signing instead of trying to provision
-# Travis's containers with keys.
-install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true -B -V
-# Older versions of Javadoc don't recognize the -Xdoclint flag.
+# Test each version with an appropriate Java version and flags to disable
+# GPG signing so that we don't have to provision Travis with private keys.
 script: "$TRAVIS_BUILD_DIR/scripts/build_for_travis.sh"

scripts/build_for_travis.sh

@@ -4,17 +4,33 @@ set -e
 
 # Invoked from .travis.yml to verify the build.
 
-export COMMON_FLAGS="-Dgpg.skip=true -B -V"
+# Pass -Dgpg.skip to suppress signing instead of trying to provision
+# Travis's containers with keys.
+COMMON_FLAGS="-Dgpg.skip=true -B -V"
 
+IS_LEGACY=""
 if echo $TRAVIS_JDK_VERSION | egrep -q 'jdk[67]'; then
- # The main library only uses jdk6 incompatible dependencies,
- # and older versions of javadoc barf on -Xdoclint flags used
+ IS_LEGACY=1
+ # The main library only uses jdk6 compatible dependencies,
+ # but Guava 21.0 is compatibility with jdk 7.
+ COMMON_FLAGS="$COMMON_FLAGS -Dguava.version=20.0"
+
+ # Older versions of javadoc barf on -Xdoclint flags used
  # to configure the maven-javadoc-plugin.
- exec mvn verify -Dguava.version=20.0 -Dmaven.javadoc.skip=true $COMMON_FLAGS
+ COMMON_FLAGS="$COMMON_FLAGS -Dmaven.javadoc.skip=true"
+fi
+
+
+mvn install -DskipTests=true $COMMON_FLAGS
+
+
+if [ -n "$IS_LEGACY" ]; then
+ # Don't bother building ancillary JARs and reports.
+ exec mvn verify -Dmaven.javadoc.skip=true $COMMON_FLAGS
 else
  # Build the whole kit-n-kaboodle.
  mvn -f aggregate/pom.xml source:jar javadoc:jar verify $COMMON_FLAGS \
  && mvn -Dguava.version=27.1-jre -f aggregate/pom.xml clean source:jar javadoc:jar verify $COMMON_FLAGS \
  && mvn jacoco:report coveralls:report \
- && mvn org.sonatype.ossindex.maven:ossindex-maven-plugin:audit -f aggregate
+ && mvn org.sonatype.ossindex.maven:ossindex-maven-plugin:audit $COMMON_FLAGS
 fi