fix for hardcoded module jackson-module-jaxb-annotations

Signed-off-by: Maxim Nesen <[email protected]>
eclipse-ee4j · Oct 10, 2024 · 62ba351 · 62ba351
1 parent 214adbc
commit 62ba351
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 28 deletions.
diff --git a/media/json-jackson/pom.xml b/media/json-jackson/pom.xml
@@ -137,8 +137,8 @@
                     <artifactId>jakarta.activation-api</artifactId>
                 </exclusion>
             </exclusions>
-<!--            <optional>true</optional>-->
-<!--            <scope>provided</scope>-->
+            <optional>true</optional>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>

diff --git a/...java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/json/JsonMapperConfigurator.java b/...java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/json/JsonMapperConfigurator.java
@@ -9,7 +9,7 @@
 import com.fasterxml.jackson.databind.AnnotationIntrospector;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
+import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;
 
 /**
  * Helper class used to encapsulate details of configuring an
@@ -125,7 +125,7 @@ protected AnnotationIntrospector _resolveIntrospector(Annotations ann)
                  */
                 try {
                     if (_jaxbIntrospectorClass == null) {
-                        _jaxbIntrospectorClass = JaxbAnnotationIntrospector.class;
+                        _jaxbIntrospectorClass = JakartaXmlBindAnnotationIntrospector.class;
                     }
                     return _jaxbIntrospectorClass.newInstance();
                 } catch (Exception e) {

diff --git a/tests/osgi/functional/pom.xml b/tests/osgi/functional/pom.xml
@@ -367,24 +367,6 @@
             <artifactId>jackson-annotations</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
-            <artifactId>jackson-module-jaxb-annotations</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <!-- The last JAX-B API that has maven coordinates which do not collide with Jakarta coordinates -->
-            <!-- Do not update -->
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>javax.activation-api</artifactId>
-            <version>1.2.0</version>
-        </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-osgi</artifactId>

diff --git a/...s/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonJacksonTest.java b/...s/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonJacksonTest.java
@@ -48,12 +48,7 @@ public static Option[] configuration() {
                 mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").versionAsInProject(),
                 mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").versionAsInProject(),
                 mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-annotations").versionAsInProject(),
-                //required since Jackson 2.18.0 is fixed
-                mavenBundle().groupId("javax.activation").artifactId("javax.activation-api").versionAsInProject(),
-                mavenBundle().groupId("javax.xml.bind").artifactId("jaxb-api").versionAsInProject(),
-                mavenBundle().groupId("com.fasterxml.jackson.module")
-                        .artifactId("jackson-module-jaxb-annotations").versionAsInProject(),
-                //end of requirement from Jackson 2.18.0
+
                 mavenBundle().groupId("com.fasterxml.jackson.module").artifactId("jackson-module-jakarta-xmlbind-annotations")
                         .versionAsInProject()
         ));