Andreas Tille · Andreas Tille · Andreas Tille · Andreas Tille · Andreas Tille · Andreas Tille
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -11,7 +11,7 @@ install:

 build_script:
  # Maven 3.3.9 requires Java >= 7, but generation of Javadocs requires Java <= 6 (https://github.com/jacoco/jacoco/issues/110)
-  - mvn -V -B -e verify -Djdk.version=1.6 --toolchains=.travis\appveyor-toolchains.xml
+  - mvn -V -B -e verify -Djdk.version=6 --toolchains=.travis\appveyor-toolchains.xml

 artifacts:
  - path: jacoco\target\*.zip
--- a/.travis.sh
+++ b/.travis.sh
@@ -43,27 +43,29 @@ function install_jdk {
  fi
 }

+# Preinstalled JDKs:
+ls -lA /usr/lib/jvm/
+
+
 case "$JDK" in
 5)
  install_jdk $JDK5_URL false
  ;;
-6)
-  ;;
-7)
-  jdk_switcher /usr/lib/jvm/java-7-openjdk-amd64
-  ;;
-8)
+6 | 7 | 8)
  jdk_switcher /usr/lib/jvm/java-8-oracle
  ;;
-8-ea)
-  install_jdk $JDK8_EA_URL
-  ;;
 9)
-  install_jdk $JDK9_URL
+  jdk_switcher /usr/lib/jvm/java-9-oracle
  ;;
 10)
  install_jdk $JDK10_URL
  ;;
+11)
+  install_jdk $JDK11_URL
+  ;;
+12-ea)
+  install_jdk $JDK12_EA_URL
+  ;;
 esac

 # Do not use "~/.mavenrc" set by Travis (https://github.com/travis-ci/travis-ci/issues/3893),
@@ -72,34 +74,32 @@ esac
 export MAVEN_SKIP_RC=true

 # Build:
-# TODO(Godin): see https://github.com/jacoco/jacoco/issues/300 about "bytecode.version"
 case "$JDK" in
 5)
  if [[ ${TRAVIS_PULL_REQUEST} == 'false' && ${TRAVIS_BRANCH} == 'master' ]]
  then
+    # Travis does shallow clone, but SonarQube performs "git blame" and so requires full history
+    git fetch --unshallow
+
    # goal "deploy:deploy" used directly instead of "deploy" phase to avoid pollution of Maven repository by "install" phase
-    mvn -V -B -e -f org.jacoco.build verify deploy:deploy -DdeployAtEnd -Djdk.version=1.5 --toolchains=./.travis/toolchains.xml --settings=./.travis/settings.xml -Dsonar.host.url=${SONARQUBE_URL} -Dsonar.login=${SONARQUBE_TOKEN}
+    mvn -V -B -e -f org.jacoco.build verify sonar:sonar deploy:deploy -DdeployAtEnd -Djdk.version=5 --toolchains=./.travis/toolchains.xml --settings=./.travis/settings.xml -Dsonar.host.url=${SONARQUBE_URL} -Dsonar.login=${SONARQUBE_TOKEN}
    python ./.travis/trigger-site-deployment.py
  else
-    mvn -V -B -e verify -Djdk.version=1.5 --toolchains=./.travis/toolchains.xml
+    mvn -V -B -e verify -Djdk.version=5 --toolchains=./.travis/toolchains.xml \
+      --settings=./.travis/settings.xml
  fi
  ;;
-6)
-  mvn -V -B -e verify -Djdk.version=1.6 -Dbytecode.version=1.6 --toolchains=./.travis/travis-toolchains.xml
-  ;;
-7)
-  mvn -V -B -e verify -Dbytecode.version=1.7
+6 | 7 | 8 | 9)
+  mvn -V -B -e verify -Djdk.version=${JDK} -Dbytecode.version=${JDK} -Decj=${ECJ:-} --toolchains=./.travis/travis-toolchains.xml \
+    --settings=./.travis/settings.xml
  ;;
-8 | 8-ea)
-  mvn -V -B -e verify -Dbytecode.version=1.8 -Decj=${ECJ:-}
+10 | 11)
+  mvn -V -B -e verify -Dbytecode.version=${JDK} \
+    --settings=./.travis/settings.xml
  ;;
-9)
-  export MAVEN_OPTS="-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts"
-  mvn -V -B -e verify -Dbytecode.version=1.9 \
-    -Dinvoker.mavenOpts="-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts"
-  ;;
-10)
-  mvn -V -B -e verify -Dbytecode.version=10
+12-ea)
+  mvn -V -B -e verify -Dbytecode.version=12 \
+    --settings=./.travis/settings.xml
  ;;
 *)
  echo "Incorrect JDK [$JDK]"

--- a/.travis.yml
+++ b/.travis.yml
@@ -23,12 +23,9 @@ env:
  - JDK=8
  - JDK=8
    ECJ=true
-  - JDK=8-ea
  - JDK=9
  - JDK=10
-
-matrix:
-  allow_failures:
-    - env: JDK=8-ea
+  - JDK=11
+  - JDK=12-ea

 script: ./.travis.sh
--- a/.travis/appveyor-toolchains.xml
+++ b/.travis/appveyor-toolchains.xml
 <?xml version="1.0" encoding="UTF8"?>
 <toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd">
+
  <toolchain>
    <type>jdk</type>
    <provides>
      <id>java16</id>
-      <version>1.6</version>
+      <version>6</version>
      <vendor>oracle</vendor>
    </provides>
    <configuration>
      <jdkHome>C:\Program Files\Java\jdk1.6.0</jdkHome>
    </configuration>
  </toolchain>
+
 </toolchains>
--- a/.travis/toolchains.xml
+++ b/.travis/toolchains.xml
 <?xml version="1.0" encoding="UTF8"?>
 <toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd">
+
  <toolchain>
    <type>jdk</type>
    <provides>
      <id>java15</id>
-      <version>1.5</version>
+      <version>5</version>
      <vendor>sun</vendor>
    </provides>
    <configuration>
      <jdkHome>/tmp/jdk/5</jdkHome>
    </configuration>
  </toolchain>
+
 </toolchains>
--- a/.travis/travis-toolchains.xml
+++ b/.travis/travis-toolchains.xml
 <?xml version="1.0" encoding="UTF8"?>
 <toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd">
+
  <toolchain>
    <type>jdk</type>
    <provides>
-      <version>1.6</version>
+      <version>6</version>
    </provides>
    <configuration>
      <jdkHome>/usr/lib/jvm/java-6-openjdk-amd64</jdkHome>
    </configuration>
  </toolchain>
+
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <version>7</version>
+    </provides>
+    <configuration>
+      <jdkHome>/usr/lib/jvm/java-7-openjdk-amd64</jdkHome>
+    </configuration>
+  </toolchain>
+
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <version>8</version>
+    </provides>
+    <configuration>
+      <jdkHome>/usr/lib/jvm/java-8-oracle</jdkHome>
+    </configuration>
+  </toolchain>
+
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <version>9</version>
+    </provides>
+    <configuration>
+      <jdkHome>/usr/lib/jvm/java-9-oracle</jdkHome>
+    </configuration>
+  </toolchain>
+
 </toolchains>
--- a/LICENSE.md
+++ b/LICENSE.md
 License
 =======

-Copyright (c) 2009, 2018 Mountainminds GmbH & Co. KG and Contributors
+Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors

 The JaCoCo Java Code Coverage Library and all included documentation is made
 available by Mountainminds GmbH & Co. KG, Munich. Except indicated below, the

--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ JaCoCo Java Code Coverage Library

 [![Build Status](https://travis-ci.org/jacoco/jacoco.svg?branch=master)](https://travis-ci.org/jacoco/jacoco)
 [![Build status](https://ci.appveyor.com/api/projects/status/g28egytv4tb898d7/branch/master?svg=true)](https://ci.appveyor.com/project/JaCoCo/jacoco/branch/master)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.jacoco/org.jacoco.core/badge.svg?style=flat)](http://search.maven.org/#search|ga|1|g%3Aorg.jacoco)
+[![Maven Central](https://img.shields.io/maven-central/v/org.jacoco/jacoco.svg)](http://search.maven.org/#search|ga|1|g%3Aorg.jacoco)

 JaCoCo is a free Java code coverage library distributed under the Eclipse Public
 License. Check the [project homepage](http://www.jacoco.org/jacoco)

--- a/debian/changelog
+++ b/debian/changelog
+jacoco (0.8.3-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream version
+  * debhelper 12
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.3.0
+
+ -- Andreas Tille <tille@debian.org>  Sun, 27 Jan 2019 18:06:19 +0100
+
 jacoco (0.8.1-1) unstable; urgency=medium

  * Team upload.

--- a/debian/compat
+++ b/debian/compat
-11
+12
--- a/debian/control
+++ b/debian/control
 Source: jacoco
-Section: java
-Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Kai-Chung Yan <seamlikok@gmail.com>
-Build-Depends:
- ant,
- debhelper (>= 11~),
+Section: java
+Priority: optional
+Build-Depends: ant,
+               debhelper (>= 12~),
               default-jdk-doc,
               javahelper,
               libasm-java,
@@ -19,14 +18,15 @@ Build-Depends:
               libmaven-javadoc-plugin-java,
               libmaven-shade-plugin-java,
               maven-debian-helper
-Standards-Version: 4.1.5
-Vcs-Git: https://salsa.debian.org/java-team/jacoco.git
+Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/java-team/jacoco
+Vcs-Git: https://salsa.debian.org/java-team/jacoco.git
 Homepage: http://www.eclemma.org/jacoco

 Package: libjacoco-java
 Architecture: all
-Depends: ${maven:Depends}, ${misc:Depends}
+Depends: ${maven:Depends},
+         ${misc:Depends}
 Description: free code coverage library for Java
 JaCoCo is a code coverage checking library for Java. It has been integrated
 into many libraries and tools like Gradle, Maven, and Android SDK.
@@ -37,9 +37,10 @@ Description: free code coverage library for Java
   * org.jacoco.report.jar

 Package: libjacoco-java-doc
-Section: doc
 Architecture: all
-Depends: ${maven:DocDepends}, ${misc:Depends}
+Section: doc
+Depends: ${maven:DocDepends},
+         ${misc:Depends}
 Description: free code coverage library for Java - documentations
 JaCoCo is a code coverage checking library for Java. It has been integrated
 into many libraries and tools like Gradle, Maven, and Android SDK.

--- a/jacoco-maven-plugin.test/it/it-check-fails-halt/pom.xml
+++ b/jacoco-maven-plugin.test/it/it-check-fails-halt/pom.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2009, 2018 Mountainminds GmbH & Co. KG and Contributors
+   Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Public License v1.0
   which accompanies this distribution, and is available at
@@ -40,15 +40,13 @@
            </goals>
            <configuration>
              <rules>
-                <!-- implementation is needed only for Maven 2 -->
-                <rule implementation="org.jacoco.maven.RuleConfiguration">
+                <rule>
                  <element>CLASS</element>
                  <includes>
                    <include>Example</include>
                  </includes>
                  <limits>
-                    <!-- implementation is needed only for Maven 2 -->
-                    <limit implementation="org.jacoco.report.check.Limit">
+                    <limit>
                      <counter>METHOD</counter>
                      <value>MISSEDCOUNT</value>
                      <maximum>0</maximum>

--- a/jacoco-maven-plugin.test/it/it-check-fails-halt/src/main/java/Example.java
+++ b/jacoco-maven-plugin.test/it/it-check-fails-halt/src/main/java/Example.java
 /*******************************************************************************
- * Copyright (c) 2009, 2018 Mountainminds GmbH & Co. KG and Contributors
+ * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

--- a/jacoco-maven-plugin.test/it/it-check-fails-halt/src/test/java/ExampleTest.java
+++ b/jacoco-maven-plugin.test/it/it-check-fails-halt/src/test/java/ExampleTest.java
 /*******************************************************************************
- * Copyright (c) 2009, 2018 Mountainminds GmbH & Co. KG and Contributors
+ * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

--- a/jacoco-maven-plugin.test/it/it-check-fails-halt/verify.bsh
+++ b/jacoco-maven-plugin.test/it/it-check-fails-halt/verify.bsh
 /*******************************************************************************
- * Copyright (c) 2009, 2018 Mountainminds GmbH & Co. KG and Contributors
+ * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

--- a/jacoco-maven-plugin.test/it/it-check-fails-no-halt/pom.xml
+++ b/jacoco-maven-plugin.test/it/it-check-fails-no-halt/pom.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2009, 2018 Mountainminds GmbH & Co. KG and Contributors
+   Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Public License v1.0
   which accompanies this distribution, and is available at
@@ -41,12 +41,10 @@
            <configuration>
              <haltOnFailure>false</haltOnFailure>
             <rules>
-                <!-- implementation is needed only for Maven 2 -->
-                <rule implementation="org.jacoco.maven.RuleConfiguration">
+                <rule>
                  <element>BUNDLE</element>
                  <limits>
-                    <!-- implementation is needed only for Maven 2 -->
-                    <limit implementation="org.jacoco.report.check.Limit">
+                    <limit>
                      <counter>METHOD</counter>
                      <value>MISSEDCOUNT</value>
                      <maximum>0</maximum>

--- a/jacoco-maven-plugin.test/it/it-check-fails-no-halt/src/main/java/Example.java
+++ b/jacoco-maven-plugin.test/it/it-check-fails-no-halt/src/main/java/Example.java
 /*******************************************************************************
- * Copyright (c) 2009, 2018 Mountainminds GmbH & Co. KG and Contributors
+ * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

--- a/jacoco-maven-plugin.test/it/it-check-fails-no-halt/src/test/java/ExampleTest.java
+++ b/jacoco-maven-plugin.test/it/it-check-fails-no-halt/src/test/java/ExampleTest.java
 /*******************************************************************************
- * Copyright (c) 2009, 2018 Mountainminds GmbH & Co. KG and Contributors
+ * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

--- a/jacoco-maven-plugin.test/it/it-check-fails-no-halt/verify.bsh
+++ b/jacoco-maven-plugin.test/it/it-check-fails-no-halt/verify.bsh
 /*******************************************************************************
- * Copyright (c) 2009, 2018 Mountainminds GmbH & Co. KG and Contributors
+ * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

--- a/jacoco-maven-plugin.test/it/it-check-passes/pom.xml
+++ b/jacoco-maven-plugin.test/it/it-check-passes/pom.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2009, 2018 Mountainminds GmbH & Co. KG and Contributors
+   Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Public License v1.0
   which accompanies this distribution, and is available at
@@ -40,18 +40,15 @@
            </goals>
            <configuration>
              <rules>
-                <!-- implementation is needed only for Maven 2 -->
-                <rule implementation="org.jacoco.maven.RuleConfiguration">
+                <rule>
                  <element>BUNDLE</element>
                  <limits>
-                    <!-- implementation is needed only for Maven 2 -->
-                    <limit implementation="org.jacoco.report.check.Limit">
+                    <limit>
                      <counter>INSTRUCTION</counter>
                      <value>COVEREDRATIO</value>
                      <minimum>0.90</minimum>
                    </limit>
-                    <!-- implmentation is needed only for Maven 2 -->
-                    <limit implementation="org.jacoco.report.check.Limit">
+                    <limit>
                      <counter>CLASS</counter>
                      <value>MISSEDCOUNT</value>
                      <maximum>0</maximum>