Fixes #4157 - Update Expressly to latest version (#4158)

piranhacloud · Nov 2, 2024 · aa76070 · aa76070
1 parent 012be4f
commit aa76070
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 59 deletions.
diff --git 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
diff --git a/extension/eclipse-expressly/pom.xml → extension/expressly/pom.xml b/extension/eclipse-expressly/pom.xml → extension/expressly/pom.xml
@@ -7,9 +7,9 @@
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
-    <artifactId>piranha-extension-eclipse-expressly</artifactId>
+    <artifactId>piranha-extension-expressly</artifactId>
     <packaging>jar</packaging>
-    <name>Piranha - Extension - Eclipse Expressly</name>
+    <name>Piranha - Extension - Expressly</name>
     <dependencies>
         <dependency>
             <groupId>cloud.piranha.core</groupId>

diff --git a/...tension/expressly/ExpresslyExtension.java → ...tension/expressly/ExpresslyExtension.java b/...tension/expressly/ExpresslyExtension.java → ...tension/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 ([email protected])
  */

diff --git a/...-expressly/src/main/java/module-info.java → .../expressly/src/main/java/module-info.java b/...-expressly/src/main/java/module-info.java → .../expressly/src/main/java/module-info.java
@@ -27,13 +27,8 @@
  */
 
 /**
- * This module delivers the Eclipse Expressly integration extension.
- *
- * <p>
- *  This extension integrates Eclipse Exressly into Piranha. See 
- *  https://github.com/eclipse-ee4j/expressly for more information about its
- *  project.
- * </p>
+ * This module integrates Exressly into Piranha. See 
+ * https://github.com/eclipse-ee4j/expressly for more information.
  * 
  * @author Manfred Riem ([email protected])
  */

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

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

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -28,12 +28,12 @@
         <module>eclipse-concurro</module>
         <module>eclipse-epicyro</module>
         <module>eclipse-exousia</module>
-        <module>eclipse-expressly</module>
         <module>eclipse-jaxb</module>
         <module>eclipse-jstl</module>
         <module>eclipse-soteria</module>
         <module>eclipse-tyrus</module>
         <module>eclipselink</module>
+        <module>expressly</module>
         <module>hazelcast</module>
         <module>herring</module>
         <module>jersey</module>

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

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

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

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

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

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