Updated Jetty Dependencies - (Task #1184)

- Removed Jetty Dependencies from external lib plugin.
- Added the jetty ee10 servlet to the external lib plugin
- Using the jetty 12 dependencies for the VirSatJettyServer. They are
shipped with Eclipse 2024-03

---
Task #1184: Updating to Eclipse 2024/03 and all dependencies

de.dlr.sc.virsat.external.lib.feature/feature.xml

@@ -8,14 +8,14 @@
  license-feature="de.dlr.sc.virsat.license.feature">
 
  <description>
- DLR SC VirSat External Libraries Feature
-German Aerospace Center (DLR e.V.)
+ DLR SC VirSat External Libraries Feature
+German Aerospace Center (DLR e.V.)
 Simulation and Software Technology
  </description>
 
  <copyright>
- Copyright 2015
-
+ Copyright 2015
+
 by German Aerospace Center (DLR e.V.)
  </copyright>
 
@@ -29,137 +29,86 @@ by German Aerospace Center (DLR e.V.)
  <import plugin="org.eclipse.core.runtime"/>
  <import plugin="org.eclipse.jface"/>
  <import plugin="org.eclipse.draw2d"/>
- <import plugin="jakarta.servlet-api"/>
  </requires>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.apache.poi"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.commons.cli"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.commons.math"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.jfreechart"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.protobuf"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.z3"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.zmq.linux.x86_64"
  os="linux"
  arch="x86_64"
- download-size="0"
- install-size="0"
  version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.zmq.win32.x86_64"
  os="win32"
  arch="x86_64"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.vtk.linux.x86_64"
  os="linux"
  arch="x86_64"
- download-size="0"
- install-size="0"
  version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.vtk.win32.x86_64"
  os="win32"
  arch="x86_64"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.nebula.incubation"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.spotbugs"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.json-simple"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.jersey"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.matlabfile"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.commons.csv"
- download-size="0"
- install-size="0"
  version="0.0.0"/>
 
  <plugin
  id="de.dlr.sc.virsat.external.lib.swagger"
- download-size="0"
- install-size="0"
  version="0.0.0"/>
 
 </feature>

de.dlr.sc.virsat.external.lib.jersey/.classpath

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-http-12.0.6.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-io-12.0.6.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-security-12.0.6.jar" sourcepath="externalLib/maven/jetty-security-12.0.6-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-server-12.0.6.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-session-12.0.6.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-util-12.0.6.jar" sourcepath="externalLib/maven/jetty-util-12.0.6-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-container-jetty-http-3.1.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-test-framework-provider-jetty-3.1.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-ee10-servlet-12.0.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="externalLib/maven/jakarta.servlet-api-6.0.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-test-framework-core-3.1.6.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/angus-mail-2.0.2.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/aopalliance-repackaged-3.0.6.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/asm-9.7.jar"/>
@@ -23,33 +22,27 @@
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jakarta.json.bind-api-3.0.1.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jakarta.json-api-2.1.3.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jakarta.mail-api-2.1.2.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jakarta.servlet-api-6.0.0.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jakarta.validation-api-3.0.2.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jakarta.ws.rs-api-3.1.0.jar" sourcepath="externalLib/maven/jakarta.ws.rs-api-3.1.0-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="externalLib/maven/jakarta.ws.rs-api-3.1.0.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jakarta.xml.bind-api-4.0.2.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/javassist-3.30.2-GA.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-client-3.1.6.jar" sourcepath="externalLib/maven/jersey-client-3.1.6-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-common-3.1.6.jar" sourcepath="externalLib/maven/jersey-common-3.1.6-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-container-jetty-http-3.1.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-client-3.1.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-common-3.1.6.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-container-servlet-3.1.6.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-container-servlet-core-3.1.6.jar" sourcepath="externalLib/maven/jersey-container-servlet-core-3.1.6-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-container-servlet-core-3.1.6.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-entity-filtering-3.1.6.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-hk2-3.1.6.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-media-jaxb-3.1.6.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-media-json-jackson-3.1.6.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-media-moxy-3.1.6.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-server-3.1.6.jar" sourcepath="externalLib/maven/jersey-server-3.1.6-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-test-framework-core-3.1.6.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-test-framework-provider-jetty-3.1.6.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/jetty-ee10-servlet-12.0.6.jar" sourcepath="externalLib/maven/jetty-ee10-servlet-12.0.6-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="externalLib/maven/jersey-server-3.1.6.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/org.eclipse.persistence.asm-9.5.0.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/org.eclipse.persistence.core-4.0.2.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/org.eclipse.persistence.moxy-4.0.2.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/org.osgi.service.prefs-1.1.2.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/osgi.annotation-8.0.1.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/osgi-resource-locator-1.0.3.jar"/>
  <classpathentry exported="true" kind="lib" path="externalLib/maven/parsson-1.1.5.jar"/>
- <classpathentry exported="true" kind="lib" path="externalLib/maven/slf4j-api-2.0.9.jar"/>
  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
  <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
  <classpathentry kind="src" path="src"/>

de.dlr.sc.virsat.external.lib.jersey/META-INF/MANIFEST.MF

@@ -168,40 +168,6 @@ Export-Package: .,
  org.eclipse.jetty.ee10.servlet.security,
  org.eclipse.jetty.ee10.servlet.security.authentication,
  org.eclipse.jetty.ee10.servlet.util,
- org.eclipse.jetty.http,
- org.eclipse.jetty.http.compression,
- org.eclipse.jetty.http.content,
- org.eclipse.jetty.http.pathmap,
- org.eclipse.jetty.io,
- org.eclipse.jetty.io.content,
- org.eclipse.jetty.io.internal,
- org.eclipse.jetty.io.jmx,
- org.eclipse.jetty.io.ssl,
- org.eclipse.jetty.security,
- org.eclipse.jetty.security.authentication,
- org.eclipse.jetty.security.internal,
- org.eclipse.jetty.security.jaas,
- org.eclipse.jetty.security.jaas.callback,
- org.eclipse.jetty.security.jaas.spi,
- org.eclipse.jetty.server,
- org.eclipse.jetty.server.handler,
- org.eclipse.jetty.server.handler.gzip,
- org.eclipse.jetty.server.handler.jmx,
- org.eclipse.jetty.server.internal,
- org.eclipse.jetty.server.jmx,
- org.eclipse.jetty.session,
- org.eclipse.jetty.util,
- org.eclipse.jetty.util.annotation,
- org.eclipse.jetty.util.component,
- org.eclipse.jetty.util.compression,
- org.eclipse.jetty.util.jndi,
- org.eclipse.jetty.util.preventers,
- org.eclipse.jetty.util.resource,
- org.eclipse.jetty.util.security,
- org.eclipse.jetty.util.ssl,
- org.eclipse.jetty.util.statistic,
- org.eclipse.jetty.util.thread,
- org.eclipse.jetty.util.thread.strategy,
  org.eclipse.parsson,
  org.eclipse.parsson.api,
  org.eclipse.persistence,
@@ -509,11 +475,7 @@ Export-Package: .,
  org.objectweb.asm.signature,
  org.osgi.annotation.bundle,
  org.osgi.annotation.versioning,
- org.osgi.service.prefs,
- org.slf4j,
- org.slf4j.event,
- org.slf4j.helpers,
- org.slf4j.spi
+ org.osgi.service.prefs
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Vendor: DLR (German Aerospace Center)
 Require-Bundle: de.dlr.sc.virsat.external.lib
@@ -536,14 +498,12 @@ Bundle-ClassPath: .,
  externalLib/maven/jakarta.json.bind-api-3.0.1.jar,
  externalLib/maven/jakarta.json-api-2.1.3.jar,
  externalLib/maven/jakarta.mail-api-2.1.2.jar,
- externalLib/maven/jakarta.servlet-api-6.0.0.jar,
  externalLib/maven/jakarta.validation-api-3.0.2.jar,
  externalLib/maven/jakarta.ws.rs-api-3.1.0.jar,
  externalLib/maven/jakarta.xml.bind-api-4.0.2.jar,
  externalLib/maven/javassist-3.30.2-GA.jar,
  externalLib/maven/jersey-client-3.1.6.jar,
  externalLib/maven/jersey-common-3.1.6.jar,
- externalLib/maven/jersey-container-jetty-http-3.1.6.jar,
  externalLib/maven/jersey-container-servlet-3.1.6.jar,
  externalLib/maven/jersey-container-servlet-core-3.1.6.jar,
  externalLib/maven/jersey-entity-filtering-3.1.6.jar,
@@ -552,23 +512,18 @@ Bundle-ClassPath: .,
  externalLib/maven/jersey-media-json-jackson-3.1.6.jar,
  externalLib/maven/jersey-media-moxy-3.1.6.jar,
  externalLib/maven/jersey-server-3.1.6.jar,
- externalLib/maven/jersey-test-framework-core-3.1.6.jar,
- externalLib/maven/jersey-test-framework-provider-jetty-3.1.6.jar,
- externalLib/maven/jetty-ee10-servlet-12.0.6.jar,
  externalLib/maven/org.eclipse.persistence.asm-9.5.0.jar,
  externalLib/maven/org.eclipse.persistence.core-4.0.2.jar,
  externalLib/maven/org.eclipse.persistence.moxy-4.0.2.jar,
  externalLib/maven/org.osgi.service.prefs-1.1.2.jar,
  externalLib/maven/osgi.annotation-8.0.1.jar,
  externalLib/maven/osgi-resource-locator-1.0.3.jar,
  externalLib/maven/parsson-1.1.5.jar,
- externalLib/maven/slf4j-api-2.0.9.jar,
- externalLib/maven/jetty-http-12.0.6.jar,
- externalLib/maven/jetty-io-12.0.6.jar,
- externalLib/maven/jetty-security-12.0.6.jar,
- externalLib/maven/jetty-server-12.0.6.jar,
- externalLib/maven/jetty-session-12.0.6.jar,
- externalLib/maven/jetty-util-12.0.6.jar
+ externalLib/maven/jakarta.servlet-api-6.0.0.jar,
+ externalLib/maven/jersey-test-framework-core-3.1.6.jar,
+ externalLib/maven/jetty-ee10-servlet-12.0.6.jar,
+ externalLib/maven/jersey-container-jetty-http-3.1.6.jar,
+ externalLib/maven/jersey-test-framework-provider-jetty-3.1.6.jar
 Automatic-Module-Name: de.dlr.sc.virsat.external.lib.jersey
 Bundle-ActivationPolicy: lazy
 Eclipse-BuddyPolicy: dependent

de.dlr.sc.virsat.external.lib.jersey/about_files/THIRD-PARTY.txt

@@ -1,5 +1,5 @@
 
-Lists of 41 third-party dependencies.
+Lists of 43 third-party dependencies.
  (Apache 2.0) Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.17.0 - https://github.com/FasterXML/jackson)
  (Apache 2.0) Jackson-core (com.fasterxml.jackson.core:jackson-core:2.17.0 - https://github.com/FasterXML/jackson-core)
  (Apache 2.0) jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.17.0 - https://github.com/FasterXML/jackson)
@@ -16,6 +16,7 @@ Lists of 41 third-party dependencies.
  (EDL 1.0) Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:4.0.2 - https://github.com/jakartaee/jaxb-api/jakarta.xml.bind-api)
  (Apache 2.0) Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.14.9 - https://bytebuddy.net/byte-buddy)
  (EDL 1.0) (EPL 2.0) (GPL2 w/ CPE) Angus Mail Provider (org.eclipse.angus:angus-mail:2.0.2 - http://eclipse-ee4j.github.io/angus-mail/angus-mail)
+ (Apache Software License - Version 2.0) (Eclipse Public License - Version 2.0) EE10 :: Servlet (org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.6 - https://eclipse.dev/jetty/jetty-ee10/jetty-ee10-servlet)
  (EPL 2.0) (GPL2 w/ CPE) Eclipse Parsson (org.eclipse.parsson:parsson:1.1.5 - https://github.com/eclipse-ee4j/parsson/parsson)
  (EDL 1.0) (EPL 2.0) EclipseLink ASM (org.eclipse.persistence:org.eclipse.persistence.asm:9.5.0 - http://www.eclipse.org/eclipselink)
  (EDL 1.0) (EPL 2.0) EclipseLink Core (org.eclipse.persistence:org.eclipse.persistence.core:4.0.2 - http://www.eclipse.org/eclipselink/foundation/org.eclipse.persistence.core)
@@ -39,5 +40,6 @@ Lists of 41 third-party dependencies.
  (Apache 2.0) (BSD 2-Clause) (EDL 1.0) (EPL 2.0) (GPL2 w/ CPE) (MIT) (Modified BSD) (Public Domain) (W3C license) (jQuery license) jersey-test-framework-core (org.glassfish.jersey.test-framework:jersey-test-framework-core:3.1.6 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-test-framework-core)
  (Apache 2.0) (BSD 2-Clause) (EDL 1.0) (EPL 2.0) (GPL2 w/ CPE) (MIT) (Modified BSD) (Public Domain) (W3C license) (jQuery license) jersey-test-framework-provider-jetty (org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:3.1.6 - https://projects.eclipse.org/projects/ee4j.jersey/project/project/jersey-test-framework-provider-jetty)
  (Apache 2.0) (LGPL 2.1) (MPL 1.1) Javassist (org.javassist:javassist:3.30.2-GA - https://www.javassist.org/)
+ (Apache 2.0) org.osgi:org.osgi.service.prefs (org.osgi:org.osgi.service.prefs:1.1.2 - https://docs.osgi.org/)
+ (Apache 2.0) org.osgi:osgi.annotation (org.osgi:osgi.annotation:8.0.1 - https://docs.osgi.org/)
  (BSD-3-Clause) asm (org.ow2.asm:asm:9.7 - http://asm.ow2.io/)
- (MIT License) SLF4J API Module (org.slf4j:slf4j-api:2.0.9 - http://www.slf4j.org)