From 932b9e19c0aa440145d4a108ad8f8e610841264f Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Sun, 20 Oct 2024 15:46:21 -0500
Subject: [PATCH] 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 @@
         </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
index 87f0496d77..299bfb8ec5 100644
--- a/extension/micro/pom.xml
+++ b/extension/micro/pom.xml
@@ -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
index 4849539a52..fa141b5fd7 100644
--- 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/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 @@
         </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
index dc090ce9b5..b07d6b07a6 100644
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -35,7 +35,6 @@
         <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>
@@ -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 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 @@
         <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/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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cloud.piranha.external.webprofiletck</groupId>
-        <artifactId>project</artifactId>
-        <version>24.11.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>faces-tck</artifactId>
-    <packaging>pom</packaging>
-    <name>Piranha Web Profile - Jakarta Faces TCK</name>
-    <properties>
-        <faces.tck.version>4.0.3</faces.tck.version>
-        <mojarra.version>${mojarra.version}</mojarra.version>
-        <tck.home>${project.build.directory}/tck</tck.home>
-    </properties>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>cloud.piranha</groupId>
-                <artifactId>bom</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>pre-integration-test</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <!-- Download, unzip and rename TCK -->
-                                <get src="https://download.eclipse.org/jakartaee/faces/4.0/jakarta-faces-tck-${faces.tck.version}.zip"
-                                     dest="${project.build.directory}/tck.zip"
-                                     skipexisting="true"/>
-                                <unzip src="${project.build.directory}/tck.zip"
-                                       dest="${project.build.directory}"/>
-                                <move file="${project.build.directory}/faces-tck-${faces.tck.version}"
-                                      tofile="${project.build.directory}/tck"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>integration-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <!-- Run the tests -->
-                                <exec dir="${tck.home}/tck"
-                                      executable="mvn"
-                                      failonerror="true">
-                                    <arg value="verify"/>
-                                    <arg line="-Dmojarra.version=${mojarra.version}"/>
-                                </exec>                                
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
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 @@
         </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
index 521fc81004..459683ca90 100644
--- 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>