Merge branch 'current' into issue-4085

mnriem · Oct 20, 2024 · 80d9b62 · 80d9b62
2 parents c16c2c7 + fbf6ee0
commit 80d9b62
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 91 deletions.
diff --git a/VERSIONS.md b/VERSIONS.md
@@ -18,21 +18,24 @@ 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      |
-| Eclipse Yasson            | 3.0.4         |
 | EclipseLink               | 5.0.0-B02     |
 | Hazelcast                 | 5.4.0         |
 | Jakarta Annotations       | 3.0.0         |
 | Jakarta CDI               | 4.1.0         |
+| 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           |
 | 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  |
 | Weld                      | 6.0.0.Beta4   |
+| Yasson                    | 3.0.4         |
diff --git a/extension/coreprofile/pom.xml b/extension/coreprofile/pom.xml
@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-yasson</artifactId>
+            <artifactId>piranha-extension-yasson</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

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

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

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

diff --git a/...a/extension/parsson/ParssonExtension.java → ...a/extension/parsson/ParssonExtension.java b/...a/extension/parsson/ParssonExtension.java → ...a/extension/parsson/ParssonExtension.java
diff --git a/...se-parsson/src/main/java/module-info.java → ...on/parsson/src/main/java/module-info.java b/...se-parsson/src/main/java/module-info.java → ...on/parsson/src/main/java/module-info.java
diff --git a/extension/platform/pom.xml b/extension/platform/pom.xml
@@ -58,7 +58,7 @@
         </dependency> 
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-yasson</artifactId>
+            <artifactId>piranha-extension-yasson</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>       

diff --git a/extension/pom.xml b/extension/pom.xml
@@ -32,10 +32,8 @@
         <module>eclipse-jaxb</module>
         <module>eclipse-jstl</module>
         <module>eclipse-mojarra</module>
-        <module>eclipse-parsson</module>
         <module>eclipse-soteria</module>
         <module>eclipse-tyrus</module>
-        <module>eclipse-yasson</module>
         <module>eclipse-wasp</module>
         <module>eclipselink</module>
         <module>hazelcast</module>
@@ -50,6 +48,7 @@
         <module>omnifaces-omniutils</module>
         <module>omnifish-omnibeans</module>
         <module>omnifish-transact</module>
+        <module>parsson</module>
         <module>platform</module>
         <module>policy</module>
         <module>redhat-hibernate-validator</module>
@@ -63,6 +62,7 @@
         <module>webxml</module>
         <module>welcomefile</module>
         <module>weld</module>
+        <module>yasson</module>
     </modules>
 
     <dependencyManagement>

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

diff --git a/...nha/extension/yasson/YassonExtension.java → ...nha/extension/yasson/YassonExtension.java b/...nha/extension/yasson/YassonExtension.java → ...nha/extension/yasson/YassonExtension.java
diff --git a/...pse-yasson/src/main/java/module-info.java → ...ion/yasson/src/main/java/module-info.java b/...pse-yasson/src/main/java/module-info.java → ...ion/yasson/src/main/java/module-info.java
diff --git a/external/webprofile-tck/faces/pom.xml b/external/webprofile-tck/faces/pom.xml
diff --git a/test/debug/pom.xml b/test/debug/pom.xml
@@ -96,7 +96,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-yasson</artifactId>
+            <artifactId>piranha-extension-yasson</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

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