Skip to content

Commit 1c5601b

Browse files
authored
Happy birthday JDK 14! (#1033)
1 parent ed4653e commit 1c5601b

File tree

5 files changed

+16
-12
lines changed

5 files changed

+16
-12
lines changed

.travis.sh

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ case "$JDK" in
6969
13)
7070
install_jdk $JDK13_URL
7171
;;
72-
14-ea)
73-
install_jdk $JDK14_EA_URL
72+
14)
73+
install_jdk $JDK14_URL
7474
;;
7575
15-ea)
7676
install_jdk $JDK15_EA_URL
@@ -102,14 +102,10 @@ case "$JDK" in
102102
mvn -V -B -e verify -Djdk.version=${JDK} -Dbytecode.version=${JDK} -Decj=${ECJ:-} --toolchains=./.travis/travis-toolchains.xml \
103103
--settings=./.travis/settings.xml
104104
;;
105-
10 | 11 | 12 | 13)
105+
10 | 11 | 12 | 13 | 14)
106106
mvn -V -B -e verify -Dbytecode.version=${JDK} \
107107
--settings=./.travis/settings.xml
108108
;;
109-
14-ea)
110-
mvn -V -B -e verify -Dbytecode.version=14 \
111-
--settings=./.travis/settings.xml
112-
;;
113109
15-ea)
114110
mvn -V -B -e verify -Dbytecode.version=15 \
115111
--settings=./.travis/settings.xml

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env:
2929
- JDK=11
3030
- JDK=12
3131
- JDK=13
32-
- JDK=14-ea
32+
- JDK=14
3333
- JDK=15-ea
3434

3535
script: ./.travis.sh

org.jacoco.doc/docroot/doc/build.html

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,24 @@ <h2>Compilation and testing with different JDKs</h2>
107107
<th>JDK 11</th>
108108
<th>JDK 12</th>
109109
<th>JDK 13</th>
110+
<th>JDK 14</th>
110111
</tr>
111112
</thead>
112113
<tbody>
114+
<tr>
115+
<th>org.jacoco.core.test.validation.java14</th>
116+
<td colspan="9">excluded from build</td>
117+
<td>compiled into bytecode version 58 (Java 14)</td>
118+
</tr>
113119
<tr>
114120
<th>org.jacoco.core.test.validation.java8</th>
115121
<td colspan="3">excluded from build</td>
116-
<td colspan="6">compiled into bytecode version 52 (Java 8)</td>
122+
<td colspan="7">compiled into bytecode version 52 (Java 8)</td>
117123
</tr>
118124
<tr>
119125
<th>org.jacoco.core.test.validation.java7</th>
120126
<td colspan="2">excluded from build</td>
121-
<td colspan="7" rowspan="2">compiled into bytecode version 51 (Java 7)</td>
127+
<td colspan="8" rowspan="2">compiled into bytecode version 51 (Java 7)</td>
122128
</tr>
123129
<tr>
124130
<th>org.jacoco.core.test.validation.groovy</th>
@@ -128,7 +134,7 @@ <h2>Compilation and testing with different JDKs</h2>
128134
<th>org.jacoco.core.test.validation.kotlin</th>
129135
<td colspan="1">excluded from build</td>
130136
<td colspan="6">compiled into bytecode version 50 (Java 6)</td>
131-
<td colspan="2" rowspan="2">compiled into bytecode version 51 (Java 7)</td>
137+
<td colspan="3" rowspan="2">compiled into bytecode version 51 (Java 7)</td>
132138
</tr>
133139
<tr>
134140
<th>all other modules</th>
@@ -175,6 +181,7 @@ <h2>Compilation and testing with different JDKs</h2>
175181
<li><code>mvn clean verify -Djdk.version=11 -Dbytecode.version=11</code></li>
176182
<li><code>mvn clean verify -Djdk.version=12 -Dbytecode.version=12</code></li>
177183
<li><code>mvn clean verify -Djdk.version=13 -Dbytecode.version=13</code></li>
184+
<li><code>mvn clean verify -Djdk.version=14 -Dbytecode.version=14</code></li>
178185
</ul>
179186

180187

org.jacoco.doc/docroot/doc/changes.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ <h2>Snapshot Build @qualified.bundle.version@ (@build.date@)</h2>
2222

2323
<h3>New Features</h3>
2424
<ul>
25+
<li>JaCoCo now officially supports Java 14.</li>
2526
<li>Experimental support for Java 15 class files
2627
(GitHub <a href="https://github.com/jacoco/jacoco/issues/992">#992</a>).</li>
2728
<li>Methods <code>toString</code>, <code>hashCode</code> and <code>equals</code>

org.jacoco.doc/docroot/doc/faq.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ <h3>Does JaCoCo have a plug-in for [Eclipse|Netbeans|Whatever...]?</h3>
4545

4646
<h3>What Java versions are supported by JaCoCo?</h3>
4747
<p>
48-
JaCoCo supports Java class files from version 1.0 to 13. However the minimum
48+
JaCoCo supports Java class files from version 1.0 to 14. However the minimum
4949
JRE version required by the JaCoCo runtime (e.g. the agent) and the JaCoCo
5050
tools is 1.5. Also note that class files under test from version 1.6 and above
5151
have to contain valid stackmap frames.

0 commit comments

Comments
 (0)