diff --git a/VERSIONS.md b/VERSIONS.md index a7e5d85d7..29213b8e5 100644 --- 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 index a725cbe63..6a66349ed 100644 --- a/extension/coreprofile/pom.xml +++ b/extension/coreprofile/pom.xml @@ -45,7 +45,7 @@ cloud.piranha.extension - piranha-extension-eclipse-jersey + piranha-extension-jersey ${project.version} compile diff --git a/extension/eclipse-jersey/pom.xml b/extension/jersey/pom.xml similarity index 96% rename from extension/eclipse-jersey/pom.xml rename to extension/jersey/pom.xml index a505ab86c..6c48067fc 100644 --- a/extension/eclipse-jersey/pom.xml +++ b/extension/jersey/pom.xml @@ -9,9 +9,9 @@ project 24.11.0-SNAPSHOT - piranha-extension-eclipse-jersey + piranha-extension-jersey jar - Piranha - Extension - Eclipse Jersey + Piranha - Extension - Jersey diff --git a/extension/eclipse-jersey/src/main/java/cloud/piranha/extension/jersey/JerseyExtension.java b/extension/jersey/src/main/java/cloud/piranha/extension/jersey/JerseyExtension.java similarity index 100% rename from extension/eclipse-jersey/src/main/java/cloud/piranha/extension/jersey/JerseyExtension.java rename to extension/jersey/src/main/java/cloud/piranha/extension/jersey/JerseyExtension.java diff --git a/extension/eclipse-jersey/src/main/java/cloud/piranha/extension/jersey/JerseySourceBean.java b/extension/jersey/src/main/java/cloud/piranha/extension/jersey/JerseySourceBean.java similarity index 100% rename from extension/eclipse-jersey/src/main/java/cloud/piranha/extension/jersey/JerseySourceBean.java rename to extension/jersey/src/main/java/cloud/piranha/extension/jersey/JerseySourceBean.java diff --git a/extension/eclipse-jersey/src/main/java/cloud/piranha/extension/jersey/JerseyTargetBean.java b/extension/jersey/src/main/java/cloud/piranha/extension/jersey/JerseyTargetBean.java similarity index 100% rename from extension/eclipse-jersey/src/main/java/cloud/piranha/extension/jersey/JerseyTargetBean.java rename to extension/jersey/src/main/java/cloud/piranha/extension/jersey/JerseyTargetBean.java diff --git a/extension/eclipse-jersey/src/main/java/module-info.java b/extension/jersey/src/main/java/module-info.java similarity index 100% rename from extension/eclipse-jersey/src/main/java/module-info.java rename to extension/jersey/src/main/java/module-info.java diff --git a/extension/eclipse-jersey/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension b/extension/jersey/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension similarity index 100% rename from extension/eclipse-jersey/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension rename to extension/jersey/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension diff --git a/extension/micro/pom.xml b/extension/micro/pom.xml index ae60171bb..495ad3374 100644 --- a/extension/micro/pom.xml +++ b/extension/micro/pom.xml @@ -56,7 +56,7 @@ cloud.piranha.extension - piranha-extension-eclipse-jersey + piranha-extension-jersey ${project.version} compile diff --git a/extension/microprofile/pom.xml b/extension/microprofile/pom.xml index e162f9e3f..86912ed55 100644 --- a/extension/microprofile/pom.xml +++ b/extension/microprofile/pom.xml @@ -39,7 +39,7 @@ cloud.piranha.extension - piranha-extension-eclipse-jersey + piranha-extension-jersey ${project.version} compile diff --git a/extension/platform/pom.xml b/extension/platform/pom.xml index f897590a3..538dc6ed5 100644 --- a/extension/platform/pom.xml +++ b/extension/platform/pom.xml @@ -52,7 +52,7 @@ cloud.piranha.extension - piranha-extension-eclipse-jersey + piranha-extension-jersey ${project.version} compile diff --git a/extension/pom.xml b/extension/pom.xml index 6ac0e5621..c3b0b2d26 100644 --- a/extension/pom.xml +++ b/extension/pom.xml @@ -30,7 +30,6 @@ eclipse-exousia eclipse-expressly eclipse-jaxb - eclipse-jersey eclipse-jstl eclipse-mojarra eclipse-parsson @@ -63,6 +62,7 @@ webprofile webxml welcomefile + jersey diff --git a/extension/webprofile/pom.xml b/extension/webprofile/pom.xml index 1f9f04ed4..6b066e694 100644 --- a/extension/webprofile/pom.xml +++ b/extension/webprofile/pom.xml @@ -70,7 +70,7 @@ cloud.piranha.extension - piranha-extension-eclipse-jersey + piranha-extension-jersey ${project.version} compile diff --git a/pom.xml b/pom.xml index d72243c3f..9c2256021 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ 3.2.2 4.0.5 1.3.1.Final - 4.0-M1-GF1 + 4.0.0-M1 3.0.1 2.3.0 1.11.2 diff --git a/test/embedded/jersey/pom.xml b/test/embedded/jersey/pom.xml index 67cf57121..d9bfe7775 100644 --- a/test/embedded/jersey/pom.xml +++ b/test/embedded/jersey/pom.xml @@ -29,7 +29,7 @@ cloud.piranha.extension - piranha-extension-eclipse-jersey + piranha-extension-jersey ${project.version} test