From affab34be8b9b42ae0c3b9f18f72b7b0a9c3b705 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Tue, 11 Feb 2025 23:47:29 +0100
Subject: [PATCH] Remove now unused Apache JXPath dependencies

The final step of
- https://github.com/eclipse-platform/eclipse.platform.ui/issues/423
---
 .../org.eclipse.platform.doc.isv/pom.xml      |  5 ----
 .../eclipse-sdk-prereqs.target                | 26 -------------------
 .../publish-to-maven-central/SDK4Mvn.aggr     |  1 -
 3 files changed, 32 deletions(-)

diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
index 784680c8ae8..4dba11f1917 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
@@ -133,11 +133,6 @@
                     <id>org.apache.batik.css</id>
                     <versionRange>0.0.0</versionRange>
                   </requirement>
-                  <requirement>
-                    <type>eclipse-plugin</type>
-                    <id>org.apache.commons.jxpath</id>
-                    <versionRange>0.0.0</versionRange>
-                  </requirement>
                   <requirement>
                     <type>eclipse-plugin</type>
                     <id>org.apache.lucene.analysis-common</id>
diff --git a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
index c51260aa638..b26d41de1a9 100644
--- a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
+++ b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
@@ -33,10 +33,6 @@
       <unit id="org.apache.lucene.analysis-smartcn.source" version="10.1.0.v20241221-1000"/>
       <unit id="org.apache.lucene.analysis-common.source" version="10.1.0.v20241221-1000"/>
 
-      <!-- Transitive dependency of jxpath, not available as OSGi bundle on Maven Central -->
-      <unit id="org.jdom" version="1.1.3.v20230812-1600"/>
-      <unit id="org.jdom.source" version="1.1.3.v20230812-1600"/>
-
       <!-- This version contains with notarized *.jnilib -->
       <unit id="com.sun.jna" version="5.16.0.v20241222-1200"/>
 
@@ -765,28 +761,6 @@
 			  </dependency>
 		  </dependencies>
 	  </location>
-	  <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="jxpath" missingManifest="ignore" type="Maven">
-		  <dependencies>
-			  <dependency>
-				  <groupId>commons-beanutils</groupId>
-				  <artifactId>commons-beanutils</artifactId>
-				  <version>1.10.0</version>
-				  <type>jar</type>
-			  </dependency>
-			  <dependency>
-				  <groupId>commons-collections</groupId>
-				  <artifactId>commons-collections</artifactId>
-				  <version>3.2.2</version>
-				  <type>jar</type>
-			  </dependency>
-			  <dependency>
-				  <groupId>commons-jxpath</groupId>
-				  <artifactId>commons-jxpath</artifactId>
-				  <version>1.3</version>
-				  <type>jar</type>
-			  </dependency>
-		  </dependencies>
-	  </location>
 	  <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Jakarta EE" missingManifest="error" type="Maven">
 		  <dependencies>
 			  <dependency>
diff --git a/eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr b/eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr
index bc9c9bb4e5b..68ba52090b0 100644
--- a/eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr
+++ b/eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr
@@ -25,7 +25,6 @@
   <mavenMappings namePattern="(org\.(commonmark))(.*)" groupId="$1" artifactId="$2-ext$3"/>
   <mavenMappings namePattern="javax\.annotation" groupId="jakarta.annotation" artifactId="jakarta.annotation-api"/>
   <mavenMappings namePattern="(javax.inject)" groupId="$1" artifactId="$1" versionPattern="([^.]+)\.0(?:\..*)?" versionTemplate="$1"/>
-  <mavenMappings namePattern="org\.apache\.commons\.(jxpath|logging)" groupId="commons-$1" artifactId="commons-$1" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>
   <mavenMappings namePattern="org\.apache\.lucene\.(.*)" groupId="org.apache.lucene" artifactId="lucene-$1"/>
   <mavenMappings namePattern="org\.apache\.ant$" groupId="org.apache.ant" artifactId="ant"/>
   <mavenMappings namePattern="org.apache.batik.([^.]+)" groupId="org.apache.xmlgraphics" artifactId="batik-$1" versionPattern="([^.]+)\.([^.]+)\.0(?:\..*)?" versionTemplate="$1.$2"/>