Switch Jersey dependencies to Maven

And update to version 2.40 while at it.
eclipse-linuxtools · Jul 17, 2023 · 5a8b320 · 5a8b320
1 parent d38cca3
commit 5a8b320
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 33 deletions.
diff --git a/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.glassfish.jersey.core.jersey-client;bundle-version="2.30.1",
  org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="2.30.1",
  org.glassfish.jersey.core.jersey-common;bundle-version="2.30.1",
- org.glassfish.jersey.containers.servlet;bundle-version="2.3.0.1",
+ org.glassfish.jersey.containers.jersey-container-servlet;bundle-version="2.40",
  org.glassfish.jersey.inject.jersey-hk2;bundle-version="2.3.0.1",
  org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
  org.eclipse.debug.core;bundle-version="3.10.100",

diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.linuxtools.docker.ui;bundle-version="1.0.0",
  org.mockito.mockito-core,
  org.glassfish.hk2.api;bundle-version="2.3.0",
  org.glassfish.jersey.core.jersey-common;bundle-version="2.3.0",
- org.glassfish.jersey.containers.servlet.core;bundle-version="2.3.0",
+ org.glassfish.jersey.containers.jersey-container-servlet-core;bundle-version="2.40",
  org.glassfish.jersey.inject.jersey-hk2;bundle-version="2.3.0",
  com.fasterxml.jackson.core.jackson-core;bundle-version="2.5.0",
  com.fasterxml.jackson.core.jackson-databind;bundle-version="2.5.0",

diff --git a/releng/org.eclipse.linuxtools.docker-site/category.xml b/releng/org.eclipse.linuxtools.docker-site/category.xml
@@ -96,10 +96,6 @@
    <iu id="org.mandas.docker-client" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>
-   <iu id="org.mandas.docker-client.source" version="0.0.0">
-        <category name="Docker Client Dependencies"/>
-   </iu>
-
    <iu id="org.apache.httpcomponents.httpcore" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>
@@ -178,7 +174,7 @@
    <iu id="org.glassfish.hk2.utils" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>
-   <iu id="org.glassfish.jersey.apache.connector" version="0.0.0">
+   <iu id="org.glassfish.jersey.connectors.jersey-apache-connector" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>
    <iu id="org.glassfish.jersey.core.jersey-client" version="0.0.0">
@@ -190,16 +186,16 @@
    <iu id="org.glassfish.jersey.media.jersey-media-json-jackson" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>
-   <iu id="org.glassfish.jersey.ext.entityfiltering" version="0.0.0">
+   <iu id="org.glassfish.jersey.ext.jersey-entity-filtering" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>
    <iu id="org.glassfish.jersey.core.jersey-server" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>
-   <iu id="org.glassfish.jersey.containers.servlet.core" version="0.0.0">
+   <iu id="org.glassfish.jersey.containers.jersey-container-servlet-core" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>
-   <iu id="org.glassfish.jersey.containers.servlet" version="0.0.0">
+   <iu id="org.glassfish.jersey.containers.jersey-container-servlet" version="0.0.0">
         <category name="Docker Client Dependencies"/>
    </iu>
    <iu id="org.glassfish.jersey.inject.jersey-hk2" version="0.0.0">

diff --git a/releng/org.eclipse.linuxtools.docker-site/pom.xml b/releng/org.eclipse.linuxtools.docker-site/pom.xml
@@ -42,6 +42,8 @@
 						</goals>
 						<configuration>
 							<finalName>${project.artifactId}</finalName>
+							<includeAllDependencies>true</includeAllDependencies>
+          					<includeAllSources>true</includeAllSources>
 						</configuration>
 					</execution>
 				</executions>

diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.29.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.29.target
@@ -21,15 +21,6 @@
 <unit id="org.glassfish.hk2.locator" version="2.6.1.v20221203-1659"/>
 <unit id="org.glassfish.hk2.osgi-resource-locator" version="2.5.0.v20161103-1916"/>
 <unit id="org.glassfish.hk2.utils" version="2.6.1.v20221203-1659"/>
-<unit id="org.glassfish.jersey.apache.connector" version="2.30.1.v20221203-1659"/>
-<unit id="org.glassfish.jersey.containers.servlet" version="2.30.1.v20221112-0806"/>
-<unit id="org.glassfish.jersey.containers.servlet.core" version="2.30.1.v20221112-0806"/>
-<unit id="org.glassfish.jersey.core.jersey-client" version="2.30.1.v20221112-0806"/>
-<unit id="org.glassfish.jersey.core.jersey-common" version="2.30.1.v20221112-0806"/>
-<unit id="org.glassfish.jersey.core.jersey-server" version="2.30.1.v20221112-0806"/>
-<unit id="org.glassfish.jersey.ext.entityfiltering" version="2.30.1.v20221112-0806"/>
-<unit id="org.glassfish.jersey.inject.jersey-hk2" version="2.30.1.v20221203-1659"/>
-<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.30.1.v20221112-0806"/>
 <unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
 <unit id="org.aopalliance" version="1.0.0.v20220404-1927"/>
 <repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06"/>
@@ -101,6 +92,20 @@
 </location>
 	<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
 		<dependencies>
+			<dependency>
+				<groupId>com.github.jnr</groupId>
+				<artifactId>jffi</artifactId>
+				<version>1.3.11</version>
+				<type>jar</type>
+				<classifier>complete</classifier>
+			</dependency>
+			<dependency>
+				<groupId>com.github.jnr</groupId>
+				<artifactId>jffi</artifactId>
+				<version>1.3.11</version>
+				<type>jar</type>
+				<classifier>native</classifier>
+			</dependency>
 			<dependency>
 				<groupId>com.github.jnr</groupId>
 				<artifactId>jnr-constants</artifactId>
@@ -113,20 +118,6 @@
 				<version>0.32.15</version>
 				<type>jar</type>
 			</dependency>
-			<dependency>
-	          <groupId>com.github.jnr</groupId>
-	          <artifactId>jffi</artifactId>
-	          <version>1.3.11</version>
-	          <type>jar</type>
-	          <classifier>complete</classifier>
-	        </dependency>
-	        <dependency>
-	          <groupId>com.github.jnr</groupId>
-	          <artifactId>jffi</artifactId>
-	          <version>1.3.11</version>
-	          <type>jar</type>
-	          <classifier>native</classifier>
-	        </dependency>
 			<dependency>
 				<groupId>com.github.jnr</groupId>
 				<artifactId>jnr-ffi</artifactId>
@@ -157,6 +148,60 @@
 				<version>1.75</version>
 				<type>jar</type>
 			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jersey.connectors</groupId>
+				<artifactId>jersey-apache-connector</artifactId>
+				<version>2.40</version>
+				<type>jar</type>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jersey.containers</groupId>
+				<artifactId>jersey-container-servlet-core</artifactId>
+				<version>2.40</version>
+				<type>jar</type>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jersey.containers</groupId>
+				<artifactId>jersey-container-servlet</artifactId>
+				<version>2.40</version>
+				<type>jar</type>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jersey.core</groupId>
+				<artifactId>jersey-client</artifactId>
+				<version>2.40</version>
+				<type>jar</type>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jersey.core</groupId>
+				<artifactId>jersey-common</artifactId>
+				<version>2.40</version>
+				<type>jar</type>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish.jersey.core</groupId>
+				<artifactId>jersey-server</artifactId>
+				<version>2.40</version>
+				<type>jar</type>
+			</dependency>
+			<dependency>
+			    <groupId>org.glassfish.jersey.media</groupId>
+			    <artifactId>jersey-media-json-jackson</artifactId>
+			    <version>2.40</version>
+			    <type>jar</type>
+			</dependency>
+			<dependency>
+			    <groupId>org.glassfish.jersey.ext</groupId>
+			    <artifactId>jersey-entity-filtering</artifactId>
+			    <version>2.40</version>
+			    <type>jar</type>
+			</dependency>
+			<dependency>
+			    <groupId>org.glassfish.jersey.inject</groupId>
+			    <artifactId>jersey-hk2</artifactId>
+			    <version>2.40</version>
+			    <type>jar</type>
+			</dependency>
 			<dependency>
 				<groupId>org.javassist</groupId>
 				<artifactId>javassist</artifactId>