Reuse Apache dependencies packaged by Eclipse.

eclipse-chemclipse · Dec 5, 2024 · 948f07a · 948f07a
1 parent e3b49b4
commit 948f07a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 50 deletions.
diff --git a/...ipse/plugins/org.eclipse.chemclipse.xxd.identifier.supplier.wikidata/META-INF/MANIFEST.MF b/...ipse/plugins/org.eclipse.chemclipse.xxd.identifier.supplier.wikidata/META-INF/MANIFEST.MF
@@ -20,12 +20,11 @@ Require-Bundle: org.eclipse.core.runtime,
  org.apache.commons.lang3;bundle-version="3.12.0",
  org.apache.thrift;bundle-version="0.12.0",
  org.apache.commons.commons-compress;bundle-version="1.22.0",
- wrapped.org.apache.httpcomponents.httpclient;bundle-version="4.5.14",
- wrapped.org.apache.httpcomponents.httpcore;bundle-version="4.4.16",
  org.slf4j.api;bundle-version="1.7.30",
- wrapped.org.apache.httpcomponents.httpclient-cache;bundle-version="4.5.14",
  org.eclipse.chemclipse.logging;bundle-version="0.9.0",
  org.eclipse.chemclipse.model;bundle-version="0.9.0",
- org.eclipse.chemclipse.chromatogram.xxd.identifier;bundle-version="0.9.0"
+ org.eclipse.chemclipse.chromatogram.xxd.identifier;bundle-version="0.9.0",
+ org.apache.httpcomponents.httpclient;bundle-version="4.5.14",
+ org.apache.httpcomponents.httpcore;bundle-version="4.4.16"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
diff --git a/...releng/org.eclipse.chemclipse.targetplatform/org.eclipse.chemclipse.targetplatform.target b/...releng/org.eclipse.chemclipse.targetplatform/org.eclipse.chemclipse.targetplatform.target
@@ -15,6 +15,12 @@
 	<unit id="org.glassfish.hk2.osgi-resource-locator" version="0.0.0"/>
 	<unit id="com.sun.xml.bind.jaxb-osgi" version="0.0.0"/>
 	<unit id="jakarta.xml.bind-api" version="0.0.0"/>
+	<unit id="org.apache.commons.codec" version="0.0.0"/>
+	<unit id="org.apache.commons.commons-collections4" version="0.0.0"/>
+	<unit id="org.apache.commons.commons-compress" version="0.0.0"/>
+	<unit id="org.apache.commons.lang3" version="0.0.0"/>
+	<unit id="org.apache.httpcomponents.httpclient" version="0.0.0"/>
+	<unit id="org.apache.httpcomponents.httpcore" version="0.0.0"/>
 	<repository location="https://download.eclipse.org/releases/2024-09/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -46,36 +52,12 @@
 				<version>1.5.0</version>
 				<type>jar</type>
 			</dependency>
-			<dependency>
-				<groupId>commons-codec</groupId>
-				<artifactId>commons-codec</artifactId>
-				<version>1.16.0</version>
-				<type>jar</type>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-collections4</artifactId>
-				<version>4.4</version>
-				<type>jar</type>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-compress</artifactId>
-				<version>1.24.0</version>
-				<type>jar</type>
-			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-csv</artifactId>
 				<version>1.10.0</version>
 				<type>jar</type>
 			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-lang3</artifactId>
-				<version>3.13.0</version>
-				<type>jar</type>
-			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-math3</artifactId>
@@ -228,28 +210,6 @@
 			</dependency>
 		</dependencies>
 	</location>
-	<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="org.apache.httpcomponents" missingManifest="generate" type="Maven">
-		<dependencies>
-			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpclient-cache</artifactId>
-				<version>4.5.14</version>
-				<type>jar</type>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpclient</artifactId>
-				<version>4.5.14</version>
-				<type>jar</type>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpcore</artifactId>
-				<version>4.4.16</version>
-				<type>jar</type>
-			</dependency>
-		</dependencies>
-	</location>
 	<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
 		<dependencies>
 			<dependency>