From 73de6eb1f0b8517fdb8881dd2c0717e79a2e0968 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sun, 18 Feb 2018 21:47:50 +0100 Subject: [PATCH] [ci] Use Java9 for building PMD Fixes #854 --- .travis.yml | 4 ++-- .travis/build-coveralls.sh | 2 +- .travis/build-deploy.sh | 5 +---- .travis/build-sonar.sh | 2 +- docs/pages/release_notes.md | 1 + pmd-apex-jorje/pom.xml | 1 - pmd-apex/pom.xml | 1 - pmd-doc/pom.xml | 1 - pmd-java8/pom.xml | 1 - pom.xml | 41 ++----------------------------------- 10 files changed, 8 insertions(+), 51 deletions(-) diff --git a/.travis.yml b/.travis.yml index 035d9eacd6..7e1e0b8fd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,13 @@ sudo: false addons: apt: packages: - - oracle-java8-installer + - oracle-java9-installer ssh_known_hosts: - web.sourceforge.net language: java -jdk: oraclejdk8 +jdk: oraclejdk9 env: global: diff --git a/.travis/build-coveralls.sh b/.travis/build-coveralls.sh index 12e99969e6..674918d9c3 100755 --- a/.travis/build-coveralls.sh +++ b/.travis/build-coveralls.sh @@ -14,7 +14,7 @@ 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 install -DskipTests=true -Dmaven.javadoc.skip=true -B -V ./mvnw test jacoco:report coveralls:report -Pcoveralls -B -V diff --git a/.travis/build-deploy.sh b/.travis/build-deploy.sh index e7e6d8538c..babe7ed903 100755 --- a/.travis/build-deploy.sh +++ b/.travis/build-deploy.sh @@ -25,10 +25,7 @@ function push_docs() { VERSION=$(./mvnw -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.5.0:exec | tail -1) echo "Building PMD ${VERSION} on branch ${TRAVIS_BRANCH}" -# determine java 7 path -JAVA7_HOME=$(jdk_switcher home openjdk7) - -MVN_BUILD_FLAGS="-B -V -Djava7.home=${JAVA7_HOME}" +MVN_BUILD_FLAGS="-B -V" if travis_isPullRequest; then diff --git a/.travis/build-sonar.sh b/.travis/build-sonar.sh index 8dc3e83dad..8faf4ca260 100755 --- a/.travis/build-sonar.sh +++ b/.travis/build-sonar.sh @@ -14,7 +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/docs/pages/release_notes.md b/docs/pages/release_notes.md index 45ffd35632..f85c2144ce 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -26,6 +26,7 @@ This is a minor release. * [#795](https://github.com/pmd/pmd/issues/795): \[cpd] java.lang.OutOfMemoryError * [#848](https://github.com/pmd/pmd/issues/848): \[doc] Test failures when building pmd-doc under Windows * [#872](https://github.com/pmd/pmd/issues/872): \[core] NullPointerException at FileDataSource.glomName() + * [#854](https://github.com/pmd/pmd/issues/854): \[ci] Use Java9 for building PMD * doc * [#791](https://github.com/pmd/pmd/issues/791): \[doc] Documentation site reorganisation * [#891](https://github.com/pmd/pmd/issues/891): \[doc] Apex @SuppressWarnings should use single quotes instead of double quotes diff --git a/pmd-apex-jorje/pom.xml b/pmd-apex-jorje/pom.xml index 68ce009f63..2b2e6689fa 100644 --- a/pmd-apex-jorje/pom.xml +++ b/pmd-apex-jorje/pom.xml @@ -14,7 +14,6 @@ ${basedir}/../pmd-core 8 - ${env.JAVA_HOME} 2017-11-17 diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml index 96b4ac153e..f5099e6d17 100644 --- a/pmd-apex/pom.xml +++ b/pmd-apex/pom.xml @@ -14,7 +14,6 @@ ${basedir}/../pmd-core 8 - ${env.JAVA_HOME} diff --git a/pmd-doc/pom.xml b/pmd-doc/pom.xml index 46a5ad5da5..e3a7cea6ea 100644 --- a/pmd-doc/pom.xml +++ b/pmd-doc/pom.xml @@ -13,7 +13,6 @@ 8 - ${env.JAVA_HOME} ${basedir}/../pmd-core diff --git a/pmd-java8/pom.xml b/pmd-java8/pom.xml index 8a2a791ebe..62ee202bc5 100644 --- a/pmd-java8/pom.xml +++ b/pmd-java8/pom.xml @@ -13,7 +13,6 @@ ${basedir}/../pmd-core 8 - ${env.JAVA_HOME} diff --git a/pom.xml b/pom.xml index d5b49aaab8..aaeefb8ab5 100644 --- a/pom.xml +++ b/pom.xml @@ -256,7 +256,6 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code 7 - ${env.JAVA_HOME} 5.0 2.20.1 @@ -341,11 +340,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code maven-compiler-plugin 3.7.0 - ${java.version} - ${java.version} - - ${java.home}/jre/lib/rt.jar - + ${java.version} @@ -483,7 +478,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code - [1.8,) + [9,) @@ -929,18 +924,6 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code - - jdk7-settings - - - java7.home - - - - ${java7.home} - - - jdk8-modules @@ -955,26 +938,6 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code - - jdk9-config - - [9, - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - - - - - - - doclint