From e03e5bd026e7b89de1f9a5745483b4a052a59dd5 Mon Sep 17 00:00:00 2001
From: Evgeny Mandrikov <mandrikov@gmail.com>
Date: Fri, 22 Mar 2019 17:09:46 +0100
Subject: Happy birthday JDK 12!

---
 .travis.sh                              | 10 +++-------
 .travis.yml                             |  2 +-
 org.jacoco.doc/docroot/doc/changes.html |  1 +
 org.jacoco.doc/docroot/doc/faq.html     |  2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.travis.sh b/.travis.sh
index cb2022cf..58892364 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -63,8 +63,8 @@ case "$JDK" in
 11)
   install_jdk $JDK11_URL
   ;;
-12-ea)
-  install_jdk $JDK12_EA_URL
+12)
+  install_jdk $JDK12_URL
   ;;
 13-ea)
   install_jdk $JDK13_EA_URL
@@ -96,14 +96,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)
+10 | 11 | 12)
   mvn -V -B -e verify -Dbytecode.version=${JDK} \
     --settings=./.travis/settings.xml
   ;;
-12-ea)
-  mvn -V -B -e verify -Dbytecode.version=12 \
-    --settings=./.travis/settings.xml
-  ;;
 13-ea)
   mvn -V -B -e verify -Dbytecode.version=13 \
     --projects \!org.jacoco.core.test.validation.groovy \
diff --git a/.travis.yml b/.travis.yml
index 19eb8d3f..239d3b2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ env:
   - JDK=9
   - JDK=10
   - JDK=11
-  - JDK=12-ea
+  - JDK=12
   - JDK=13-ea
 
 script: ./.travis.sh
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
index fa81f09d..f16d09af 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 12</li>
   <li>Instrumentation does not add synthetic field to Java 11+ class files,
       however still adds synthetic method
       (GitHub <a href="https://github.com/jacoco/jacoco/issues/845">#845</a>).</li>
diff --git a/org.jacoco.doc/docroot/doc/faq.html b/org.jacoco.doc/docroot/doc/faq.html
index da5eab0a..2e48734e 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 11. However the minimum
+  JaCoCo supports Java class files from version 1.0 to 12. 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.
-- 
cgit v1.2.3