commit 00c1654f1ffd13d7310e45a1444538dee6783b3e
author Jean-Louis Monteiro <jlmonteiro@tomitribe.com> Wed Jan 11 12:42:55 2023 +0100
committer Jean-Louis Monteiro <jlmonteiro@tomitribe.com> Wed Jan 11 12:42:55 2023 +0100
tree 0d7d05531ac976bc360bf97241fedbf3ddbec9c6
parent 0c407f66c006e649a728a8b5093685e4a90cd551

Last fixes for the jakarta namespace

Signed-off-by: Jean-Louis Monteiro <jlmonteiro@tomitribe.com>

johnzon-maven-plugin/src/test/resources/SomeValue.record.java

diff --git a/johnzon-maven-plugin/src/test/resources/SomeValue.record.java b/johnzon-maven-plugin/src/test/resources/SomeValue.record.java
index 9bced30..7ae2c64 100644
--- a/johnzon-maven-plugin/src/test/resources/SomeValue.record.java
+++ b/johnzon-maven-plugin/src/test/resources/SomeValue.record.java
@@ -18,8 +18,8 @@
  */
 package org.test.apache.johnzon.mojo;
 
-import java.util.List;
 import jakarta.json.bind.annotation.JsonbProperty;
+import java.util.List;
 
 public record SomeValue(
     String benchmark,

johnzon-websocket/pom.xml

diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml
index c4539a4..d8adbf6 100644
--- a/johnzon-websocket/pom.xml
+++ b/johnzon-websocket/pom.xml
@@ -30,7 +30,7 @@
 
   <properties>
     <tomcat.version>10.1.4</tomcat.version>
-    <tomee.version>8.0.13</tomee.version>
+    <tomee.version>9.0.0</tomee.version>
     <staging.directory>${project.parent.reporting.outputDirectory}</staging.directory>
   </properties>
 

johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java

diff --git a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java
index 3f3269e..ee5f786 100644
--- a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java
+++ b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java
@@ -18,7 +18,6 @@
  */
 package org.apache.johnzon.websocket;
 
-import org.apache.johnzon.core.JsonProviderImpl;
 import org.apache.johnzon.websocket.endpoint.JsrClientEndpointImpl;
 import org.apache.johnzon.websocket.endpoint.JsrServerEndpointImpl;
 import org.apache.johnzon.websocket.endpoint.Message;
@@ -46,7 +45,6 @@
 import jakarta.websocket.Session;
 import jakarta.websocket.WebSocketContainer;
 
-import static org.apache.openejb.loader.JarLocation.jarLocation;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -59,8 +57,8 @@
                 .addAsLibraries(
                         ShrinkWrap.create(JavaArchive.class, "johnzon-websocket.jar")
                                 .addClasses(FactoryLocator.class, JsrDecoder.class, JsrEncoder.class, JsrObjectDecoder.class, JsrObjectEncoder.class)
-                                .addPackages(true, JsonProviderImpl.class.getPackage()))
-                .addAsLibrary(jarLocation(Json.class));
+                                )
+                ;
     }
 
     @ArquillianResource

johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java

diff --git a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java
index 81cd02f..fb97cc7 100644
--- a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java
+++ b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java
@@ -18,8 +18,6 @@
  */
 package org.apache.johnzon.websocket;
 
-import org.apache.johnzon.core.JsonProviderImpl;
-import org.apache.johnzon.mapper.Mapper;
 import org.apache.johnzon.mapper.MapperBuilder;
 import org.apache.johnzon.websocket.endpoint.ClientEndpointImpl;
 import org.apache.johnzon.websocket.endpoint.Message;
@@ -42,13 +40,11 @@
 
 import java.net.URI;
 import java.net.URL;
-import jakarta.json.Json;
 import jakarta.websocket.CloseReason;
 import jakarta.websocket.ContainerProvider;
 import jakarta.websocket.Session;
 import jakarta.websocket.WebSocketContainer;
 
-import static org.apache.openejb.loader.JarLocation.jarLocation;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -56,14 +52,18 @@
 public class MapperCodecTest {
     @Deployment(testable = false)
     public static WebArchive war() {
-        return ShrinkWrap.create(WebArchive.class, "codec.war")
-                .addClasses(ServerEndpointImpl.class, ServerReport.class, Message.class)
-                .addAsLibrary(
-                        ShrinkWrap.create(JavaArchive.class, "johnzon-websocket.jar")
-                            .addClasses(MapperLocator.class, MapperLocatorDelegate.class, IgnoreIfMissing.class, JohnzonTextDecoder.class, JohnzonTextEncoder.class)
-                            .addPackages(true, JsonProviderImpl.class.getPackage())
-                            .addPackages(true, Mapper.class.getPackage()))
-                .addAsLibrary(jarLocation(Json.class));
+        final WebArchive war = ShrinkWrap.create(WebArchive.class, "codec.war")
+                                                .addClasses(ServerEndpointImpl.class, ServerReport.class, Message.class)
+                                                .addAsLibrary(
+                                                    ShrinkWrap.create(JavaArchive.class, "johnzon-websocket.jar")
+                                                              .addClasses(MapperLocator.class,
+                                                                          MapperLocatorDelegate.class,
+                                                                          IgnoreIfMissing.class,
+                                                                          JohnzonTextDecoder.class,
+                                                                          JohnzonTextEncoder.class));
+
+        System.out.println(war.toString(true));
+        return war;
     }
 
     @ArquillianResource