From 261fe7cc70681417e181d803db46e2bdd5560d47 Mon Sep 17 00:00:00 2001
From: Aymane Harmaz <aharmaz@openjdk.org>
Date: Fri, 17 Jul 2026 16:06:25 +0000
Subject: [PATCH] 8598: Update to Eclipse 2026-06

Reviewed-by: hirt
---
 .../org.openjdk.jmc.feature.core/feature.xml  |  2 +-
 .../src/main/resources/index.html             |  4 +-
 .../update-site-instructions/index.html       |  2 +-
 pom.xml                                       | 23 ++++-
 .../platform-definition-2024-12.target        |  4 +-
 .../platform-definition-2025-03.target        |  4 +-
 .../platform-definition-2025-06.target        |  4 +-
 .../platform-definition-2025-09.target        |  4 +-
 .../platform-definition-2025-12.target        |  4 +-
 .../platform-definition-2026-03.target        |  4 +-
 .../platform-definition-2026-06.target        | 97 +++++++++++++++++++
 .../platform-definition-2026-06/pom.xml       | 47 +++++++++
 releng/platform-definitions/pom.xml           |  1 +
 releng/third-party/pom.xml                    |  2 +-
 .../openjdk/jmc/releng/util/ListVersions.java |  2 +-
 15 files changed, 185 insertions(+), 19 deletions(-)
 create mode 100644 releng/platform-definitions/platform-definition-2026-06/platform-definition-2026-06.target
 create mode 100644 releng/platform-definitions/platform-definition-2026-06/pom.xml

diff --git a/application/org.openjdk.jmc.feature.core/feature.xml b/application/org.openjdk.jmc.feature.core/feature.xml
index e13b98c47f..9e8c8a032c 100644
--- a/application/org.openjdk.jmc.feature.core/feature.xml
+++ b/application/org.openjdk.jmc.feature.core/feature.xml
@@ -57,7 +57,7 @@
       <import plugin="org.eclipse.help.ui"/>
       <import plugin="org.eclipse.help.webapp"/>
       <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.apache.commons.codec"/>
+      <import plugin="org.apache.commons.commons-codec"/>
       <import plugin="org.eclipse.e4.core.di"/>
       <import plugin="org.eclipse.e4.core.contexts"/>
    </requires>
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 563f6d9cf8..c34685bedf 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.39.</li>
+                  <li>Requires Eclipse 4.40.</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.39.<br><br>
+                JDK Mission Control is a set of plug-ins for Eclipse 4.40.<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 a8b4a4d43c..62f2a4f438 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.39.
+          Before starting, make sure that you have downloaded and installed Eclipse 4.40.
         </td>
       </tr>
 
diff --git a/pom.xml b/pom.xml
index e8fbe28637..50c8597d82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,10 +125,31 @@
 	</distributionManagement>
 	<profiles>
 		<profile>
-			<id>2026-03</id>
+			<id>2026-06</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>target-platform-configuration</artifactId>
+						<version>${tycho.version}</version>
+						<configuration>
+							<target>
+								<artifact>
+									<groupId>org.openjdk.jmc</groupId>
+									<artifactId>platform-definition-2026-06</artifactId>
+									<version>${revision}${changelist}</version>
+								</artifact>
+							</target>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>2026-03</id>
 			<build>
 				<plugins>
 					<plugin>
diff --git a/releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target b/releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target
index 389c78c674..71cbbeb0d5 100644
--- a/releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target
+++ b/releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target
@@ -53,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.6"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.1.6"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.9"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.9"/>
             <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.rc9"/>
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 5a9b1d547b..ecc9620a5a 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
@@ -54,8 +54,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.6"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.1.6"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.9"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.9"/>
             <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.rc9"/>
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 6a90497814..735bc39695 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
@@ -53,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.6"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.1.6"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.9"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.9"/>
             <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.rc9"/>
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 75f37edd21..1e0c8c534c 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
@@ -52,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.6"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.1.6"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.9"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.9"/>
             <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.rc9"/>
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 237c1779dd..316e20041a 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
@@ -53,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.6"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.1.6"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.9"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.9"/>
             <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.rc9"/>
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 07532e226b..c1ad9ae666 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
@@ -53,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.6"/>
-            <unit id="org.eclipse.jetty.websocket.server" version="12.1.6"/>
+            <unit id="org.eclipse.jetty.websocket.api" version="12.1.9"/>
+            <unit id="org.eclipse.jetty.websocket.server" version="12.1.9"/>
             <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.rc9"/>
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
new file mode 100644
index 0000000000..af39e98f25
--- /dev/null
+++ b/releng/platform-definitions/platform-definition-2026-06/platform-definition-2026-06.target
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+   Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2026, Datadog, Inc. All rights reserved.
+
+   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+   The contents of this file are subject to the terms of either the Universal Permissive License
+   v 1.0 as shown at https://oss.oracle.com/licenses/upl
+
+   or the following license:
+
+   Redistribution and use in source and binary forms, with or without modification, are permitted
+   provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of conditions
+   and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+   conditions and the following disclaimer in the documentation and/or other materials provided with
+   the distribution.
+
+   3. Neither the name of the copyright holder nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+   FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+   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-2026-06" 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"/>
+            <unit id="angus-activation" version="2.0.3"/>
+            <unit id="org.owasp.encoder" version="1.4.0"/>
+            <unit id="lz4-java" version="1.10.4"/>
+            <unit id="org.hdrhistogram.HdrHistogram" version="2.2.2"/>
+            <unit id="org.adoptopenjdk.jemmy-awt-input" version="2.0.0"/>
+            <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"/>
+            <unit id="org.jolokia.service.serializer" version="2.5.1"/>
+            <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="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.rc9"/>
+            <unit id="fireplace-swt-awt-bridge" version="0.0.1.rc9"/>
+            <unit id="fireplace-swing-animation" version="0.0.1.rc9"/>
+            <unit id="radiance-animation" version="8.5.0"/>
+            <unit id="org.awaitility" version="4.0.0"/>
+            <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.3300.v20260414-2255"/>
+            <unit id="org.eclipse.pde.feature.group" version="3.16.700.v20260601-0713"/>
+            <unit id="jakarta.servlet-api" version="6.1.0"/>
+            <unit id="org.eclipse.equinox.p2.ui.sdk.scheduler" version="1.7.100.v20260304-0653"/>
+            <unit id="org.eclipse.equinox.p2.updatechecker" version="1.4.600.v20250728-0401"/>
+            <unit id="org.eclipse.update.configurator" version="3.5.1000.v20260130-1253"/>
+            <unit id="org.eclipse.equinox.p2.reconciler.dropins" version="1.5.800.v20251111-0852"/>
+            <unit id="org.eclipse.help.webapp" version="3.12.500.v20260326-0937"/>
+            <unit id="org.apache.commons.commons-codec" version="1.22.0"/>
+            <unit id="org.eclipse.rcp.feature.group" version="4.40.0.v20260601-0955"/>
+            <unit id="org.eclipse.help.feature.group" version="2.3.2600.v20260601-0713"/>
+            <unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.4.3200.v20260516-0947"/>
+            <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.40.0.v20260601-0713"/>
+            <unit id="org.eclipse.osgi.services" version="3.12.300.v20250707-1221"/>
+            <unit id="org.eclipse.emf.common.feature.group" version="2.38.0.v20260311-1301"/>
+            <unit id="org.eclipse.emf.ecore.feature.group" version="2.43.0.v20251210-1145"/>
+            <repository location="https://download.eclipse.org/releases/2026-06/" />
+        </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"/>
+            <unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.26.0.v20230220105658"/>
+            <!-- No new release yet - using 2022-12 -->
+            <repository location="https://archive.eclipse.org/technology/babel/update-site/R0.20.0/2022-12/"/>
+        </location>
+    </locations>
+    <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
+</target>
diff --git a/releng/platform-definitions/platform-definition-2026-06/pom.xml b/releng/platform-definitions/platform-definition-2026-06/pom.xml
new file mode 100644
index 0000000000..676ad57eb3
--- /dev/null
+++ b/releng/platform-definitions/platform-definition-2026-06/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2026, Datadog, Inc. All rights reserved.
+
+   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+   The contents of this file are subject to the terms of either the Universal Permissive License
+   v 1.0 as shown at https://oss.oracle.com/licenses/upl
+
+   or the following license:
+
+   Redistribution and use in source and binary forms, with or without modification, are permitted
+   provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of conditions
+   and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+   conditions and the following disclaimer in the documentation and/or other materials provided with
+   the distribution.
+
+   3. Neither the name of the copyright holder nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+   FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+   WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.openjdk.jmc</groupId>
+		<artifactId>platform-definitions</artifactId>
+		<version>${revision}${changelist}</version>
+	</parent>
+	<artifactId>platform-definition-2026-06</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	<properties>
+		<jmc.config.path>${project.basedir}/../../../configuration</jmc.config.path>
+	</properties>
+</project>
diff --git a/releng/platform-definitions/pom.xml b/releng/platform-definitions/pom.xml
index 24d20ca903..60c4d2a177 100644
--- a/releng/platform-definitions/pom.xml
+++ b/releng/platform-definitions/pom.xml
@@ -44,6 +44,7 @@
 		<jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
 	</properties>
 	<modules>
+      <module>platform-definition-2026-06</module>
 		<module>platform-definition-2026-03</module>
 		<module>platform-definition-2025-12</module>
 		<module>platform-definition-2025-09</module>
diff --git a/releng/third-party/pom.xml b/releng/third-party/pom.xml
index a56d45e726..873a91edd1 100644
--- a/releng/third-party/pom.xml
+++ b/releng/third-party/pom.xml
@@ -59,7 +59,7 @@
 		<lz4.version>1.10.4</lz4.version>
 		<hdrhistogram.version>2.2.2</hdrhistogram.version>
 		<jemmy.version>2.0.0</jemmy.version>
-		<jetty.version>12.1.6</jetty.version>
+		<jetty.version>12.1.9</jetty.version>
 		<spifly.version>1.3.7</spifly.version>
 		<jolokia.version>2.5.1</jolokia.version>
 		<wiremock.version>2.27.2</wiremock.version>
diff --git a/releng/tools/org.openjdk.jmc.util.listversions/src/org/openjdk/jmc/releng/util/ListVersions.java b/releng/tools/org.openjdk.jmc.util.listversions/src/org/openjdk/jmc/releng/util/ListVersions.java
index 78a773b88a..c98ad51ce6 100644
--- a/releng/tools/org.openjdk.jmc.util.listversions/src/org/openjdk/jmc/releng/util/ListVersions.java
+++ b/releng/tools/org.openjdk.jmc.util.listversions/src/org/openjdk/jmc/releng/util/ListVersions.java
@@ -71,7 +71,7 @@ public static void main(String[] args) throws IOException {
 			case "org.eclipse.update.configurator":
 			case "org.eclipse.equinox.p2.reconciler.dropins":
 			case "org.eclipse.help.webapp":
-			case "org.apache.commons.codec":
+			case "org.apache.commons.commons-codec":
 			case "org.eclipse.rcp.feature.group":
 			case "org.eclipse.help.feature.group":
 			case "org.eclipse.equinox.p2.rcp.feature.feature.group":