Upgrade JaCoCo to 0.8.12

jacoco · Apr 3, 2024 · 196dda0 · 196dda0
1 parent 95289ba
commit 196dda0
Show file tree

Hide file tree

Showing 36 changed files with 256 additions and 253 deletions.
diff --git a/EclEmma.setup b/EclEmma.setup
@@ -122,7 +122,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2024-06"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -135,7 +135,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2024-03"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -148,7 +148,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -161,7 +161,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -174,7 +174,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -187,7 +187,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -200,7 +200,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -213,7 +213,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -226,7 +226,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -239,7 +239,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -252,7 +252,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -265,7 +265,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -278,7 +278,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -291,7 +291,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -304,7 +304,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -317,7 +317,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -330,7 +330,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -343,7 +343,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -356,7 +356,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -369,7 +369,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -382,7 +382,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -395,7 +395,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -408,7 +408,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -421,7 +421,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -434,7 +434,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -447,7 +447,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -460,7 +460,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -473,7 +473,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -486,7 +486,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -499,7 +499,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository
@@ -512,7 +512,7 @@
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
         <repository

diff --git a/org.eclipse.eclemma.build/pom.xml b/org.eclipse.eclemma.build/pom.xml
@@ -75,7 +75,7 @@
 
     <orbit-repository-url>https://download.eclipse.org/tools/orbit/downloads/latest-I/</orbit-repository-url>
 
-    <jacoco.version>0.8.11</jacoco.version>
+    <jacoco.version>0.8.12</jacoco.version>
     <tycho.testArgLine>-Xmx800m</tycho.testArgLine>
 
     <!-- SonarQube -->

diff --git a/org.eclipse.eclemma.core/META-INF/MANIFEST.MF b/org.eclipse.eclemma.core/META-INF/MANIFEST.MF
@@ -15,9 +15,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.jdt.core,
  org.eclipse.jdt.launching,
- org.jacoco.core;bundle-version="[0.8.11,0.8.12)",
- org.jacoco.agent;bundle-version="[0.8.11,0.8.12)",
- org.jacoco.report;bundle-version="[0.8.11,0.8.12)"
+ org.jacoco.core;bundle-version="[0.8.12,0.8.13)",
+ org.jacoco.agent;bundle-version="[0.8.12,0.8.13)",
+ org.jacoco.report;bundle-version="[0.8.12,0.8.13)"
 Bundle-Activator: org.eclipse.eclemma.internal.core.EclEmmaCorePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.eclemma.doc/pages/changes.html b/org.eclipse.eclemma.doc/pages/changes.html
@@ -12,6 +12,9 @@
 <h1>EclEmma Change Log</h1>
 
 <h2>Version 3.1.9 (not yet released)</h2>
+<ul>
+  <li>Upgrade to JaCoCo 0.8.12</li>
+</ul>
 
 <h2>Version 3.1.8 (2023/12/12)</h2>
 <ul>

diff --git a/org.eclipse.eclemma.target/eclemma-e3.8.target b/org.eclipse.eclemma.target/eclemma-e3.8.target
@@ -8,13 +8,13 @@
 <repository location="https://download.eclipse.org/releases/juno/"/>
 </location>
 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.objectweb.asm" version="9.6.0"/>
-<unit id="org.objectweb.asm.commons" version="9.6.0"/>
-<unit id="org.objectweb.asm.tree" version="9.6.0"/>
-<unit id="org.jacoco.agent" version="0.8.11.202310140853"/>
-<unit id="org.jacoco.core" version="0.8.11.202310140853"/>
-<unit id="org.jacoco.report" version="0.8.11.202310140853"/>
-<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+<unit id="org.objectweb.asm" version="9.7.0"/>
+<unit id="org.objectweb.asm.commons" version="9.7.0"/>
+<unit id="org.objectweb.asm.tree" version="9.7.0"/>
+<unit id="org.jacoco.agent" version="0.8.12.202403310830"/>
+<unit id="org.jacoco.core" version="0.8.12.202403310830"/>
+<unit id="org.jacoco.report" version="0.8.12.202403310830"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
 </location>
 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.junit" version="4.13.2.v20211018-1956"/>

diff --git a/org.eclipse.eclemma.target/eclemma-e4.10.target b/org.eclipse.eclemma.target/eclemma-e4.10.target
@@ -10,13 +10,13 @@
 <repository location="https://download.eclipse.org/releases/2018-12/"/>
 </location>
 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.objectweb.asm" version="9.6.0"/>
-<unit id="org.objectweb.asm.commons" version="9.6.0"/>
-<unit id="org.objectweb.asm.tree" version="9.6.0"/>
-<unit id="org.jacoco.agent" version="0.8.11.202310140853"/>
-<unit id="org.jacoco.core" version="0.8.11.202310140853"/>
-<unit id="org.jacoco.report" version="0.8.11.202310140853"/>
-<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+<unit id="org.objectweb.asm" version="9.7.0"/>
+<unit id="org.objectweb.asm.commons" version="9.7.0"/>
+<unit id="org.objectweb.asm.tree" version="9.7.0"/>
+<unit id="org.jacoco.agent" version="0.8.12.202403310830"/>
+<unit id="org.jacoco.core" version="0.8.12.202403310830"/>
+<unit id="org.jacoco.report" version="0.8.12.202403310830"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
 </location>
 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.junit" version="4.13.2.v20211018-1956"/>

diff --git a/org.eclipse.eclemma.target/eclemma-e4.11.target b/org.eclipse.eclemma.target/eclemma-e4.11.target
@@ -10,13 +10,13 @@
 <repository location="https://download.eclipse.org/releases/2019-03/"/>
 </location>
 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.objectweb.asm" version="9.6.0"/>
-<unit id="org.objectweb.asm.commons" version="9.6.0"/>
-<unit id="org.objectweb.asm.tree" version="9.6.0"/>
-<unit id="org.jacoco.agent" version="0.8.11.202310140853"/>
-<unit id="org.jacoco.core" version="0.8.11.202310140853"/>
-<unit id="org.jacoco.report" version="0.8.11.202310140853"/>
-<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+<unit id="org.objectweb.asm" version="9.7.0"/>
+<unit id="org.objectweb.asm.commons" version="9.7.0"/>
+<unit id="org.objectweb.asm.tree" version="9.7.0"/>
+<unit id="org.jacoco.agent" version="0.8.12.202403310830"/>
+<unit id="org.jacoco.core" version="0.8.12.202403310830"/>
+<unit id="org.jacoco.report" version="0.8.12.202403310830"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
 </location>
 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.junit" version="4.13.2.v20211018-1956"/>

diff --git a/org.eclipse.eclemma.target/eclemma-e4.12.target b/org.eclipse.eclemma.target/eclemma-e4.12.target
@@ -10,13 +10,13 @@
 <repository location="https://download.eclipse.org/releases/2019-06/"/>
 </location>
 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.objectweb.asm" version="9.6.0"/>
-<unit id="org.objectweb.asm.commons" version="9.6.0"/>
-<unit id="org.objectweb.asm.tree" version="9.6.0"/>
-<unit id="org.jacoco.agent" version="0.8.11.202310140853"/>
-<unit id="org.jacoco.core" version="0.8.11.202310140853"/>
-<unit id="org.jacoco.report" version="0.8.11.202310140853"/>
-<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2023-12"/>
+<unit id="org.objectweb.asm" version="9.7.0"/>
+<unit id="org.objectweb.asm.commons" version="9.7.0"/>
+<unit id="org.objectweb.asm.tree" version="9.7.0"/>
+<unit id="org.jacoco.agent" version="0.8.12.202403310830"/>
+<unit id="org.jacoco.core" version="0.8.12.202403310830"/>
+<unit id="org.jacoco.report" version="0.8.12.202403310830"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly"/>
 </location>
 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.junit" version="4.13.2.v20211018-1956"/>