From aa76070a430bada5d8566a5e7be19e80ca9396ef Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Sat, 2 Nov 2024 10:54:55 -0500 Subject: [PATCH] Fixes #4157 - Update Expressly to latest version (#4158) --- VERSIONS.md | 81 ++++++++++--------- .../{eclipse-expressly => expressly}/pom.xml | 4 +- .../expressly/ExpresslyExtension.java | 2 +- .../src/main/java/module-info.java | 9 +-- extension/micro/pom.xml | 2 +- extension/platform/pom.xml | 2 +- extension/pom.xml | 2 +- extension/servlet/pom.xml | 2 +- extension/webprofile/pom.xml | 2 +- test/debug/pom.xml | 2 +- test/embedded/eclipselink/pom.xml | 2 +- test/embedded/hazelcast/pom.xml | 2 +- test/embedded/weld/pom.xml | 2 +- 13 files changed, 55 insertions(+), 59 deletions(-) rename extension/{eclipse-expressly => expressly}/pom.xml (88%) rename extension/{eclipse-expressly => expressly}/src/main/java/cloud/piranha/extension/expressly/ExpresslyExtension.java (97%) rename extension/{eclipse-expressly => expressly}/src/main/java/module-info.java (88%) diff --git a/VERSIONS.md b/VERSIONS.md index 20c1129857..da0576c11d 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -3,46 +3,47 @@ The table below lists all the versions of the 3rd party components that are used by Piranha to deliver various bits and pieces of functionality. -| Name | Version | CP | WP | -|---------------------------|---------------|-----|-----| -| Apache Commons FileUpload | 2.0.0-M2 | | | -| Apache Commons IO | 2.15.1 | | | -| Arquillian | 1.8.0.Final | | | -| Eclipse Angus Activation | 2.0.2 | | | -| Eclipse Angus Mail | 2.0.3 | | | -| Eclipse Epicyro | 3.1.0 | | | -| Eclipse Exousia | 3.0.0-M1.1 | | | -| Eclipse Grizzly | 4.1.0-M1 | | | -| Eclipse Grizzly NPN | 2.0.0 | | | -| Eclipse JAXB | 4.0.5 | | | -| Eclipse JSTL | 3.0.1 | | | -| Eclipse Soteria | 4.0.0-M3 | | | -| Eclipse Tyrus | 2.2.0-M1 | | | -| EclipseLink | 5.0.0-B02 | | | -| Expressly | 6.0.0-M2 | | | -| Hazelcast | 5.4.0 | | | -| Jakarta Annotations | 3.0.0 | X | X | -| Jakarta CDI | 4.1.0 | X | X | -| Jakarta EL | | | | -| Jakarta Faces | 4.1.0 | | X | -| Jakarta Inject | 2.0.1 | X | X | -| Jakarta Interceptors | 2.2.0 | X | -| Jakarta JSON Binding | 3.0.1 | X | X | -| Jakarta JSON Processing | 2.1.3 | X | X | -| Jakarta REST | 4.0.0 | X | X | -| Jakarta Servlet | 6.1.0 | X | X | -| Jersey | 4.0.0-M1 | X | X | -| Mojarra | 4.1.1 | | X | -| Netty | 4.1.112.Final | | | -| OmniFaces Services | 0.4 | | | -| OmniFish OmniBeans | 0.3 | | | -| OmniFish Transact | 1.0.1 | | | -| Parsson | 1.1.7 | X | X | -| Project CRaC | 0.1.3 | | | -| Spring Boot | 3.3.0 | | | -| Undertow | 2.3.14.Final | | | -| Weld | 6.0.0.Beta4 | X | X | -| Yasson | 3.0.4 | X | X | +| Name | Version | CP | WP | S | +|---------------------------|---------------|-----|-----|-----| +| Apache Commons FileUpload | 2.0.0-M2 | | | | +| Apache Commons IO | 2.15.1 | | | | +| Arquillian | 1.8.0.Final | | | | +| Eclipse Angus Activation | 2.0.2 | | | | +| Eclipse Angus Mail | 2.0.3 | | | | +| Eclipse Epicyro | 3.1.0 | | | | +| Eclipse Exousia | 3.0.0-M1.1 | | | | +| Eclipse Grizzly | 4.1.0-M1 | | | | +| Eclipse Grizzly NPN | 2.0.0 | | | | +| Eclipse JAXB | 4.0.5 | | | | +| Eclipse JSTL | 3.0.1 | | | | +| Eclipse Soteria | 4.0.0-M3 | | | | +| Eclipse Tyrus | 2.2.0-M1 | | | | +| EclipseLink | 5.0.0-B02 | | | | +| Expressly | 6.0.0-M2 | | X | X | +| Hazelcast | 5.4.0 | | | | +| Jakarta Annotations | 3.0.0 | X | X | | +| Jakarta CDI | 4.1.0 | X | X | | +| Jakarta EL | | | | | +| Jakarta Faces | 4.1.0 | | X | | +| Jakarta Inject | 2.0.1 | X | X | | +| Jakarta Interceptors | 2.2.0 | X | | +| Jakarta JSON Binding | 3.0.1 | X | X | | +| Jakarta JSON Processing | 2.1.3 | X | X | | +| Jakarta REST | 4.0.0 | X | X | | +| Jakarta Servlet | 6.1.0 | X | X | | +| Jersey | 4.0.0-M1 | X | X | | +| Mojarra | 4.1.1 | | X | | +| Netty | 4.1.112.Final | | | | +| OmniFaces Services | 0.4 | | | | +| OmniFish OmniBeans | 0.3 | | | | +| OmniFish Transact | 1.0.1 | | | | +| Parsson | 1.1.7 | X | X | | +| Project CRaC | 0.1.3 | | | | +| Spring Boot | 3.3.0 | | | | +| Undertow | 2.3.14.Final | | | | +| Weld | 6.0.0.Beta4 | X | X | | +| Yasson | 3.0.4 | X | X | | CP = Piranha Core Profile WP = Piranha Web Profile +S = Piranha Servlet \ No newline at end of file diff --git a/extension/eclipse-expressly/pom.xml b/extension/expressly/pom.xml similarity index 88% rename from extension/eclipse-expressly/pom.xml rename to extension/expressly/pom.xml index e6e5079c8d..2ca1ab27cb 100644 --- a/extension/eclipse-expressly/pom.xml +++ b/extension/expressly/pom.xml @@ -7,9 +7,9 @@ project 24.11.0-SNAPSHOT - piranha-extension-eclipse-expressly + piranha-extension-expressly jar - Piranha - Extension - Eclipse Expressly + Piranha - Extension - Expressly cloud.piranha.core diff --git a/extension/eclipse-expressly/src/main/java/cloud/piranha/extension/expressly/ExpresslyExtension.java b/extension/expressly/src/main/java/cloud/piranha/extension/expressly/ExpresslyExtension.java similarity index 97% rename from extension/eclipse-expressly/src/main/java/cloud/piranha/extension/expressly/ExpresslyExtension.java rename to extension/expressly/src/main/java/cloud/piranha/extension/expressly/ExpresslyExtension.java index c5a9f239f7..5cbc93cd07 100644 --- a/extension/eclipse-expressly/src/main/java/cloud/piranha/extension/expressly/ExpresslyExtension.java +++ b/extension/expressly/src/main/java/cloud/piranha/extension/expressly/ExpresslyExtension.java @@ -33,7 +33,7 @@ import static java.lang.System.Logger.Level.TRACE; /** - * The extension that delivers Eclipse Expressly to Piranha. + * The extension that delivers Expressly to Piranha. * * @author Manfred Riem (mriem@manorrock.com) */ diff --git a/extension/eclipse-expressly/src/main/java/module-info.java b/extension/expressly/src/main/java/module-info.java similarity index 88% rename from extension/eclipse-expressly/src/main/java/module-info.java rename to extension/expressly/src/main/java/module-info.java index dd85c439c0..2333a8234c 100644 --- a/extension/eclipse-expressly/src/main/java/module-info.java +++ b/extension/expressly/src/main/java/module-info.java @@ -27,13 +27,8 @@ */ /** - * This module delivers the Eclipse Expressly integration extension. - * - *

- * This extension integrates Eclipse Exressly into Piranha. See - * https://github.com/eclipse-ee4j/expressly for more information about its - * project. - *

+ * This module integrates Exressly into Piranha. See + * https://github.com/eclipse-ee4j/expressly for more information. * * @author Manfred Riem (mriem@manorrock.com) */ diff --git a/extension/micro/pom.xml b/extension/micro/pom.xml index e43b380e13..ecc9f32468 100644 --- a/extension/micro/pom.xml +++ b/extension/micro/pom.xml @@ -44,7 +44,7 @@ cloud.piranha.extension - piranha-extension-eclipse-expressly + piranha-extension-expressly ${project.version} compile diff --git a/extension/platform/pom.xml b/extension/platform/pom.xml index 402f1419ff..38f51099b9 100644 --- a/extension/platform/pom.xml +++ b/extension/platform/pom.xml @@ -46,7 +46,7 @@ cloud.piranha.extension - piranha-extension-eclipse-expressly + piranha-extension-expressly ${project.version} compile diff --git a/extension/pom.xml b/extension/pom.xml index e4362bb144..ea64159d73 100644 --- a/extension/pom.xml +++ b/extension/pom.xml @@ -28,12 +28,12 @@ eclipse-concurro eclipse-epicyro eclipse-exousia - eclipse-expressly eclipse-jaxb eclipse-jstl eclipse-soteria eclipse-tyrus eclipselink + expressly hazelcast herring jersey diff --git a/extension/servlet/pom.xml b/extension/servlet/pom.xml index a168437135..67ac5db862 100644 --- a/extension/servlet/pom.xml +++ b/extension/servlet/pom.xml @@ -52,7 +52,7 @@ cloud.piranha.extension - piranha-extension-eclipse-expressly + piranha-extension-expressly ${project.version} compile diff --git a/extension/webprofile/pom.xml b/extension/webprofile/pom.xml index 68c1873979..c778809516 100644 --- a/extension/webprofile/pom.xml +++ b/extension/webprofile/pom.xml @@ -64,7 +64,7 @@ cloud.piranha.extension - piranha-extension-eclipse-expressly + piranha-extension-expressly ${project.version} compile diff --git a/test/debug/pom.xml b/test/debug/pom.xml index 0e2c6ced81..c211a4587a 100644 --- a/test/debug/pom.xml +++ b/test/debug/pom.xml @@ -81,7 +81,7 @@ cloud.piranha.extension - piranha-extension-eclipse-expressly + piranha-extension-expressly ${project.version} diff --git a/test/embedded/eclipselink/pom.xml b/test/embedded/eclipselink/pom.xml index 1677cb7cd5..4f58731ba8 100644 --- a/test/embedded/eclipselink/pom.xml +++ b/test/embedded/eclipselink/pom.xml @@ -45,7 +45,7 @@ cloud.piranha.extension - piranha-extension-eclipse-expressly + piranha-extension-expressly ${project.version} test diff --git a/test/embedded/hazelcast/pom.xml b/test/embedded/hazelcast/pom.xml index 1fe471b32c..6c2d98e888 100644 --- a/test/embedded/hazelcast/pom.xml +++ b/test/embedded/hazelcast/pom.xml @@ -33,7 +33,7 @@ cloud.piranha.extension - piranha-extension-eclipse-expressly + piranha-extension-expressly ${project.version} test diff --git a/test/embedded/weld/pom.xml b/test/embedded/weld/pom.xml index fadc965672..6decdef86c 100644 --- a/test/embedded/weld/pom.xml +++ b/test/embedded/weld/pom.xml @@ -56,7 +56,7 @@ cloud.piranha.extension - piranha-extension-eclipse-expressly + piranha-extension-expressly ${project.version} test