HADOOP-18033. Upgrade fasterxml Jackson to 2.13.0 (#3749)
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
This commit is contained in:
parent
126079612c
commit
53edd0de5a
@ -218,12 +218,12 @@ com.aliyun.oss:aliyun-sdk-oss:3.13.0
|
||||
com.amazonaws:aws-java-sdk-bundle:1.11.901
|
||||
com.cedarsoftware:java-util:1.9.0
|
||||
com.cedarsoftware:json-io:2.5.1
|
||||
com.fasterxml.jackson.core:jackson-annotations:2.9.9
|
||||
com.fasterxml.jackson.core:jackson-core:2.9.9
|
||||
com.fasterxml.jackson.core:jackson-databind:2.9.9.2
|
||||
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.9.9
|
||||
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.9.9
|
||||
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.9
|
||||
com.fasterxml.jackson.core:jackson-annotations:2.13.0
|
||||
com.fasterxml.jackson.core:jackson-core:2.13.0
|
||||
com.fasterxml.jackson.core:jackson-databind:2.13.0
|
||||
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.13.0
|
||||
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.13.0
|
||||
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.0
|
||||
com.fasterxml.uuid:java-uuid-generator:3.1.4
|
||||
com.fasterxml.woodstox:woodstox-core:5.3.0
|
||||
com.github.davidmoten:rxjava-extras:0.8.0.17
|
||||
@ -494,6 +494,7 @@ javax.annotation:javax.annotation-api:1.3.2
|
||||
javax.servlet:javax.servlet-api:3.1.0
|
||||
javax.servlet.jsp:jsp-api:2.1
|
||||
javax.websocket:javax.websocket-api:1.0
|
||||
javax.ws.rs:javax.ws.rs-api:2.1.1
|
||||
javax.ws.rs:jsr311-api:1.1.1
|
||||
javax.xml.bind:jaxb-api:2.2.11
|
||||
|
||||
|
@ -690,6 +690,7 @@
|
||||
<exclude>org.bouncycastle:*</exclude>
|
||||
<!-- Leave snappy that includes native methods which cannot be relocated. -->
|
||||
<exclude>org.xerial.snappy:*</exclude>
|
||||
<exclude>javax.ws.rs:javax.ws.rs-api</exclude>
|
||||
</excludes>
|
||||
</artifactSet>
|
||||
<filters>
|
||||
@ -736,6 +737,12 @@
|
||||
<exclude>testdata/*</exclude>
|
||||
</excludes>
|
||||
</filter>
|
||||
<filter>
|
||||
<artifact>com.fasterxml.jackson.*:*</artifact>
|
||||
<excludes>
|
||||
<exclude>META-INF/versions/11/module-info.class</exclude>
|
||||
</excludes>
|
||||
</filter>
|
||||
|
||||
<!-- Mockito tries to include its own unrelocated copy of hamcrest. :( -->
|
||||
<filter>
|
||||
|
@ -163,6 +163,7 @@
|
||||
<exclude>org.bouncycastle:*</exclude>
|
||||
<!-- Leave snappy that includes native methods which cannot be relocated. -->
|
||||
<exclude>org.xerial.snappy:*</exclude>
|
||||
<exclude>javax.ws.rs:javax.ws.rs-api</exclude>
|
||||
</excludes>
|
||||
</artifactSet>
|
||||
<filters>
|
||||
@ -242,6 +243,12 @@
|
||||
<exclude>google/protobuf/**/*.proto</exclude>
|
||||
</excludes>
|
||||
</filter>
|
||||
<filter>
|
||||
<artifact>com.fasterxml.jackson.*:*</artifact>
|
||||
<excludes>
|
||||
<exclude>META-INF/versions/11/module-info.class</exclude>
|
||||
</excludes>
|
||||
</filter>
|
||||
</filters>
|
||||
<relocations>
|
||||
<relocation>
|
||||
|
@ -70,6 +70,10 @@
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-common</artifactId>
|
||||
|
@ -70,8 +70,11 @@
|
||||
|
||||
<!-- jackson versions -->
|
||||
<jackson.version>1.9.13</jackson.version>
|
||||
<jackson2.version>2.10.5</jackson2.version>
|
||||
<jackson2.databind.version>2.10.5.1</jackson2.databind.version>
|
||||
<jackson2.version>2.13.0</jackson2.version>
|
||||
<jackson2.databind.version>2.13.0</jackson2.databind.version>
|
||||
|
||||
<!-- javax ws rs api version -->
|
||||
<javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
|
||||
|
||||
<!-- httpcomponents versions -->
|
||||
<httpclient.version>4.5.13</httpclient.version>
|
||||
@ -760,6 +763,11 @@
|
||||
<artifactId>jsr311-api</artifactId>
|
||||
<version>1.1.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
<version>${javax.ws.rs-api.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-server</artifactId>
|
||||
|
@ -115,6 +115,10 @@
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-annotations</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
@ -248,6 +248,11 @@
|
||||
<artifactId>jackson-jaxrs-base</artifactId>
|
||||
<version>${jackson2.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<finalName>${artifact.name}</finalName>
|
||||
|
@ -154,6 +154,10 @@
|
||||
<scope>test</scope>
|
||||
<type>test-jar</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
@ -137,6 +137,11 @@
|
||||
<artifactId>jackson-annotations</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
<artifactId>hadoop-hdfs-client</artifactId>
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
package org.apache.hadoop.yarn.service.utils;
|
||||
|
||||
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
|
||||
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
|
||||
import org.apache.hadoop.classification.VisibleForTesting;
|
||||
import org.apache.hadoop.util.Preconditions;
|
||||
import org.apache.hadoop.thirdparty.com.google.common.collect.ArrayListMultimap;
|
||||
@ -75,20 +75,20 @@ public class ServiceApiUtil {
|
||||
LoggerFactory.getLogger(ServiceApiUtil.class);
|
||||
public static JsonSerDeser<Service> jsonSerDeser =
|
||||
new JsonSerDeser<>(Service.class,
|
||||
PropertyNamingStrategy.SNAKE_CASE);
|
||||
PropertyNamingStrategies.SNAKE_CASE);
|
||||
|
||||
public static final JsonSerDeser<Container[]> CONTAINER_JSON_SERDE =
|
||||
new JsonSerDeser<>(Container[].class,
|
||||
PropertyNamingStrategy.SNAKE_CASE);
|
||||
PropertyNamingStrategies.SNAKE_CASE);
|
||||
|
||||
public static final JsonSerDeser<ComponentContainers[]>
|
||||
COMP_CONTAINERS_JSON_SERDE = new JsonSerDeser<>(
|
||||
ComponentContainers[].class,
|
||||
PropertyNamingStrategy.SNAKE_CASE);
|
||||
PropertyNamingStrategies.SNAKE_CASE);
|
||||
|
||||
public static final JsonSerDeser<Component[]> COMP_JSON_SERDE =
|
||||
new JsonSerDeser<>(Component[].class,
|
||||
PropertyNamingStrategy.SNAKE_CASE);
|
||||
PropertyNamingStrategies.SNAKE_CASE);
|
||||
|
||||
private static final PatternValidator namePattern
|
||||
= new PatternValidator("[a-z][a-z0-9-]*");
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
package org.apache.hadoop.yarn.service;
|
||||
|
||||
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
|
||||
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
|
||||
import org.apache.hadoop.thirdparty.com.google.common.base.Throwables;
|
||||
import org.apache.hadoop.thirdparty.com.google.common.collect.HashMultimap;
|
||||
import org.apache.hadoop.thirdparty.com.google.common.collect.Multimap;
|
||||
@ -98,7 +98,7 @@ public class ServiceTestUtils {
|
||||
|
||||
public static final JsonSerDeser<Service> JSON_SER_DESER =
|
||||
new JsonSerDeser<>(Service.class,
|
||||
PropertyNamingStrategy.SNAKE_CASE);
|
||||
PropertyNamingStrategies.SNAKE_CASE);
|
||||
|
||||
// Example service definition
|
||||
// 2 components, each of which has 2 containers.
|
||||
|
@ -183,6 +183,10 @@
|
||||
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
||||
<artifactId>jackson-jaxrs-json-provider</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
@ -191,6 +191,11 @@
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
@ -186,6 +186,11 @@
|
||||
<type>test-jar</type>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<profiles>
|
||||
|
@ -320,6 +320,10 @@
|
||||
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
||||
<artifactId>jackson-dataformat-yaml</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
@ -116,6 +116,11 @@
|
||||
<artifactId>guice</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
@ -132,6 +132,10 @@
|
||||
<scope>test</scope>
|
||||
<type>test-jar</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
@ -133,6 +133,10 @@
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
@ -417,6 +417,10 @@
|
||||
<artifactId>commons-lang3</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
@ -95,6 +95,11 @@
|
||||
<artifactId>junit</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
@ -117,6 +117,11 @@
|
||||
<version>1.1.1</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>javax.ws.rs-api</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
||||
<dependency>
|
||||
<groupId>org.apache.hadoop</groupId>
|
||||
|
Loading…
Reference in New Issue
Block a user