From d2b47796c92070f923573321a475e0bebfb459c4 Mon Sep 17 00:00:00 2001
From: Aymane Harmaz <aharmaz@openjdk.org>
Date: Wed, 23 Sep 2026 18:14:53 +0000
Subject: [PATCH] 8624: Update to Eclipse 2026-09

Reviewed-by: hirt
---
 AGENTS.md                                     |  2 +-
 .../org.openjdk.jmc.feature.core/feature.xml  |  7 ----
 .../org.openjdk.jmc.feature.rcp/feature.xml   |  1 -
 .../org.openjdk.jmc.rcp.product/jmc.product   |  1 -
 .../src/main/resources/index.html             |  4 +-
 .../update-site-instructions/index.html       |  2 +-
 .../META-INF/MANIFEST.MF                      |  3 +-
 pom.xml                                       | 28 ++++++-------
 .../platform-definition-2025-03.target        |  5 +--
 .../platform-definition-2025-06.target        |  5 +--
 .../platform-definition-2025-09.target        |  5 +--
 .../platform-definition-2025-12.target        |  5 +--
 .../platform-definition-2026-03.target        |  5 +--
 .../platform-definition-2026-06.target        |  5 +--
 .../platform-definition-2026-09.target}       | 42 +++++++++----------
 .../pom.xml                                   |  2 +-
 releng/platform-definitions/pom.xml           |  2 +-
 releng/third-party/pom.xml                    |  5 +--
 .../platform-definition.target.template       |  2 -
 19 files changed, 55 insertions(+), 76 deletions(-)
 rename releng/platform-definitions/{platform-definition-2024-12/platform-definition-2024-12.target => platform-definition-2026-09/platform-definition-2026-09.target} (84%)
 rename releng/platform-definitions/{platform-definition-2024-12 => platform-definition-2026-09}/pom.xml (97%)

diff --git a/AGENTS.md b/AGENTS.md
index 0cd87fae44..f85b2f84a4 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -29,7 +29,7 @@
 ### Eclipse Platform Profiles
 Build against specific Eclipse platform versions using Maven profiles:
 ```bash
-mvn verify -P 2024-12
+mvn verify -P 2025-03
 ```
 
 ## Java Version & Toolchains
diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml
index 9e8c8a032c..20c7f67d9e 100644
--- a/application/org.openjdk.jmc.feature.core/feature.xml
+++ b/application/org.openjdk.jmc.feature.core/feature.xml
@@ -272,11 +272,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.osgi.service.servlet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/application/org.openjdk.jmc.feature.rcp/feature.xml b/application/org.openjdk.jmc.feature.rcp/feature.xml
index 91affb3f75..3d710607ed 100644
--- a/application/org.openjdk.jmc.feature.rcp/feature.xml
+++ b/application/org.openjdk.jmc.feature.rcp/feature.xml
@@ -85,7 +85,6 @@
       <import plugin="org.eclipse.ui.forms"/>
       <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.osgi.services"/>
       <import plugin="org.eclipse.text"/>
       <import plugin="org.eclipse.core.net"/>
       <import plugin="org.eclipse.equinox.security"/>
diff --git a/application/org.openjdk.jmc.rcp.product/jmc.product b/application/org.openjdk.jmc.rcp.product/jmc.product
index c9decbdc3a..debe8f01ea 100644
--- a/application/org.openjdk.jmc.rcp.product/jmc.product
+++ b/application/org.openjdk.jmc.rcp.product/jmc.product
@@ -96,7 +96,6 @@
       <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.equinox.util" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
       <plugin id="org.openjdk.jmc.osgi.extension" autoStart="false" startLevel="4" />
       <plugin id="org.openjdk.jmc.rcp.application" autoStart="false" startLevel="5" />
diff --git a/application/org.openjdk.jmc.updatesite.ide/src/main/resources/index.html b/application/org.openjdk.jmc.updatesite.ide/src/main/resources/index.html
index c34685bedf..94da112d35 100644
--- a/application/org.openjdk.jmc.updatesite.ide/src/main/resources/index.html
+++ b/application/org.openjdk.jmc.updatesite.ide/src/main/resources/index.html
@@ -71,7 +71,7 @@
                 <p class="section-header"><b>Requirements</b></p>
 
                 <ul>
-                  <li>Requires Eclipse 4.40.</li>
+                  <li>Requires Eclipse 4.41.</li>
                   <li>Requires any previously installed versions of JMC 4.x, 5.x, 6.x or 7.x to be uninstalled before installing JMC 9.</li>
                   <li>Note that you need to run your Eclipse on a JDK (version 21 or above) installation for all features to work. For more information on this,
 			please see the <a href="run-on-jdk-instructions/index.html">Run Eclipse on JDK HOWTO</a>.</li>
@@ -108,7 +108,7 @@
                 <br>
                 
                 <b>Prerequisites</b><br>
-                JDK Mission Control is a set of plug-ins for Eclipse 4.40.<br><br>
+                JDK Mission Control is a set of plug-ins for Eclipse 4.41.<br><br>
 
                 <img src="images/bullet-arrow-red.gif" alt="Bullet">
                 <a href="http://www.eclipse.org/downloads/">
diff --git a/application/org.openjdk.jmc.updatesite.ide/src/main/resources/update-site-instructions/index.html b/application/org.openjdk.jmc.updatesite.ide/src/main/resources/update-site-instructions/index.html
index 62f2a4f438..62f85ef02e 100644
--- a/application/org.openjdk.jmc.updatesite.ide/src/main/resources/update-site-instructions/index.html
+++ b/application/org.openjdk.jmc.updatesite.ide/src/main/resources/update-site-instructions/index.html
@@ -43,7 +43,7 @@
 
           <p class="section-header"><b>Step-by-Step Instructions</b></p>
           
-          Before starting, make sure that you have downloaded and installed Eclipse 4.40.
+          Before starting, make sure that you have downloaded and installed Eclipse 4.41.
         </td>
       </tr>
 
diff --git a/application/tests/org.openjdk.jmc.jolokia.test/META-INF/MANIFEST.MF b/application/tests/org.openjdk.jmc.jolokia.test/META-INF/MANIFEST.MF
index beeba2051c..375e45fde3 100644
--- a/application/tests/org.openjdk.jmc.jolokia.test/META-INF/MANIFEST.MF
+++ b/application/tests/org.openjdk.jmc.jolokia.test/META-INF/MANIFEST.MF
@@ -13,8 +13,7 @@ Require-Bundle: org.junit,
  org.openjdk.jmc.rjmx,
  org.eclipse.ui,
  org.awaitility,
- org.hamcrest,
- org.osgi.service.servlet;bundle-version="2.0.0"
+ org.hamcrest
 Automatic-Module-Name: org.openjdk.jmc.jolokia.test
 Import-Package: org.jolokia.server.core.config;version="2.5.1",
  org.jolokia.server.core.service.api;version="2.5.1",
diff --git a/pom.xml b/pom.xml
index 50c8597d82..90f4855116 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
 	</distributionManagement>
 	<profiles>
 		<profile>
-			<id>2026-06</id>
+			<id>2026-09</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
@@ -139,7 +139,7 @@
 							<target>
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
-									<artifactId>platform-definition-2026-06</artifactId>
+									<artifactId>platform-definition-2026-09</artifactId>
 									<version>${revision}${changelist}</version>
 								</artifact>
 							</target>
@@ -149,7 +149,7 @@
 			</build>
 		</profile>
 		<profile>
-			<id>2026-03</id>
+			<id>2026-06</id>
 			<build>
 				<plugins>
 					<plugin>
@@ -160,7 +160,7 @@
 							<target>
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
-									<artifactId>platform-definition-2026-03</artifactId>
+									<artifactId>platform-definition-2026-06</artifactId>
 									<version>${revision}${changelist}</version>
 								</artifact>
 							</target>
@@ -170,7 +170,7 @@
 			</build>
 		</profile>
 		<profile>
-			<id>2025-12</id>
+			<id>2026-03</id>
 			<build>
 				<plugins>
 					<plugin>
@@ -181,7 +181,7 @@
 							<target>
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
-									<artifactId>platform-definition-2025-12</artifactId>
+									<artifactId>platform-definition-2026-03</artifactId>
 									<version>${revision}${changelist}</version>
 								</artifact>
 							</target>
@@ -191,7 +191,7 @@
 			</build>
 		</profile>
 		<profile>
-			<id>2025-09</id>
+			<id>2025-12</id>
 			<build>
 				<plugins>
 					<plugin>
@@ -202,7 +202,7 @@
 							<target>
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
-									<artifactId>platform-definition-2025-09</artifactId>
+									<artifactId>platform-definition-2025-12</artifactId>
 									<version>${revision}${changelist}</version>
 								</artifact>
 							</target>
@@ -212,7 +212,7 @@
 			</build>
 		</profile>
 		<profile>
-			<id>2025-06</id>
+			<id>2025-09</id>
 			<build>
 				<plugins>
 					<plugin>
@@ -223,7 +223,7 @@
 							<target>
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
-									<artifactId>platform-definition-2025-06</artifactId>
+									<artifactId>platform-definition-2025-09</artifactId>
 									<version>${revision}${changelist}</version>
 								</artifact>
 							</target>
@@ -233,7 +233,7 @@
 			</build>
 		</profile>
 		<profile>
-			<id>2025-03</id>
+			<id>2025-06</id>
 			<build>
 				<plugins>
 					<plugin>
@@ -244,7 +244,7 @@
 							<target>
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
-									<artifactId>platform-definition-2025-03</artifactId>
+									<artifactId>platform-definition-2025-06</artifactId>
 									<version>${revision}${changelist}</version>
 								</artifact>
 							</target>
@@ -254,7 +254,7 @@
 			</build>
 		</profile>
 		<profile>
-			<id>2024-12</id>
+			<id>2025-03</id>
 			<build>
 				<plugins>
 					<plugin>
@@ -265,7 +265,7 @@
 							<target>
 								<artifact>
 									<groupId>org.openjdk.jmc</groupId>
-									<artifactId>platform-definition-2024-12</artifactId>
+									<artifactId>platform-definition-2025-03</artifactId>
 									<version>${revision}${changelist}</version>
 								</artifact>
 							</target>
diff --git a/releng/platform-definitions/platform-definition-2025-03/platform-definition-2025-03.target b/releng/platform-definitions/platform-definition-2025-03/platform-definition-2025-03.target
index 12de143296..1e0f1020bf 100644
--- a/releng/platform-definitions/platform-definition-2025-03/platform-definition-2025-03.target
+++ b/releng/platform-definitions/platform-definition-2025-03/platform-definition-2025-03.target
@@ -45,7 +45,6 @@
             <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
-            <unit id="org.osgi.service.servlet" version="2.0.0.202212101352"/>
             <unit id="org.jolokia.core" version="2.5.1"/>
             <unit id="org.jolokia.client.jmx-adapter" version="2.5.1"/>
             <unit id="org.jolokia.core" version="2.5.1"/>
@@ -54,8 +53,8 @@
             <unit id="org.jolokia.client.java" version="2.5.1"/>
             <unit id="org.jolokia.server.core" version="2.5.1"/>
             <unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
-            <unit id="org.eclipse.jetty.websocket.api" version="12.1.9"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.1.9"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.12"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.12"/>
             <unit id="jakarta.annotation-api" version="3.0.0"/>
             <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
             <unit id="fireplace-swing" version="0.0.1.rc10"/>
diff --git a/releng/platform-definitions/platform-definition-2025-06/platform-definition-2025-06.target b/releng/platform-definitions/platform-definition-2025-06/platform-definition-2025-06.target
index c2c0ebdd6d..5b6e8bc335 100644
--- a/releng/platform-definitions/platform-definition-2025-06/platform-definition-2025-06.target
+++ b/releng/platform-definitions/platform-definition-2025-06/platform-definition-2025-06.target
@@ -45,7 +45,6 @@
             <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
-            <unit id="org.osgi.service.servlet" version="2.0.0.202212101352"/>
             <unit id="org.jolokia.core" version="2.5.1"/>
             <unit id="org.jolokia.client.jmx-adapter" version="2.5.1"/>
             <unit id="org.jolokia.service.discovery" version="2.5.1"/>
@@ -53,8 +52,8 @@
             <unit id="org.jolokia.client.java" version="2.5.1"/>
             <unit id="org.jolokia.server.core" version="2.5.1"/>
             <unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
-            <unit id="org.eclipse.jetty.websocket.api" version="12.1.9"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.1.9"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.12"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.12"/>
             <unit id="jakarta.annotation-api" version="3.0.0"/>
             <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
             <unit id="fireplace-swing" version="0.0.1.rc10"/>
diff --git a/releng/platform-definitions/platform-definition-2025-09/platform-definition-2025-09.target b/releng/platform-definitions/platform-definition-2025-09/platform-definition-2025-09.target
index 51215d77ef..ce70233596 100644
--- a/releng/platform-definitions/platform-definition-2025-09/platform-definition-2025-09.target
+++ b/releng/platform-definitions/platform-definition-2025-09/platform-definition-2025-09.target
@@ -44,7 +44,6 @@
             <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
-            <unit id="org.osgi.service.servlet" version="2.0.0.202212101352"/>
             <unit id="org.jolokia.client.jmx-adapter" version="2.5.1"/>
             <unit id="org.jolokia.core" version="2.5.1"/>
             <unit id="org.jolokia.service.discovery" version="2.5.1"/>
@@ -52,8 +51,8 @@
             <unit id="org.jolokia.client.java" version="2.5.1"/>
             <unit id="org.jolokia.server.core" version="2.5.1"/>
             <unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
-            <unit id="org.eclipse.jetty.websocket.api" version="12.1.9"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.1.9"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.12"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.12"/>
             <unit id="jakarta.annotation-api" version="3.0.0"/>
             <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
             <unit id="fireplace-swing" version="0.0.1.rc10"/>
diff --git a/releng/platform-definitions/platform-definition-2025-12/platform-definition-2025-12.target b/releng/platform-definitions/platform-definition-2025-12/platform-definition-2025-12.target
index 29b2213199..0c873560fd 100644
--- a/releng/platform-definitions/platform-definition-2025-12/platform-definition-2025-12.target
+++ b/releng/platform-definitions/platform-definition-2025-12/platform-definition-2025-12.target
@@ -45,7 +45,6 @@
             <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
-            <unit id="org.osgi.service.servlet" version="2.0.0.202212101352"/>
             <unit id="org.jolokia.client.jmx-adapter" version="2.5.1"/>
             <unit id="org.jolokia.core" version="2.5.1"/>
             <unit id="org.jolokia.service.discovery" version="2.5.1"/>
@@ -53,8 +52,8 @@
             <unit id="org.jolokia.client.java" version="2.5.1"/>
             <unit id="org.jolokia.server.core" version="2.5.1"/>
             <unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
-            <unit id="org.eclipse.jetty.websocket.api" version="12.1.9"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.1.9"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.12"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.12"/>
             <unit id="jakarta.annotation-api" version="3.0.0"/>
             <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
             <unit id="fireplace-swing" version="0.0.1.rc10"/>
diff --git a/releng/platform-definitions/platform-definition-2026-03/platform-definition-2026-03.target b/releng/platform-definitions/platform-definition-2026-03/platform-definition-2026-03.target
index 980585d423..b8d26b4429 100644
--- a/releng/platform-definitions/platform-definition-2026-03/platform-definition-2026-03.target
+++ b/releng/platform-definitions/platform-definition-2026-03/platform-definition-2026-03.target
@@ -45,7 +45,6 @@
             <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
-            <unit id="org.osgi.service.servlet" version="2.0.0.202212101352"/>
             <unit id="org.jolokia.client.jmx-adapter" version="2.5.1"/>
             <unit id="org.jolokia.core" version="2.5.1"/>
             <unit id="org.jolokia.service.discovery" version="2.5.1"/>
@@ -53,8 +52,8 @@
             <unit id="org.jolokia.client.java" version="2.5.1"/>
             <unit id="org.jolokia.server.core" version="2.5.1"/>
             <unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
-            <unit id="org.eclipse.jetty.websocket.api" version="12.1.9"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.1.9"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.12"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.12"/>
             <unit id="jakarta.annotation-api" version="3.0.0"/>
             <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
             <unit id="fireplace-swing" version="0.0.1.rc10"/>
diff --git a/releng/platform-definitions/platform-definition-2026-06/platform-definition-2026-06.target b/releng/platform-definitions/platform-definition-2026-06/platform-definition-2026-06.target
index ef5e938982..12af86d0bd 100644
--- a/releng/platform-definitions/platform-definition-2026-06/platform-definition-2026-06.target
+++ b/releng/platform-definitions/platform-definition-2026-06/platform-definition-2026-06.target
@@ -45,7 +45,6 @@
             <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
-            <unit id="org.osgi.service.servlet" version="2.0.0.202212101352"/>
             <unit id="org.jolokia.client.jmx-adapter" version="2.5.1"/>
             <unit id="org.jolokia.core" version="2.5.1"/>
             <unit id="org.jolokia.service.discovery" version="2.5.1"/>
@@ -53,8 +52,8 @@
             <unit id="org.jolokia.client.java" version="2.5.1"/>
             <unit id="org.jolokia.server.core" version="2.5.1"/>
             <unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
-            <unit id="org.eclipse.jetty.websocket.api" version="12.1.9"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.1.9"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.12"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.12"/>
             <unit id="jakarta.annotation-api" version="3.0.0"/>
             <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
             <unit id="fireplace-swing" version="0.0.1.rc10"/>
diff --git a/releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target b/releng/platform-definitions/platform-definition-2026-09/platform-definition-2026-09.target
similarity index 84%
rename from releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target
rename to releng/platform-definitions/platform-definition-2026-09/platform-definition-2026-09.target
index d29d9f1223..04d856b23b 100644
--- a/releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target
+++ b/releng/platform-definitions/platform-definition-2026-09/platform-definition-2026-09.target
@@ -33,7 +33,7 @@
    WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <?pde version="3.8"?>
-<target name="jmc-target-2024-12" sequenceNumber="47">
+<target name="jmc-target-2026-09" sequenceNumber="47">
     <locations>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.angus.jakarta.mail" version="2.0.5"/>
@@ -45,7 +45,6 @@
             <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
             <unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
-            <unit id="org.osgi.service.servlet" version="2.0.0.202212101352"/>
             <unit id="org.jolokia.core" version="2.5.1"/>
             <unit id="org.jolokia.client.jmx-adapter" version="2.5.1"/>
             <unit id="org.jolokia.service.discovery" version="2.5.1"/>
@@ -53,8 +52,8 @@
             <unit id="org.jolokia.client.java" version="2.5.1"/>
             <unit id="org.jolokia.server.core" version="2.5.1"/>
             <unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
-            <unit id="org.eclipse.jetty.websocket.api" version="12.1.9"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.1.9"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.12"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.12"/>
             <unit id="jakarta.annotation-api" version="3.0.0"/>
             <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
             <unit id="fireplace-swing" version="0.0.1.rc10"/>
@@ -65,24 +64,25 @@
             <repository location="http://localhost:8080/site"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2700.v20240929-1145"/>
-            <unit id="org.eclipse.pde.feature.group" version="3.16.100.v20241120-1800"/>
+            <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.3400.v20260804-1928"/>
+            <unit id="org.eclipse.pde.feature.group" version="3.16.800.v20260828-1142"/>
             <unit id="jakarta.servlet-api" version="6.1.0"/>
-            <unit id="org.eclipse.equinox.p2.ui.sdk.scheduler" version="1.6.300.v20240515-1919"/>
-            <unit id="org.eclipse.equinox.p2.updatechecker" version="1.4.300.v20240514-1422"/>
-            <unit id="org.eclipse.update.configurator" version="3.5.500.v20241001-1711"/>
-            <unit id="org.eclipse.equinox.p2.reconciler.dropins" version="1.5.400.v20240321-1450"/>
-            <unit id="org.eclipse.help.webapp" version="3.11.600.v20240903-1558"/>
-            <unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
-            <unit id="org.eclipse.rcp.feature.group" version="4.34.0.v20241120-1800"/>
-            <unit id="org.eclipse.help.feature.group" version="2.3.2000.v20241120-1800"/>
-            <unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.2600.v20241019-1812"/>
-            <unit id="org.eclipse.ui.net" version="1.5.400.v20240413-1529"/>
-            <unit id="org.eclipse.equinox.p2.director.app" version="1.3.500.v20240918-1902"/>
-            <unit id="org.eclipse.ui.themes" version="1.2.2600.v20241028-0713"/>
-            <unit id="org.eclipse.sdk" version="4.34.0.v20241120-1800"/>
-            <unit id="org.eclipse.osgi.services" version="3.12.100.v20240327-0645"/>
-            <repository location="https://download.eclipse.org/releases/2024-12/" />
+            <unit id="org.eclipse.equinox.p2.ui.sdk.scheduler" version="1.7.200.v20260730-1701"/>
+            <unit id="org.eclipse.equinox.p2.updatechecker" version="1.4.600.v20250728-0401"/>
+            <unit id="org.eclipse.update.configurator" version="3.5.1100.v20260810-1743"/>
+            <unit id="org.eclipse.equinox.p2.reconciler.dropins" version="1.5.800.v20251111-0852"/>
+            <unit id="org.eclipse.help.webapp" version="3.12.600.v20260710-0925"/>
+            <unit id="org.apache.commons.commons-codec" version="1.22.1"/>
+            <unit id="org.eclipse.rcp.feature.group" version="4.41.0.v20260828-1142"/>
+            <unit id="org.eclipse.help.feature.group" version="2.3.2700.v20260828-1142"/>
+            <unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.3300.v20260803-1203"/>
+            <unit id="org.eclipse.ui.net" version="1.6.0.v20251219-1227"/>
+            <unit id="org.eclipse.equinox.p2.director.app" version="1.3.1000.v20260305-0817"/>
+            <unit id="org.eclipse.ui.themes" version="1.3.0.v20260508-0854"/>
+            <unit id="org.eclipse.sdk" version="4.41.0.v20260828-1142"/>
+            <unit id="org.eclipse.emf.common.feature.group" version="2.39.0.v20260704-1256"/>
+            <unit id="org.eclipse.emf.ecore.feature.group" version="2.44.0.v20260704-1256"/>
+            <repository location="https://download.eclipse.org/releases/2026-09/" />
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.babel.nls_eclipse_ja.feature.group" version="4.26.0.v20230220105658"/>
diff --git a/releng/platform-definitions/platform-definition-2024-12/pom.xml b/releng/platform-definitions/platform-definition-2026-09/pom.xml
similarity index 97%
rename from releng/platform-definitions/platform-definition-2024-12/pom.xml
rename to releng/platform-definitions/platform-definition-2026-09/pom.xml
index d24fda7e3e..26e5779049 100644
--- a/releng/platform-definitions/platform-definition-2024-12/pom.xml
+++ b/releng/platform-definitions/platform-definition-2026-09/pom.xml
@@ -39,7 +39,7 @@
 		<artifactId>platform-definitions</artifactId>
 		<version>${revision}${changelist}</version>
 	</parent>
-	<artifactId>platform-definition-2024-12</artifactId>
+	<artifactId>platform-definition-2026-09</artifactId>
 	<packaging>eclipse-target-definition</packaging>
 	<properties>
 		<jmc.config.path>${project.basedir}/../../../configuration</jmc.config.path>
diff --git a/releng/platform-definitions/pom.xml b/releng/platform-definitions/pom.xml
index 60c4d2a177..6d15444ec5 100644
--- a/releng/platform-definitions/pom.xml
+++ b/releng/platform-definitions/pom.xml
@@ -44,12 +44,12 @@
 		<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
 	</properties>
 	<modules>
+      <module>platform-definition-2026-09</module>
       <module>platform-definition-2026-06</module>
 		<module>platform-definition-2026-03</module>
 		<module>platform-definition-2025-12</module>
 		<module>platform-definition-2025-09</module>
 		<module>platform-definition-2025-06</module>
 		<module>platform-definition-2025-03</module>
-		<module>platform-definition-2024-12</module>
 	</modules>
 </project>
diff --git a/releng/third-party/pom.xml b/releng/third-party/pom.xml
index ec297cf5a8..f565887992 100644
--- a/releng/third-party/pom.xml
+++ b/releng/third-party/pom.xml
@@ -59,7 +59,7 @@
 		<lz4.version>1.11.1</lz4.version>
 		<hdrhistogram.version>2.2.2</hdrhistogram.version>
 		<jemmy.version>2.0.0</jemmy.version>
-		<jetty.version>12.1.9</jetty.version>
+		<jetty.version>12.1.12</jetty.version>
 		<spifly.version>1.3.7</spifly.version>
 		<jolokia.version>2.5.1</jolokia.version>
 		<wiremock.version>2.27.2</wiremock.version>
@@ -182,9 +182,6 @@
 									<id>org.jolokia:jolokia-client-java:${jolokia.version}</id>
 									<transitive>false</transitive>
 								</artifact>
-								<artifact>
-									<id>org.osgi:org.osgi.service.servlet:2.0.0</id>
-								</artifact>
 								<artifact>
 									<id>org.awaitility:awaitility:4.0.0</id>
 								</artifact>
diff --git a/releng/tools/org.openjdk.jmc.util.listversions/src/org/openjdk/jmc/releng/util/templates/platform-definition.target.template b/releng/tools/org.openjdk.jmc.util.listversions/src/org/openjdk/jmc/releng/util/templates/platform-definition.target.template
index 5c87e28b17..4f53574f8d 100644
--- a/releng/tools/org.openjdk.jmc.util.listversions/src/org/openjdk/jmc/releng/util/templates/platform-definition.target.template
+++ b/releng/tools/org.openjdk.jmc.util.listversions/src/org/openjdk/jmc/releng/util/templates/platform-definition.target.template
@@ -45,7 +45,6 @@
             <unit id="org.adoptopenjdk.jemmy-browser" version="${org.adoptopenjdk.jemmy-browser.version}"/>
             <unit id="org.adoptopenjdk.jemmy-core" version="${org.adoptopenjdk.jemmy-core.version}"/>
             <unit id="org.adoptopenjdk.jemmy-swt" version="${org.adoptopenjdk.jemmy-swt.version}"/>
-            <unit id="org.osgi.service.servlet" version="${org.osgi.service.servlet.version}"/>
             <unit id="org.jolokia.client.jmx-adapter" version="${org.jolokia.client.jmx-adapter.version}"/>
             <unit id="org.jolokia.core" version="${org.jolokia.core.version}"/>
             <unit id="org.jolokia.service.discovery" version="${org.jolokia.service.discovery.version}"/>
@@ -81,7 +80,6 @@
             <unit id="org.eclipse.equinox.p2.director.app" version="${org.eclipse.equinox.p2.director.app.version}"/>
             <unit id="org.eclipse.ui.themes" version="${org.eclipse.ui.themes.version}"/>
             <unit id="org.eclipse.sdk" version="${org.eclipse.sdk.version}"/>
-            <unit id="org.eclipse.osgi.services" version="${org.eclipse.osgi.services.version}"/>
             <unit id="org.eclipse.emf.common.feature.group" version="${org.eclipse.emf.common.feature.group.version}"/>
             <unit id="org.eclipse.emf.ecore.feature.group" version="${org.eclipse.emf.ecore.feature.group.version}"/>
             <repository location="https://download.eclipse.org/releases/${ECLIPSE_VERSION}/" />