HADOOP-18033. Upgrade fasterxml Jackson to 2.13.0 (#3764)
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
This commit is contained in:
parent
45e6d22462
commit
a45df81822
|
@ -690,6 +690,7 @@
|
||||||
<exclude>org.bouncycastle:*</exclude>
|
<exclude>org.bouncycastle:*</exclude>
|
||||||
<!-- Leave snappy that includes native methods which cannot be relocated. -->
|
<!-- Leave snappy that includes native methods which cannot be relocated. -->
|
||||||
<exclude>org.xerial.snappy:*</exclude>
|
<exclude>org.xerial.snappy:*</exclude>
|
||||||
|
<exclude>javax.ws.rs:javax.ws.rs-api</exclude>
|
||||||
</excludes>
|
</excludes>
|
||||||
</artifactSet>
|
</artifactSet>
|
||||||
<filters>
|
<filters>
|
||||||
|
@ -736,6 +737,12 @@
|
||||||
<exclude>testdata/*</exclude>
|
<exclude>testdata/*</exclude>
|
||||||
</excludes>
|
</excludes>
|
||||||
</filter>
|
</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. :( -->
|
<!-- Mockito tries to include its own unrelocated copy of hamcrest. :( -->
|
||||||
<filter>
|
<filter>
|
||||||
|
|
|
@ -163,6 +163,7 @@
|
||||||
<exclude>org.bouncycastle:*</exclude>
|
<exclude>org.bouncycastle:*</exclude>
|
||||||
<!-- Leave snappy that includes native methods which cannot be relocated. -->
|
<!-- Leave snappy that includes native methods which cannot be relocated. -->
|
||||||
<exclude>org.xerial.snappy:*</exclude>
|
<exclude>org.xerial.snappy:*</exclude>
|
||||||
|
<exclude>javax.ws.rs:javax.ws.rs-api</exclude>
|
||||||
</excludes>
|
</excludes>
|
||||||
</artifactSet>
|
</artifactSet>
|
||||||
<filters>
|
<filters>
|
||||||
|
@ -242,6 +243,12 @@
|
||||||
<exclude>google/protobuf/**/*.proto</exclude>
|
<exclude>google/protobuf/**/*.proto</exclude>
|
||||||
</excludes>
|
</excludes>
|
||||||
</filter>
|
</filter>
|
||||||
|
<filter>
|
||||||
|
<artifact>com.fasterxml.jackson.*:*</artifact>
|
||||||
|
<excludes>
|
||||||
|
<exclude>META-INF/versions/11/module-info.class</exclude>
|
||||||
|
</excludes>
|
||||||
|
</filter>
|
||||||
</filters>
|
</filters>
|
||||||
<relocations>
|
<relocations>
|
||||||
<relocation>
|
<relocation>
|
||||||
|
|
|
@ -70,6 +70,10 @@
|
||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-common</artifactId>
|
<artifactId>hadoop-common</artifactId>
|
||||||
|
|
|
@ -70,8 +70,11 @@
|
||||||
|
|
||||||
<!-- jackson versions -->
|
<!-- jackson versions -->
|
||||||
<jackson.version>1.9.13</jackson.version>
|
<jackson.version>1.9.13</jackson.version>
|
||||||
<jackson2.version>2.10.5</jackson2.version>
|
<jackson2.version>2.13.0</jackson2.version>
|
||||||
<jackson2.databind.version>2.10.5.1</jackson2.databind.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 -->
|
<!-- httpcomponents versions -->
|
||||||
<httpclient.version>4.5.13</httpclient.version>
|
<httpclient.version>4.5.13</httpclient.version>
|
||||||
|
@ -736,6 +739,11 @@
|
||||||
<artifactId>jsr311-api</artifactId>
|
<artifactId>jsr311-api</artifactId>
|
||||||
<version>1.1.1</version>
|
<version>1.1.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
<version>${javax.ws.rs-api.version}</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
<artifactId>jetty-server</artifactId>
|
<artifactId>jetty-server</artifactId>
|
||||||
|
|
|
@ -115,6 +115,10 @@
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-annotations</artifactId>
|
<artifactId>jackson-annotations</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -228,6 +228,11 @@
|
||||||
<artifactId>jackson-jaxrs-base</artifactId>
|
<artifactId>jackson-jaxrs-base</artifactId>
|
||||||
<version>${jackson2.version}</version>
|
<version>${jackson2.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<build>
|
<build>
|
||||||
<finalName>${artifact.name}</finalName>
|
<finalName>${artifact.name}</finalName>
|
||||||
|
|
|
@ -154,6 +154,10 @@
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
<type>test-jar</type>
|
<type>test-jar</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -137,6 +137,11 @@
|
||||||
<artifactId>jackson-annotations</artifactId>
|
<artifactId>jackson-annotations</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-hdfs-client</artifactId>
|
<artifactId>hadoop-hdfs-client</artifactId>
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
package org.apache.hadoop.yarn.service.utils;
|
package org.apache.hadoop.yarn.service.utils;
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
|
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
|
||||||
import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
|
import org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting;
|
||||||
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
|
import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
|
||||||
import org.apache.hadoop.thirdparty.com.google.common.collect.ArrayListMultimap;
|
import org.apache.hadoop.thirdparty.com.google.common.collect.ArrayListMultimap;
|
||||||
|
@ -75,20 +75,20 @@ public class ServiceApiUtil {
|
||||||
LoggerFactory.getLogger(ServiceApiUtil.class);
|
LoggerFactory.getLogger(ServiceApiUtil.class);
|
||||||
public static JsonSerDeser<Service> jsonSerDeser =
|
public static JsonSerDeser<Service> jsonSerDeser =
|
||||||
new JsonSerDeser<>(Service.class,
|
new JsonSerDeser<>(Service.class,
|
||||||
PropertyNamingStrategy.SNAKE_CASE);
|
PropertyNamingStrategies.SNAKE_CASE);
|
||||||
|
|
||||||
public static final JsonSerDeser<Container[]> CONTAINER_JSON_SERDE =
|
public static final JsonSerDeser<Container[]> CONTAINER_JSON_SERDE =
|
||||||
new JsonSerDeser<>(Container[].class,
|
new JsonSerDeser<>(Container[].class,
|
||||||
PropertyNamingStrategy.SNAKE_CASE);
|
PropertyNamingStrategies.SNAKE_CASE);
|
||||||
|
|
||||||
public static final JsonSerDeser<ComponentContainers[]>
|
public static final JsonSerDeser<ComponentContainers[]>
|
||||||
COMP_CONTAINERS_JSON_SERDE = new JsonSerDeser<>(
|
COMP_CONTAINERS_JSON_SERDE = new JsonSerDeser<>(
|
||||||
ComponentContainers[].class,
|
ComponentContainers[].class,
|
||||||
PropertyNamingStrategy.SNAKE_CASE);
|
PropertyNamingStrategies.SNAKE_CASE);
|
||||||
|
|
||||||
public static final JsonSerDeser<Component[]> COMP_JSON_SERDE =
|
public static final JsonSerDeser<Component[]> COMP_JSON_SERDE =
|
||||||
new JsonSerDeser<>(Component[].class,
|
new JsonSerDeser<>(Component[].class,
|
||||||
PropertyNamingStrategy.SNAKE_CASE);
|
PropertyNamingStrategies.SNAKE_CASE);
|
||||||
|
|
||||||
private static final PatternValidator namePattern
|
private static final PatternValidator namePattern
|
||||||
= new PatternValidator("[a-z][a-z0-9-]*");
|
= new PatternValidator("[a-z][a-z0-9-]*");
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
package org.apache.hadoop.yarn.service;
|
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.base.Throwables;
|
||||||
import org.apache.hadoop.thirdparty.com.google.common.collect.HashMultimap;
|
import org.apache.hadoop.thirdparty.com.google.common.collect.HashMultimap;
|
||||||
import org.apache.hadoop.thirdparty.com.google.common.collect.Multimap;
|
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 =
|
public static final JsonSerDeser<Service> JSON_SER_DESER =
|
||||||
new JsonSerDeser<>(Service.class,
|
new JsonSerDeser<>(Service.class,
|
||||||
PropertyNamingStrategy.SNAKE_CASE);
|
PropertyNamingStrategies.SNAKE_CASE);
|
||||||
|
|
||||||
// Example service definition
|
// Example service definition
|
||||||
// 2 components, each of which has 2 containers.
|
// 2 components, each of which has 2 containers.
|
||||||
|
|
|
@ -183,6 +183,10 @@
|
||||||
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
||||||
<artifactId>jackson-jaxrs-json-provider</artifactId>
|
<artifactId>jackson-jaxrs-json-provider</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -191,6 +191,11 @@
|
||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -181,6 +181,11 @@
|
||||||
<type>test-jar</type>
|
<type>test-jar</type>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
|
|
|
@ -243,6 +243,11 @@
|
||||||
<artifactId>jersey-test-framework-grizzly2</artifactId>
|
<artifactId>jersey-test-framework-grizzly2</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -109,6 +109,11 @@
|
||||||
<artifactId>guice</artifactId>
|
<artifactId>guice</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -132,6 +132,10 @@
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
<type>test-jar</type>
|
<type>test-jar</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -133,6 +133,10 @@
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-databind</artifactId>
|
<artifactId>jackson-databind</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -384,6 +384,10 @@
|
||||||
<artifactId>commons-lang3</artifactId>
|
<artifactId>commons-lang3</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -95,6 +95,11 @@
|
||||||
<artifactId>junit</artifactId>
|
<artifactId>junit</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -117,6 +117,11 @@
|
||||||
<version>1.1.1</version>
|
<version>1.1.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.ws.rs</groupId>
|
||||||
|
<artifactId>javax.ws.rs-api</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
|
|
Loading…
Reference in New Issue