[isis] branch spring6 updated: ISIS-3275: migrate jackson to jakarta variant

[ahuber]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/spring6 by this push:
     new 4b0a9527d3 ISIS-3275: migrate jackson to jakarta variant
4b0a9527d3 is described below

commit 4b0a9527d3c9597dd8bab9c0c4e1e1ba6543be1c
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Mon Nov 14 07:36:01 2022 +0100

    ISIS-3275: migrate jackson to jakarta variant
---
 commons/pom.xml                                                   | 8 +++++++-
 commons/src/main/java/module-info.java                            | 2 +-
 .../org/apache/causeway/commons/internal/resources/_Json.java     | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/commons/pom.xml b/commons/pom.xml
index 083601ef83..a479b43caf 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -68,7 +68,7 @@
                        <artifactId>causeway-core-privileged</artifactId>
                </dependency>
                
-               <!-- provides @Nullable that's required by Spring 5.x (as 
Spring is on the module path) -->
+               <!-- provides @Nullable that's required by Spring 5.x (as 
Spring is on the module path) 
                <dependency>
                        <groupId>com.google.code.findbugs</groupId>
                        <artifactId>jsr305</artifactId>
@@ -83,6 +83,12 @@
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-jaxb-annotations</artifactId>
         </dependency>
+        -->
+        
+        <dependency>
+                   <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+                   <artifactId>jackson-jakarta-rs-json-provider</artifactId>
+               </dependency>
 
                <dependency>
                        <groupId>org.jsoup</groupId>
diff --git a/commons/src/main/java/module-info.java 
b/commons/src/main/java/module-info.java
index 155d04756f..2cdd00c6b8 100644
--- a/commons/src/main/java/module-info.java
+++ b/commons/src/main/java/module-info.java
@@ -58,7 +58,7 @@ module org.apache.causeway.commons {
     requires transitive com.fasterxml.jackson.annotation;
     requires transitive com.fasterxml.jackson.core;
     requires transitive com.fasterxml.jackson.databind;
-    requires transitive com.fasterxml.jackson.module.jaxb;
+    requires transitive com.fasterxml.jackson.module.jakarta.xmlbind;
     requires transitive java.desktop;
     requires transitive java.sql;
     requires transitive java.xml;
diff --git 
a/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Json.java
 
b/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Json.java
index d858c8748a..4becbd6fda 100644
--- 
a/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Json.java
+++ 
b/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Json.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
+import 
com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule;
 
 import org.springframework.lang.Nullable;
 
@@ -219,7 +219,7 @@ public class _Json {
 
     /** add support for JAXB annotations */
     public static ObjectMapper jaxbAnnotationSupport(final ObjectMapper 
mapper) {
-        return mapper.registerModule(new JaxbAnnotationModule());
+        return mapper.registerModule(new JakartaXmlBindAnnotationModule());
     }
 
     @SneakyThrows