diff --git a/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF b/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF
index 94573932..f126d643 100644
--- a/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF
@@ -22,13 +22,9 @@ Export-Package: org.eclipse.glsp.example.workflow,
  org.eclipse.glsp.example.workflow.wfgraph.util
 Automatic-Module-Name: org.eclipse.glsp.example.workflow
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
- org.apache.commons.cli;bundle-version="1.9.0",
- org.eclipse.emf.common;bundle-version="2.31.0",
- org.eclipse.glsp.layout;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.glsp.graph;bundle-version="2.3.0",
- org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.glsp.server.websocket;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: org.eclipse.glsp.layout;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.glsp.server;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.glsp.server.websocket;bundle-version="[2.3.0,3.0.0)",
  org.eclipse.elk.alg.layered;bundle-version="0.8.1",
  org.eclipse.elk.core;bundle-version="0.8.1",
  org.eclipse.elk.graph;bundle-version="0.8.1"
diff --git a/examples/org.eclipse.glsp.example.workflow/pom.xml b/examples/org.eclipse.glsp.example.workflow/pom.xml
index 3645fb11..6e318ba7 100644
--- a/examples/org.eclipse.glsp.example.workflow/pom.xml
+++ b/examples/org.eclipse.glsp.example.workflow/pom.xml
@@ -139,7 +139,6 @@
 							</transformers>
 							<artifactSet>
 								<excludes>
-									<exclude>jakarta.websocket:jakarta.websocket-api</exclude>
 									<exclude>log4j:log4j</exclude>
 								</excludes>
 							</artifactSet>
diff --git a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF
index 334f5d6b..df64ffe7 100644
--- a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@ Bundle-Version: 2.3.0.qualifier
 Bundle-Vendor: Eclipse GLSP
 Automatic-Module-Name: org.eclipse.glsp.graph
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.emf.common;bundle-version="2.31.0",
- org.eclipse.emf.ecore;bundle-version="2.37.0",
- com.google.gson;bundle-version="2.11.0"
+Require-Bundle: org.eclipse.emf.common;bundle-version="2.29.0",
+ org.eclipse.emf.ecore;bundle-version="2.35.0";visibility:=reexport,
+ com.google.gson;bundle-version="2.10.1"
 Export-Package: org.eclipse.glsp.graph,
  org.eclipse.glsp.graph,
  org.eclipse.glsp.graph.builder,
diff --git a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF
index 35847f0d..3cb8f5f6 100644
--- a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF
@@ -7,10 +7,9 @@ Bundle-Vendor: EclispeSource
 Automatic-Module-Name: org.eclipse.glsp.layout
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
- org.apache.commons.cli;bundle-version="1.9.0",
- org.eclipse.emf.common;bundle-version="2.31.0",
+ org.apache.commons.cli;bundle-version="1.6.0",
+ org.eclipse.emf.common;bundle-version="2.29.0",
  org.eclipse.elk.core;bundle-version="0.8.1",
  org.eclipse.elk.graph;bundle-version="0.8.1",
- org.eclipse.glsp.graph;bundle-version="2.3.0",
- org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.glsp.server;bundle-version="[2.3.0,3.0.0)"
 Export-Package: org.eclipse.glsp.layout
diff --git a/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF
index 874a89f9..f31dce45 100644
--- a/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF
@@ -8,12 +8,10 @@ Bundle-Vendor: Eclipse GLSP
 Bundle-Localization: plugin
 Automatic-Module-Name: org.eclipse.glsp.example.emf
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
+Require-Bundle: org.eclipse.glsp.server;bundle-version="[2.3.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="2.25.0",
  org.eclipse.emf.ecore.edit;bundle-version="2.13.0",
- org.eclipse.emf.ecore.xmi;bundle-version="2.16.0",
- org.eclipse.glsp.graph;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.emf.ecore.xmi;bundle-version="2.16.0"
 Export-Package: 
  org.eclipse.glsp.server.emf,
  org.eclipse.glsp.server.emf.idgen,
diff --git a/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF
index 1297ec13..1a5323f0 100644
--- a/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF
@@ -6,24 +6,30 @@ Bundle-Version: 2.3.0.qualifier
 Bundle-Vendor: Eclipse GLSP
 Automatic-Module-Name: com.eclipsesource.glps.server.websocket
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: com.google.gson;bundle-version="2.8.7",
- com.google.inject;bundle-version="[7.0.0,8.0.0)",
- org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0]",
- org.eclipse.jetty.ee10.servlet;bundle-version="12.0.12",
- org.eclipse.jetty.ee10.websocket.jakarta.server;bundle-version="12.0.12",
- org.eclipse.jetty.ee10.websocket.server;bundle-version="12.0.12",
- org.eclipse.jetty.ee8.server;bundle-version="12.0.12",
- org.eclipse.jetty.server;bundle-version="12.0.12",
- org.eclipse.jetty.session;bundle-version="12.0.12",
- org.eclipse.jetty.util;bundle-version="12.0.12",
- org.eclipse.jetty.websocket.api;bundle-version="12.0.12",
- org.eclipse.lsp4j;bundle-version="0.11.0",
- org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0",
- org.eclipse.lsp4j.websocket.jakarta;bundle-version="0.23.1"
+Require-Bundle: com.google.gson;bundle-version="2.10.1",
+ org.eclipse.glsp.server;bundle-version="[2.3.0,3.0.0]",
+ org.eclipse.lsp4j;bundle-version="0.21.0",
+ org.eclipse.lsp4j.jsonrpc;bundle-version="0.21.0",
+ org.eclipse.lsp4j.websocket.jakarta;bundle-version="0.21.0",
+ org.eclipse.jetty.ee10.servlet;bundle-version="12.0.0",
+ org.eclipse.jetty.ee10.websocket.jakarta.server;bundle-version="12.0.0",
+ org.eclipse.jetty.ee10.websocket.server;bundle-version="12.0.0",
+ org.eclipse.jetty.server;bundle-version="12.0.0",
+ org.eclipse.jetty.session;bundle-version="12.0.0",
+ org.eclipse.jetty.util;bundle-version="12.0.0",
+ org.eclipse.jetty.websocket.api;bundle-version="12.0.0",
+ org.eclipse.jetty.http;bundle-version="12.0.0",
+ org.eclipse.jetty.io;bundle-version="12.0.0",
+ org.eclipse.jetty.ee10.websocket.jakarta.client;bundle-version="12.0.0",
+ org.eclipse.jetty.ee10.websocket.jakarta.common;bundle-version="12.0.0",
+ org.eclipse.jetty.websocket.core.server;bundle-version="12.0.0",
+ org.eclipse.jetty.ee10.websocket.servlet;bundle-version="12.0.0",
+ org.eclipse.jetty.websocket.core.common;bundle-version="12.0.0",
+ org.eclipse.jetty.security;bundle-version="12.0.0"
 Export-Package: org.eclipse.glsp.server.websocket
-Import-Package: jakarta.servlet;version="[6.1.0,7.0.0)",
- jakarta.websocket;version="[2.2.0,3.0.0)",
- jakarta.websocket.server;version="[2.2.0,3.0.0)",
+Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)",
+ jakarta.websocket;version="[2.0.0,3.0.0)",
+ jakarta.websocket.server;version="[2.0.0,3.0.0)",
  org.apache.logging.log4j;version="2.17.1",
  org.apache.logging.log4j.core.config;version="2.17.1",
  org.apache.logging.slf4j;version="2.17.1"
diff --git a/plugins/org.eclipse.glsp.server.websocket/pom.xml b/plugins/org.eclipse.glsp.server.websocket/pom.xml
index aff3d703..2b14cade 100644
--- a/plugins/org.eclipse.glsp.server.websocket/pom.xml
+++ b/plugins/org.eclipse.glsp.server.websocket/pom.xml
@@ -48,13 +48,13 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.jetty.websocket</groupId>
-			<artifactId>websocket-javax-server</artifactId>
+			<groupId>org.eclipse.jetty.ee10.websocket</groupId>
+			<artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
 			<version>${jetty.websocket.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.lsp4j</groupId>
-			<artifactId>org.eclipse.lsp4j.websocket</artifactId>
+			<artifactId>org.eclipse.lsp4j.websocket.jakarta</artifactId>
 			<version>${lsp4j.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF
index 85b6bc20..d13cde77 100644
--- a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF
@@ -6,13 +6,13 @@ Bundle-Version: 2.3.0.qualifier
 Bundle-Vendor: Eclipse GLSP
 Automatic-Module-Name: org.eclipse.glsp.server
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
- com.google.gson;bundle-version="2.11.0",
- org.apache.commons.cli;bundle-version="1.9.0",
- org.eclipse.emf.ecore.change;bundle-version="2.17.0",
- org.eclipse.glsp.graph;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.lsp4j;bundle-version="0.23.1",
- org.eclipse.lsp4j.jsonrpc;bundle-version="0.23.1"
+Require-Bundle: org.eclipse.emf.ecore.change;bundle-version="2.15.0",
+ com.google.gson;bundle-version="2.10.1",
+ org.eclipse.lsp4j;bundle-version="0.21.0",
+ org.eclipse.lsp4j.jsonrpc;bundle-version="0.21.0",
+ org.apache.commons.cli;bundle-version="1.6.0";visibility:=reexport,
+ com.google.inject;bundle-version="[7.0.0,8.0.0)";visibility:=reexport,
+ org.eclipse.glsp.graph;bundle-version="[2.3.0,3.0.0)";visibility:=reexport
 Export-Package: org.eclipse.glsp.server.actions,
  org.eclipse.glsp.server.di,
  org.eclipse.glsp.server.di.scope,
diff --git a/pom.xml b/pom.xml
index ea5e47fd..e064f09d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,26 +58,24 @@
 		<maven.shade.version>3.6.0</maven.shade.version>
 		<maven.source.version>3.3.1</maven.source.version>
 		<maven.surefire.version>3.3.1</maven.surefire.version>
-		<puppycrawl.checkstyle.version>10.17.0</puppycrawl.checkstyle.version>
 		<tycho.version>4.0.8</tycho.version>
 		<versions.maven.version>2.17.1</versions.maven.version>
 
 		<!-- Dependency Versions: Version of dependencies provided by the target 
 			platform in ,2. We try to match the p2-version if possible. -->
-		<apache.logging.log4j.version>[2.19.0,2.23.1]</apache.logging.log4j.version>
+		<apache.logging.log4j.version>[2.19.0,2.24.2]</apache.logging.log4j.version>
 		<commons.cli.version>[1.4,)</commons.cli.version>
 		<elk.version>0.8.1</elk.version>
-		<emf.common.version>[2.23.0,)</emf.common.version>
+		<emf.common.version>[2.29.0,)</emf.common.version>
 		<emf.ecore.change.version>[2.14.0,)</emf.ecore.change.version>
-		<emf.ecore.edit.version>[2.13.0,)</emf.ecore.edit.version>
-		<emf.ecore.version>[2.25.0,)</emf.ecore.version>
-		<emf.ecore.xmi.version>2.16.0</emf.ecore.xmi.version>
-		<emfjson.jackson.version>2.0.0</emfjson.jackson.version>
+		<emf.ecore.edit.version>[2.14.0,)</emf.ecore.edit.version>
+		<emf.ecore.version>[2.35.0,)</emf.ecore.version>
+		<emf.ecore.xmi.version>[2.35.0,)</emf.ecore.xmi.version>
 		<google.guice.version>[7.0.0,)</google.guice.version>
-		<google.gson.version>[2.8.7,)</google.gson.version>
+		<google.gson.version>[2.10.1,)</google.gson.version>
 		<junit.jupiter.engine.version>[5.7.1,6.0.0)</junit.jupiter.engine.version>
-		<lsp4j.version>[0.23.1,)</lsp4j.version>
-		<jetty.websocket.version>[10.0.12,)</jetty.websocket.version>
+		<lsp4j.version>[0.21.0,)</lsp4j.version>
+		<jetty.websocket.version>[12.0.3,)</jetty.websocket.version>
 
 
 		<!-- Release Dependencies for M2 -->
@@ -118,7 +116,7 @@
 
 			<properties>
 				<!-- Maven Plugin Versions: General maven plugin versions -->
-
+				<p2.target>r2024-09</p2.target>
 			</properties>
 
 			<modules>
@@ -233,7 +231,7 @@
 								<artifact>
 									<groupId>org.eclipse.glsp</groupId>
 									<artifactId>org.eclipse.glsp.parent</artifactId>
-									<classifier>targetplatforms/r2024-09</classifier>
+									<classifier>targetplatforms/${p2.target}</classifier>
 									<version>${project.version}</version>
 								</artifact>
 							</target>
diff --git a/releng/org.eclipse.glsp.feature/feature.xml b/releng/org.eclipse.glsp.feature/feature.xml
index 494eee3d..4d324d38 100644
--- a/releng/org.eclipse.glsp.feature/feature.xml
+++ b/releng/org.eclipse.glsp.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.glsp.feature"
-      label="GLSP SDK"
+      label="GLSP SDK (Core)"
       version="2.3.0.qualifier"
       provider-name="Eclipse GLSP">
 
@@ -312,17 +312,17 @@ version(s), and exceptions or additional permissions here}.&quot;
    </url>
 
    <requires>
-      <import plugin="org.eclipse.emf.ecore.change" version="2.14.0" match="greaterOrEqual"/>
-      <import plugin="com.google.gson" version="2.8.7" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.lsp4j" version="0.23.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.lsp4j.jsonrpc" version="0.23.1" match="greaterOrEqual"/>
-      <import plugin="org.apache.commons.cli" version="1.4.0" match="greaterOrEqual"/>
+      <import plugin="com.google.gson" version="2.10.1" match="greaterOrEqual"/>
       <import plugin="com.google.inject" version="5.0.1" match="greaterOrEqual"/>
+      <import plugin="jakarta.inject.jakarta.inject-api"/>
+      <import plugin="org.apache.commons.cli" version="1.4.0" match="greaterOrEqual"/>
       <import plugin="org.apache.logging.log4j.api"/>
       <import plugin="org.apache.logging.log4j.core"/>
       <import plugin="org.eclipse.emf.common" version="2.23.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore" version="2.25.0" match="greaterOrEqual"/>
-      <import plugin="jakarta.inject.jakarta.inject-api"/>
+      <import plugin="org.eclipse.emf.ecore.change" version="2.14.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.lsp4j" version="0.21.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.lsp4j.jsonrpc" version="0.21.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/releng/org.eclipse.glsp.repository/category.xml b/releng/org.eclipse.glsp.repository/category.xml
index e715ca37..e241bedf 100644
--- a/releng/org.eclipse.glsp.repository/category.xml
+++ b/releng/org.eclipse.glsp.repository/category.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
+   <stats location="https://download.eclipse.org/stats/">
+      <feature url="features/org.eclipse.glsp.feature_2.3.0.qualifier.jar" id="org.eclipse.glsp.feature" version="2.3.0.qualifier"/>
+   </stats>
    <feature id="org.eclipse.glsp.feature">
       <category name="org.eclipse.glsp"/>
    </feature>
@@ -36,28 +39,13 @@
    <bundle id="org.apache.logging.log4j.core">
       <category name="org.eclipse.glsp.dependencies"/>
    </bundle>
-   <bundle id="org.apache.logging.log4j.slf4j2-impl">
+   <bundle id="org.apache.logging.log4j.slf4j2.impl">
       <category name="org.eclipse.glsp.dependencies"/>
    </bundle>
-   <bundle id="slf4j.api">
+   <bundle id="org.apache.logging.log4j.1.2.api">
       <category name="org.eclipse.glsp.dependencies"/>
    </bundle>
-   <bundle id="org.apache.aries.spifly.dynamic.bundle">
-      <category name="org.eclipse.glsp.dependencies"/>
-   </bundle>
-   <bundle id="org.objectweb.asm">
-      <category name="org.eclipse.glsp.dependencies"/>
-   </bundle>
-   <bundle id="org.objectweb.asm.commons">
-      <category name="org.eclipse.glsp.dependencies"/>
-   </bundle>
-   <bundle id="org.objectweb.asm.tree">
-      <category name="org.eclipse.glsp.dependencies"/>
-   </bundle>
-   <bundle id="org.objectweb.asm.tree.analysis">
-      <category name="org.eclipse.glsp.dependencies"/>
-   </bundle>
-   <bundle id="org.objectweb.asm.util">
+   <bundle id="org.apache.logging.log4j.to.slf4j">
       <category name="org.eclipse.glsp.dependencies"/>
    </bundle>
    <category-def name="org.eclipse.glsp" label="Eclipse GLSP"/>
@@ -67,6 +55,7 @@
       </description>
    </category-def>
    <category-def name="org.eclipse.glsp.dependencies" label="External Dependencies"/>
-   <repository-reference location="mvn:org.eclipse.jetty:jetty-p2:10.0.13:zip:p2site" enabled="true" />
-   <repository-reference location="https://download.eclipse.org/elk/updates/releases/0.8.1/" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/elk/updates/releases/0.9.1/" name="ELK 0.9.1" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.12" name="Orbit- Jetty 12.0.12" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09" name="Orbit- Aggreation 24-09" enabled="true" />
 </site>
diff --git a/targetplatforms/.settings/org.eclipse.core.resources.prefs b/targetplatforms/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c02..00000000
--- a/targetplatforms/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/targetplatforms/maven-dependencies.tpd b/targetplatforms/maven-dependencies.tpd
index 016f71ad..95a131a9 100644
--- a/targetplatforms/maven-dependencies.tpd
+++ b/targetplatforms/maven-dependencies.tpd
@@ -1,5 +1,3 @@
-// Provides the jetty websocket artifacts from maven as a feature
-
 target "Wrapper for maven dependencies"
 
 
@@ -7,33 +5,30 @@ maven log4j scope=compile dependencyDepth=none missingManifest=generate {
 	dependency {
 		groupId="org.apache.logging.log4j"
 		artifactId="log4j-slf4j2-impl"
-		version="2.19.0"
+		version="2.23.1"
 	}
 	dependency {
 		groupId="org.apache.logging.log4j"
 		artifactId="log4j-core"
-		version="2.19.0"
+		version="2.23.1"
 	}
 	dependency {
 		groupId="org.apache.logging.log4j"
 		artifactId="log4j-api"
-		version="2.19.0"
+		version="2.23.1"
 	}
-}
-
-maven slf4j scope=compile dependencyDepth=none missingManifest=generate {
 	dependency {
-		groupId="org.slf4j"
-		artifactId="slf4j-api"
-		version="2.0.0"
+		groupId="org.apache.logging.log4j"
+		artifactId="log4j-1.2-api"
+		version="2.23.1"
 	}
-}
-
-maven spifly scope=compile,test dependencyDepth=infinite missingManifest=generate {
 	dependency {
-		groupId="org.apache.aries.spifly"
-		artifactId="org.apache.aries.spifly.dynamic.bundle"
-		version="1.3.6"
+		groupId="org.apache.logging.log4j"
+		artifactId="log4j-to-slf4j"
+		version="2.23.1"
 	}
 }
 
+
+
+
diff --git a/targetplatforms/r2021-09_minimum-baseline.target b/targetplatforms/r2021-09_minimum-baseline.target
deleted file mode 100644
index bcd45471..00000000
--- a/targetplatforms/r2021-09_minimum-baseline.target
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="2021-09 - Minimum Baseline" sequenceNumber="1724771695">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.27.0.v20210816-1137"/>
-      <unit id="org.eclipse.lsp4j" version="0.12.0.v20210402-1305"/>
-      <unit id="org.eclipse.lsp4j.websocket" version="0.12.0.v20210402-1305"/>
-      <unit id="org.apache.commons.cli" version="1.4.0.v20200417-1444"/>
-      <unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
-      <repository location="http://download.eclipse.org/releases/2021-09"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.junit.jupiter.api" version="5.7.1.v20210222-1948"/>
-      <unit id="com.google.inject" version="5.0.1.v20210324-2015"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.core" version="0.8.1"/>
-      <unit id="org.eclipse.elk.graph" version="0.8.1"/>
-      <unit id="org.eclipse.elk.graph.text" version="0.8.1"/>
-      <unit id="org.eclipse.elk.alg.layered" version="0.8.1"/>
-      <repository location="https://download.eclipse.org/elk/updates/releases/0.8.1/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.websocket.javax.server" version="10.0.13"/>
-      <repository location="mvn:org.eclipse.jetty:jetty-p2:10.0.13:zip:p2site"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="javax.websocket" version="1.1.0.20180730"/>
-      <repository location="https://download.eclipse.org/gemini/updates/web/3.0.4"/>
-    </location>
-    <location includeDependencyDepth="infinite" includeDependencyScopes="compile,test" includeSource="false" missingManifest="generate" type="Maven" label="spifly">
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.aries.spifly</groupId>
-          <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
-          <version>1.3.6</version>
-          <type>jar</type>
-        </dependency>
-      </dependencies>
-    </location>
-    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="false" missingManifest="generate" type="Maven" label="slf4j">
-      <dependencies>
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-          <version>2.0.0</version>
-          <type>jar</type>
-        </dependency>
-      </dependencies>
-    </location>
-    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="false" missingManifest="generate" type="Maven" label="log4j">
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-slf4j2-impl</artifactId>
-          <version>2.19.0</version>
-          <type>jar</type>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-          <version>2.19.0</version>
-          <type>jar</type>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-api</artifactId>
-          <version>2.19.0</version>
-          <type>jar</type>
-        </dependency>
-      </dependencies>
-    </location>
-  </locations>
-</target>
diff --git a/targetplatforms/r2021-09_minimum-baseline.tpd b/targetplatforms/r2021-09_minimum-baseline.tpd
deleted file mode 100644
index 3d19995d..00000000
--- a/targetplatforms/r2021-09_minimum-baseline.tpd
+++ /dev/null
@@ -1,32 +0,0 @@
-
-target "2021-09 - Minimum Baseline" with source requirements
-include "maven-dependencies.tpd"
-
-location "http://download.eclipse.org/releases/2021-09" {
-	org.eclipse.emf.sdk.feature.group
-	org.eclipse.lsp4j [0.11.0,1.0.0)
-	org.eclipse.lsp4j.websocket [0.11.0,1.0.0)
-	org.apache.commons.cli [1.4.0,2.0.0)
-	com.google.gson [2.8.7,3.0.0)
-}
-
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/" {
-	org.junit [4.12.0,4.13.0)
-	org.junit.jupiter.api [5.7.1,6.0.0)
-	com.google.inject [5.0.1,5.0.2)
-}
-
-location "https://download.eclipse.org/elk/updates/releases/0.8.1/" {
-	org.eclipse.elk.core
-	org.eclipse.elk.graph
-	org.eclipse.elk.graph.text
-	org.eclipse.elk.alg.layered
-}
-
-location "mvn:org.eclipse.jetty:jetty-p2:10.0.13:zip:p2site" {
-	org.eclipse.jetty.websocket.javax.server
-}
-
-location "https://download.eclipse.org/gemini/updates/web/3.0.4" {
-	javax.websocket
-}
\ No newline at end of file
diff --git a/targetplatforms/r2022-12.target b/targetplatforms/r2022-12.target
deleted file mode 100644
index 4738871e..00000000
--- a/targetplatforms/r2022-12.target
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="2022-12 - Default" sequenceNumber="1724771670">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.32.0.v20221121-1400"/>
-      <unit id="org.eclipse.lsp4j" version="0.19.0.v20221118-0359"/>
-      <unit id="org.eclipse.lsp4j.websocket" version="0.19.0.v20221118-0359"/>
-      <unit id="org.apache.commons.cli" version="1.4.0.v20221112-0806"/>
-      <unit id="com.google.gson" version="2.9.1.v20220915-1632"/>
-      <unit id="com.google.inject" version="5.0.1.v20221112-0806"/>
-      <repository location="http://download.eclipse.org/releases/2022-12"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.junit" version="4.13.2.v20211018-1956"/>
-      <unit id="org.junit.jupiter.api" version="5.9.1.v20221103-2317"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.core" version="0.8.1"/>
-      <unit id="org.eclipse.elk.graph" version="0.8.1"/>
-      <unit id="org.eclipse.elk.graph.text" version="0.8.1"/>
-      <unit id="org.eclipse.elk.alg.layered" version="0.8.1"/>
-      <repository location="https://download.eclipse.org/elk/updates/releases/0.8.1/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.websocket.javax.server" version="10.0.13"/>
-      <repository location="mvn:org.eclipse.jetty:jetty-p2:10.0.13:zip:p2site"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="javax.websocket" version="1.1.0.20180730"/>
-      <repository location="https://download.eclipse.org/gemini/updates/web/3.0.4"/>
-    </location>
-    <location includeDependencyDepth="infinite" includeDependencyScopes="compile,test" includeSource="false" missingManifest="generate" type="Maven" label="spifly">
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.aries.spifly</groupId>
-          <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
-          <version>1.3.6</version>
-          <type>jar</type>
-        </dependency>
-      </dependencies>
-    </location>
-    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="false" missingManifest="generate" type="Maven" label="slf4j">
-      <dependencies>
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-          <version>2.0.0</version>
-          <type>jar</type>
-        </dependency>
-      </dependencies>
-    </location>
-    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="false" missingManifest="generate" type="Maven" label="log4j">
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-slf4j2-impl</artifactId>
-          <version>2.19.0</version>
-          <type>jar</type>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-          <version>2.19.0</version>
-          <type>jar</type>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-api</artifactId>
-          <version>2.19.0</version>
-          <type>jar</type>
-        </dependency>
-      </dependencies>
-    </location>
-  </locations>
-</target>
diff --git a/targetplatforms/r2022-12.tpd b/targetplatforms/r2022-12.tpd
deleted file mode 100644
index cd04b85f..00000000
--- a/targetplatforms/r2022-12.tpd
+++ /dev/null
@@ -1,32 +0,0 @@
-
-target "2022-12 - Default" with source requirements
-include "maven-dependencies.tpd"
-
-location "http://download.eclipse.org/releases/2022-12" {
-	org.eclipse.emf.sdk.feature.group 
-	org.eclipse.lsp4j [0.19.0,1.0.0)
-	org.eclipse.lsp4j.websocket [0.19.0,1.0.0)
-	org.apache.commons.cli [1.4.0,2.0.0)
-	com.google.gson[2.8.7,3.0.0)
-	com.google.inject [5.0.1,5.0.2)
-}
-
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/" {
-	org.junit [4.13.2,5.0.0)
-	org.junit.jupiter.api [5.8.1,6.0.0)
-}
-
-location "https://download.eclipse.org/elk/updates/releases/0.8.1/" {
-	org.eclipse.elk.core
-	org.eclipse.elk.graph
-	org.eclipse.elk.graph.text
-	org.eclipse.elk.alg.layered
-}
-
-location "mvn:org.eclipse.jetty:jetty-p2:10.0.13:zip:p2site" {
-	org.eclipse.jetty.websocket.javax.server
-}
-
-location "https://download.eclipse.org/gemini/updates/web/3.0.4" {
-	javax.websocket
-}
\ No newline at end of file
diff --git a/targetplatforms/r2023-09.target b/targetplatforms/r2023-09.target
deleted file mode 100644
index 4a41da80..00000000
--- a/targetplatforms/r2023-09.target
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="2023-09 - Default" sequenceNumber="1724771625">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.35.0.v20230829-0934"/>
-      <unit id="org.eclipse.lsp4j" version="0.21.1.v20230829-0012"/>
-      <unit id="org.eclipse.lsp4j.websocket" version="0.21.1.v20230829-0012"/>
-      <unit id="org.apache.commons.cli" version="1.5.0"/>
-      <unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
-      <unit id="com.google.inject" version="7.0.0"/>
-      <unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
-      <repository location="http://download.eclipse.org/releases/2023-09"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.junit" version="4.13.2.v20211018-1956"/>
-      <unit id="org.junit.jupiter.api" version="5.9.1.v20221103-2317"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.core" version="0.8.1"/>
-      <unit id="org.eclipse.elk.graph" version="0.8.1"/>
-      <unit id="org.eclipse.elk.graph.text" version="0.8.1"/>
-      <unit id="org.eclipse.elk.alg.layered" version="0.8.1"/>
-      <repository location="https://download.eclipse.org/elk/updates/releases/0.8.1/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.websocket.javax.server" version="10.0.13"/>
-      <repository location="mvn:org.eclipse.jetty:jetty-p2:10.0.13:zip:p2site"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="javax.websocket" version="1.1.0.20180730"/>
-      <repository location="https://download.eclipse.org/gemini/updates/web/3.0.4"/>
-    </location>
-    <location includeDependencyDepth="infinite" includeDependencyScopes="compile,test" includeSource="false" missingManifest="generate" type="Maven" label="spifly">
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.aries.spifly</groupId>
-          <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
-          <version>1.3.6</version>
-          <type>jar</type>
-        </dependency>
-      </dependencies>
-    </location>
-    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="false" missingManifest="generate" type="Maven" label="slf4j">
-      <dependencies>
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-          <version>2.0.0</version>
-          <type>jar</type>
-        </dependency>
-      </dependencies>
-    </location>
-    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="false" missingManifest="generate" type="Maven" label="log4j">
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-slf4j2-impl</artifactId>
-          <version>2.19.0</version>
-          <type>jar</type>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-          <version>2.19.0</version>
-          <type>jar</type>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-api</artifactId>
-          <version>2.19.0</version>
-          <type>jar</type>
-        </dependency>
-      </dependencies>
-    </location>
-  </locations>
-</target>
diff --git a/targetplatforms/r2023-09.tpd b/targetplatforms/r2023-09.tpd
deleted file mode 100644
index f8567b99..00000000
--- a/targetplatforms/r2023-09.tpd
+++ /dev/null
@@ -1,33 +0,0 @@
-
-target "2023-09 - Default" with source requirements
-include "maven-dependencies.tpd"
-
-location "http://download.eclipse.org/releases/2023-09" {
-	org.eclipse.emf.sdk.feature.group 
-	org.eclipse.lsp4j [0.19.0,1.0.0)
-	org.eclipse.lsp4j.websocket [0.19.0,1.0.0)
-	org.apache.commons.cli [1.4.0,2.0.0)
-	com.google.gson[2.8.7,3.0.0)
-	com.google.inject [7.0.0,8.0.0)
-	jakarta.inject.jakarta.inject-api [2.0.1,3.0.0)
-}
-
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/" {
-	org.junit [4.13.2,5.0.0)
-	org.junit.jupiter.api [5.8.1,6.0.0)
-}
-
-location "https://download.eclipse.org/elk/updates/releases/0.8.1/" {
-	org.eclipse.elk.core
-	org.eclipse.elk.graph
-	org.eclipse.elk.graph.text
-	org.eclipse.elk.alg.layered
-}
-
-location "mvn:org.eclipse.jetty:jetty-p2:10.0.13:zip:p2site" {
-	org.eclipse.jetty.websocket.javax.server
-}
-
-location "https://download.eclipse.org/gemini/updates/web/3.0.4" {
-	javax.websocket
-}
\ No newline at end of file
diff --git a/targetplatforms/r2023-12.target b/targetplatforms/r2023-12.target
new file mode 100644
index 00000000..350b8c00
--- /dev/null
+++ b/targetplatforms/r2023-12.target
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="2023-12 - Minimum Baseline" sequenceNumber="1733276282">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/>
+      <unit id="org.eclipse.lsp4j" version="0.21.1.v20230829-0012"/>
+      <unit id="org.eclipse.lsp4j.websocket.jakarta" version="0.21.1.v20230829-0012"/>
+      <unit id="org.apache.commons.cli" version="1.6.0"/>
+      <unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
+      <repository location="http://download.eclipse.org/releases/2023-12"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.junit" version="4.13.2.v20230809-1000"/>
+      <unit id="junit-jupiter-api" version="5.10.1"/>
+      <unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
+      <unit id="jakarta.servlet-api" version="4.0.0"/>
+      <unit id="jakarta.websocket-api" version="2.1.1"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.elk.core" version="0.0.0"/>
+      <unit id="org.eclipse.elk.graph" version="0.0.0"/>
+      <unit id="org.eclipse.elk.graph.text" version="0.0.0"/>
+      <unit id="org.eclipse.elk.alg.layered" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/elk/updates/releases/0.9.1/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.jetty.ee10.websocket.jakarta.server" version="0.0.0"/>
+      <unit id="org.eclipse.jetty.ee10.websocket.server" version="0.0.0"/>
+      <unit id="org.eclipse.jetty.websocket.api" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.3"/>
+    </location>
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="false" missingManifest="generate" type="Maven" label="log4j">
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-slf4j2-impl</artifactId>
+          <version>2.23.1</version>
+          <type>jar</type>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-core</artifactId>
+          <version>2.23.1</version>
+          <type>jar</type>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-api</artifactId>
+          <version>2.23.1</version>
+          <type>jar</type>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-1.2-api</artifactId>
+          <version>2.23.1</version>
+          <type>jar</type>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-to-slf4j</artifactId>
+          <version>2.23.1</version>
+          <type>jar</type>
+        </dependency>
+      </dependencies>
+    </location>
+  </locations>
+</target>
diff --git a/targetplatforms/r2023-12.tpd b/targetplatforms/r2023-12.tpd
new file mode 100644
index 00000000..ceccac73
--- /dev/null
+++ b/targetplatforms/r2023-12.tpd
@@ -0,0 +1,34 @@
+
+target "2023-12 - Minimum Baseline" with source requirements
+include "maven-dependencies.tpd"
+
+location "http://download.eclipse.org/releases/2023-12" {
+	org.eclipse.emf.sdk.feature.group 
+	org.eclipse.lsp4j [0.21.1,1.0.0)
+	org.eclipse.lsp4j.websocket.jakarta [0.21.1,1.0.0)
+	org.apache.commons.cli [1.6.0,2.0.0)
+	com.google.gson [2.10.1,3.0.0)
+}
+
+location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12" {
+	org.junit [4.13.2,5.0.0)
+	junit-jupiter-api [5.10.1,6.0.0)
+	jakarta.inject.jakarta.inject-api [2.0.1,3.0.0)
+	jakarta.servlet-api [4.0.0,5.0.0)
+	jakarta.websocket-api
+}
+
+location "http://download.eclipse.org/elk/updates/releases/0.9.1/" {
+	org.eclipse.elk.core lazy
+	org.eclipse.elk.graph lazy
+	org.eclipse.elk.graph.text lazy 
+	org.eclipse.elk.alg.layered lazy
+}
+
+location "https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.3" {
+	org.eclipse.jetty.ee10.websocket.jakarta.server lazy
+	org.eclipse.jetty.ee10.websocket.server lazy
+	org.eclipse.jetty.websocket.api lazy
+	
+}
+
diff --git a/targetplatforms/r2024-09.target b/targetplatforms/r2024-09.target
index a9c350b9..75cd72ba 100644
--- a/targetplatforms/r2024-09.target
+++ b/targetplatforms/r2024-09.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="2024-09 - Default" sequenceNumber="1731105528">
+<target name="2024-09 - Default" sequenceNumber="1733275570">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.sdk.feature.group" version="2.39.0.v20240731-0952"/>
@@ -9,102 +9,58 @@
       <unit id="org.eclipse.lsp4j.websocket.jakarta" version="0.23.1.v20240521-1815"/>
       <unit id="org.apache.commons.cli" version="1.9.0"/>
       <unit id="com.google.gson" version="2.11.0"/>
-      <unit id="com.google.inject" version="7.0.0"/>
-      <unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
       <repository location="http://download.eclipse.org/releases/2024-09"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.junit" version="4.13.2.v20211018-1956"/>
-      <unit id="org.junit.jupiter.api" version="5.9.1.v20221103-2317"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/"/>
+      <unit id="org.junit" version="4.13.2.v20230809-1000"/>
+      <unit id="junit-jupiter-api" version="5.11.0"/>
+      <unit id="slf4j.api" version="2.0.16"/>
+      <unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.core" version="0.9.1"/>
-      <unit id="org.eclipse.elk.graph" version="0.9.1"/>
-      <unit id="org.eclipse.elk.graph.text" version="0.9.1"/>
-      <unit id="org.eclipse.elk.alg.layered" version="0.9.1"/>
+      <unit id="org.eclipse.elk.core" version="0.0.0"/>
+      <unit id="org.eclipse.elk.graph" version="0.0.0"/>
+      <unit id="org.eclipse.elk.graph.text" version="0.0.0"/>
+      <unit id="org.eclipse.elk.alg.layered" version="0.0.0"/>
       <repository location="http://download.eclipse.org/elk/updates/releases/0.9.1/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.alpn.client" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.client" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.ee" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.ee8.server" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.ee10.servlet" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.ee10.webapp" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.ee10.websocket.jakarta.client" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.ee10.websocket.jakarta.common" version="12.0.12"/>
       <unit id="org.eclipse.jetty.ee10.websocket.jakarta.server" version="12.0.12"/>
       <unit id="org.eclipse.jetty.ee10.websocket.server" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.ee10.websocket.servlet" version="12.0.12"/>
       <unit id="org.eclipse.jetty.websocket.api" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.websocket.common" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.websocket.core.client" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.websocket.core.common" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.websocket.core.server" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.xml" version="12.0.12"/>
-      <repository location="mvn:org.eclipse.jetty:jetty-p2:12.0.12:zip:p2site"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.12"/>
     </location>
-    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="false" missingManifest="generate" type="Maven" label="jakarta">
-      <dependencies>
-        <dependency>
-          <groupId>jakarta.servlet</groupId>
-          <artifactId>jakarta.servlet-api</artifactId>
-          <version>6.1.0</version>
-          <type>jar</type>
-        </dependency>
-        <dependency>
-          <groupId>jakarta.websocket</groupId>
-          <artifactId>jakarta.websocket-api</artifactId>
-          <version>2.2.0</version>
-          <type>jar</type>
-        </dependency>
-        <dependency>
-          <groupId>jakarta.websocket</groupId>
-          <artifactId>jakarta.websocket-client-api</artifactId>
-          <version>2.2.0</version>
-          <type>jar</type>
-        </dependency>
-      </dependencies>
-    </location>
-    <location includeDependencyDepth="infinite" includeDependencyScopes="compile,test" includeSource="false" missingManifest="generate" type="Maven" label="spifly">
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="false" missingManifest="generate" type="Maven" label="log4j">
       <dependencies>
         <dependency>
-          <groupId>org.apache.aries.spifly</groupId>
-          <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
-          <version>1.3.6</version>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-slf4j2-impl</artifactId>
+          <version>2.23.1</version>
           <type>jar</type>
         </dependency>
-      </dependencies>
-    </location>
-    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="false" missingManifest="generate" type="Maven" label="slf4j">
-      <dependencies>
         <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-          <version>2.0.0</version>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-core</artifactId>
+          <version>2.23.1</version>
           <type>jar</type>
         </dependency>
-      </dependencies>
-    </location>
-    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="false" missingManifest="generate" type="Maven" label="log4j">
-      <dependencies>
         <dependency>
           <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-slf4j2-impl</artifactId>
-          <version>2.19.0</version>
+          <artifactId>log4j-api</artifactId>
+          <version>2.23.1</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-          <version>2.19.0</version>
+          <artifactId>log4j-1.2-api</artifactId>
+          <version>2.23.1</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-api</artifactId>
-          <version>2.19.0</version>
+          <artifactId>log4j-to-slf4j</artifactId>
+          <version>2.23.1</version>
           <type>jar</type>
         </dependency>
       </dependencies>
diff --git a/targetplatforms/r2024-09.tpd b/targetplatforms/r2024-09.tpd
index e48ee35b..5a76f456 100644
--- a/targetplatforms/r2024-09.tpd
+++ b/targetplatforms/r2024-09.tpd
@@ -8,13 +8,13 @@ location "http://download.eclipse.org/releases/2024-09" {
 	org.eclipse.lsp4j.websocket.jakarta [0.23.0,1.0.0)
 	org.apache.commons.cli [1.4.0,2.0.0)
 	com.google.gson[2.8.7,3.0.0)
-	com.google.inject [7.0.0,8.0.0)
-	jakarta.inject.jakarta.inject-api [2.0.1,3.0.0)	
 }
 
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/" {
+location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09" {
 	org.junit [4.13.2,5.0.0)
-	org.junit.jupiter.api [5.8.1,6.0.0)
+	junit-jupiter-api [5.11.0,6.0.0)
+	slf4j.api [2.0.16,3.0.0)
+	jakarta.inject.jakarta.inject-api [2.0.1,3.0.0)
 }
 
 location "http://download.eclipse.org/elk/updates/releases/0.9.1/" {
@@ -24,40 +24,9 @@ location "http://download.eclipse.org/elk/updates/releases/0.9.1/" {
 	org.eclipse.elk.alg.layered
 }
 
-location "mvn:org.eclipse.jetty:jetty-p2:12.0.12:zip:p2site" {
-	org.eclipse.jetty.alpn.client
-	org.eclipse.jetty.client
-	org.eclipse.jetty.ee
-	org.eclipse.jetty.ee8.server
-	org.eclipse.jetty.ee10.servlet
-	org.eclipse.jetty.ee10.webapp
-	org.eclipse.jetty.ee10.websocket.jakarta.client
-	org.eclipse.jetty.ee10.websocket.jakarta.common
+location "https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.12" {
 	org.eclipse.jetty.ee10.websocket.jakarta.server
 	org.eclipse.jetty.ee10.websocket.server
-	org.eclipse.jetty.ee10.websocket.servlet
-	org.eclipse.jetty.websocket.api
-	org.eclipse.jetty.websocket.common
-	org.eclipse.jetty.websocket.core.client
-	org.eclipse.jetty.websocket.core.common
-	org.eclipse.jetty.websocket.core.server
-	org.eclipse.jetty.xml
+	org.eclipse.jetty.websocket.api	
 }
 
-maven jakarta scope=compile dependencyDepth=none missingManifest=generate {
-	dependency {
-		groupId="jakarta.servlet"
-		artifactId="jakarta.servlet-api"
-		version="6.1.0"
-	}
-	dependency {
-		groupId="jakarta.websocket"
-		artifactId="jakarta.websocket-api"
-		version="2.2.0"
-	}
-	dependency {
-		groupId="jakarta.websocket"
-		artifactId="jakarta.websocket-client-api"
-		version="2.2.0"
-	}
-}