diff options
author | Evgeny Mandrikov <138671+Godin@users.noreply.github.com> | 2020-03-29 14:33:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-29 14:33:40 +0200 |
commit | 1c5601bba5bf195a5f9b09a87cb5d2152857bbb7 (patch) | |
tree | 617dd8df2ac258624016986be9f20b1d3d28b601 | |
parent | ed4653ee8b814c744aeb6d8aba9545fd9321daa8 (diff) | |
download | platform_external_jacoco-1c5601bba5bf195a5f9b09a87cb5d2152857bbb7.tar.gz platform_external_jacoco-1c5601bba5bf195a5f9b09a87cb5d2152857bbb7.tar.bz2 platform_external_jacoco-1c5601bba5bf195a5f9b09a87cb5d2152857bbb7.zip |
Happy birthday JDK 14! (#1033)
-rwxr-xr-x | .travis.sh | 10 | ||||
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | org.jacoco.doc/docroot/doc/build.html | 13 | ||||
-rw-r--r-- | org.jacoco.doc/docroot/doc/changes.html | 1 | ||||
-rw-r--r-- | org.jacoco.doc/docroot/doc/faq.html | 2 |
5 files changed, 16 insertions, 12 deletions
@@ -69,8 +69,8 @@ case "$JDK" in 13) install_jdk $JDK13_URL ;; -14-ea) - install_jdk $JDK14_EA_URL +14) + install_jdk $JDK14_URL ;; 15-ea) install_jdk $JDK15_EA_URL @@ -102,14 +102,10 @@ case "$JDK" in mvn -V -B -e verify -Djdk.version=${JDK} -Dbytecode.version=${JDK} -Decj=${ECJ:-} --toolchains=./.travis/travis-toolchains.xml \ --settings=./.travis/settings.xml ;; -10 | 11 | 12 | 13) +10 | 11 | 12 | 13 | 14) mvn -V -B -e verify -Dbytecode.version=${JDK} \ --settings=./.travis/settings.xml ;; -14-ea) - mvn -V -B -e verify -Dbytecode.version=14 \ - --settings=./.travis/settings.xml - ;; 15-ea) mvn -V -B -e verify -Dbytecode.version=15 \ --settings=./.travis/settings.xml diff --git a/.travis.yml b/.travis.yml index a52886cd..977b07d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ env: - JDK=11 - JDK=12 - JDK=13 - - JDK=14-ea + - JDK=14 - JDK=15-ea script: ./.travis.sh diff --git a/org.jacoco.doc/docroot/doc/build.html b/org.jacoco.doc/docroot/doc/build.html index 60a1a896..19cdf736 100644 --- a/org.jacoco.doc/docroot/doc/build.html +++ b/org.jacoco.doc/docroot/doc/build.html @@ -107,18 +107,24 @@ <th>JDK 11</th> <th>JDK 12</th> <th>JDK 13</th> + <th>JDK 14</th> </tr> </thead> <tbody> <tr> + <th>org.jacoco.core.test.validation.java14</th> + <td colspan="9">excluded from build</td> + <td>compiled into bytecode version 58 (Java 14)</td> + </tr> + <tr> <th>org.jacoco.core.test.validation.java8</th> <td colspan="3">excluded from build</td> - <td colspan="6">compiled into bytecode version 52 (Java 8)</td> + <td colspan="7">compiled into bytecode version 52 (Java 8)</td> </tr> <tr> <th>org.jacoco.core.test.validation.java7</th> <td colspan="2">excluded from build</td> - <td colspan="7" rowspan="2">compiled into bytecode version 51 (Java 7)</td> + <td colspan="8" rowspan="2">compiled into bytecode version 51 (Java 7)</td> </tr> <tr> <th>org.jacoco.core.test.validation.groovy</th> @@ -128,7 +134,7 @@ <th>org.jacoco.core.test.validation.kotlin</th> <td colspan="1">excluded from build</td> <td colspan="6">compiled into bytecode version 50 (Java 6)</td> - <td colspan="2" rowspan="2">compiled into bytecode version 51 (Java 7)</td> + <td colspan="3" rowspan="2">compiled into bytecode version 51 (Java 7)</td> </tr> <tr> <th>all other modules</th> @@ -175,6 +181,7 @@ <li><code>mvn clean verify -Djdk.version=11 -Dbytecode.version=11</code></li> <li><code>mvn clean verify -Djdk.version=12 -Dbytecode.version=12</code></li> <li><code>mvn clean verify -Djdk.version=13 -Dbytecode.version=13</code></li> + <li><code>mvn clean verify -Djdk.version=14 -Dbytecode.version=14</code></li> </ul> diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html index 4bfa4a41..aaa783e8 100644 --- a/org.jacoco.doc/docroot/doc/changes.html +++ b/org.jacoco.doc/docroot/doc/changes.html @@ -22,6 +22,7 @@ <h3>New Features</h3> <ul> + <li>JaCoCo now officially supports Java 14.</li> <li>Experimental support for Java 15 class files (GitHub <a href="https://github.com/jacoco/jacoco/issues/992">#992</a>).</li> <li>Methods <code>toString</code>, <code>hashCode</code> and <code>equals</code> diff --git a/org.jacoco.doc/docroot/doc/faq.html b/org.jacoco.doc/docroot/doc/faq.html index 93e2f73a..f9ec02b5 100644 --- a/org.jacoco.doc/docroot/doc/faq.html +++ b/org.jacoco.doc/docroot/doc/faq.html @@ -45,7 +45,7 @@ <h3>What Java versions are supported by JaCoCo?</h3> <p> - JaCoCo supports Java class files from version 1.0 to 13. However the minimum + JaCoCo supports Java class files from version 1.0 to 14. However the minimum JRE version required by the JaCoCo runtime (e.g. the agent) and the JaCoCo tools is 1.5. Also note that class files under test from version 1.6 and above have to contain valid stackmap frames. |