diff options
| -rwxr-xr-x | .travis.sh | 7 | ||||
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | org.jacoco.build/pom.xml | 21 | ||||
| -rw-r--r-- | org.jacoco.core.test.validation/pom.xml | 24 |
4 files changed, 53 insertions, 0 deletions
@@ -69,6 +69,9 @@ case "$JDK" in 13-ea) install_jdk $JDK13_EA_URL ;; +14-ea) + install_jdk $JDK14_EA_URL + ;; esac # Do not use "~/.mavenrc" set by Travis (https://github.com/travis-ci/travis-ci/issues/3893), @@ -104,6 +107,10 @@ case "$JDK" in mvn -V -B -e verify -Dbytecode.version=13 \ --settings=./.travis/settings.xml ;; +14-ea) + mvn -V -B -e verify -Dbytecode.version=14 \ + --settings=./.travis/settings.xml + ;; *) echo "Incorrect JDK [$JDK]" exit 1; diff --git a/.travis.yml b/.travis.yml index f6007d29..d17d7b7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,5 +29,6 @@ env: - JDK=11 - JDK=12 - JDK=13-ea + - JDK=14-ea script: ./.travis.sh diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml index 8c579afa..b646c791 100644 --- a/org.jacoco.build/pom.xml +++ b/org.jacoco.build/pom.xml @@ -748,6 +748,27 @@ </build> </profile> + <!-- + Following profile enables compilation into bytecode version 13 + when requested "bytecode.version" greater than 13, + because this is maximum that can be processed by + maven-shade-plugin and maven-plugin-plugin. + This is overridden for tests. + --> + <profile> + <id>java14-bytecode</id> + <activation> + <property> + <name>bytecode.version</name> + <value>14</value> + </property> + </activation> + <properties> + <maven.compiler.source>13</maven.compiler.source> + <maven.compiler.target>13</maven.compiler.target> + </properties> + </profile> + <!-- This profile enables use of ECJ --> <profile> <id>ecj</id> diff --git a/org.jacoco.core.test.validation/pom.xml b/org.jacoco.core.test.validation/pom.xml index 34e55ef9..c0e91777 100644 --- a/org.jacoco.core.test.validation/pom.xml +++ b/org.jacoco.core.test.validation/pom.xml @@ -195,6 +195,30 @@ <module>../org.jacoco.core.test.validation.groovy</module> </modules> </profile> + + <profile> + <id>java14-bytecode</id> + <activation> + <property> + <name>bytecode.version</name> + <value>14</value> + </property> + </activation> + <properties> + <!-- see respective profile in org.jacoco.build about this override --> + <maven.compiler.source>14</maven.compiler.source> + <maven.compiler.target>14</maven.compiler.target> + </properties> + <modules> + <module>../org.jacoco.core.test.validation.kotlin</module> + <module>../org.jacoco.core.test.validation.java7</module> + <module>../org.jacoco.core.test.validation.java8</module> + <!-- Groovy 2.5.7 doesn't support bytecode version 14 + <module>../org.jacoco.core.test.validation.groovy</module> + --> + <module>../org.jacoco.core.test.validation.scala</module> + </modules> + </profile> </profiles> </project> |