diff --git a/pom.xml b/pom.xml
index 1b4d18d0f0..3dbbb797ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
 		<!-- When updating surefire version, double-check Import-Package statements generated by bnd-maven-plugin and possibly adapt instructions in various bnd.bnd files -->
 		<surefire-version>3.2.5</surefire-version>
 		<equinoxVersion>3.19.0</equinoxVersion>
-		<ecjVersion>3.36.0</ecjVersion>
+		<ecjVersion>3.37.0</ecjVersion>
 		<bnd.version>7.0.0</bnd.version>
 	    <!-- these are referenced from src/main/resources/META-INF/plexus/components.xml -->
 		<resources-plugin.version>3.3.1</resources-plugin.version>
diff --git a/tycho-apitools-plugin/pom.xml b/tycho-apitools-plugin/pom.xml
index fa292de1b0..10d45914a3 100644
--- a/tycho-apitools-plugin/pom.xml
+++ b/tycho-apitools-plugin/pom.xml
@@ -50,7 +50,7 @@
 		<dependency>
 		    <groupId>org.eclipse.pde</groupId>
 		    <artifactId>org.eclipse.pde.core</artifactId>
-		    <version>3.17.200</version>
+		    <version>3.18.0</version>
 		    <type>jar</type>
 		    <exclusions>
                 <exclusion>
@@ -67,7 +67,7 @@
 		<dependency>
 		    <groupId>org.eclipse.jdt</groupId>
 		    <artifactId>org.eclipse.jdt.core</artifactId>
-		    <version>3.36.0</version>
+		    <version>3.37.0</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.eclipse.jdt</groupId>
diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
index d62c839a59..8d9cd17aea 100644
--- a/tycho-core/pom.xml
+++ b/tycho-core/pom.xml
@@ -314,12 +314,12 @@
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
 			<artifactId>org.eclipse.jdt.core</artifactId>
-			<version>3.36.0</version>
+			<version>3.37.0</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.eclipse.pde</groupId>
 		    <artifactId>org.eclipse.pde.core</artifactId>
-		    <version>3.17.200</version>
+		    <version>3.18.0</version>
 		    <scope>test</scope>
 		    <exclusions>
 				<exclusion>
diff --git a/tycho-eclipse-plugin/pom.xml b/tycho-eclipse-plugin/pom.xml
index 0d955d8f17..e9f2051c73 100644
--- a/tycho-eclipse-plugin/pom.xml
+++ b/tycho-eclipse-plugin/pom.xml
@@ -39,7 +39,7 @@
 		<dependency>
 			<groupId>org.eclipse.pde</groupId>
 			<artifactId>org.eclipse.pde.core</artifactId>
-			<version>3.17.200</version>
+			<version>3.18.0</version>
 			<type>jar</type>
 			<exclusions>
 				<exclusion>
diff --git a/tycho-extras/tycho-document-bundle-plugin/pom.xml b/tycho-extras/tycho-document-bundle-plugin/pom.xml
index 5f7bdea1f4..f6d4a8dce2 100644
--- a/tycho-extras/tycho-document-bundle-plugin/pom.xml
+++ b/tycho-extras/tycho-document-bundle-plugin/pom.xml
@@ -64,7 +64,7 @@
 		<dependency>
 			<groupId>org.eclipse.pde</groupId>
 			<artifactId>org.eclipse.pde.core</artifactId>
-			<version>3.17.200</version>
+			<version>3.18.0</version>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/runner/ConvertSchemaToHtmlRunner.java b/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/runner/ConvertSchemaToHtmlRunner.java
index f4d058d69d..bb94a85fc9 100644
--- a/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/runner/ConvertSchemaToHtmlRunner.java
+++ b/tycho-extras/tycho-document-bundle-plugin/src/main/java/org/eclipse/tycho/extras/docbundle/runner/ConvertSchemaToHtmlRunner.java
@@ -25,6 +25,7 @@
 import java.io.Serializable;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -50,7 +51,6 @@
 import org.eclipse.pde.internal.core.schema.Schema;
 import org.eclipse.pde.internal.core.schema.SchemaDescriptor;
 import org.eclipse.pde.internal.core.schema.SchemaProvider;
-import org.eclipse.pde.internal.core.util.HeaderMap;
 import org.osgi.framework.Constants;
 
 /**
@@ -164,7 +164,7 @@ private String getPluginID(File manifest) {
 
 		if (OSGiFile.exists()) {
 			try (FileInputStream manifestStream = new FileInputStream(OSGiFile)) {
-				Map<String, String> headers = ManifestElement.parseBundleManifest(manifestStream, new HeaderMap<>());
+				Map<String, String> headers = ManifestElement.parseBundleManifest(manifestStream, new HashMap<>());
 				String value = headers.get(Constants.BUNDLE_SYMBOLICNAME);
 				if (value == null) {
 					return null;
diff --git a/tycho-its/pom.xml b/tycho-its/pom.xml
index b9a759d0f0..cf21a34d33 100644
--- a/tycho-its/pom.xml
+++ b/tycho-its/pom.xml
@@ -194,7 +194,7 @@
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
 			<artifactId>org.eclipse.jdt.core</artifactId>
-			<version>3.36.0</version>
+			<version>3.37.0</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- update site tests -->