You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2020/03/10 06:04:10 UTC
[phoenix] branch master updated: PHOENIX-5762 Update jackson
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new 8a048e9 PHOENIX-5762 Update jackson
8a048e9 is described below
commit 8a048e96d9e44fdb86f8fee8eecfcadb9970858b
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Mar 9 13:32:04 2020 +0100
PHOENIX-5762 Update jackson
---
.../build/components/all-common-dependencies.xml | 5 ++--
phoenix-core/pom.xml | 16 ++++---------
.../phoenix/mapreduce/JsonToKeyValueMapper.java | 2 +-
.../phoenix/mapreduce/bulkload/TargetTableRef.java | 4 ++--
.../bulkload/TargetTableRefFunctions.java | 2 +-
phoenix-server/pom.xml | 4 ++--
phoenix-tracing-webapp/pom.xml | 9 ++-----
.../phoenix/tracingwebapp/http/TraceServlet.java | 2 +-
pom.xml | 28 ++++++++--------------
9 files changed, 26 insertions(+), 46 deletions(-)
diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml b/phoenix-assembly/src/build/components/all-common-dependencies.xml
index 45efee4..f6293d4 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -93,8 +93,9 @@
<!-- save these dependencies to the top-level -->
<outputDirectory>/lib</outputDirectory>
<includes>
- <include>org.codehaus.jackson:jackson-core-asl</include>
- <include>org.codehaus.jackson:jackson-mapper-asl</include>
+ <include>com.fasterxml.jackson.core:jackson-core</include>
+ <include>com.fasterxml.jackson.core:jackson-databind</include>
+ <include>com.fasterxml.jackson.core:jackson-annotations</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 9fff5f0..e53c3ce 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -258,20 +258,12 @@
<artifactId>jcip-annotations</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/JsonToKeyValueMapper.java b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/JsonToKeyValueMapper.java
index 2a51b2c..962667a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/JsonToKeyValueMapper.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/JsonToKeyValueMapper.java
@@ -25,8 +25,8 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.phoenix.util.ColumnInfo;
import org.apache.phoenix.util.UpsertExecutor;
import org.apache.phoenix.util.json.JsonUpsertExecutor;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/bulkload/TargetTableRef.java b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/bulkload/TargetTableRef.java
index 2c3069f..dfa2c82 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/bulkload/TargetTableRef.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/bulkload/TargetTableRef.java
@@ -19,8 +19,8 @@ package org.apache.phoenix.mapreduce.bulkload;
import java.util.Map;
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.Maps;
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/bulkload/TargetTableRefFunctions.java b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/bulkload/TargetTableRefFunctions.java
index 58725c2..6e0da73 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/bulkload/TargetTableRefFunctions.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/bulkload/TargetTableRefFunctions.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index ef76762..8bf085d 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -267,8 +267,8 @@
<shadedPattern>${shaded.package}.net.jcip.annotations</shadedPattern>
</relocation>
<relocation>
- <pattern>org.codehaus.jackson</pattern>
- <shadedPattern>${shaded.package}.org.codehaus.jackson</shadedPattern>
+ <pattern>com.fasterxml.jackson</pattern>
+ <shadedPattern>${shaded.package}.com.fasterxml.jackson</shadedPattern>
</relocation>
<relocation>
<pattern>javax.annotation</pattern>
diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml
index 274f4fa..64db1fe 100755
--- a/phoenix-tracing-webapp/pom.xml
+++ b/phoenix-tracing-webapp/pom.xml
@@ -75,13 +75,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
index 98250e8..c0f82a0 100755
--- a/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
+++ b/phoenix-tracing-webapp/src/main/java/org/apache/phoenix/tracingwebapp/http/TraceServlet.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
diff --git a/pom.xml b/pom.xml
index 8d4029b..dd3ffae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
<!-- Dependency versions -->
<commons-cli.version>1.4</commons-cli.version>
- <jackson.version>1.9.2</jackson.version>
+ <jackson.version>2.10.3</jackson.version>
<antlr.version>3.5.2</antlr.version>
<argparse4j.version>0.8.1</argparse4j.version>
<log4j.version>1.2.17</log4j.version>
@@ -1180,33 +1180,25 @@
<version>${snappy.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>2.0.1</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- <version>${jackson.version}</version>
- <scope>test</scope>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>