瀏覽代碼

HADOOP-18178. Upgrade jackson to 2.13.2 and jackson-databind to 2.13.2.2 (#4147)

(cherry picked from commit 4b786c797a76d00ef33237fde76f2bd6edda7f3a)

 Conflicts:
	LICENSE-binary

Change-Id: I44042ade3c81a5852f1b81892ec9fbc18921a272
Co-authored-by: PJ Fanning <pjfanning@users.noreply.github.com>
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
Akira Ajisaka 3 年之前
父節點
當前提交
1a1b108dbd

+ 6 - 6
LICENSE-binary

@@ -217,12 +217,12 @@ com.aliyun.oss:aliyun-sdk-oss:3.13.0
 com.amazonaws:aws-java-sdk-bundle:1.11.901
 com.amazonaws:aws-java-sdk-bundle:1.11.901
 com.cedarsoftware:java-util:1.9.0
 com.cedarsoftware:java-util:1.9.0
 com.cedarsoftware:json-io:2.5.1
 com.cedarsoftware:json-io:2.5.1
-com.fasterxml.jackson.core:jackson-annotations:2.10.5
-com.fasterxml.jackson.core:jackson-core:2.10.5
-com.fasterxml.jackson.core:jackson-databind:2.10.5.1
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.10.5
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.10.5
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.10.5
+com.fasterxml.jackson.core:jackson-annotations:2.13.2
+com.fasterxml.jackson.core:jackson-core:2.13.2
+com.fasterxml.jackson.core:jackson-databind:2.13.2.2
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.13.2
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.13.2
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.2
 com.fasterxml.uuid:java-uuid-generator:3.1.4
 com.fasterxml.uuid:java-uuid-generator:3.1.4
 com.fasterxml.woodstox:woodstox-core:5.3.0
 com.fasterxml.woodstox:woodstox-core:5.3.0
 com.github.davidmoten:rxjava-extras:0.8.0.17
 com.github.davidmoten:rxjava-extras:0.8.0.17

+ 1 - 1
hadoop-client-modules/hadoop-client-minicluster/pom.xml

@@ -744,7 +744,7 @@
                     <filter>
                     <filter>
                       <artifact>com.fasterxml.jackson.*:*</artifact>
                       <artifact>com.fasterxml.jackson.*:*</artifact>
                       <excludes>
                       <excludes>
-                        <exclude>META-INF/versions/11/module-info.class</exclude>
+                        <exclude>META-INF/versions/9/module-info.class</exclude>
                       </excludes>
                       </excludes>
                     </filter>
                     </filter>
 
 

+ 1 - 1
hadoop-client-modules/hadoop-client-runtime/pom.xml

@@ -246,7 +246,7 @@
                     <filter>
                     <filter>
                       <artifact>com.fasterxml.jackson.*:*</artifact>
                       <artifact>com.fasterxml.jackson.*:*</artifact>
                       <excludes>
                       <excludes>
-                        <exclude>META-INF/versions/11/module-info.class</exclude>
+                        <exclude>META-INF/versions/9/module-info.class</exclude>
                       </excludes>
                       </excludes>
                     </filter>
                     </filter>
                   </filters>
                   </filters>

+ 2 - 2
hadoop-project/pom.xml

@@ -70,8 +70,8 @@
 
 
     <!-- jackson versions -->
     <!-- jackson versions -->
     <jackson.version>1.9.13</jackson.version>
     <jackson.version>1.9.13</jackson.version>
-    <jackson2.version>2.13.0</jackson2.version>
-    <jackson2.databind.version>2.13.0</jackson2.databind.version>
+    <jackson2.version>2.13.2</jackson2.version>
+    <jackson2.databind.version>2.13.2.2</jackson2.databind.version>
 
 
     <!-- javax ws rs api version -->
     <!-- javax ws rs api version -->
     <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
     <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>