This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new b6128f9b65 [dependenct](fe) Replace jackson-mapper-asl with
fastxml-jsckson (#17303)
b6128f9b65 is described below
commit b6128f9b65b5be5b5470987515508f8d3b6bc02b
Author: Calvin Kirs <[email protected]>
AuthorDate: Thu Mar 9 09:35:58 2023 +0800
[dependenct](fe) Replace jackson-mapper-asl with fastxml-jsckson (#17303)
---
dist/LICENSE-dist.txt | 4 ----
fe/fe-core/pom.xml | 5 -----
fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java | 2 +-
.../main/java/org/apache/doris/httpv2/rest/GetLogFileAction.java | 2 +-
.../main/java/org/apache/doris/persist/meta/MetaJsonHeader.java | 2 +-
.../org/apache/doris/external/elasticsearch/EsNodeInfoTest.java | 4 ++--
.../apache/doris/external/elasticsearch/PartitionPhaseTest.java | 4 ++--
fe/pom.xml | 7 -------
8 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/dist/LICENSE-dist.txt b/dist/LICENSE-dist.txt
index d2b16151cf..5501e9e567 100644
--- a/dist/LICENSE-dist.txt
+++ b/dist/LICENSE-dist.txt
@@ -815,8 +815,6 @@ The Apache Software License, Version 2.0
* Curator Recipes:
- org.apache.curator:curator-recipes:2.6.0
(http://curator.apache.org/curator-recipes)
- org.apache.curator:curator-recipes:2.7.1
(http://curator.apache.org/curator-recipes)
- * Data Mapper for Jackson:
- - org.codehaus.jackson:jackson-mapper-asl:1.9.13
(http://jackson.codehaus.org)
* DataNucleus Core:
- org.datanucleus:datanucleus-core:4.1.17
(http://www.datanucleus.org/#/datanucleus-core)
* DataNucleus JDO API plugin:
@@ -934,8 +932,6 @@ The Apache Software License, Version 2.0
* JVM Integration for Metrics:
- io.dropwizard.metrics:metrics-jvm:3.1.5
(http://metrics.codahale.com/metrics-jvm/)
- io.dropwizard.metrics:metrics-jvm:4.2.7
(https://metrics.dropwizard.io/metrics-jvm)
- * Jackson:
- - org.codehaus.jackson:jackson-core-asl:1.9.13
(http://jackson.codehaus.org)
* Jackson Integration for Metrics:
- io.dropwizard.metrics:metrics-json:3.1.5
(http://metrics.codahale.com/metrics-json/)
- io.dropwizard.metrics:metrics-json:4.2.7
(https://metrics.dropwizard.io/metrics-json)
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 07ade9f929..252c370f15 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -170,11 +170,6 @@ under the License.
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
- <!--
https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-mapper-asl -->
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </dependency>
<!--
https://mvnrepository.com/artifact/net.sourceforge.czt.dev/java-cup -->
<dependency>
<groupId>net.sourceforge.czt.dev</groupId>
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
index e253316fee..43b5a26d52 100755
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
@@ -234,6 +234,7 @@ import
org.apache.doris.transaction.DbUsedDataQuotaInfoCollector;
import org.apache.doris.transaction.GlobalTransactionMgr;
import org.apache.doris.transaction.PublishVersionDaemon;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
@@ -250,7 +251,6 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.codehaus.jackson.map.ObjectMapper;
import java.io.BufferedReader;
import java.io.DataInputStream;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLogFileAction.java
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLogFileAction.java
index 9535cc650d..c96e19971b 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLogFileAction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/GetLogFileAction.java
@@ -22,10 +22,10 @@ import org.apache.doris.httpv2.entity.ResponseEntityBuilder;
import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.qe.ConnectContext;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import org.codehaus.jackson.map.ObjectMapper;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/persist/meta/MetaJsonHeader.java
b/fe/fe-core/src/main/java/org/apache/doris/persist/meta/MetaJsonHeader.java
index c59b47ad73..82e4a5d48f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/meta/MetaJsonHeader.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/meta/MetaJsonHeader.java
@@ -20,7 +20,7 @@ package org.apache.doris.persist.meta;
import org.apache.doris.common.FeConstants;
import org.apache.doris.common.io.Text;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.io.RandomAccessFile;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsNodeInfoTest.java
b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsNodeInfoTest.java
index 59b9d8757e..e44ad9322e 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsNodeInfoTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsNodeInfoTest.java
@@ -17,8 +17,8 @@
package org.apache.doris.external.elasticsearch;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/PartitionPhaseTest.java
b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/PartitionPhaseTest.java
index f174393669..b700938727 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/PartitionPhaseTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/PartitionPhaseTest.java
@@ -22,10 +22,10 @@ import org.apache.doris.catalog.EsTable;
import org.apache.doris.catalog.PrimitiveType;
import org.apache.doris.common.ExceptionChecker;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.ObjectMapper;
import mockit.Expectations;
import mockit.Injectable;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Assert;
import org.junit.Test;
diff --git a/fe/pom.xml b/fe/pom.xml
index 44cdd12e37..633ff8cde9 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -178,7 +178,6 @@ under the License.
<gson.version>2.8.9</gson.version>
<guava.version>30.0-jre</guava.version>
<jackson.version>2.14.2</jackson.version>
- <jackson-mapper-asl.version>1.9.13</jackson-mapper-asl.version>
<java-cup.version>0.11-a-czt02-cdh</java-cup.version>
<javassist.version>3.18.2-GA</javassist.version>
<javax.servlet-api.version>3.0.1</javax.servlet-api.version>
@@ -401,12 +400,6 @@ under the License.
<artifactId>jackson</artifactId>
<version>${jackson.version}</version>
</dependency>
- <!--
https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-mapper-asl -->
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson-mapper-asl.version}</version>
- </dependency>
<!--
https://mvnrepository.com/artifact/net.sourceforge.czt.dev/java-cup -->
<dependency>
<groupId>net.sourceforge.czt.dev</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
