refs #4138 - update jackson to 2.13.2

swagger-api · Mar 22, 2022 · 67e3a3f · 67e3a3f
1 parent 3626f1d
commit 67e3a3f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 21 deletions.
diff --git a/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/pom.xml b/modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/pom.xml
@@ -72,9 +72,8 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <classifier>jakarta</classifier>
+            <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+            <artifactId>jackson-jakarta-rs-json-provider</artifactId>
             <version>${jackson-version}</version>
         </dependency>
     </dependencies>

diff --git a/...n-plugin-jakarta/src/main/java/io/swagger/v3/plugin/maven/jakarta/JakartaTransformer.java b/...n-plugin-jakarta/src/main/java/io/swagger/v3/plugin/maven/jakarta/JakartaTransformer.java
@@ -73,9 +73,8 @@ public class JakartaTransformer {
     private static final String jakartaValidationRegex = "^.*(<dependency>.*jakarta\\.validation((?!</dependency>).)*</dependency>).*$";
 
     private static final String jacksonJsonDep = "<dependency>\n" +
-            "                <groupId>com.fasterxml.jackson.jaxrs</groupId>\n" +
-            "                <artifactId>jackson-jaxrs-json-provider</artifactId>\n" +
-            "                <classifier>jakarta</classifier>\n" +
+            "                <groupId>com.fasterxml.jackson.jakarta.rs</groupId>\n" +
+            "                <artifactId>jackson-jakarta-rs-json-provider</artifactId>\n" +
             "                <version>VERSION</version>\n" +
             "                <exclusions>\n" +
             "                    <exclusion>\n" +
@@ -92,18 +91,16 @@ public class JakartaTransformer {
     private static final String jacksonJsonRegex = "^.*(<dependency>.*jackson\\-jaxrs\\-json((?!</dependency>).)*</dependency>).*$";
 
     private static final String jacksonBaseDep = "<dependency>\n" +
-            "                <groupId>com.fasterxml.jackson.jaxrs</groupId>\n" +
-            "                <artifactId>jackson-jaxrs-base</artifactId>\n" +
-            "                <classifier>jakarta</classifier>\n" +
+            "                <groupId>com.fasterxml.jackson.jakarta.rs</groupId>\n" +
+            "                <artifactId>jackson-jakarta-rs-base</artifactId>\n" +
             "                <version>VERSION</version>\n" +
             "            </dependency>";
 
     private static final String jacksonBaseRegex = "^.*(<dependency>.*jackson\\-jaxrs\\-base((?!</dependency>).)*</dependency>).*$";
 
     private static final String jacksonJaxbDep = "<dependency>\n" +
             "                <groupId>com.fasterxml.jackson.module</groupId>\n" +
-            "                <artifactId>jackson-module-jaxb-annotations</artifactId>\n" +
-            "                <classifier>jakarta</classifier>\n" +
+            "                <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>\n" +
             "                <version>VERSION</version>\n" +
             "                <exclusions>\n" +
             "                    <exclusion>\n" +
@@ -114,6 +111,10 @@ public class JakartaTransformer {
             "                        <groupId>jakarta.xml.bind</groupId>\n" +
             "                        <artifactId>jakarta.xml.bind-api</artifactId>\n" +
             "                    </exclusion>\n" +
+            "                    <exclusion>\n" +
+            "                        <groupId>com.sun.activation</groupId>\n" +
+            "                        <artifactId>jakarta.activation</artifactId>\n" +
+            "                    </exclusion>" +
             "                </exclusions>\n" +
             "            </dependency>";
 

diff --git a/modules/swagger-project-jakarta/pom.xml b/modules/swagger-project-jakarta/pom.xml
@@ -506,9 +506,8 @@
                 <version>${jackson-version}</version>
             </dependency>
             <dependency>
-                <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                <artifactId>jackson-jaxrs-json-provider</artifactId>
-                <classifier>jakarta</classifier>
+                <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+                <artifactId>jackson-jakarta-rs-json-provider</artifactId>
                 <version>${jackson-version}</version>
                 <exclusions>
                     <exclusion>
@@ -522,15 +521,13 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                <artifactId>jackson-jaxrs-base</artifactId>
-                <classifier>jakarta</classifier>
+                <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+                <artifactId>jackson-jakarta-rs-base</artifactId>
                 <version>${jackson-version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.module</groupId>
-                <artifactId>jackson-module-jaxb-annotations</artifactId>
-                <classifier>jakarta</classifier>
+                <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
                 <version>${jackson-version}</version>
                 <exclusions>
                     <exclusion>
@@ -541,6 +538,10 @@
                         <groupId>jakarta.xml.bind</groupId>
                         <artifactId>jakarta.xml.bind-api</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.activation</groupId>
+                        <artifactId>jakarta.activation</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -563,7 +564,7 @@
         <servlet-api-version>5.0.0</servlet-api-version>
         <jersey2-version>3.0.1</jersey2-version>
         <junit-version>4.13.1</junit-version>
-        <jackson-version>2.12.1</jackson-version>
+        <jackson-version>2.13.2</jackson-version>
         <logback-version>1.2.9</logback-version>
         <classgraph-version>4.8.138</classgraph-version>
         <guava-version>31.0.1-jre</guava-version>

diff --git a/pom.xml b/pom.xml
@@ -646,7 +646,7 @@
         <servlet-api-version>4.0.3</servlet-api-version>
         <jersey2-version>2.26</jersey2-version>
         <junit-version>4.13.1</junit-version>
-        <jackson-version>2.12.1</jackson-version>
+        <jackson-version>2.13.2</jackson-version>
         <logback-version>1.2.9</logback-version>
         <classgraph-version>4.8.138</classgraph-version>
         <guava-version>31.0.1-jre</guava-version>