Fixes piranhacloud#4077 - Update to Jersey 4.0.0-M1

mnriem · Oct 20, 2024 · 79ba9d4 · 79ba9d4
1 parent cc566fd
commit 79ba9d4
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 11 deletions.
diff --git a/VERSIONS.md b/VERSIONS.md
@@ -16,7 +16,6 @@ used by Piranha to deliver various bits and pieces of functionality.
 | Eclipse Grizzly           | 4.1.0-M1      |
 | Eclipse Grizzly NPN       | 2.0.0         |
 | Eclipse JAXB              | 4.0.5         |
-| Eclipse Jersey            | 3.1.7         |
 | Eclipse JSTL              | 3.0.1         |
 | Eclipse Mojarra           | 4.1.0         |
 | Eclipse Parsson           | 1.1.7         |
@@ -25,6 +24,8 @@ used by Piranha to deliver various bits and pieces of functionality.
 | Eclipse Yasson            | 3.0.4         |
 | EclipseLink               | 5.0.0-B02     |
 | Hazelcast                 | 5.4.0         |
+| Jakarta REST              | 4.0.0         |
+| Jersey                    | 4.0.0-M1      |
 | Netty                     | 4.1.112.Final |
 | OmniFaces Services        | 0.4           |
 | OmniFish OmniBeans        | 0.3           |

diff --git a/extension/coreprofile/pom.xml b/extension/coreprofile/pom.xml
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-jersey</artifactId>
+            <artifactId>piranha-extension-jersey</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

diff --git a/extension/eclipse-jersey/pom.xml → extension/jersey/pom.xml b/extension/eclipse-jersey/pom.xml → extension/jersey/pom.xml
@@ -9,9 +9,9 @@
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
-    <artifactId>piranha-extension-eclipse-jersey</artifactId>
+    <artifactId>piranha-extension-jersey</artifactId>
     <packaging>jar</packaging>
-    <name>Piranha - Extension - Eclipse Jersey</name>
+    <name>Piranha - Extension - Jersey</name>
     <dependencies>
         <!-- compile -->
         <dependency>

diff --git a/...nha/extension/jersey/JerseyExtension.java → ...nha/extension/jersey/JerseyExtension.java b/...nha/extension/jersey/JerseyExtension.java → ...nha/extension/jersey/JerseyExtension.java
diff --git a/...ha/extension/jersey/JerseySourceBean.java → ...ha/extension/jersey/JerseySourceBean.java b/...ha/extension/jersey/JerseySourceBean.java → ...ha/extension/jersey/JerseySourceBean.java
diff --git a/...ha/extension/jersey/JerseyTargetBean.java → ...ha/extension/jersey/JerseyTargetBean.java b/...ha/extension/jersey/JerseyTargetBean.java → ...ha/extension/jersey/JerseyTargetBean.java
diff --git a/...pse-jersey/src/main/java/module-info.java → ...ion/jersey/src/main/java/module-info.java b/...pse-jersey/src/main/java/module-info.java → ...ion/jersey/src/main/java/module-info.java
diff --git a/...s/jakarta.enterprise.inject.spi.Extension → ...s/jakarta.enterprise.inject.spi.Extension b/...s/jakarta.enterprise.inject.spi.Extension → ...s/jakarta.enterprise.inject.spi.Extension
diff --git a/extension/micro/pom.xml b/extension/micro/pom.xml
@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-jersey</artifactId>
+            <artifactId>piranha-extension-jersey</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

diff --git a/extension/microprofile/pom.xml b/extension/microprofile/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-jersey</artifactId>
+            <artifactId>piranha-extension-jersey</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

diff --git a/extension/platform/pom.xml b/extension/platform/pom.xml
@@ -52,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-jersey</artifactId>
+            <artifactId>piranha-extension-jersey</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency> 

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -30,7 +30,6 @@
         <module>eclipse-exousia</module>
         <module>eclipse-expressly</module>
         <module>eclipse-jaxb</module>
-        <module>eclipse-jersey</module>
         <module>eclipse-jstl</module>
         <module>eclipse-mojarra</module>
         <module>eclipse-parsson</module>
@@ -63,6 +62,7 @@
         <module>webprofile</module>
         <module>webxml</module>
         <module>welcomefile</module>
+        <module>jersey</module>
     </modules>
 
     <dependencyManagement>

diff --git a/extension/webprofile/pom.xml b/extension/webprofile/pom.xml
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-jersey</artifactId>
+            <artifactId>piranha-extension-jersey</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

diff --git a/pom.xml b/pom.xml
@@ -98,7 +98,7 @@
         <jandex.version>3.2.2</jandex.version>
         <jaxb-runtime.version>4.0.5</jaxb-runtime.version>
         <jboss-classfilewriter.version>1.3.1.Final</jboss-classfilewriter.version>
-        <jersey.version>4.0-M1-GF1</jersey.version>
+        <jersey.version>4.0.0-M1</jersey.version>
         <jstl.version>3.0.1</jstl.version>
         <junit-pioneer.version>2.3.0</junit-pioneer.version>
         <junit-platform-launcher.version>1.11.2</junit-platform-launcher.version>

diff --git a/test/embedded/jersey/pom.xml b/test/embedded/jersey/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-jersey</artifactId>
+            <artifactId>piranha-extension-jersey</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>