This is an automated email from the ASF dual-hosted git repository. peacewong pushed a commit to branch dev-1.3.0 in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 93800444bb4c3edf23dc99abcc972443d06a7b1d Author: Jack Xu <[email protected]> AuthorDate: Wed Aug 24 20:53:24 2022 +0800 fix: fix duplicate declaration of some jars --- .../linkis-application-manager/pom.xml | 20 -------------------- linkis-engineconn-plugins/flink/pom.xml | 1 - linkis-engineconn-plugins/python/pom.xml | 1 - linkis-engineconn-plugins/shell/pom.xml | 9 +-------- linkis-engineconn-plugins/spark/pom.xml | 2 -- linkis-engineconn-plugins/sqoop/pom.xml | 7 ------- .../gateway/ujes/route/HaContextGatewayRouter.scala | 17 +++++++++++------ pom.xml | 19 ++++++++++++++----- 8 files changed, 26 insertions(+), 50 deletions(-) diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml b/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml index 9e2d28fe5..093176a4f 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml @@ -87,26 +87,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-engineconn-plugin-core</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-executor-core</artifactId> - </exclusion> - <exclusion> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.linkis</groupId> - <artifactId>linkis-engineconn-common</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> <build> diff --git a/linkis-engineconn-plugins/flink/pom.xml b/linkis-engineconn-plugins/flink/pom.xml index 4bfdf897e..6cd5cb394 100644 --- a/linkis-engineconn-plugins/flink/pom.xml +++ b/linkis-engineconn-plugins/flink/pom.xml @@ -389,7 +389,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-exec</artifactId> - <version>1.3</version> </dependency> <dependency> diff --git a/linkis-engineconn-plugins/python/pom.xml b/linkis-engineconn-plugins/python/pom.xml index 0be87249f..068ecd5b7 100644 --- a/linkis-engineconn-plugins/python/pom.xml +++ b/linkis-engineconn-plugins/python/pom.xml @@ -33,7 +33,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-exec</artifactId> - <version>1.3</version> </dependency> <dependency> diff --git a/linkis-engineconn-plugins/shell/pom.xml b/linkis-engineconn-plugins/shell/pom.xml index 9078b34d7..4096d8e6b 100755 --- a/linkis-engineconn-plugins/shell/pom.xml +++ b/linkis-engineconn-plugins/shell/pom.xml @@ -33,8 +33,8 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-exec</artifactId> - <version>1.3</version> </dependency> + <dependency> <groupId>org.apache.linkis</groupId> <artifactId>linkis-engineconn-plugin-core</artifactId> @@ -75,13 +75,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-exec</artifactId> - <version>1.3</version> - - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> diff --git a/linkis-engineconn-plugins/spark/pom.xml b/linkis-engineconn-plugins/spark/pom.xml index 14afae034..f8deb8ec2 100644 --- a/linkis-engineconn-plugins/spark/pom.xml +++ b/linkis-engineconn-plugins/spark/pom.xml @@ -137,8 +137,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-exec</artifactId> - <version>1.3</version> - </dependency> <dependency> diff --git a/linkis-engineconn-plugins/sqoop/pom.xml b/linkis-engineconn-plugins/sqoop/pom.xml index 0221d8477..60afdca33 100644 --- a/linkis-engineconn-plugins/sqoop/pom.xml +++ b/linkis-engineconn-plugins/sqoop/pom.xml @@ -34,7 +34,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-exec</artifactId> - <version>1.3</version> <scope>provided</scope> </dependency> <dependency> @@ -43,12 +42,6 @@ <version>${sqoop.version}</version> <classifier>hadoop200</classifier> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-exec</artifactId> - <version>1.3</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala index 89de5e0c7..f7c526dbb 100644 --- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala +++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/org/apache/linkis/gateway/ujes/route/HaContextGatewayRouter.scala @@ -156,16 +156,21 @@ class HaContextGatewayRouter extends AbstractGatewayRouter { } object HaContextGatewayRouter { - val CONTEXT_ID_STR: String = "contextId" - val CONTEXT_SERVICE_NAME: String = if (RPCConfiguration.ENABLE_PUBLIC_SERVICE.getValue) { - RPCConfiguration.PUBLIC_SERVICE_APPLICATION_NAME.getValue - } else { - RPCConfiguration.CONTEXT_SERVICE_APPLICATION_NAME.getValue - } + val CONTEXT_ID_STR: String = "contextId" val CONTEXT_SERVICE_REQUEST_PREFIX = "contextservice" + val CONTEXT_SERVICE_NAME: String = + if ( + RPCConfiguration.ENABLE_PUBLIC_SERVICE.getValue && RPCConfiguration.PUBLIC_SERVICE_LIST + .exists(_.equalsIgnoreCase(CONTEXT_SERVICE_REQUEST_PREFIX)) + ) { + RPCConfiguration.PUBLIC_SERVICE_APPLICATION_NAME.getValue + } else { + RPCConfiguration.CONTEXT_SERVICE_APPLICATION_NAME.getValue + } + val CONTEXT_REGEX: Regex = (normalPath(API_URL_PREFIX) + "rest_[a-zA-Z][a-zA-Z_0-9]*/(v\\d+)/contextservice/" + ".+").r diff --git a/pom.xml b/pom.xml index 217161d27..8cdf524cb 100644 --- a/pom.xml +++ b/pom.xml @@ -130,6 +130,7 @@ <commons-beanutils.version>1.9.4</commons-beanutils.version> <commons-compress.version>1.21</commons-compress.version> <commons-configuration.version>1.10</commons-configuration.version> + <commons-exec.version>1.3</commons-exec.version> <protobuf.version>3.15.8</protobuf.version> <cglib.version>3.3.0</cglib.version> <asm-bom.version>9.3</asm-bom.version> @@ -271,6 +272,13 @@ <artifactId>ant-launcher</artifactId> <version>${ant.version}</version> </dependency> + + <dependency> + <groupId>org.reflections</groupId> + <artifactId>reflections</artifactId> + <version>${reflections.version}</version> + </dependency> + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> @@ -311,16 +319,17 @@ <artifactId>commons-compress</artifactId> <version>${commons-compress.version}</version> </dependency> - <dependency> - <groupId>org.reflections</groupId> - <artifactId>reflections</artifactId> - <version>${reflections.version}</version> - </dependency> <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> <version>${commons-configuration.version}</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-exec</artifactId> + <version>${commons-exec.version}</version> + </dependency> + <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
