From 932b9e19c0aa440145d4a108ad8f8e610841264f Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Sun, 20 Oct 2024 15:46:21 -0500 Subject: [PATCH 1/3] Fixes #4079 - Update Yasson to 3.0.4 (#4080) --- VERSIONS.md | 3 +- extension/coreprofile/pom.xml | 2 +- extension/micro/pom.xml | 2 +- extension/microprofile/pom.xml | 2 +- extension/platform/pom.xml | 2 +- extension/pom.xml | 2 +- extension/{eclipse-yasson => yasson}/pom.xml | 4 +- .../extension/yasson/YassonExtension.java | 0 .../src/main/java/module-info.java | 0 external/webprofile-tck/faces/pom.xml | 76 ------------------- test/debug/pom.xml | 2 +- test/embedded/eclipselink/pom.xml | 2 +- 12 files changed, 11 insertions(+), 86 deletions(-) rename extension/{eclipse-yasson => yasson}/pom.xml (91%) rename extension/{eclipse-yasson => yasson}/src/main/java/cloud/piranha/extension/yasson/YassonExtension.java (100%) rename extension/{eclipse-yasson => yasson}/src/main/java/module-info.java (100%) delete mode 100644 external/webprofile-tck/faces/pom.xml diff --git a/VERSIONS.md b/VERSIONS.md index c11fd425b0..52d25d9855 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -21,10 +21,10 @@ used by Piranha to deliver various bits and pieces of functionality. | Eclipse Parsson | 1.1.7 | | Eclipse Soteria | 4.0.0-M3 | | Eclipse Tyrus | 2.2.0-M1 | -| Eclipse Yasson | 3.0.4 | | EclipseLink | 5.0.0-B02 | | Hazelcast | 5.4.0 | | Jakarta CDI | 4.1.0 | +| Jakarta JSON Binding | 3.0.1 | | Jakarta REST | 4.0.0 | | Jersey | 4.0.0-M1 | | Netty | 4.1.112.Final | @@ -35,3 +35,4 @@ used by Piranha to deliver various bits and pieces of functionality. | Spring Boot | 3.3.0 | | Undertow | 2.3.14.Final | | Weld | 6.0.0.Beta4 | +| Yasson | 3.0.4 | diff --git a/extension/coreprofile/pom.xml b/extension/coreprofile/pom.xml index 280f79402d..f959fadfcc 100644 --- a/extension/coreprofile/pom.xml +++ b/extension/coreprofile/pom.xml @@ -51,7 +51,7 @@ cloud.piranha.extension - piranha-extension-eclipse-yasson + piranha-extension-yasson ${project.version} compile diff --git a/extension/micro/pom.xml b/extension/micro/pom.xml index 87f0496d77..299bfb8ec5 100644 --- a/extension/micro/pom.xml +++ b/extension/micro/pom.xml @@ -98,7 +98,7 @@ cloud.piranha.extension - piranha-extension-eclipse-yasson + piranha-extension-yasson ${project.version} compile diff --git a/extension/microprofile/pom.xml b/extension/microprofile/pom.xml index 4849539a52..fa141b5fd7 100644 --- a/extension/microprofile/pom.xml +++ b/extension/microprofile/pom.xml @@ -45,7 +45,7 @@ cloud.piranha.extension - piranha-extension-eclipse-yasson + piranha-extension-yasson ${project.version} compile diff --git a/extension/platform/pom.xml b/extension/platform/pom.xml index 20324f3ae2..a6ac661876 100644 --- a/extension/platform/pom.xml +++ b/extension/platform/pom.xml @@ -58,7 +58,7 @@ cloud.piranha.extension - piranha-extension-eclipse-yasson + piranha-extension-yasson ${project.version} compile diff --git a/extension/pom.xml b/extension/pom.xml index dc090ce9b5..b07d6b07a6 100644 --- a/extension/pom.xml +++ b/extension/pom.xml @@ -35,7 +35,6 @@ eclipse-parsson eclipse-soteria eclipse-tyrus - eclipse-yasson eclipse-wasp eclipselink hazelcast @@ -63,6 +62,7 @@ webxml welcomefile weld + yasson diff --git a/extension/eclipse-yasson/pom.xml b/extension/yasson/pom.xml similarity index 91% rename from extension/eclipse-yasson/pom.xml rename to extension/yasson/pom.xml index 2dcbbcc73d..160a31a8cb 100644 --- a/extension/eclipse-yasson/pom.xml +++ b/extension/yasson/pom.xml @@ -9,10 +9,10 @@ 24.11.0-SNAPSHOT - piranha-extension-eclipse-yasson + piranha-extension-yasson jar - Piranha - Extension - Eclipse Yasson + Piranha - Extension - Yasson diff --git a/extension/eclipse-yasson/src/main/java/cloud/piranha/extension/yasson/YassonExtension.java b/extension/yasson/src/main/java/cloud/piranha/extension/yasson/YassonExtension.java similarity index 100% rename from extension/eclipse-yasson/src/main/java/cloud/piranha/extension/yasson/YassonExtension.java rename to extension/yasson/src/main/java/cloud/piranha/extension/yasson/YassonExtension.java diff --git a/extension/eclipse-yasson/src/main/java/module-info.java b/extension/yasson/src/main/java/module-info.java similarity index 100% rename from extension/eclipse-yasson/src/main/java/module-info.java rename to extension/yasson/src/main/java/module-info.java diff --git a/external/webprofile-tck/faces/pom.xml b/external/webprofile-tck/faces/pom.xml deleted file mode 100644 index 9d818aeb33..0000000000 --- a/external/webprofile-tck/faces/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - 4.0.0 - - cloud.piranha.external.webprofiletck - project - 24.11.0-SNAPSHOT - - faces-tck - pom - Piranha Web Profile - Jakarta Faces TCK - - 4.0.3 - ${mojarra.version} - ${project.build.directory}/tck - - - - - cloud.piranha - bom - ${project.version} - pom - import - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - pre-integration-test - pre-integration-test - - run - - - - - - - - - - - - integration-test - integration-test - - run - - - - - - - - - - - - - - - - diff --git a/test/debug/pom.xml b/test/debug/pom.xml index 06afa47290..70b6dba271 100644 --- a/test/debug/pom.xml +++ b/test/debug/pom.xml @@ -96,7 +96,7 @@ cloud.piranha.extension - piranha-extension-eclipse-yasson + piranha-extension-yasson ${project.version} diff --git a/test/embedded/eclipselink/pom.xml b/test/embedded/eclipselink/pom.xml index 521fc81004..459683ca90 100644 --- a/test/embedded/eclipselink/pom.xml +++ b/test/embedded/eclipselink/pom.xml @@ -69,7 +69,7 @@ cloud.piranha.extension - piranha-extension-eclipse-yasson + piranha-extension-yasson ${project.version} test From 69fa369379d7e797b34ec0fd2c83274db1d249df Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Sun, 20 Oct 2024 16:12:08 -0500 Subject: [PATCH 2/3] Fixes #4081 - Update to Parsson 1.1.7 (#4082) --- VERSIONS.md | 3 ++- extension/micro/pom.xml | 2 +- extension/{eclipse-parsson => parsson}/pom.xml | 4 ++-- .../cloud/piranha/extension/parsson/ParssonExtension.java | 0 .../src/main/java/module-info.java | 0 extension/pom.xml | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) rename extension/{eclipse-parsson => parsson}/pom.xml (91%) rename extension/{eclipse-parsson => parsson}/src/main/java/cloud/piranha/extension/parsson/ParssonExtension.java (100%) rename extension/{eclipse-parsson => parsson}/src/main/java/module-info.java (100%) diff --git a/VERSIONS.md b/VERSIONS.md index 52d25d9855..c7aa282b1b 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -18,12 +18,12 @@ used by Piranha to deliver various bits and pieces of functionality. | Eclipse JAXB | 4.0.5 | | Eclipse JSTL | 3.0.1 | | Eclipse Mojarra | 4.1.0 | -| Eclipse Parsson | 1.1.7 | | Eclipse Soteria | 4.0.0-M3 | | Eclipse Tyrus | 2.2.0-M1 | | EclipseLink | 5.0.0-B02 | | Hazelcast | 5.4.0 | | Jakarta CDI | 4.1.0 | +| Jakarta JSON Processing | 2.1.3 | | Jakarta JSON Binding | 3.0.1 | | Jakarta REST | 4.0.0 | | Jersey | 4.0.0-M1 | @@ -31,6 +31,7 @@ used by Piranha to deliver various bits and pieces of functionality. | OmniFaces Services | 0.4 | | OmniFish OmniBeans | 0.3 | | OmniFish Transact | 1.0.1 | +| Parsson | 1.1.7 | | Project CRaC | 0.1.3 | | Spring Boot | 3.3.0 | | Undertow | 2.3.14.Final | diff --git a/extension/micro/pom.xml b/extension/micro/pom.xml index 299bfb8ec5..3da20db410 100644 --- a/extension/micro/pom.xml +++ b/extension/micro/pom.xml @@ -74,7 +74,7 @@ cloud.piranha.extension - piranha-extension-eclipse-parsson + piranha-extension-parsson ${project.version} compile diff --git a/extension/eclipse-parsson/pom.xml b/extension/parsson/pom.xml similarity index 91% rename from extension/eclipse-parsson/pom.xml rename to extension/parsson/pom.xml index 7c74239428..78d4d17505 100644 --- a/extension/eclipse-parsson/pom.xml +++ b/extension/parsson/pom.xml @@ -7,9 +7,9 @@ project 24.11.0-SNAPSHOT - piranha-extension-eclipse-parsson + piranha-extension-parsson jar - Piranha - Extension - Eclipse Parsson + Piranha - Extension - Parsson diff --git a/extension/eclipse-parsson/src/main/java/cloud/piranha/extension/parsson/ParssonExtension.java b/extension/parsson/src/main/java/cloud/piranha/extension/parsson/ParssonExtension.java similarity index 100% rename from extension/eclipse-parsson/src/main/java/cloud/piranha/extension/parsson/ParssonExtension.java rename to extension/parsson/src/main/java/cloud/piranha/extension/parsson/ParssonExtension.java diff --git a/extension/eclipse-parsson/src/main/java/module-info.java b/extension/parsson/src/main/java/module-info.java similarity index 100% rename from extension/eclipse-parsson/src/main/java/module-info.java rename to extension/parsson/src/main/java/module-info.java diff --git a/extension/pom.xml b/extension/pom.xml index b07d6b07a6..69f3945d34 100644 --- a/extension/pom.xml +++ b/extension/pom.xml @@ -32,7 +32,6 @@ eclipse-jaxb eclipse-jstl eclipse-mojarra - eclipse-parsson eclipse-soteria eclipse-tyrus eclipse-wasp @@ -49,6 +48,7 @@ omnifaces-omniutils omnifish-omnibeans omnifish-transact + parsson platform policy redhat-hibernate-validator From fbf6ee0dde68a20c0092563d8d31d03699442eeb Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Sun, 20 Oct 2024 16:29:36 -0500 Subject: [PATCH 3/3] Fixes #4083 - Update to Jakarta Servlet 6.1.0 (#4084) --- VERSIONS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/VERSIONS.md b/VERSIONS.md index c7aa282b1b..2839cf8462 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -26,6 +26,7 @@ used by Piranha to deliver various bits and pieces of functionality. | Jakarta JSON Processing | 2.1.3 | | Jakarta JSON Binding | 3.0.1 | | Jakarta REST | 4.0.0 | +| Jakarta Servlet | 6.1.0 | | Jersey | 4.0.0-M1 | | Netty | 4.1.112.Final | | OmniFaces Services | 0.4 |