Skip to content

Commit 2ae734d

Browse files
committed
remove single digit major version assumption
1 parent 5c4da34 commit 2ae734d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

scripts/build_for_travis.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set -e
99
COMMON_FLAGS="-Dgpg.skip=true -B -V"
1010

1111
IS_LEGACY=""
12-
if echo $TRAVIS_JDK_VERSION | egrep -q 'jdk[67]'; then
12+
if echo $TRAVIS_JDK_VERSION | egrep -q '(jdk|jre)[67]($|[^0-9])'; then
1313
IS_LEGACY=1
1414
# The main library only uses jdk6 compatible dependencies,
1515
# but Guava 21.0 is compatibility with jdk 7.
@@ -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+
2324
echo "*** TRAVIS_JDK_VERSION=$TRAVIS_JDK_VERSION COMMON_FLAGS=($COMMON_FLAGS) IS_LEGACY=$IS_LEGACY"
2425

2526
mvn install -DskipTests=true $COMMON_FLAGS

0 commit comments

Comments
 (0)