diff --git a/maven-osgi/tp/Maven.target b/maven-osgi/tp/Maven.target
index 54552ae..d59f76d 100644
--- a/maven-osgi/tp/Maven.target
+++ b/maven-osgi/tp/Maven.target
@@ -3,7 +3,7 @@
 <target name="Maven" sequenceNumber="1">
   <locations>
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
-      <feature id="org.eclipse.orbit.maven.osgi.all" label="Orbit Maven OSGi All" provider-name="Eclipse Orbit" version="4.32.0.v20240401-1000">
+      <feature id="org.eclipse.orbit.maven.osgi.all" label="Orbit Maven OSGi All" provider-name="Eclipse Orbit" version="4.32.0.v20240403-0700">
         <description>This feature's dependencies are pulled directly from Maven central.</description>
         <copyright>
 Copyright (c) 2024 Eclipse contributors and others.
@@ -16,7 +16,7 @@ https://www.eclipse.org/legal/epl-2.0/
 SPDX-License-Identifier: EPL-2.0
         </copyright>
         <license url="https://www.eclipse.org/legal/epl-2.0/"/>
-        <!-- SHA1 41070a95d1399e43f802bc1ac4519f300cab7892 -->
+        <!-- SHA1 e6b762b58e128019deac68c8490d67722c39d3d6 -->
       </feature>
       <dependencies>
         <dependency>
@@ -1067,19 +1067,19 @@ SPDX-License-Identifier: EPL-2.0
         <dependency>
           <groupId>org.jacoco</groupId>
           <artifactId>org.jacoco.agent</artifactId>
-          <version>0.8.11</version>
+          <version>0.8.12</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.jacoco</groupId>
           <artifactId>org.jacoco.core</artifactId>
-          <version>0.8.11</version>
+          <version>0.8.12</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.jacoco</groupId>
           <artifactId>org.jacoco.report</artifactId>
-          <version>0.8.11</version>
+          <version>0.8.12</version>
           <type>jar</type>
         </dependency>
         <dependency>
@@ -1475,31 +1475,31 @@ SPDX-License-Identifier: EPL-2.0
         <dependency>
           <groupId>org.ow2.asm</groupId>
           <artifactId>asm</artifactId>
-          <version>9.6</version>
+          <version>9.7</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.ow2.asm</groupId>
           <artifactId>asm-analysis</artifactId>
-          <version>9.6</version>
+          <version>9.7</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.ow2.asm</groupId>
           <artifactId>asm-commons</artifactId>
-          <version>9.6</version>
+          <version>9.7</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.ow2.asm</groupId>
           <artifactId>asm-tree</artifactId>
-          <version>9.6</version>
+          <version>9.7</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.ow2.asm</groupId>
           <artifactId>asm-util</artifactId>
-          <version>9.6</version>
+          <version>9.7</version>
           <type>jar</type>
         </dependency>
         <dependency>
diff --git a/maven-osgi/tp/other/MavenSupplement.target b/maven-osgi/tp/other/MavenSupplement.target
index 9c83e91..17095f4 100644
--- a/maven-osgi/tp/other/MavenSupplement.target
+++ b/maven-osgi/tp/other/MavenSupplement.target
@@ -559,19 +559,19 @@
         <dependency>
           <groupId>org.jacoco</groupId>
           <artifactId>org.jacoco.agent</artifactId>
-          <version>0.8.11</version>
+          <version>0.8.12</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.jacoco</groupId>
           <artifactId>org.jacoco.core</artifactId>
-          <version>0.8.11</version>
+          <version>0.8.12</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.jacoco</groupId>
           <artifactId>org.jacoco.report</artifactId>
-          <version>0.8.11</version>
+          <version>0.8.12</version>
           <type>jar</type>
         </dependency>
         <dependency>
diff --git a/report/maven-osgi/cdt/REPORT.md b/report/maven-osgi/cdt/REPORT.md
index 4a751f0..47bd74b 100644
--- a/report/maven-osgi/cdt/REPORT.md
+++ b/report/maven-osgi/cdt/REPORT.md
@@ -20,11 +20,11 @@
  - [org.mockito](https://repo1.maven.org/maven2/org/mockito/)
     - [mockito-core](https://repo1.maven.org/maven2/org/mockito/mockito-core/) **[5.4.0](https://repo1.maven.org/maven2/org/mockito/mockito-core/5.4.0)** < [5.11.0](https://repo1.maven.org/maven2/org/mockito/mockito-core/5.11.0/)
  - [org.ow2.asm](https://repo1.maven.org/maven2/org/ow2/asm/)
-    - [asm](https://repo1.maven.org/maven2/org/ow2/asm/asm/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.5)** < [9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.6/)
-    - [asm-analysis](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.5)** < [9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.6/)
-    - [asm-commons](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.5)** < [9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.6/)
-    - [asm-tree](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.5)** < [9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.6/)
-    - [asm-util](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.5)** < [9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.6/)
+    - [asm](https://repo1.maven.org/maven2/org/ow2/asm/asm/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.5)** < [9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.7/)
+    - [asm-analysis](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.5)** < [9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.7/)
+    - [asm-commons](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.5)** < [9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.7/)
+    - [asm-tree](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.5)** < [9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.7/)
+    - [asm-util](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/) **[9.5](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.5)** < [9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.7/)
  - [org.slf4j](https://repo1.maven.org/maven2/org/slf4j/)
     - [slf4j-api](https://repo1.maven.org/maven2/org/slf4j/slf4j-api/) **[2.0.7](https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.7)** < [2.0.12](https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.12/)
     - [slf4j-simple](https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/) **[2.0.7](https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/2.0.7)** < [2.0.12](https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/2.0.12/)
diff --git a/report/maven-osgi/cdt/updated.target b/report/maven-osgi/cdt/updated.target
index a33f55b..8ca2066 100644
--- a/report/maven-osgi/cdt/updated.target
+++ b/report/maven-osgi/cdt/updated.target
@@ -154,31 +154,31 @@
 				<dependency>
 					<groupId>org.ow2.asm</groupId>
 					<artifactId>asm-commons</artifactId>
-					<version>9.6</version>
+					<version>9.7</version>
 					<type>jar</type>
 				</dependency>
 				<dependency>
 					<groupId>org.ow2.asm</groupId>
 					<artifactId>asm-util</artifactId>
-					<version>9.6</version>
+					<version>9.7</version>
 					<type>jar</type>
 				</dependency>
 				<dependency>
 					<groupId>org.ow2.asm</groupId>
 					<artifactId>asm</artifactId>
-					<version>9.6</version>
+					<version>9.7</version>
 					<type>jar</type>
 				</dependency>
 				<dependency>
 					<groupId>org.ow2.asm</groupId>
 					<artifactId>asm-tree</artifactId>
-					<version>9.6</version>
+					<version>9.7</version>
 					<type>jar</type>
 				</dependency>
 				<dependency>
 					<groupId>org.ow2.asm</groupId>
 					<artifactId>asm-analysis</artifactId>
-					<version>9.6</version>
+					<version>9.7</version>
 					<type>jar</type>
 				</dependency>
 				<dependency>
diff --git a/report/maven-osgi/merged-target/REPORT.md b/report/maven-osgi/merged-target/REPORT.md
index d3489f1..0087ee5 100644
--- a/report/maven-osgi/merged-target/REPORT.md
+++ b/report/maven-osgi/merged-target/REPORT.md
@@ -297,9 +297,9 @@
  - [org.hamcrest](https://repo1.maven.org/maven2/org/hamcrest/)
     - [hamcrest](https://repo1.maven.org/maven2/org/hamcrest/hamcrest/) **[2.2](https://repo1.maven.org/maven2/org/hamcrest/hamcrest/2.2)**
  - [org.jacoco](https://repo1.maven.org/maven2/org/jacoco/)
-    - [org.jacoco.agent](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/) **[0.8.11](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.11)**
-    - [org.jacoco.core](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/) **[0.8.11](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.8.11)**
-    - [org.jacoco.report](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/) **[0.8.11](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.8.11)**
+    - [org.jacoco.agent](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/) **[0.8.12](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.12)**
+    - [org.jacoco.core](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/) **[0.8.12](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.8.12)**
+    - [org.jacoco.report](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/) **[0.8.12](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.8.12)**
  - [org.javassist](https://repo1.maven.org/maven2/org/javassist/)
     - [javassist](https://repo1.maven.org/maven2/org/javassist/javassist/) **[3.30.2-GA](https://repo1.maven.org/maven2/org/javassist/javassist/3.30.2-GA)**
  - [org.json](https://repo1.maven.org/maven2/org/json/)
@@ -381,11 +381,11 @@
     - [org.osgi.util.tracker](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.tracker/) **[1.5.4](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.tracker/1.5.4)**
     - [org.osgi.util.xml](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.xml/) **[1.0.2](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.xml/1.0.2)**
  - [org.ow2.asm](https://repo1.maven.org/maven2/org/ow2/asm/)
-    - [asm](https://repo1.maven.org/maven2/org/ow2/asm/asm/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.6)**
-    - [asm-analysis](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.6)**
-    - [asm-commons](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.6)**
-    - [asm-tree](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.6)**
-    - [asm-util](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.6)**
+    - [asm](https://repo1.maven.org/maven2/org/ow2/asm/asm/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.7)**
+    - [asm-analysis](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.7)**
+    - [asm-commons](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.7)**
+    - [asm-tree](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.7)**
+    - [asm-util](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.7)**
  - [org.ow2.sat4j](https://repo1.maven.org/maven2/org/ow2/sat4j/)
     - [org.ow2.sat4j.core](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.core/) **[2.3.6](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.core/2.3.6)**
     - [org.ow2.sat4j.pb](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.pb/) **[2.3.6](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.pb/2.3.6)**
diff --git a/report/maven-osgi/platform/REPORT.md b/report/maven-osgi/platform/REPORT.md
index 60d3126..b632217 100644
--- a/report/maven-osgi/platform/REPORT.md
+++ b/report/maven-osgi/platform/REPORT.md
@@ -156,11 +156,11 @@
     - [org.osgi.util.pushstream](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.pushstream/) **[1.1.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.pushstream/1.1.0)**
     - [org.osgi.util.xml](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.xml/) **[1.0.2](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.xml/1.0.2)**
  - [org.ow2.asm](https://repo1.maven.org/maven2/org/ow2/asm/)
-    - [asm](https://repo1.maven.org/maven2/org/ow2/asm/asm/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.6)**
-    - [asm-analysis](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.6)**
-    - [asm-commons](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.6)**
-    - [asm-tree](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.6)**
-    - [asm-util](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/) **[9.6](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.6)**
+    - [asm](https://repo1.maven.org/maven2/org/ow2/asm/asm/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.7)**
+    - [asm-analysis](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.7)**
+    - [asm-commons](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.7)**
+    - [asm-tree](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.7)**
+    - [asm-util](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/) **[9.7](https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.7)**
  - [org.ow2.sat4j](https://repo1.maven.org/maven2/org/ow2/sat4j/)
     - [org.ow2.sat4j.core](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.core/) **[2.3.6](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.core/2.3.6)**
     - [org.ow2.sat4j.pb](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.pb/) **[2.3.6](https://repo1.maven.org/maven2/org/ow2/sat4j/org.ow2.sat4j.pb/2.3.6)**
diff --git a/report/maven-osgi/platform/original.target b/report/maven-osgi/platform/original.target
index e487d30..85986f5 100644
--- a/report/maven-osgi/platform/original.target
+++ b/report/maven-osgi/platform/original.target
@@ -54,8 +54,8 @@
 
     <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
        <!-- Check version in "<EMF>/features" directory -->
-      <unit id="org.eclipse.emf.common.feature.group" version="2.31.0.v20231210-0956"/>
-      <unit id="org.eclipse.emf.common.source.feature.group" version="2.31.0.v20231210-0956"/>
+`      <unit id="org.eclipse.emf.common.feature.group" version="2.31.0.v20240314-0928"/>
+      <unit id="org.eclipse.emf.common.source.feature.group" version="2.31.0.v20240314-0928"/>
       <unit id="org.eclipse.emf.ecore.feature.group" version="2.37.0.v20240203-0859"/>
       <unit id="org.eclipse.emf.ecore.source.feature.group" version="2.37.0.v20240203-0859"/>
        <!-- For org.eclipse.ui.tools, and PDE's spy dependencies as of Eclipse 4.22 -->
@@ -66,7 +66,7 @@
       <unit id="org.eclipse.emf.databinding.source.feature.group" version="1.11.0.v20231208-1346"/>
       <unit id="org.eclipse.emf.databinding.edit.feature.group" version="1.11.0.v20231208-1346"/>
       <unit id="org.eclipse.emf.databinding.edit.source.feature.group" version="1.11.0.v20231208-1346"/>
-      <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.37.0"/>
+      <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202404020819"/>
     </location>
 
     <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
@@ -358,31 +358,31 @@
 			  <dependency>
 				  <groupId>org.ow2.asm</groupId>
 				  <artifactId>asm-analysis</artifactId>
-				  <version>9.6</version>
+				  <version>9.7</version>
 				  <type>jar</type>
 			  </dependency>
 			  <dependency>
 				  <groupId>org.ow2.asm</groupId>
 				  <artifactId>asm-commons</artifactId>
-				  <version>9.6</version>
+				  <version>9.7</version>
 				  <type>jar</type>
 			  </dependency>
 			  <dependency>
 				  <groupId>org.ow2.asm</groupId>
 				  <artifactId>asm-tree</artifactId>
-				  <version>9.6</version>
+				  <version>9.7</version>
 				  <type>jar</type>
 			  </dependency>
 			  <dependency>
 				  <groupId>org.ow2.asm</groupId>
 				  <artifactId>asm-util</artifactId>
-				  <version>9.6</version>
+				  <version>9.7</version>
 				  <type>jar</type>
 			  </dependency>
 			  <dependency>
 				  <groupId>org.ow2.asm</groupId>
 				  <artifactId>asm</artifactId>
-				  <version>9.6</version>
+				  <version>9.7</version>
 				  <type>jar</type>
 			  </dependency>
 		  </dependencies>
@@ -401,6 +401,24 @@
 				  <version>1.1.2</version>
 				  <type>jar</type>
 			  </dependency>
+			  <dependency>
+				  <groupId>org.osgi</groupId>
+				  <artifactId>org.osgi.namespace.contract</artifactId>
+				  <version>1.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.osgi</groupId>
+				  <artifactId>org.osgi.namespace.extender</artifactId>
+				  <version>1.0.1</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.osgi</groupId>
+				  <artifactId>org.osgi.namespace.service</artifactId>
+				  <version>1.0.0</version>
+				  <type>jar</type>
+			  </dependency>
 			  <dependency>
 				  <groupId>org.osgi</groupId>
 				  <artifactId>org.osgi.service.cm</artifactId>
@@ -533,21 +551,6 @@
 				  <version>1.0.2</version>
 				  <type>jar</type>
 			  </dependency>
-				<dependency>
-					<groupId>org.osgi</groupId>
-					<artifactId>org.osgi.namespace.service</artifactId>
-					<version>1.0.0</version>
-				</dependency>
-				<dependency>
-					<groupId>org.osgi</groupId>
-					<artifactId>org.osgi.namespace.extender</artifactId>
-					<version>1.0.1</version>
-				</dependency>
-				<dependency>
-					<groupId>org.osgi</groupId>
-					<artifactId>org.osgi.namespace.contract</artifactId>
-					<version>1.0.0</version>
-				</dependency>
 		  </dependencies>
 	  </location>
 	  <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="BND" missingManifest="error" type="Maven">
@@ -588,6 +591,24 @@
 				  <version>7.0.0</version>
 				  <type>jar</type>
 			  </dependency>
+			  <dependency>
+				  <groupId>org.bndtools</groupId>
+				  <artifactId>bndtools.api</artifactId>
+				  <version>7.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.bndtools</groupId>
+				  <artifactId>org.bndtools.headless.build.manager</artifactId>
+				  <version>7.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.bndtools</groupId>
+				  <artifactId>org.bndtools.headless.build.plugin.gradle</artifactId>
+				  <version>7.0.0</version>
+				  <type>jar</type>
+			  </dependency>
 			  <dependency>
 				  <groupId>org.bndtools</groupId>
 				  <artifactId>org.bndtools.templates.template</artifactId>
@@ -600,33 +621,18 @@
 				  <version>7.0.0</version>
 				  <type>jar</type>
 			  </dependency>
-				<dependency>
-					<groupId>org.bndtools</groupId>
-					<artifactId>bndtools.api</artifactId>
-					<version>7.0.0</version>
-				</dependency>
-				<dependency>
-					<groupId>org.bndtools</groupId>
-					<artifactId>org.bndtools.headless.build.manager</artifactId>
-					<version>7.0.0</version>
-				</dependency>
-				<dependency>
-					<groupId>org.bndtools</groupId>
-					<artifactId>org.bndtools.versioncontrol.ignores.manager</artifactId>
-					<version>7.0.0</version>
-				</dependency>
-				<dependency>
-					<groupId>org.bndtools</groupId>
-					<artifactId>org.bndtools.headless.build.plugin.gradle</artifactId>
-					<version>7.0.0</version>
-					<type>jar</type>
-				</dependency>
-				<dependency>
-					<groupId>org.bndtools</groupId>
-					<artifactId>org.bndtools.versioncontrol.ignores.plugin.git</artifactId>
-					<version>7.0.0</version>
-					<type>jar</type>
-				</dependency>
+			  <dependency>
+				  <groupId>org.bndtools</groupId>
+				  <artifactId>org.bndtools.versioncontrol.ignores.manager</artifactId>
+				  <version>7.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.bndtools</groupId>
+				  <artifactId>org.bndtools.versioncontrol.ignores.plugin.git</artifactId>
+				  <version>7.0.0</version>
+				  <type>jar</type>
+			  </dependency>
 		  </dependencies>
 	  </location>
 	  <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Apache Felix" missingManifest="error" type="Maven">
diff --git a/report/maven-osgi/platform/updated.target b/report/maven-osgi/platform/updated.target
index e487d30..85986f5 100644
--- a/report/maven-osgi/platform/updated.target
+++ b/report/maven-osgi/platform/updated.target
@@ -54,8 +54,8 @@
 
     <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
        <!-- Check version in "<EMF>/features" directory -->
-      <unit id="org.eclipse.emf.common.feature.group" version="2.31.0.v20231210-0956"/>
-      <unit id="org.eclipse.emf.common.source.feature.group" version="2.31.0.v20231210-0956"/>
+`      <unit id="org.eclipse.emf.common.feature.group" version="2.31.0.v20240314-0928"/>
+      <unit id="org.eclipse.emf.common.source.feature.group" version="2.31.0.v20240314-0928"/>
       <unit id="org.eclipse.emf.ecore.feature.group" version="2.37.0.v20240203-0859"/>
       <unit id="org.eclipse.emf.ecore.source.feature.group" version="2.37.0.v20240203-0859"/>
        <!-- For org.eclipse.ui.tools, and PDE's spy dependencies as of Eclipse 4.22 -->
@@ -66,7 +66,7 @@
       <unit id="org.eclipse.emf.databinding.source.feature.group" version="1.11.0.v20231208-1346"/>
       <unit id="org.eclipse.emf.databinding.edit.feature.group" version="1.11.0.v20231208-1346"/>
       <unit id="org.eclipse.emf.databinding.edit.source.feature.group" version="1.11.0.v20231208-1346"/>
-      <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.37.0"/>
+      <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202404020819"/>
     </location>
 
     <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
@@ -358,31 +358,31 @@
 			  <dependency>
 				  <groupId>org.ow2.asm</groupId>
 				  <artifactId>asm-analysis</artifactId>
-				  <version>9.6</version>
+				  <version>9.7</version>
 				  <type>jar</type>
 			  </dependency>
 			  <dependency>
 				  <groupId>org.ow2.asm</groupId>
 				  <artifactId>asm-commons</artifactId>
-				  <version>9.6</version>
+				  <version>9.7</version>
 				  <type>jar</type>
 			  </dependency>
 			  <dependency>
 				  <groupId>org.ow2.asm</groupId>
 				  <artifactId>asm-tree</artifactId>
-				  <version>9.6</version>
+				  <version>9.7</version>
 				  <type>jar</type>
 			  </dependency>
 			  <dependency>
 				  <groupId>org.ow2.asm</groupId>
 				  <artifactId>asm-util</artifactId>
-				  <version>9.6</version>
+				  <version>9.7</version>
 				  <type>jar</type>
 			  </dependency>
 			  <dependency>
 				  <groupId>org.ow2.asm</groupId>
 				  <artifactId>asm</artifactId>
-				  <version>9.6</version>
+				  <version>9.7</version>
 				  <type>jar</type>
 			  </dependency>
 		  </dependencies>
@@ -401,6 +401,24 @@
 				  <version>1.1.2</version>
 				  <type>jar</type>
 			  </dependency>
+			  <dependency>
+				  <groupId>org.osgi</groupId>
+				  <artifactId>org.osgi.namespace.contract</artifactId>
+				  <version>1.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.osgi</groupId>
+				  <artifactId>org.osgi.namespace.extender</artifactId>
+				  <version>1.0.1</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.osgi</groupId>
+				  <artifactId>org.osgi.namespace.service</artifactId>
+				  <version>1.0.0</version>
+				  <type>jar</type>
+			  </dependency>
 			  <dependency>
 				  <groupId>org.osgi</groupId>
 				  <artifactId>org.osgi.service.cm</artifactId>
@@ -533,21 +551,6 @@
 				  <version>1.0.2</version>
 				  <type>jar</type>
 			  </dependency>
-				<dependency>
-					<groupId>org.osgi</groupId>
-					<artifactId>org.osgi.namespace.service</artifactId>
-					<version>1.0.0</version>
-				</dependency>
-				<dependency>
-					<groupId>org.osgi</groupId>
-					<artifactId>org.osgi.namespace.extender</artifactId>
-					<version>1.0.1</version>
-				</dependency>
-				<dependency>
-					<groupId>org.osgi</groupId>
-					<artifactId>org.osgi.namespace.contract</artifactId>
-					<version>1.0.0</version>
-				</dependency>
 		  </dependencies>
 	  </location>
 	  <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="BND" missingManifest="error" type="Maven">
@@ -588,6 +591,24 @@
 				  <version>7.0.0</version>
 				  <type>jar</type>
 			  </dependency>
+			  <dependency>
+				  <groupId>org.bndtools</groupId>
+				  <artifactId>bndtools.api</artifactId>
+				  <version>7.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.bndtools</groupId>
+				  <artifactId>org.bndtools.headless.build.manager</artifactId>
+				  <version>7.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.bndtools</groupId>
+				  <artifactId>org.bndtools.headless.build.plugin.gradle</artifactId>
+				  <version>7.0.0</version>
+				  <type>jar</type>
+			  </dependency>
 			  <dependency>
 				  <groupId>org.bndtools</groupId>
 				  <artifactId>org.bndtools.templates.template</artifactId>
@@ -600,33 +621,18 @@
 				  <version>7.0.0</version>
 				  <type>jar</type>
 			  </dependency>
-				<dependency>
-					<groupId>org.bndtools</groupId>
-					<artifactId>bndtools.api</artifactId>
-					<version>7.0.0</version>
-				</dependency>
-				<dependency>
-					<groupId>org.bndtools</groupId>
-					<artifactId>org.bndtools.headless.build.manager</artifactId>
-					<version>7.0.0</version>
-				</dependency>
-				<dependency>
-					<groupId>org.bndtools</groupId>
-					<artifactId>org.bndtools.versioncontrol.ignores.manager</artifactId>
-					<version>7.0.0</version>
-				</dependency>
-				<dependency>
-					<groupId>org.bndtools</groupId>
-					<artifactId>org.bndtools.headless.build.plugin.gradle</artifactId>
-					<version>7.0.0</version>
-					<type>jar</type>
-				</dependency>
-				<dependency>
-					<groupId>org.bndtools</groupId>
-					<artifactId>org.bndtools.versioncontrol.ignores.plugin.git</artifactId>
-					<version>7.0.0</version>
-					<type>jar</type>
-				</dependency>
+			  <dependency>
+				  <groupId>org.bndtools</groupId>
+				  <artifactId>org.bndtools.versioncontrol.ignores.manager</artifactId>
+				  <version>7.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.bndtools</groupId>
+				  <artifactId>org.bndtools.versioncontrol.ignores.plugin.git</artifactId>
+				  <version>7.0.0</version>
+				  <type>jar</type>
+			  </dependency>
 		  </dependencies>
 	  </location>
 	  <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Apache Felix" missingManifest="error" type="Maven">
diff --git a/report/maven-osgi/supplement/REPORT.md b/report/maven-osgi/supplement/REPORT.md
index 5d7839d..f198620 100644
--- a/report/maven-osgi/supplement/REPORT.md
+++ b/report/maven-osgi/supplement/REPORT.md
@@ -201,9 +201,9 @@
  - [org.hamcrest](https://repo1.maven.org/maven2/org/hamcrest/)
     - [hamcrest](https://repo1.maven.org/maven2/org/hamcrest/hamcrest/) **[2.2](https://repo1.maven.org/maven2/org/hamcrest/hamcrest/2.2)**
  - [org.jacoco](https://repo1.maven.org/maven2/org/jacoco/)
-    - [org.jacoco.agent](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/) **[0.8.11](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.11)**
-    - [org.jacoco.core](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/) **[0.8.11](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.8.11)**
-    - [org.jacoco.report](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/) **[0.8.11](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.8.11)**
+    - [org.jacoco.agent](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/) **[0.8.12](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.12)**
+    - [org.jacoco.core](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/) **[0.8.12](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.8.12)**
+    - [org.jacoco.report](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/) **[0.8.12](https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.8.12)**
  - [org.json](https://repo1.maven.org/maven2/org/json/)
     - [json](https://repo1.maven.org/maven2/org/json/json/) **[20230227](https://repo1.maven.org/maven2/org/json/json/20230227)**
  - [org.mandas](https://repo1.maven.org/maven2/org/mandas/)
diff --git a/report/maven-osgi/supplement/original.target b/report/maven-osgi/supplement/original.target
index 9c83e91..17095f4 100644
--- a/report/maven-osgi/supplement/original.target
+++ b/report/maven-osgi/supplement/original.target
@@ -559,19 +559,19 @@
         <dependency>
           <groupId>org.jacoco</groupId>
           <artifactId>org.jacoco.agent</artifactId>
-          <version>0.8.11</version>
+          <version>0.8.12</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.jacoco</groupId>
           <artifactId>org.jacoco.core</artifactId>
-          <version>0.8.11</version>
+          <version>0.8.12</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.jacoco</groupId>
           <artifactId>org.jacoco.report</artifactId>
-          <version>0.8.11</version>
+          <version>0.8.12</version>
           <type>jar</type>
         </dependency>
         <dependency>
diff --git a/report/maven-osgi/supplement/updated.target b/report/maven-osgi/supplement/updated.target
index 9c83e91..17095f4 100644
--- a/report/maven-osgi/supplement/updated.target
+++ b/report/maven-osgi/supplement/updated.target
@@ -559,19 +559,19 @@
         <dependency>
           <groupId>org.jacoco</groupId>
           <artifactId>org.jacoco.agent</artifactId>
-          <version>0.8.11</version>
+          <version>0.8.12</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.jacoco</groupId>
           <artifactId>org.jacoco.core</artifactId>
-          <version>0.8.11</version>
+          <version>0.8.12</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.jacoco</groupId>
           <artifactId>org.jacoco.report</artifactId>
-          <version>0.8.11</version>
+          <version>0.8.12</version>
           <type>jar</type>
         </dependency>
         <dependency>