This is an automated email from the ASF dual-hosted git repository. peacewong pushed a commit to branch dev-1.1.2 in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 33b1979378b7a6eb5815427db78ac5397787ca9b Author: Jack Xu <[email protected]> AuthorDate: Sat May 7 14:18:07 2022 +0800 feat(dependency): unify the json4s dependency, and add spark's version commont (#2018) --- linkis-commons/linkis-rpc/pom.xml | 9 --------- pom.xml | 29 ++++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/linkis-commons/linkis-rpc/pom.xml b/linkis-commons/linkis-rpc/pom.xml index 76c56f2db..32adcd572 100644 --- a/linkis-commons/linkis-rpc/pom.xml +++ b/linkis-commons/linkis-rpc/pom.xml @@ -48,10 +48,6 @@ <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-openfeign</artifactId> <exclusions> - <exclusion> - <artifactId>spring-boot-autoconfigure</artifactId> - <groupId>org.springframework.boot</groupId> - </exclusion> <exclusion> <artifactId>spring-boot-starter-aop</artifactId> <groupId>org.springframework.boot</groupId> @@ -84,10 +80,6 @@ <artifactId>spring-cloud-commons</artifactId> <groupId>org.springframework.cloud</groupId> </exclusion> - <exclusion> - <artifactId>spring-cloud-starter-openfeign</artifactId> - <groupId>org.springframework.cloud</groupId> - </exclusion> </exclusions> </dependency> <dependency> @@ -100,7 +92,6 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>io.protostuff</groupId> <artifactId>protostuff-core</artifactId> diff --git a/pom.xml b/pom.xml index 072ba0a20..bfce04d0d 100644 --- a/pom.xml +++ b/pom.xml @@ -105,12 +105,13 @@ <spring.boot.version>2.3.12.RELEASE</spring.boot.version> <guava.version>30.0-jre</guava.version> <gson.version>2.8.5</gson.version> - <jackson-bom.version>2.13.2.1</jackson-bom.version> <scala.version>2.11.12</scala.version> <jdk.compile.version>1.8</jdk.compile.version> <plugin.scala.version>2.15.2</plugin.scala.version> <scala.binary.version>2.11</scala.binary.version> <netty.version>4.1.68.Final</netty.version> + <jackson-bom.version>2.13.2.1</jackson-bom.version> + <!-- spark2.4 use 3.5.3, spark3.2 use 3.7.0-M11 --> <json4s.version>3.5.3</json4s.version> <jersey.version>1.19.4</jersey.version> <jersey.servlet.version>2.23.1</jersey.servlet.version> @@ -270,6 +271,32 @@ <type>pom</type> <scope>import</scope> </dependency> + <dependency> + <groupId>org.json4s</groupId> + <artifactId>json4s-core_${scala.binary.version}</artifactId> + <version>${json4s.version}</version> + </dependency> + <dependency> + <groupId>org.json4s</groupId> + <artifactId>json4s-jackson_${scala.binary.version}</artifactId> + <version>${json4s.version}</version> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.json4s</groupId> + <artifactId>json4s-ast_${scala.binary.version}</artifactId> + <version>${json4s.version}</version> + </dependency> + <dependency> + <groupId>org.json4s</groupId> + <artifactId>json4s-scalap_${scala.binary.version}</artifactId> + <version>${json4s.version}</version> + </dependency> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-client</artifactId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
