Turned over to Jersey 2.35 from Maven Central (see target platform)

EnFlexIT · Mar 27, 2022 · 8ee7e17 · 8ee7e17
1 parent e155db2
commit 8ee7e17
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 141 deletions.
diff --git a/eclipseProjects/org.agentgui/bundles/de.enflexit.awb.ws.core/META-INF/MANIFEST.MF b/eclipseProjects/org.agentgui/bundles/de.enflexit.awb.ws.core/META-INF/MANIFEST.MF
@@ -20,5 +20,5 @@ Export-Package: de.enflexit.awb.ws,
  de.enflexit.awb.ws.server
 Import-Package: javax.servlet;version="4.0.0",
  javax.validation;version="1.1.0",
- org.glassfish.jersey.server.spi;version="2.30.1",
- org.glassfish.jersey.servlet;version="2.30.1"
+ org.glassfish.jersey.server.spi;version="2.35.0",
+ org.glassfish.jersey.servlet;version="2.35.0"
diff --git a/...s/org.agentgui/bundles/de.enflexit.awb.ws.core/src/de/enflexit/awb/ws/AwbWsActivator.java b/...s/org.agentgui/bundles/de.enflexit.awb.ws.core/src/de/enflexit/awb/ws/AwbWsActivator.java
@@ -5,8 +5,8 @@
 
 import agentgui.core.application.Application;
 import agentgui.core.application.ApplicationListener;
-import de.enflexit.awb.ws.core.JettyServerManager;
 import de.enflexit.awb.ws.core.JettyConfiguration.StartOn;
+import de.enflexit.awb.ws.core.JettyServerManager;
 
 /**
  * The Class WsActivator.
@@ -20,6 +20,7 @@ public class AwbWsActivator implements BundleActivator, ApplicationListener {
 	private AwbWebServerServiceTracker webServerServiceTracker;
 	private AwbWebHandlerServiceTracker webHandlerServiceTracker;
 
+
 	/* (non-Javadoc)
 	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
 	 */

diff --git a/eclipseProjects/org.agentgui/features/de.enflexit.awb.ws.feature/feature.xml b/eclipseProjects/org.agentgui/features/de.enflexit.awb.ws.feature/feature.xml
@@ -37,8 +37,6 @@
       <import plugin="org.agentgui.core"/>
       <import plugin="jakarta.servlet-api"/>
       <import plugin="jakarta.validation.jakarta.validation-api"/>
-      <import plugin="org.glassfish.jersey.core.jersey-server"/>
-      <import plugin="org.glassfish.jersey.containers.servlet.core"/>
    </requires>
 
    <plugin

diff --git a/eclipseProjects/org.agentgui/features/de.enflexit.awb.ws.jersey.feature/feature.xml b/eclipseProjects/org.agentgui/features/de.enflexit.awb.ws.jersey.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.enflexit.awb.ws.jersey.feature"
       label="Agent.Workbench Jersey-Feature"
-      version="2.30.1.qualifier"
+      version="2.35.0.qualifier"
       provider-name="Enflex.IT">
 
    <description url="http://www.example.com/description">
@@ -17,20 +17,6 @@
       [Enter License Description here.]
    </license>
 
-   <plugin
-         id="org.glassfish.jersey.containers.servlet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.glassfish.jersey.media.jersey-media-jaxb"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.glassfish.jersey.core.jersey-server"
          download-size="0"
@@ -52,69 +38,20 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.glassfish.jersey.media.jersey-media-json-jackson"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.glassfish.jersey.core.jersey-client"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.glassfish.jersey.ext.jersey-bean-validation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.glassfish.jersey.containers.servlet.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.glassfish.jersey.ext.entityfiltering"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.google.gson"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.hibernate.validator.hibernate-validator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.fasterxml.classmate"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.el-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.glassfish.hk2.external.jakarta.inject"
          download-size="0"
@@ -129,13 +66,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.jboss.logging.jboss-logging"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="javax.el"
          download-size="0"
@@ -144,70 +74,35 @@
          unpack="false"/>
 
    <plugin
-         id="com.fasterxml.jackson.core.jackson-annotations"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.fasterxml.jackson.core.jackson-core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.fasterxml.jackson.core.jackson-databind"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.ws.rs"
+         id="org.glassfish.hk2.api"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.aopalliance"
+         id="org.glassfish.hk2.locator"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.glassfish.hk2.api"
+         id="org.glassfish.hk2.utils"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.glassfish.hk2.locator"
+         id="org.glassfish.jersey.containers.jersey-container-servlet"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.glassfish.hk2.utils"
+         id="org.glassfish.jersey.containers.jersey-container-servlet-core"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/eclipseProjects/org.agentgui/releng/org.agentgui.target/org.agentgui.target.target b/eclipseProjects/org.agentgui/releng/org.agentgui.target/org.agentgui.target.target
@@ -35,23 +35,6 @@
 		<unit id="org.bouncycastle.bcpkix.source" version="0.0.0"/>
 		<unit id="org.bouncycastle.bcprov" version="0.0.0"/>
 		<unit id="org.bouncycastle.bcprov.source" version="0.0.0"/>
-		<unit id="com.google.gson" version="0.0.0"/>
-		<unit id="com.google.gson.source" version="0.0.0"/>
-
-		<unit id="org.glassfish.jersey.core.jersey-server" version="0.0.0"/>
-		<unit id="org.glassfish.jersey.core.jersey-server.source" version="0.0.0"/>
-		<unit id="org.glassfish.jersey.containers.servlet" version="0.0.0"/>
-		<unit id="org.glassfish.jersey.containers.servlet.source" version="0.0.0"/>
-		<unit id="org.glassfish.jersey.core.jersey-client" version="0.0.0"/>
-		<unit id="org.glassfish.jersey.core.jersey-client.source" version="0.0.0"/>
-		<unit id="org.glassfish.jersey.core.jersey-common" version="0.0.0"/>
-		<unit id="org.glassfish.jersey.core.jersey-common.source" version="0.0.0"/>
-		<unit id="org.glassfish.jersey.ext.entityfiltering" version="0.0.0"/>
-		<unit id="org.glassfish.jersey.ext.entityfiltering.source" version="0.0.0"/>
-		<unit id="org.glassfish.jersey.inject.jersey-hk2" version="0.0.0"/>
-		<unit id="org.glassfish.jersey.inject.jersey-hk2.source" version="0.0.0"/>
-		<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="0.0.0"/>
-		<unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="0.0.0"/>
 		<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/>
 		<!--  Space for older versions (as reminder)
 		<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>
@@ -67,9 +50,10 @@
 		<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository"/>
 		-->
 	</location>
+
+	<!-- JAXB integration as bundle -->
 	<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
 		<dependencies>
-			<!-- JAXB integration as bundle -->
 			<dependency>
 				<groupId>com.sun.xml.bind</groupId>
 				<artifactId>jaxb-impl</artifactId>
@@ -78,26 +62,37 @@
 			</dependency>
 		</dependencies>
 	</location>
+
+	<!-- Integration of latest Jersey version comptible to Jetty -->
 	<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
 		<dependencies>
-			<!-- With an AWB adjustment/release: Check Orbit version of 'org.glassfish.jersey.containers.servlet' and place version in here!!! -->
 			<dependency>
-				<groupId>org.glassfish.jersey.ext</groupId>
-				<artifactId>jersey-bean-validation</artifactId>
-    			<version>2.30.1</version>
+			    <groupId>org.glassfish.jersey.containers</groupId>
+			    <artifactId>jersey-container-servlet</artifactId>
+			    <version>2.35</version>
+			    <scope>provided</scope>
+			</dependency>
+			<dependency>
+			    <groupId>org.glassfish.jersey.inject</groupId>
+			    <artifactId>jersey-hk2</artifactId>
+			    <version>2.35</version>
+			</dependency>
+			<dependency>
+			    <groupId>com.google.code.gson</groupId>
+			    <artifactId>gson</artifactId>
+			    <version>2.9.0</version>
 			</dependency>
-
 		</dependencies>
 	</location>
+
+	<!-- Integration of Swagger / OpenAI for Rest srevices  -->
 	<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
 		<dependencies>
-			<!-- Integration of Swagger / OpenAI for Rest srevices  -->
 			<dependency>
 				<groupId>io.swagger.core.v3</groupId>
 				<artifactId>swagger-jaxrs2</artifactId>
 				<version>2.1.13</version>
 			</dependency>
-
 		</dependencies>
 	</location>
 </locations>