Merge branch 'master' into fix-wording-in-flow

.azure-pipelines/azure-pipelines.yml

@@ -0,0 +1,82 @@
+jobs:
+- job:
+  strategy:
+    matrix:
+      JDK 5:
+        JDK_VERSION: 5
+      JDK 6:
+        JDK_VERSION: 6
+      JDK 7:
+        JDK_VERSION: 7
+      JDK 8:
+        JDK_VERSION: 8
+      JDK 8 with ECJ:
+        JDK_VERSION: 8
+        ECJ: true
+      JDK 9:
+        JDK_VERSION: 9
+      JDK 10:
+        JDK_VERSION: 10
+      JDK 11:
+        JDK_VERSION: 11
+      JDK 12:
+        JDK_VERSION: 12
+      JDK 13:
+        JDK_VERSION: 13
+      JDK 14:
+        JDK_VERSION: 14
+      JDK 15:
+        JDK_VERSION: 15
+      JDK 16:
+        JDK_VERSION: 16
+      JDK 17:
+        JDK_VERSION: 17
+  pool:
+    vmImage: 'ubuntu-18.04'
+  steps:
+  - bash: |
+      set -e
+      url_var=JDK${JDK_VERSION}_URL
+      JDK_URL=${!url_var}
+      mkdir .jdk
+      curl -L $JDK_URL -o .jdk/jdk.tar.gz
+      tar -xzf .jdk/jdk.tar.gz -C .jdk --strip-components 1
+      .jdk/bin/java -version
+      echo "
+      <toolchains>
+        <toolchain>
+          <type>jdk</type>
+          <provides>
+            <id>$JDK_VERSION</id>
+            <version>$JDK_VERSION</version>
+          </provides>
+          <configuration>
+            <jdkHome>$PWD/.jdk</jdkHome>
+          </configuration>
+        </toolchain>
+      </toolchains>
+      " > toolchains.xml
+    displayName: Setup JDK
+  - bash: |
+      if [[ "$JDK_VERSION" -ge "8" ]]; then
+        export JAVA_HOME=$PWD/.jdk
+      fi
+      if [[ "$BUILD_SOURCEBRANCH" == "refs/heads/master" && "$JDK_VERSION" == "5" ]]; then
+        mvn -V -B -e -f org.jacoco.build \
+          verify -Djdk.version=$JDK_VERSION \
+          sonar:sonar deploy:deploy -DdeployAtEnd \
+          --toolchains=toolchains.xml --settings=.azure-pipelines/maven-settings.xml
+      elif [[ "$JDK_VERSION" == "5" ]]; then
+        mvn -V -B -e \
+          verify -Djdk.version=$JDK_VERSION \
+          --toolchains=toolchains.xml
+      else
+        mvn -V -B -e \
+          verify -Djdk.version=$JDK_VERSION -Dbytecode.version=$JDK_VERSION -Decj=${ECJ:-} \
+          --toolchains=toolchains.xml
+      fi
+    displayName: Build
+    env:
+      SONARQUBE_TOKEN: $(SONARQUBE_TOKEN)
+      SONATYPE_USERNAME: $(SONATYPE_USERNAME)
+      SONATYPE_PASSWORD: $(SONATYPE_PASSWORD)

.travis/settings.xml → .azure-pipelines/maven-settings.xml

@@ -9,13 +9,15 @@
   </servers>
   <profiles>
     <profile>
-      <id>default</id>
+      <id>SonarCloud</id>
       <properties>
-        <https.protocols>TLSv1</https.protocols>
+        <sonar.host.url>https://sonarcloud.io/</sonar.host.url>
+        <sonar.organization>default</sonar.organization>
+        <sonar.login>${env.SONARQUBE_TOKEN}</sonar.login>
       </properties>
     </profile>
   </profiles>
   <activeProfiles>
-    <activeProfile>default</activeProfile>
+    <activeProfile>SonarCloud</activeProfile>
   </activeProfiles>
 </settings>

README.md

@@ -1,7 +1,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://dev.azure.com/jacoco-org/JaCoCo/_apis/build/status/JaCoCo?branchName=master)](https://dev.azure.com/jacoco-org/JaCoCo/_build/latest?definitionId=1&branchName=master)
 [![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://img.shields.io/maven-central/v/org.jacoco/jacoco.svg)](http://search.maven.org/#search|ga|1|g%3Aorg.jacoco)
 

jacoco-maven-plugin/src/org/jacoco/maven/ReportSupport.java

@@ -165,7 +165,7 @@ public void processProject(final IReportGroupVisitor visitor,
 	 *
 	 * @param visitor
 	 *            group visitor to emit the project's coverage to
-	 * @param bundeName
+	 * @param bundleName
 	 *            name for this project in the report
 	 * @param project
 	 *            the MavenProject
@@ -179,15 +179,15 @@ public void processProject(final IReportGroupVisitor visitor,
 	 *             if class files can't be read
 	 */
 	public void processProject(final IReportGroupVisitor visitor,
-			final String bundeName, final MavenProject project,
+			final String bundleName, final MavenProject project,
 			final List<String> includes, final List<String> excludes,
 			final String srcEncoding) throws IOException {
-		processProject(visitor, bundeName, project, includes, excludes,
+		processProject(visitor, bundleName, project, includes, excludes,
 				new SourceFileCollection(project, srcEncoding));
 	}
 
 	private void processProject(final IReportGroupVisitor visitor,
-			final String bundeName, final MavenProject project,
+			final String bundleName, final MavenProject project,
 			final List<String> includes, final List<String> excludes,
 			final ISourceFileLocator locator) throws IOException {
 		final CoverageBuilder builder = new CoverageBuilder();
@@ -203,7 +203,7 @@ private void processProject(final IReportGroupVisitor visitor,
 			}
 		}
 
-		final IBundleCoverage bundle = builder.getBundle(bundeName);
+		final IBundleCoverage bundle = builder.getBundle(bundleName);
 		logBundleInfo(bundle, builder.getNoMatchClasses());
 
 		visitor.visitBundle(bundle, locator);