From b22a46f08317a8497b20e476a9523cb14f7e4a5d Mon Sep 17 00:00:00 2001 From: Martin Goellnitz Date: Tue, 2 Jan 2018 02:03:43 +0100 Subject: [PATCH] Try to build JDK7 compatible stuff with JDK8 --- .travis.yml | 6 +++--- publication-build.sh | 11 +++-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index b678ad36..2afa3a75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ # -# Copyright 2016-2017 Martin Goellnitz +# Copyright 2016-2018 Martin Goellnitz # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by @@ -27,7 +27,7 @@ sudo: false language: java jdk: - - openjdk7 + - oraclejdk8 cache: directories: @@ -35,7 +35,7 @@ cache: - $HOME/.gradle/wrapper/ after_success: - - gradle jacocoCombinedReport coveralls generatePomFileForMavenJavaPublication artifactoryPublish + - ./gradlew jacocoCombinedReport coveralls generatePomFileForMavenJavaPublication artifactoryPublish before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock diff --git a/publication-build.sh b/publication-build.sh index 9178975c..22b30235 100755 --- a/publication-build.sh +++ b/publication-build.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2015-2017 Martin Goellnitz +# Copyright 2015-2018 Martin Goellnitz # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by @@ -19,12 +19,7 @@ JDK=`ls -d /opt/*jdk*1.7*|tail -1` if [ -z "$JDK" ] ; then JDK=`ls -d /usr/lib/jvm/*java*1.7*|tail -1` fi -if [ ! -z "$JDK" ] ; then - echo $JDK - export JAVA_HOME=$JDK - export PATH=$JAVA_HOME/bin:$PATH -else +if [ -z "$JDK" ] ; then echo "Didn't find Java7 - exiting" fi -export JAVA_OPTS="-XX:PermSize=128m -XX:MaxPermSize=256m" -./gradlew -Prelease clean build jacocoTestReport jacocoCombinedReport publishToMavenLocal +./gradlew -Pjdk=$JDK -Prelease clean build jacocoTestReport jacocoCombinedReport publishToMavenLocal