merge

.azure-pipelines/azure-pipelines.yml

@@ -10,15 +10,15 @@ jobs:
         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 11 with ECJ:
+        JDK_VERSION: 11
+        ECJ: true
       JDK 12:
         JDK_VERSION: 12
       JDK 13:
@@ -31,8 +31,35 @@ jobs:
         JDK_VERSION: 16
       JDK 17:
         JDK_VERSION: 17
+      JDK 17 with ECJ:
+        JDK_VERSION: 17
+        ECJ: true
+      JDK 18:
+        JDK_VERSION: 18
+      JDK 19:
+        JDK_VERSION: 19
+      JDK 20:
+        JDK_VERSION: 20
+      JDK 21:
+        JDK_VERSION: 21
+      JDK 21 with ECJ:
+        JDK_VERSION: 21
+        ECJ: true
+      JDK 22:
+        JDK_VERSION: 22
+      JDK 23:
+        JDK_VERSION: 23
+      JDK 23 with ECJ:
+        JDK_VERSION: 23
+        ECJ: true
+      JDK 24:
+        JDK_VERSION: 24
+      JDK 25:
+        JDK_VERSION: 25
+      JDK 26:
+        JDK_VERSION: 26
   pool:
-    vmImage: 'ubuntu-18.04'
+    vmImage: 'ubuntu-24.04'
   steps:
   - bash: |
       set -e
@@ -58,20 +85,23 @@ jobs:
       " > toolchains.xml
     displayName: Setup JDK
   - bash: |
-      if [[ "$JDK_VERSION" -ge "8" ]]; then
+      if [[ "$JDK_VERSION" -ge "17" ]]; then
         export JAVA_HOME=$PWD/.jdk
+      else
+        export JAVA_HOME=$JAVA_HOME_17_X64
       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 \
+        ./mvnw -V -B -e --no-transfer-progress -f org.jacoco.build \
+          verify -Djdk.version=$JDK_VERSION -Dbytecode.version=$JDK_VERSION \
+          deploy:deploy -DdeployAtEnd \
+          --toolchains=toolchains.xml --settings=.azure-pipelines/maven-settings.xml
+      elif [[ "$BUILD_SOURCEBRANCH" == "refs/heads/master" && "$JDK_VERSION" == "11" ]]; then
+        ./mvnw -V -B -e --no-transfer-progress -f org.jacoco.build \
+          verify -Djdk.version=$JDK_VERSION -Dbytecode.version=$JDK_VERSION \
+          sonar:sonar -Dsonar.scanner.skipJreProvisioning \
           --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 \
+        ./mvnw -V -B -e --no-transfer-progress \
           verify -Djdk.version=$JDK_VERSION -Dbytecode.version=$JDK_VERSION -Decj=${ECJ:-} \
           --toolchains=toolchains.xml
       fi

.azure-pipelines/maven-settings.xml

@@ -13,7 +13,7 @@
       <properties>
         <sonar.host.url>https://sonarcloud.io/</sonar.host.url>
         <sonar.organization>default</sonar.organization>
-        <sonar.login>${env.SONARQUBE_TOKEN}</sonar.login>
+        <sonar.token>${env.SONARQUBE_TOKEN}</sonar.token>
       </properties>
     </profile>
   </profiles>

.github/ISSUE_TEMPLATE/1_question.yml

@@ -0,0 +1,22 @@
+name: Question
+description: Please ask questions at our user forum
+title: "PLEASE DO NOT USE GITHUB FOR QUESTIONS - CHECK FAQ OR USE FORUM"
+labels: ["declined: question :x:"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please understand that we do **not** use the issue tracker for questions. The issue will be closed as invalid.
+
+        Many questions are already answered in our [FAQ](https://www.jacoco.org/jacoco/trunk/doc/faq.html).
+
+        Please have a look at our [forum](https://groups.google.com/forum/?fromgroups=#!forum/jacoco) where more questions have been discussed before or ask a new question at the [forum](https://groups.google.com/forum/?fromgroups=#!forum/jacoco).
+
+        Thank you for keeping our issue tracker clean!
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: No questions answered here
+      options:
+        - label: I understand that no quesions will be answered on this issue tracker
+          required: true

.github/ISSUE_TEMPLATE/2_bug_report.md

@@ -15,7 +15,7 @@ https://groups.google.com/forum/?fromgroups=#!forum/jacoco
 
 Please understand that
 ISSUES WITHOUT FOLLOWING INFORMATION WILL BE CLOSED WITHOUT COMMENTS!
-Thank you for filling bug report!
+Thank you for filing a useful bug report!
 
 ### Steps to reproduce
 

.github/dependabot.yml

@@ -0,0 +1,53 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "dependencies"
+      - "component: build"
+  - package-ecosystem: "maven"
+    directory: "/org.jacoco.build"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "dependencies"
+      - "component: build"
+    allow:
+      - dependency-name: "org.apache.maven.plugins:*"
+      - dependency-name: "org.codehaus.mojo:*"
+      - dependency-name: "com.diffplug.spotless:*"
+      - dependency-name: "org.apache.felix:*"
+      - dependency-name: "org.sonarsource.scanner.maven:*"
+    ignore:
+      # It is known that upgrade from current version requires additional changes:
+      - dependency-name: "org.apache.maven.plugins:maven-plugin-plugin"
+      # Because of
+      # https://github.com/apache/maven-compiler-plugin/blob/maven-compiler-plugin-3.13.0/pom.xml#L71
+      # https://github.com/codehaus-plexus/plexus-compiler/blob/plexus-compiler-2.15.0/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java#L149-L163
+      # requires javac version to be at least 6:
+      - dependency-name: "org.apache.maven.plugins:maven-compiler-plugin"
+        versions: ">=3.13.0"
+      # Requires tests to be executed with Java 6:
+      - dependency-name: "org.apache.maven.plugins:maven-surefire-plugin"
+        versions: ">=2.20.0"
+  - package-ecosystem: "maven"
+    directory: "/org.jacoco.core"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+      - "component: core"
+    allow:
+      - dependency-name: "org.ow2.asm:*"
+  - package-ecosystem: "maven"
+    directory: "/org.jacoco.core.test.validation.kotlin"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "dependencies"
+      - "component: test"
+      - "language: Kotlin"
+    allow:
+      - dependency-name: "org.jetbrains.kotlin:*"

.github/workflows/ci.yml

@@ -0,0 +1,99 @@
+name: CI
+on:
+  - push
+  - pull_request
+jobs:
+  Linux:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - jdk: 8
+          - jdk: 8
+            ecj: true
+          - jdk: 11
+          - jdk: 11
+            ecj: true
+          - jdk: 17
+          - jdk: 17
+            ecj: true
+          - jdk: 21
+          - jdk: 21
+            ecj: true
+    name: JDK ${{ matrix.jdk }}${{ matrix.ecj && ' with ECJ' || ''}}
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          distribution: 'zulu'
+          java-version: |
+            ${{ matrix.jdk }}
+            17
+      - name: 'Generate toolchains.xml'
+        env:
+          JDK_VERSION: ${{ matrix.jdk }}
+          JDK_HOME_VARIABLE_NAME: JAVA_HOME_${{ matrix.jdk }}_X64
+        run: |
+          echo "
+          <toolchains>
+            <toolchain>
+              <type>jdk</type>
+              <provides>
+                <id>$JDK_VERSION</id>
+                <version>$JDK_VERSION</version>
+              </provides>
+              <configuration>
+                <jdkHome>${!JDK_HOME_VARIABLE_NAME}</jdkHome>
+              </configuration>
+            </toolchain>
+          </toolchains>
+          " > toolchains.xml
+      - name: 'Build'
+        run: |
+          ./mvnw -V -B -e --no-transfer-progress \
+            verify -Djdk.version=${{ matrix.jdk }} -Dbytecode.version=${{ matrix.jdk }} \
+            ${{ matrix.ecj && '-Decj' || ''}} \
+            --toolchains=toolchains.xml
+  Windows:
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          distribution: 'zulu'
+          java-version: |
+            6
+            17
+      - name: 'Generate toolchains.xml'
+        env:
+          JDK_VERSION: 6
+          JDK_HOME_VARIABLE_NAME: JAVA_HOME_6_X64
+        shell: bash
+        run: |
+          echo "
+          <toolchains>
+            <toolchain>
+              <type>jdk</type>
+              <provides>
+                <id>$JDK_VERSION</id>
+                <version>$JDK_VERSION</version>
+              </provides>
+              <configuration>
+                <jdkHome>${!JDK_HOME_VARIABLE_NAME}</jdkHome>
+              </configuration>
+            </toolchain>
+          </toolchains>
+          " > toolchains.xml
+      - name: 'Build'
+        shell: bash
+        run: |
+          ./mvnw -V -B -e --no-transfer-progress \
+            verify -Djdk.version=6 -Dbytecode.version=5 \
+            --toolchains=toolchains.xml
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        id: artifact-upload-step
+        with:
+          name: jacoco
+          path: jacoco/target/*.zip
+          if-no-files-found: error

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
+distributionSha256Sum=0d7125e8c91097b36edb990ea5934e6c68b4440eef4ea96510a0f6815e7eeadb