diff --git a/.travis.yml b/.travis.yml index f4f272f1c9..627df0e99c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,13 @@ sudo: false addons: apt: packages: - - oracle-java9-installer + - oracle-java8-installer ssh_known_hosts: - web.sourceforge.net language: java -jdk: oraclejdk9 +jdk: oraclejdk8 env: global: diff --git a/.travis/build-coveralls.sh b/.travis/build-coveralls.sh index 490dc2c618..0ff1f3106a 100755 --- a/.travis/build-coveralls.sh +++ b/.travis/build-coveralls.sh @@ -14,7 +14,6 @@ fi # # for java9: enable all modules. # coveralls plugin seems to need java.xml.bind module -# -echo "MAVEN_OPTS='-Xms1g -Xmx1g --add-modules java.se.ee'" > ${HOME}/.mavenrc +# echo "MAVEN_OPTS='-Xms1g -Xmx1g --add-modules java.se.ee'" > ${HOME}/.mavenrc ./mvnw clean test jacoco:report coveralls:report -Pcoveralls -B -V diff --git a/.travis/build-sonar.sh b/.travis/build-sonar.sh index 058a86bc8d..8dc3e83dad 100755 --- a/.travis/build-sonar.sh +++ b/.travis/build-sonar.sh @@ -14,8 +14,7 @@ fi # # for java9: enable all modules. # sonar plugin seems to need java.xml.bind module -# -echo "MAVEN_OPTS='-Xms1g -Xmx1g --add-modules java.se.ee'" > ${HOME}/.mavenrc +# echo "MAVEN_OPTS='-Xms1g -Xmx1g --add-modules java.se.ee'" > ${HOME}/.mavenrc # Run the build, truncate output due to Travis log limits ./mvnw clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${SONAR_TOKEN} -B -V diff --git a/pom.xml b/pom.xml index 10439d235e..8f08ad1225 100644 --- a/pom.xml +++ b/pom.xml @@ -342,7 +342,6 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code ${java.version} ${java.version} - ${java.version} @@ -480,7 +479,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code - [9,) + [1.8,) @@ -939,6 +938,26 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code + + jdk9-config + + [9, + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + + + + + + + jdk9-disabled