.gitignore

+target/
+.settings/
+!org.jacoco.core/.settings/
+!org.jacoco.core.test/.settings/
+org.jacoco.agent/src/jacocoagent.jar
+.idea
+*.iml

.travis.sh

@@ -9,6 +9,18 @@ then
   exit 1
 fi
 
+function jdk_switcher {
+  DIR=$1
+  if [ ! -d "$DIR" ]; then
+    echo "Not found: $DIR"
+    exit 1
+  fi
+  export JAVA_HOME="$DIR"
+  export JDK_HOME="${JAVA_HOME}"
+  export JAVAC="${JAVA_HOME}/bin/javac"
+  export PATH="${JAVA_HOME}/bin:${PATH}"
+}
+
 # Switch to desired JDK, download if required:
 function install_jdk {
   JDK_URL=$1
@@ -27,33 +39,30 @@ function install_jdk {
 
   if [ -z "${2+false}" ]
   then
-    export JAVA_HOME="/tmp/jdk/$JDK"
-    export JDK_HOME="${JAVA_HOME}"
-    export JAVAC="${JAVA_HOME}/bin/javac"
-    export PATH="${JAVA_HOME}/bin:${PATH}"
+    jdk_switcher "/tmp/jdk/$JDK"
   fi
 }
 
-source $HOME/.jdk_switcher_rc
 case "$JDK" in
 5)
-  jdk_switcher use oraclejdk8
   install_jdk $JDK5_URL false
   ;;
 6)
-  jdk_switcher use openjdk6
   ;;
-7|8)
-  jdk_switcher use oraclejdk${JDK}
+7)
+  jdk_switcher /usr/lib/jvm/java-7-openjdk-amd64
+  ;;
+8)
+  jdk_switcher /usr/lib/jvm/java-8-oracle
   ;;
 8-ea)
   install_jdk $JDK8_EA_URL
   ;;
-9-ea)
-  install_jdk $JDK9_EA_URL
+9)
+  install_jdk $JDK9_URL
   ;;
-9-ea-stable)
-  install_jdk $JDK9_EA_STABLE_URL
+10)
+  install_jdk $JDK10_URL
   ;;
 esac
 
@@ -69,25 +78,28 @@ case "$JDK" in
   if [[ ${TRAVIS_PULL_REQUEST} == 'false' && ${TRAVIS_BRANCH} == 'master' ]]
   then
     # 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 sonar:sonar 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 deploy:deploy -DdeployAtEnd -Djdk.version=1.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
   fi
   ;;
 6)
-  mvn -V -B -e verify -Dbytecode.version=1.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
   ;;
 8 | 8-ea)
-  mvn -V -B -e verify -Dbytecode.version=1.8
+  mvn -V -B -e verify -Dbytecode.version=1.8 -Decj=${ECJ:-}
   ;;
-9-ea | 9-ea-stable)
-  # see https://bugs.openjdk.java.net/browse/JDK-8131041 about "java.locale.providers"
+9)
+  export MAVEN_OPTS="-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts"
   mvn -V -B -e verify -Dbytecode.version=1.9 \
-    -DargLine=-Djava.locale.providers=JRE,SPI
+    -Dinvoker.mavenOpts="-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts"
+  ;;
+10)
+  mvn -V -B -e verify -Dbytecode.version=10
   ;;
 *)
   echo "Incorrect JDK [$JDK]"

.travis.yml

@@ -6,6 +6,11 @@ install: true
 # Use container-based infrastructure:
 sudo: false
 
+addons:
+  apt:
+    packages:
+      - openjdk-6-jdk
+
 # Keep Maven local repository between builds:
 cache:
   directories:
@@ -16,13 +21,14 @@ env:
   - JDK=6
   - JDK=7
   - JDK=8
+  - JDK=8
+    ECJ=true
   - JDK=8-ea
-  - JDK=9-ea
-  - JDK=9-ea-stable
+  - JDK=9
+  - JDK=10
 
 matrix:
   allow_failures:
     - env: JDK=8-ea
-    - env: JDK=9-ea
 
 script: ./.travis.sh

.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>
+    </provides>
+    <configuration>
+      <jdkHome>/usr/lib/jvm/java-6-openjdk-amd64</jdkHome>
+    </configuration>
+  </toolchain>
+</toolchains>

LICENSE.md

 License
 =======
 
-Copyright (c) 2009, 2016 Mountainminds GmbH & Co. KG and Contributors
+Copyright (c) 2009, 2018 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

debian/changelog

+jacoco (0.8.1-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+    - Ignore the beanshell-maven-plugin
+    - New build dependency on libmaven-bundle-plugin-java
+  * Standards-Version updated to 4.1.5
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 31 Jul 2018 19:28:50 +0200
+
 jacoco (0.7.8-2) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
\ No newline at end of file
+11

debian/control

@@ -3,8 +3,9 @@ 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 (>= 10~),
+Build-Depends:
+ ant,
+ debhelper (>= 11~),
  default-jdk-doc,
  javahelper,
  libasm-java,
@@ -12,14 +13,15 @@ Build-Depends: ant,
  libgmavenplus-java,
  libmaven-antrun-plugin-java,
  libmaven-assembly-plugin-java,
+ libmaven-bundle-plugin-java,
  libmaven-dependency-plugin-java,
  libmaven-invoker-plugin-java,
  libmaven-javadoc-plugin-java,
  libmaven-shade-plugin-java,
  maven-debian-helper
-Standards-Version: 4.1.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jacoco.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jacoco.git
+Standards-Version: 4.1.5
+Vcs-Git: https://salsa.debian.org/java-team/jacoco.git
+Vcs-Browser: https://salsa.debian.org/java-team/jacoco
 Homepage: http://www.eclemma.org/jacoco
 
 Package: libjacoco-java

debian/maven.ignoreRules

 org.apache.maven.plugins maven-enforcer-plugin * * * *
 org.codehaus.mojo buildnumber-maven-plugin * * * *
+com.github.genthaler beanshell-maven-plugin * * * *

debian/maven.properties

 project.build.sourceEncoding=UTF-8
+
+buildNumber=00000000
+unqualifiedVersion=${project.version}
+buildQualifier=0000
+qualified.bundle.version=${unqualifiedVersion}.${buildQualifier}
+build.date=
+jacoco.runtime.package.name=org.jacoco.agent.rt.internal_0000

debian/patches/gmaven-plugin-compatibility.patch

@@ -3,55 +3,16 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/org.jacoco.build/pom.xml
 +++ b/org.jacoco.build/pom.xml
-@@ -145,6 +145,8 @@
-     <!-- See http://jira.codehaus.org/browse/SONAR-2096 -->
-     <sonar.java.source>1.5</sonar.java.source>
-     <sonar.java.target>1.5</sonar.java.target>
-+
-+    <buildNumber>00000000</buildNumber>
-   </properties>
- 
-   <dependencyManagement>
-@@ -563,8 +565,9 @@
-       </plugin>
- 
-       <plugin>
+@@ -1007,9 +1007,9 @@
+                     </pluginExecution>
+                     <pluginExecution>
+                       <pluginExecutionFilter>
 -                        <groupId>org.codehaus.groovy.maven</groupId>
 -                        <artifactId>gmaven-plugin</artifactId>
+-                        <versionRange>[0,)</versionRange>
 +                        <groupId>org.codehaus.gmavenplus</groupId>
 +                        <artifactId>gmavenplus-plugin</artifactId>
 +                        <version>1.5</version>
-         <executions>
-           <execution>
-             <id>parse-version</id>
-@@ -573,7 +576,8 @@
+                         <goals>
                            <goal>execute</goal>
                          </goals>
-             <configuration>
--              <source>
-+              <scripts>
-+                <script>
-                 major = project.properties['parsedVersion.majorVersion']
-                 minor = project.properties['parsedVersion.minorVersion']
-                 incremental = project.properties['parsedVersion.incrementalVersion']
-@@ -584,10 +588,19 @@
-                 project.properties['build.date'] = qualifier.substring(0, 4) + '/' + qualifier.substring(4, 6) + '/' + qualifier.substring(6, 8)
-                 buildNumber = project.properties['buildNumber']
-                 project.properties['jacoco.runtime.package.name'] = "org.jacoco.agent.rt.internal_" + buildNumber.substring(buildNumber.length() - 7, buildNumber.length())
--              </source>
-+                </script>
-+              </scripts>
-             </configuration>
-           </execution>
-         </executions>
-+        <dependencies>
-+          <dependency>
-+            <groupId>org.codehaus.groovy</groupId>
-+            <artifactId>groovy-all</artifactId>
-+            <version>debian</version>
-+            <scope>runtime</scope>
-+          </dependency>
-+        </dependencies>
-       </plugin>
-     </plugins>
-   </build>

debian/patches/ignore_modules.patch

@@ -9,12 +9,12 @@ Description: maven-debian-helper fails to ignore modules
      <module>../org.jacoco.agent.rt</module>
      <module>../org.jacoco.agent</module>
      <module>../org.jacoco.ant</module>
--
+-    <module>../org.jacoco.cli</module>
+-    <module>../org.jacoco.examples</module>
 -    <module>../jacoco-maven-plugin</module>
 -
 -    <module>../org.jacoco.tests</module>
 -
--    <module>../org.jacoco.examples</module>
 -    <module>../org.jacoco.doc</module>
 -    <module>../jacoco</module>
    </modules>

debian/rules

 #!/usr/bin/make -f
 
 %:
-	dh $@ --buildsystem=maven --with javahelper
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename
+	dh $@ --with javahelper

jacoco-maven-plugin.test/.gitignore

-/target
-/.settings

jacoco-maven-plugin.test/it/it-check-fails-halt/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2009, 2016 Mountainminds GmbH & Co. KG and Contributors
+   Copyright (c) 2009, 2018 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

jacoco-maven-plugin.test/it/it-check-fails-halt/src/main/java/Example.java

 /*******************************************************************************
- * Copyright (c) 2009, 2016 Mountainminds GmbH & Co. KG and Contributors
+ * Copyright (c) 2009, 2018 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

jacoco-maven-plugin.test/it/it-check-fails-halt/src/test/java/ExampleTest.java

 /*******************************************************************************
- * Copyright (c) 2009, 2016 Mountainminds GmbH & Co. KG and Contributors
+ * Copyright (c) 2009, 2018 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

jacoco-maven-plugin.test/it/it-check-fails-halt/verify.bsh

 /*******************************************************************************
- * Copyright (c) 2009, 2016 Mountainminds GmbH & Co. KG and Contributors
+ * Copyright (c) 2009, 2018 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

jacoco-maven-plugin.test/it/it-check-fails-no-halt/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2009, 2016 Mountainminds GmbH & Co. KG and Contributors
+   Copyright (c) 2009, 2018 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