This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.4.0
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.4.0 by this push:
new af0b6e312 fix(pom): fix the spark miss jetty-client, and remove the
older jesery (#4562)
af0b6e312 is described below
commit af0b6e312f3e56a43a8aba61ac00fbbfdd4dab26
Author: Jack Xu <[email protected]>
AuthorDate: Fri May 19 11:04:13 2023 +0800
fix(pom): fix the spark miss jetty-client, and remove the older jesery
(#4562)
* fix(pom): fix the spark miss jetty-client, and remove the older jesery
* refactor: remove the guava's version in ecp-spark
---
linkis-commons/linkis-module/pom.xml | 138 ---------------------
linkis-commons/linkis-rpc/pom.xml | 11 +-
linkis-engineconn-plugins/flink/pom.xml | 11 +-
linkis-engineconn-plugins/hive/pom.xml | 10 +-
linkis-engineconn-plugins/spark/pom.xml | 96 ++------------
linkis-engineconn-plugins/sqoop/pom.xml | 10 +-
.../linkis-bml/linkis-bml-server/pom.xml | 4 -
.../core/restful/DataSourceCoreRestfulApi.java | 2 +-
.../linkis-service-discovery/linkis-eureka/pom.xml | 51 ++------
.../src/main/assembly/distribution.xml | 14 ---
.../linkis-gateway-server-support/pom.xml | 10 +-
pom.xml | 25 ++++
tool/dependencies/known-dependencies.txt | 6 -
13 files changed, 50 insertions(+), 338 deletions(-)
diff --git a/linkis-commons/linkis-module/pom.xml
b/linkis-commons/linkis-module/pom.xml
index a660dd7b5..d4ffc38e2 100644
--- a/linkis-commons/linkis-module/pom.xml
+++ b/linkis-commons/linkis-module/pom.xml
@@ -49,7 +49,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
- <version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
@@ -68,52 +67,6 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-autoconfigure</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-commons</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-cache</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.github.x-stream</groupId>
- <artifactId>mxparser</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -197,59 +150,6 @@
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-config</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-autoconfigure</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-config-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-config-client</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-commons</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-autoconfigure</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter</artifactId>
@@ -322,30 +222,7 @@
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
</dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
- </dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
@@ -361,21 +238,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
diff --git a/linkis-commons/linkis-rpc/pom.xml
b/linkis-commons/linkis-rpc/pom.xml
index 84744f3c4..70ef8e6bc 100644
--- a/linkis-commons/linkis-rpc/pom.xml
+++ b/linkis-commons/linkis-rpc/pom.xml
@@ -56,15 +56,7 @@
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
@@ -87,7 +79,6 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.5</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
diff --git a/linkis-engineconn-plugins/flink/pom.xml
b/linkis-engineconn-plugins/flink/pom.xml
index c4ec724f7..58abf3300 100644
--- a/linkis-engineconn-plugins/flink/pom.xml
+++ b/linkis-engineconn-plugins/flink/pom.xml
@@ -137,11 +137,7 @@
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
@@ -423,11 +419,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
-
<dependency>
<groupId>com.github.rholder</groupId>
<artifactId>guava-retrying</artifactId>
diff --git a/linkis-engineconn-plugins/hive/pom.xml
b/linkis-engineconn-plugins/hive/pom.xml
index b2c53eda9..cdf943333 100644
--- a/linkis-engineconn-plugins/hive/pom.xml
+++ b/linkis-engineconn-plugins/hive/pom.xml
@@ -220,15 +220,7 @@
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>javax.ws.rs</groupId>
diff --git a/linkis-engineconn-plugins/spark/pom.xml
b/linkis-engineconn-plugins/spark/pom.xml
index f28b036e2..0e5ad0e42 100644
--- a/linkis-engineconn-plugins/spark/pom.xml
+++ b/linkis-engineconn-plugins/spark/pom.xml
@@ -34,11 +34,7 @@
<exclusions>
<exclusion>
<groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -50,11 +46,7 @@
<exclusions>
<exclusion>
<groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -104,14 +96,9 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>*</artifactId>
</exclusion>
-
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.protobuf</groupId>
@@ -134,7 +121,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
<scope>provided</scope>
</dependency>
@@ -160,11 +146,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-common</artifactId>
@@ -201,23 +182,11 @@
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.module</groupId>
@@ -225,11 +194,7 @@
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
@@ -266,31 +231,15 @@
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.protobuf</groupId>
@@ -324,31 +273,15 @@
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.janino</groupId>
@@ -432,11 +365,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-client</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>${spark.hadoop.groupid}</groupId>
<artifactId>${spark.hadoop-common.artifactId}</artifactId>
diff --git a/linkis-engineconn-plugins/sqoop/pom.xml
b/linkis-engineconn-plugins/sqoop/pom.xml
index 9c90a9b4d..b09026d38 100644
--- a/linkis-engineconn-plugins/sqoop/pom.xml
+++ b/linkis-engineconn-plugins/sqoop/pom.xml
@@ -112,15 +112,7 @@
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>javax.ws.rs</groupId>
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml
index 8078966fc..9a68d4ec6 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml
@@ -47,10 +47,6 @@
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
index b192f3065..c6c6a58b7 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
@@ -62,13 +62,13 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageInfo;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml
b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml
index e432fcd29..355864379 100644
---
a/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml
+++
b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml
@@ -33,14 +33,9 @@
<dependencies>
<dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.linkis</groupId>
+ <artifactId>linkis-module</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -48,47 +43,15 @@
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
<exclusions>
<exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.github.x-stream</groupId>
- <artifactId>mxparser</artifactId>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter</artifactId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-log4j2</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- <version>${spring.boot.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-prometheus</artifactId>
- <scope>compile</scope>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-apache-client4</artifactId>
</dependency>
</dependencies>
diff --git
a/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/src/main/assembly/distribution.xml
b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/src/main/assembly/distribution.xml
index f722478d4..09865e46f 100644
---
a/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/src/main/assembly/distribution.xml
+++
b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/src/main/assembly/distribution.xml
@@ -50,10 +50,8 @@
<exclude>commons-configuration:commons-configuration:jar</exclude>
<exclude>commons-jxpath:commons-jxpath:jar</exclude>
<exclude>commons-lang:commons-lang:jar</exclude>
- <exclude>commons-logging:commons-logging:jar</exclude>
<exclude>org.apache.commons:commons-math:jar</exclude>
<exclude>com.google.errorprone:error_prone_annotations:jar</exclude>
-
<exclude>org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:jar</exclude>
<exclude>com.netflix.eureka:eureka-core:jar</exclude>
<exclude>com.stoyanr:evictor:jar</exclude>
<exclude>com.google.guava:failureaccess:jar</exclude>
@@ -72,26 +70,16 @@
<exclude>com.fasterxml.jackson.module:jackson-module-parameter-names:jar</exclude>
<exclude>jakarta.annotation:jakarta.annotation-api:jar</exclude>
<exclude>javax.inject:javax.inject:jar</exclude>
-
<exclude>com.sun.jersey.contribs:jersey-apache-client4:jar</exclude>
- <exclude>com.sun.jersey:jersey-client:jar</exclude>
- <exclude>com.sun.jersey:jersey-core:jar</exclude>
- <exclude>com.sun.jersey:jersey-server:jar</exclude>
- <exclude>com.sun.jersey:jersey-servlet:jar</exclude>
<exclude>org.codehaus.jettison:jettison:jar</exclude>
<exclude>joda-time:joda-time:jar</exclude>
<exclude>com.google.code.findbugs:jsr305:jar</exclude>
<exclude>org.slf4j:jul-to-slf4j:jar</exclude>
<exclude>com.google.guava:listenablefuture:jar</exclude>
- <exclude>org.apache.logging.log4j:log4j-api:jar</exclude>
- <exclude>org.apache.logging.log4j:log4j-core:jar</exclude>
- <exclude>org.apache.logging.log4j:log4j-jul:jar</exclude>
-
<exclude>org.apache.logging.log4j:log4j-slf4j-impl:jar</exclude>
<exclude>io.micrometer:micrometer-core:jar</exclude>
<exclude>com.netflix.netflix-commons:netflix-commons-util:jar</exclude>
<exclude>com.netflix.netflix-commons:netflix-eventbus:jar</exclude>
<exclude>com.netflix.netflix-commons:netflix-infix:jar</exclude>
<exclude>com.netflix.netflix-commons:netflix-statistics:jar</exclude>
- <exclude>org.glassfish.hk2:osgi-resource-locator:jar</exclude>
<exclude>org.reactivestreams:reactive-streams:jar</exclude>
<exclude>io.projectreactor:reactor-core:jar</exclude>
<exclude>io.projectreactor.addons:reactor-extra:jar</exclude>
@@ -119,7 +107,6 @@
<exclude>org.springframework.boot:spring-boot-starter-aop:jar</exclude>
<exclude>org.springframework.boot:spring-boot-starter-cache:jar</exclude>
<exclude>org.springframework.boot:spring-boot-starter-json:jar</exclude>
-
<exclude>org.springframework.boot:spring-boot-starter-log4j2:jar</exclude>
<exclude>org.springframework.boot:spring-boot-starter-web:jar</exclude>
<exclude>org.springframework.cloud:spring-cloud-commons:jar</exclude>
<exclude>org.springframework.cloud:spring-cloud-context:jar</exclude>
@@ -140,7 +127,6 @@
<exclude>org.springframework.security:spring-security-rsa:jar</exclude>
<exclude>org.springframework:spring-web:jar</exclude>
<exclude>org.springframework:spring-webmvc:jar</exclude>
- <exclude>javax.xml.stream:stax-api:jar</exclude>
<exclude>org.codehaus.woodstox:stax2-api:jar</exclude>
<exclude>org.antlr:stringtemplate:jar</exclude>
<exclude>com.fasterxml.woodstox:woodstox-core:jar</exclude>
diff --git
a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml
b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml
index 8d8c131ab..b0151452c 100644
---
a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml
+++
b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml
@@ -47,15 +47,7 @@
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/pom.xml b/pom.xml
index 1a51fb4c1..577fca8c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,6 +173,7 @@
<commons-compress.version>1.21</commons-compress.version>
<commons-configuration.version>1.10</commons-configuration.version>
<commons-exec.version>1.3</commons-exec.version>
+ <commons-fileupload.version>1.5</commons-fileupload.version>
<commons-net.version>3.9.0</commons-net.version>
<commons-cli.version>1.3.1</commons-cli.version>
<jline.version>3.9.0</jline.version>
@@ -406,6 +407,11 @@
<artifactId>commons-exec</artifactId>
<version>${commons-exec.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${commons-fileupload.version}</version>
+ </dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
@@ -1290,6 +1296,25 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+ <version>${spring-netflix.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-apache-client4</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.github.x-stream</groupId>
+ <artifactId>mxparser</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
diff --git a/tool/dependencies/known-dependencies.txt
b/tool/dependencies/known-dependencies.txt
index 78da16478..b97fdbed8 100644
--- a/tool/dependencies/known-dependencies.txt
+++ b/tool/dependencies/known-dependencies.txt
@@ -228,14 +228,12 @@ jackson-datatype-guava-2.13.4.jar
jackson-datatype-jdk8-2.13.4.jar
jackson-datatype-joda-2.13.4.jar
jackson-datatype-jsr310-2.13.4.jar
-jackson-jaxrs-1.9.2.jar
jackson-jaxrs-base-2.13.4.jar
jackson-jaxrs-json-provider-2.13.4.jar
jackson-mapper-asl-1.9.13.jar
jackson-module-jaxb-annotations-2.13.4.jar
jackson-module-parameter-names-2.13.4.jar
jackson-module-scala_2.12-2.13.4.jar
-jackson-xc-1.9.2.jar
jakarta.activation-1.2.2.jar
jakarta.activation-api-1.2.2.jar
jakarta.annotation-api-1.3.5.jar
@@ -259,7 +257,6 @@ javax.servlet.jsp-api-2.3.1.jar
javax.ws.rs-api-2.0.1.jar
javolution-5.5.1.jar
jaxb-api-2.3.1.jar
-jaxb-impl-2.2.3-1.jar
jaxb-runtime-2.3.4.jar
jboss-logging-3.4.2.Final.jar
jcip-annotations-1.0-1.jar
@@ -276,7 +273,6 @@ jersey-container-servlet-2.23.1.jar
jersey-container-servlet-core-2.23.1.jar
jersey-core-1.19.4.jar
jersey-guava-2.23.1.jar
-jersey-json-1.19.4.jar
jersey-media-jaxb-2.23.1.jar
jersey-server-1.19.4.jar
jersey-server-2.23.1.jar
@@ -517,7 +513,6 @@ spring-boot-starter-validation-2.3.12.RELEASE.jar
spring-boot-starter-web-2.3.12.RELEASE.jar
spring-boot-starter-webflux-2.3.12.RELEASE.jar
spring-cloud-commons-2.2.9.RELEASE.jar
-spring-cloud-config-client-2.2.8.RELEASE.jar
spring-cloud-context-2.2.9.RELEASE.jar
spring-cloud-gateway-core-2.2.9.RELEASE.jar
spring-cloud-gateway-server-2.2.9.RELEASE.jar
@@ -529,7 +524,6 @@ spring-cloud-netflix-hystrix-2.2.9.RELEASE.jar
spring-cloud-netflix-ribbon-2.2.9.RELEASE.jar
spring-cloud-openfeign-core-2.2.9.RELEASE.jar
spring-cloud-starter-2.2.9.RELEASE.jar
-spring-cloud-starter-config-2.2.8.RELEASE.jar
spring-cloud-starter-gateway-2.2.9.RELEASE.jar
spring-cloud-starter-loadbalancer-2.2.9.RELEASE.jar
spring-cloud-starter-netflix-archaius-2.2.9.RELEASE.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
