This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.2.0 by this push:
new 461f5e3a2 Optimize build out dependence of linkis-cg-engineconnplugin
(#2477)
461f5e3a2 is described below
commit 461f5e3a2fd93b3bbf735d9f430cb90120da81dc
Author: Casion <[email protected]>
AuthorDate: Mon Jul 18 14:55:34 2022 +0800
Optimize build out dependence of linkis-cg-engineconnplugin (#2477)
* Optimize dependence of linkis-cg-engineconnplugin of
linkis-cg-engineconnmanager
* fix:linkis-cli log4j2.xml
---
.../src/main/assembly/distribution.xml | 243 +++++++++++++++++++-
.../src/main/assembly/distribution.xml | 244 ++++++++++++++++++++-
.../conf/{ => linkis-cli}/linkis-cli.properties | 0
linkis-dist/package/conf/linkis-cli/log4j2.xml | 49 +++++
.../org/apache/linkis/bml/http/HttpConf.scala | 3 +-
5 files changed, 533 insertions(+), 6 deletions(-)
diff --git
a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/assembly/distribution.xml
b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/assembly/distribution.xml
index 25ac4dece..7e5d90e65 100644
---
a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/assembly/distribution.xml
+++
b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/assembly/distribution.xml
@@ -38,17 +38,254 @@
<useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
+ <exclude>antlr:antlr:jar</exclude>
+ <exclude>aopalliance:aopalliance:jar</exclude>
+ <exclude>asm:asm:jar</exclude>
+ <exclude>cglib:cglib:jar</exclude>
+ <exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude>
+ <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>
+ <exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude>
+ <exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude>
+ <exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude>
+ <exclude>com.amazonaws:jmespath-java:jar</exclude>
+
<exclude>com.fasterxml.jackson.core:jackson-annotations:jar</exclude>
+ <exclude>com.fasterxml.jackson.core:jackson-core:jar</exclude>
+
<exclude>com.fasterxml.jackson.core:jackson-databind:jar</exclude>
+
<exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude>
+
<exclude>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar</exclude>
+
<exclude>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar</exclude>
+
<exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar</exclude>
+
<exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar</exclude>
+
<exclude>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar</exclude>
+
<exclude>com.fasterxml.jackson.module:jackson-module-parameter-names:jar</exclude>
+
<exclude>com.fasterxml.jackson.module:jackson-module-paranamer:jar</exclude>
+
<exclude>com.fasterxml.jackson.module:jackson-module-scala_2.11:jar</exclude>
+
<exclude>com.github.andrewoma.dexx:dexx-collections:jar</exclude>
+ <exclude>com.github.vlsi.compactmap:compactmap:jar</exclude>
<exclude>com.google.code.findbugs:annotations:jar</exclude>
+ <exclude>com.google.code.findbugs:jsr305:jar</exclude>
+ <exclude>com.google.code.gson:gson:jar</exclude>
+ <exclude>com.google.guava:guava:jar</exclude>
+ <exclude>com.google.inject:guice:jar</exclude>
+ <exclude>com.google.protobuf:protobuf-java:jar</exclude>
+ <exclude>com.netflix.archaius:archaius-core:jar</exclude>
+ <exclude>com.netflix.eureka:eureka-client:jar</exclude>
+ <exclude>com.netflix.eureka:eureka-core:jar</exclude>
+ <exclude>com.netflix.hystrix:hystrix-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>com.netflix.ribbon:ribbon:jar</exclude>
+ <exclude>com.netflix.ribbon:ribbon-core:jar</exclude>
+ <exclude>com.netflix.ribbon:ribbon-eureka:jar</exclude>
+ <exclude>com.netflix.ribbon:ribbon-httpclient:jar</exclude>
+ <exclude>com.netflix.ribbon:ribbon-loadbalancer:jar</exclude>
+ <exclude>com.netflix.ribbon:ribbon-transport:jar</exclude>
+ <exclude>com.netflix.servo:servo-core:jar</exclude>
+ <exclude>com.ning:async-http-client: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-json:jar</exclude>
+ <exclude>com.sun.jersey:jersey-server:jar</exclude>
+ <exclude>com.sun.jersey:jersey-servlet:jar</exclude>
+ <exclude>com.sun.xml.bind:jaxb-impl:jar</exclude>
+ <exclude>com.thoughtworks.paranamer:paranamer:jar</exclude>
+ <exclude>com.thoughtworks.xstream:xstream:jar</exclude>
+ <exclude>org.apache.linkis:linkis-common:jar</exclude>
+ <exclude>org.apache.linkis:linkis-module:jar</exclude>
<exclude>commons-beanutils:commons-beanutils:jar</exclude>
+ <exclude>commons-beanutils:commons-beanutils-core:jar</exclude>
+ <exclude>commons-cli:commons-cli:jar</exclude>
<exclude>commons-codec:commons-codec:jar</exclude>
<exclude>commons-collections:commons-collections:jar</exclude>
+
<exclude>commons-configuration:commons-configuration:jar</exclude>
+ <exclude>commons-daemon:commons-daemon:jar</exclude>
+ <exclude>commons-dbcp:commons-dbcp:jar</exclude>
+ <exclude>commons-digester:commons-digester:jar</exclude>
+ <exclude>commons-httpclient:commons-httpclient:jar</exclude>
+ <exclude>commons-io:commons-io:jar</exclude>
+ <exclude>commons-jxpath:commons-jxpath:jar</exclude>
+ <exclude>commons-lang:commons-lang:jar</exclude>
<exclude>commons-logging:commons-logging:jar</exclude>
- <exclude>com.google.code.gson:gson:jar</exclude>
-<!--
<exclude>org.apache.hadoop:hadoop-annotations:jar</exclude>-->
-<!--
<exclude>commons-httpclient:commons-httpclient:jar</exclude>-->
+ <exclude>commons-net:commons-net:jar</exclude>
+ <exclude>commons-pool:commons-pool:jar</exclude>
+ <exclude>io.micrometer:micrometer-core:jar</exclude>
+ <exclude>io.netty:netty:jar</exclude>
+ <exclude>io.netty:netty-all:jar</exclude>
+ <exclude>io.netty:netty-buffer:jar</exclude>
+ <exclude>io.netty:netty-codec:jar</exclude>
+ <exclude>io.netty:netty-codec-http:jar</exclude>
+ <exclude>io.netty:netty-common:jar</exclude>
+ <exclude>io.netty:netty-handler:jar</exclude>
+ <exclude>io.netty:netty-transport:jar</exclude>
+ <exclude>io.netty:netty-transport-native-epoll:jar</exclude>
+ <exclude>io.reactivex:rxjava:jar</exclude>
+ <exclude>io.reactivex:rxnetty:jar</exclude>
+ <exclude>io.reactivex:rxnetty-contexts:jar</exclude>
+ <exclude>io.reactivex:rxnetty-servo:jar</exclude>
+ <exclude>javax.activation:activation:jar</exclude>
+ <exclude>javax.annotation:javax.annotation-api:jar</exclude>
+ <exclude>javax.inject:javax.inject:jar</exclude>
+ <exclude>javax.servlet:javax.servlet-api:jar</exclude>
+ <exclude>javax.servlet.jsp:jsp-api:jar</exclude>
+ <exclude>javax.validation:validation-api:jar</exclude>
+ <exclude>javax.websocket:javax.websocket-api:jar</exclude>
+ <exclude>javax.ws.rs:javax.ws.rs-api:jar</exclude>
+ <exclude>javax.xml.bind:jaxb-api:jar</exclude>
+ <exclude>javax.xml.stream:stax-api:jar</exclude>
+ <exclude>joda-time:joda-time:jar</exclude>
+ <exclude>log4j:log4j:jar</exclude>
+ <exclude>mysql:mysql-connector-java:jar</exclude>
+
<exclude>net.databinder.dispatch:dispatch-core_2.11:jar</exclude>
+
<exclude>net.databinder.dispatch:dispatch-json4s-jackson_2.11:jar</exclude>
+ <exclude>org.antlr:antlr-runtime:jar</exclude>
+ <exclude>org.antlr:stringtemplate:jar</exclude>
+ <exclude>org.apache.commons:commons-compress:jar</exclude>
+ <exclude>org.apache.commons:commons-math:jar</exclude>
+ <exclude>org.apache.commons:commons-math3:jar</exclude>
+ <exclude>org.apache.curator:curator-client:jar</exclude>
+ <exclude>org.apache.curator:curator-framework:jar</exclude>
+ <exclude>org.apache.curator:curator-recipes:jar</exclude>
+ <exclude>org.apache.directory.api:api-asn1-api:jar</exclude>
+ <exclude>org.apache.directory.api:api-util:jar</exclude>
+
<exclude>org.apache.directory.server:apacheds-i18n:jar</exclude>
+
<exclude>org.apache.directory.server:apacheds-kerberos-codec:jar</exclude>
+ <exclude>org.apache.hadoop:hadoop-annotations:jar</exclude>
+ <exclude>org.apache.hadoop:hadoop-auth:jar</exclude>
+ <exclude>org.apache.hadoop:hadoop-common:jar</exclude>
+ <exclude>org.apache.hadoop:hadoop-hdfs:jar</exclude>
+ <exclude>org.apache.htrace:htrace-core:jar</exclude>
+ <exclude>org.apache.httpcomponents:httpclient:jar</exclude>
<exclude>org.apache.httpcomponents:httpcore: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>org.apache.zookeeper:zookeeper:jar</exclude>
+ <exclude>org.aspectj:aspectjweaver:jar</exclude>
+ <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
+ <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+ <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
+ <exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
+ <exclude>org.codehaus.jettison:jettison:jar</exclude>
+ <exclude>org.codehaus.woodstox:stax2-api:jar</exclude>
+ <exclude>org.codehaus.woodstox:woodstox-core-asl:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-annotations:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-client:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-continuation:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-http:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-io:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-jndi:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-plus:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-security:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-server:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-servlet:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-servlets:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-util:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-webapp:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-xml:jar</exclude>
+
<exclude>org.eclipse.jetty.websocket:javax-websocket-client-impl:jar</exclude>
+
<exclude>org.eclipse.jetty.websocket:javax-websocket-server-impl:jar</exclude>
+
<exclude>org.eclipse.jetty.websocket:websocket-api:jar</exclude>
+
<exclude>org.eclipse.jetty.websocket:websocket-client:jar</exclude>
+
<exclude>org.eclipse.jetty.websocket:websocket-common:jar</exclude>
+
<exclude>org.eclipse.jetty.websocket:websocket-server:jar</exclude>
+
<exclude>org.eclipse.jetty.websocket:websocket-servlet:jar</exclude>
+ <exclude>org.fusesource.leveldbjni:leveldbjni-all:jar</exclude>
+ <exclude>org.glassfish.hk2:class-model:jar</exclude>
+ <exclude>org.glassfish.hk2:config-types:jar</exclude>
+
<exclude>org.glassfish.hk2.external:aopalliance-repackaged:jar</exclude>
+
<exclude>org.glassfish.hk2.external:asm-all-repackaged:jar</exclude>
+
<exclude>org.glassfish.hk2.external:bean-validator:jar</exclude>
+ <exclude>org.glassfish.hk2.external:javax.inject:jar</exclude>
+ <exclude>org.glassfish.hk2:hk2:jar</exclude>
+ <exclude>org.glassfish.hk2:hk2-api:jar</exclude>
+ <exclude>org.glassfish.hk2:hk2-config:jar</exclude>
+ <exclude>org.glassfish.hk2:hk2-core:jar</exclude>
+ <exclude>org.glassfish.hk2:hk2-locator:jar</exclude>
+ <exclude>org.glassfish.hk2:hk2-runlevel:jar</exclude>
+ <exclude>org.glassfish.hk2:hk2-utils:jar</exclude>
+ <exclude>org.glassfish.hk2:osgi-resource-locator:jar</exclude>
+ <exclude>org.glassfish.hk2:spring-bridge:jar</exclude>
+ <exclude>org.glassfish.jersey.bundles:jaxrs-ri:jar</exclude>
+
<exclude>org.glassfish.jersey.bundles.repackaged:jersey-guava:jar</exclude>
+
<exclude>org.glassfish.jersey.containers:jersey-container-servlet:jar</exclude>
+
<exclude>org.glassfish.jersey.containers:jersey-container-servlet-core:jar</exclude>
+ <exclude>org.glassfish.jersey.core:jersey-client:jar</exclude>
+ <exclude>org.glassfish.jersey.core:jersey-common:jar</exclude>
+ <exclude>org.glassfish.jersey.core:jersey-server:jar</exclude>
+
<exclude>org.glassfish.jersey.ext:jersey-entity-filtering:jar</exclude>
+ <exclude>org.glassfish.jersey.ext:jersey-spring3:jar</exclude>
+
<exclude>org.glassfish.jersey.media:jersey-media-jaxb:jar</exclude>
+
<exclude>org.glassfish.jersey.media:jersey-media-json-jackson:jar</exclude>
+
<exclude>org.glassfish.jersey.media:jersey-media-multipart:jar</exclude>
+ <exclude>org.hdrhistogram:HdrHistogram:jar</exclude>
<exclude>org.javassist:javassist:jar</exclude>
+ <exclude>org.json4s:json4s-ast_2.11:jar</exclude>
+ <exclude>org.json4s:json4s-core_2.11:jar</exclude>
+ <exclude>org.json4s:json4s-jackson_2.11:jar</exclude>
+ <exclude>org.jsoup:jsoup:jar</exclude>
+ <exclude>org.jvnet.mimepull:mimepull:jar</exclude>
+ <exclude>org.jvnet:tiger-types:jar</exclude>
+ <exclude>org.latencyutils:LatencyUtils:jar</exclude>
+ <exclude>org.mortbay.jasper:apache-el:jar</exclude>
+ <exclude>org.mortbay.jetty:jetty:jar</exclude>
+ <exclude>org.mortbay.jetty:jetty-util:jar</exclude>
+ <exclude>org.ow2.asm:asm-analysis:jar</exclude>
+ <exclude>org.ow2.asm:asm-commons:jar</exclude>
+ <exclude>org.ow2.asm:asm-tree:jar</exclude>
<exclude>org.reflections:reflections:jar</exclude>
+
<exclude>org.scala-lang.modules:scala-parser-combinators_2.11:jar</exclude>
+ <exclude>org.scala-lang.modules:scala-xml_2.11:jar</exclude>
+ <exclude>org.scala-lang:scala-compiler:jar</exclude>
+ <exclude>org.scala-lang:scala-library:jar</exclude>
+ <exclude>org.scala-lang:scala-reflect:jar</exclude>
+ <exclude>org.scala-lang:scalap:jar</exclude>
+ <exclude>org.slf4j:jul-to-slf4j:jar</exclude>
+ <exclude>org.slf4j:slf4j-api:jar</exclude>
+ <exclude>org.springframework.boot:spring-boot:jar</exclude>
+
<exclude>org.springframework.boot:spring-boot-actuator:jar</exclude>
+
<exclude>org.springframework.boot:spring-boot-actuator-autoconfigure:jar</exclude>
+
<exclude>org.springframework.boot:spring-boot-autoconfigure:jar</exclude>
+
<exclude>org.springframework.boot:spring-boot-starter:jar</exclude>
+
<exclude>org.springframework.boot:spring-boot-starter-actuator:jar</exclude>
+
<exclude>org.springframework.boot:spring-boot-starter-aop:jar</exclude>
+
<exclude>org.springframework.boot:spring-boot-starter-jetty: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-config-client:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-context:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-netflix-archaius:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-netflix-core:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-netflix-eureka-client:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-netflix-ribbon:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-starter:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-starter-config:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-starter-eureka:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-starter-netflix-archaius:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-starter-netflix-ribbon:jar</exclude>
+
<exclude>org.springframework.security:spring-security-crypto:jar</exclude>
+
<exclude>org.springframework.security:spring-security-rsa:jar</exclude>
+ <exclude>org.springframework:spring-aop:jar</exclude>
+ <exclude>org.springframework:spring-beans:jar</exclude>
+ <exclude>org.springframework:spring-context:jar</exclude>
+ <exclude>org.springframework:spring-core:jar</exclude>
+ <exclude>org.springframework:spring-expression:jar</exclude>
+ <exclude>org.springframework:spring-jcl:jar</exclude>
+ <exclude>org.springframework:spring-web:jar</exclude>
+ <exclude>org.springframework:spring-webmvc:jar</exclude>
+ <exclude>org.tukaani:xz:jar</exclude>
+ <exclude>org.yaml:snakeyaml:jar</exclude>
+ <exclude>software.amazon.ion:ion-java:jar</exclude>
+ <exclude>xerces:xercesImpl:jar</exclude>
+ <exclude>xmlenc:xmlenc:jar</exclude>
+ <exclude>xmlpull:xmlpull:jar</exclude>
+ <exclude>xpp3:xpp3_min:jar</exclude>
</excludes>
</dependencySet>
</dependencySets>
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/assembly/distribution.xml
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/assembly/distribution.xml
index 024fe1b8d..41b646a85 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/assembly/distribution.xml
+++
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/assembly/distribution.xml
@@ -39,14 +39,254 @@
<useStrictFiltering>false</useStrictFiltering>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
-<!--
<exclude>commons-httpclient:commons-httpclient:jar</exclude>-->
+ <exclude>antlr:antlr:jar</exclude>
+ <exclude>aopalliance:aopalliance:jar</exclude>
+ <exclude>asm:asm:jar</exclude>
+ <exclude>cglib:cglib:jar</exclude>
+ <exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude>
+ <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>
+ <exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude>
+ <exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude>
+ <exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude>
+ <exclude>com.amazonaws:jmespath-java:jar</exclude>
+
<exclude>com.fasterxml.jackson.core:jackson-annotations:jar</exclude>
+ <exclude>com.fasterxml.jackson.core:jackson-core:jar</exclude>
+
<exclude>com.fasterxml.jackson.core:jackson-databind:jar</exclude>
+
<exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude>
+
<exclude>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar</exclude>
+
<exclude>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar</exclude>
+
<exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar</exclude>
+
<exclude>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar</exclude>
+
<exclude>com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar</exclude>
+
<exclude>com.fasterxml.jackson.module:jackson-module-parameter-names:jar</exclude>
+
<exclude>com.fasterxml.jackson.module:jackson-module-paranamer:jar</exclude>
+
<exclude>com.fasterxml.jackson.module:jackson-module-scala_2.11:jar</exclude>
+
<exclude>com.github.andrewoma.dexx:dexx-collections:jar</exclude>
+ <exclude>com.github.vlsi.compactmap:compactmap:jar</exclude>
+ <exclude>com.google.code.findbugs:annotations:jar</exclude>
+ <exclude>com.google.code.findbugs:jsr305:jar</exclude>
+ <exclude>com.google.code.gson:gson:jar</exclude>
+ <exclude>com.google.guava:guava:jar</exclude>
+ <exclude>com.google.inject:guice:jar</exclude>
+ <exclude>com.google.protobuf:protobuf-java:jar</exclude>
+ <exclude>com.netflix.archaius:archaius-core:jar</exclude>
+ <exclude>com.netflix.eureka:eureka-client:jar</exclude>
+ <exclude>com.netflix.eureka:eureka-core:jar</exclude>
+ <exclude>com.netflix.hystrix:hystrix-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>com.netflix.ribbon:ribbon:jar</exclude>
+ <exclude>com.netflix.ribbon:ribbon-core:jar</exclude>
+ <exclude>com.netflix.ribbon:ribbon-eureka:jar</exclude>
+ <exclude>com.netflix.ribbon:ribbon-httpclient:jar</exclude>
+ <exclude>com.netflix.ribbon:ribbon-loadbalancer:jar</exclude>
+ <exclude>com.netflix.ribbon:ribbon-transport:jar</exclude>
+ <exclude>com.netflix.servo:servo-core:jar</exclude>
+ <exclude>com.ning:async-http-client: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-json:jar</exclude>
+ <exclude>com.sun.jersey:jersey-server:jar</exclude>
+ <exclude>com.sun.jersey:jersey-servlet:jar</exclude>
+ <exclude>com.sun.xml.bind:jaxb-impl:jar</exclude>
+ <exclude>com.thoughtworks.paranamer:paranamer:jar</exclude>
+ <exclude>com.thoughtworks.xstream:xstream:jar</exclude>
+ <exclude>org.apache.linkis:linkis-common:jar</exclude>
+ <exclude>org.apache.linkis:linkis-module:jar</exclude>
+ <exclude>commons-beanutils:commons-beanutils:jar</exclude>
+ <exclude>commons-beanutils:commons-beanutils-core:jar</exclude>
+ <exclude>commons-cli:commons-cli:jar</exclude>
+ <exclude>commons-codec:commons-codec:jar</exclude>
+ <exclude>commons-collections:commons-collections:jar</exclude>
+
<exclude>commons-configuration:commons-configuration:jar</exclude>
+ <exclude>commons-daemon:commons-daemon:jar</exclude>
+ <exclude>commons-dbcp:commons-dbcp:jar</exclude>
+ <exclude>commons-digester:commons-digester:jar</exclude>
+ <exclude>commons-httpclient:commons-httpclient:jar</exclude>
+ <exclude>commons-io:commons-io:jar</exclude>
+ <exclude>commons-jxpath:commons-jxpath:jar</exclude>
+ <exclude>commons-lang:commons-lang:jar</exclude>
+ <exclude>commons-logging:commons-logging:jar</exclude>
+ <exclude>commons-net:commons-net:jar</exclude>
+ <exclude>commons-pool:commons-pool:jar</exclude>
+ <exclude>io.micrometer:micrometer-core:jar</exclude>
+ <exclude>io.netty:netty:jar</exclude>
+ <exclude>io.netty:netty-all:jar</exclude>
+ <exclude>io.netty:netty-buffer:jar</exclude>
+ <exclude>io.netty:netty-codec:jar</exclude>
+ <exclude>io.netty:netty-codec-http:jar</exclude>
+ <exclude>io.netty:netty-common:jar</exclude>
+ <exclude>io.netty:netty-handler:jar</exclude>
+ <exclude>io.netty:netty-transport:jar</exclude>
+ <exclude>io.netty:netty-transport-native-epoll:jar</exclude>
+ <exclude>io.reactivex:rxjava:jar</exclude>
+ <exclude>io.reactivex:rxnetty:jar</exclude>
+ <exclude>io.reactivex:rxnetty-contexts:jar</exclude>
+ <exclude>io.reactivex:rxnetty-servo:jar</exclude>
+ <exclude>javax.activation:activation:jar</exclude>
+ <exclude>javax.annotation:javax.annotation-api:jar</exclude>
+ <exclude>javax.inject:javax.inject:jar</exclude>
+ <exclude>javax.servlet:javax.servlet-api:jar</exclude>
+ <exclude>javax.servlet.jsp:jsp-api:jar</exclude>
+ <exclude>javax.validation:validation-api:jar</exclude>
+ <exclude>javax.websocket:javax.websocket-api:jar</exclude>
+ <exclude>javax.ws.rs:javax.ws.rs-api:jar</exclude>
+ <exclude>javax.xml.bind:jaxb-api:jar</exclude>
+ <exclude>javax.xml.stream:stax-api:jar</exclude>
+ <exclude>joda-time:joda-time:jar</exclude>
+ <exclude>log4j:log4j:jar</exclude>
+ <exclude>mysql:mysql-connector-java:jar</exclude>
+
<exclude>net.databinder.dispatch:dispatch-core_2.11:jar</exclude>
+
<exclude>net.databinder.dispatch:dispatch-json4s-jackson_2.11:jar</exclude>
+ <exclude>org.antlr:antlr-runtime:jar</exclude>
+ <exclude>org.antlr:stringtemplate:jar</exclude>
+ <exclude>org.apache.commons:commons-compress:jar</exclude>
+ <exclude>org.apache.commons:commons-math:jar</exclude>
+ <exclude>org.apache.commons:commons-math3:jar</exclude>
+ <exclude>org.apache.curator:curator-client:jar</exclude>
+ <exclude>org.apache.curator:curator-framework:jar</exclude>
+ <exclude>org.apache.curator:curator-recipes:jar</exclude>
+ <exclude>org.apache.directory.api:api-asn1-api:jar</exclude>
+ <exclude>org.apache.directory.api:api-util:jar</exclude>
+
<exclude>org.apache.directory.server:apacheds-i18n:jar</exclude>
+
<exclude>org.apache.directory.server:apacheds-kerberos-codec:jar</exclude>
+ <exclude>org.apache.hadoop:hadoop-annotations:jar</exclude>
+ <exclude>org.apache.hadoop:hadoop-auth:jar</exclude>
+ <exclude>org.apache.hadoop:hadoop-common:jar</exclude>
+ <exclude>org.apache.hadoop:hadoop-hdfs:jar</exclude>
+ <exclude>org.apache.htrace:htrace-core:jar</exclude>
+ <exclude>org.apache.httpcomponents:httpclient:jar</exclude>
<exclude>org.apache.httpcomponents:httpcore: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>org.apache.zookeeper:zookeeper:jar</exclude>
+ <exclude>org.aspectj:aspectjweaver:jar</exclude>
+ <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
+ <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+ <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
+ <exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
+ <exclude>org.codehaus.jettison:jettison:jar</exclude>
+ <exclude>org.codehaus.woodstox:stax2-api:jar</exclude>
+ <exclude>org.codehaus.woodstox:woodstox-core-asl:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-annotations:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-client:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-continuation:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-http:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-io:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-jndi:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-plus:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-security:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-server:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-servlet:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-servlets:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-util:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-webapp:jar</exclude>
+ <exclude>org.eclipse.jetty:jetty-xml:jar</exclude>
+
<exclude>org.eclipse.jetty.websocket:javax-websocket-client-impl:jar</exclude>
+
<exclude>org.eclipse.jetty.websocket:javax-websocket-server-impl:jar</exclude>
+
<exclude>org.eclipse.jetty.websocket:websocket-api:jar</exclude>
+
<exclude>org.eclipse.jetty.websocket:websocket-client:jar</exclude>
+
<exclude>org.eclipse.jetty.websocket:websocket-common:jar</exclude>
+
<exclude>org.eclipse.jetty.websocket:websocket-server:jar</exclude>
+
<exclude>org.eclipse.jetty.websocket:websocket-servlet:jar</exclude>
+ <exclude>org.fusesource.leveldbjni:leveldbjni-all:jar</exclude>
+ <exclude>org.glassfish.hk2:class-model:jar</exclude>
+ <exclude>org.glassfish.hk2:config-types:jar</exclude>
+
<exclude>org.glassfish.hk2.external:aopalliance-repackaged:jar</exclude>
+
<exclude>org.glassfish.hk2.external:asm-all-repackaged:jar</exclude>
+
<exclude>org.glassfish.hk2.external:bean-validator:jar</exclude>
+ <exclude>org.glassfish.hk2.external:javax.inject:jar</exclude>
+ <exclude>org.glassfish.hk2:hk2:jar</exclude>
+ <exclude>org.glassfish.hk2:hk2-api:jar</exclude>
+ <exclude>org.glassfish.hk2:hk2-config:jar</exclude>
+ <exclude>org.glassfish.hk2:hk2-core:jar</exclude>
+ <exclude>org.glassfish.hk2:hk2-locator:jar</exclude>
+ <exclude>org.glassfish.hk2:hk2-runlevel:jar</exclude>
+ <exclude>org.glassfish.hk2:hk2-utils:jar</exclude>
+ <exclude>org.glassfish.hk2:osgi-resource-locator:jar</exclude>
+ <exclude>org.glassfish.hk2:spring-bridge:jar</exclude>
+ <exclude>org.glassfish.jersey.bundles:jaxrs-ri:jar</exclude>
+
<exclude>org.glassfish.jersey.bundles.repackaged:jersey-guava:jar</exclude>
+
<exclude>org.glassfish.jersey.containers:jersey-container-servlet:jar</exclude>
+
<exclude>org.glassfish.jersey.containers:jersey-container-servlet-core:jar</exclude>
+ <exclude>org.glassfish.jersey.core:jersey-client:jar</exclude>
+ <exclude>org.glassfish.jersey.core:jersey-common:jar</exclude>
+ <exclude>org.glassfish.jersey.core:jersey-server:jar</exclude>
+
<exclude>org.glassfish.jersey.ext:jersey-entity-filtering:jar</exclude>
+ <exclude>org.glassfish.jersey.ext:jersey-spring3:jar</exclude>
+
<exclude>org.glassfish.jersey.media:jersey-media-jaxb:jar</exclude>
+
<exclude>org.glassfish.jersey.media:jersey-media-json-jackson:jar</exclude>
+
<exclude>org.glassfish.jersey.media:jersey-media-multipart:jar</exclude>
+ <exclude>org.hdrhistogram:HdrHistogram:jar</exclude>
<exclude>org.javassist:javassist:jar</exclude>
+ <exclude>org.json4s:json4s-ast_2.11:jar</exclude>
+ <exclude>org.json4s:json4s-core_2.11:jar</exclude>
+ <exclude>org.json4s:json4s-jackson_2.11:jar</exclude>
+ <exclude>org.jsoup:jsoup:jar</exclude>
+ <exclude>org.jvnet.mimepull:mimepull:jar</exclude>
+ <exclude>org.jvnet:tiger-types:jar</exclude>
+ <exclude>org.latencyutils:LatencyUtils:jar</exclude>
+ <exclude>org.mortbay.jasper:apache-el:jar</exclude>
+ <exclude>org.mortbay.jetty:jetty:jar</exclude>
+ <exclude>org.mortbay.jetty:jetty-util:jar</exclude>
+ <exclude>org.ow2.asm:asm-analysis:jar</exclude>
+ <exclude>org.ow2.asm:asm-commons:jar</exclude>
+ <exclude>org.ow2.asm:asm-tree:jar</exclude>
<exclude>org.reflections:reflections:jar</exclude>
-<!-- <exclude>org.slf4j:slf4j-api:jar</exclude>-->
+
<exclude>org.scala-lang.modules:scala-parser-combinators_2.11:jar</exclude>
+ <exclude>org.scala-lang.modules:scala-xml_2.11:jar</exclude>
+ <exclude>org.scala-lang:scala-compiler:jar</exclude>
+ <exclude>org.scala-lang:scala-library:jar</exclude>
+ <exclude>org.scala-lang:scala-reflect:jar</exclude>
+ <exclude>org.scala-lang:scalap:jar</exclude>
+ <exclude>org.slf4j:jul-to-slf4j:jar</exclude>
+ <exclude>org.slf4j:slf4j-api:jar</exclude>
+ <exclude>org.springframework.boot:spring-boot:jar</exclude>
+
<exclude>org.springframework.boot:spring-boot-actuator:jar</exclude>
+
<exclude>org.springframework.boot:spring-boot-actuator-autoconfigure:jar</exclude>
+
<exclude>org.springframework.boot:spring-boot-autoconfigure:jar</exclude>
+
<exclude>org.springframework.boot:spring-boot-starter:jar</exclude>
+
<exclude>org.springframework.boot:spring-boot-starter-actuator:jar</exclude>
+
<exclude>org.springframework.boot:spring-boot-starter-aop:jar</exclude>
+
<exclude>org.springframework.boot:spring-boot-starter-jetty: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-config-client:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-context:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-netflix-archaius:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-netflix-core:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-netflix-eureka-client:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-netflix-ribbon:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-starter:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-starter-config:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-starter-eureka:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-starter-netflix-archaius:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:jar</exclude>
+
<exclude>org.springframework.cloud:spring-cloud-starter-netflix-ribbon:jar</exclude>
+
<exclude>org.springframework.security:spring-security-crypto:jar</exclude>
+
<exclude>org.springframework.security:spring-security-rsa:jar</exclude>
+ <exclude>org.springframework:spring-aop:jar</exclude>
<exclude>org.springframework:spring-beans:jar</exclude>
+ <exclude>org.springframework:spring-context:jar</exclude>
<exclude>org.springframework:spring-core:jar</exclude>
+ <exclude>org.springframework:spring-expression:jar</exclude>
<exclude>org.springframework:spring-jcl:jar</exclude>
+ <exclude>org.springframework:spring-web:jar</exclude>
+ <exclude>org.springframework:spring-webmvc:jar</exclude>
+ <exclude>org.tukaani:xz:jar</exclude>
+ <exclude>org.yaml:snakeyaml:jar</exclude>
+ <exclude>software.amazon.ion:ion-java:jar</exclude>
+ <exclude>xerces:xercesImpl:jar</exclude>
+ <exclude>xmlenc:xmlenc:jar</exclude>
+ <exclude>xmlpull:xmlpull:jar</exclude>
+ <exclude>xpp3:xpp3_min:jar</exclude>
</excludes>
</dependencySet>
</dependencySets>
diff --git a/linkis-dist/package/conf/linkis-cli.properties
b/linkis-dist/package/conf/linkis-cli/linkis-cli.properties
similarity index 100%
rename from linkis-dist/package/conf/linkis-cli.properties
rename to linkis-dist/package/conf/linkis-cli/linkis-cli.properties
diff --git a/linkis-dist/package/conf/linkis-cli/log4j2.xml
b/linkis-dist/package/conf/linkis-cli/log4j2.xml
new file mode 100644
index 000000000..08f3025bf
--- /dev/null
+++ b/linkis-dist/package/conf/linkis-cli/log4j2.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<configuration status="INFO" monitorInterval="30">
+ <properties>
+ <property name="LOG_PATH">${sys:log.path}</property>
+ <property name="LOG_FILE">${sys:log.file}</property>
+ </properties>
+ <appenders>
+ <console name="Console-Plain" target="SYSTEM_OUT">
+ <PatternLayout pattern="%m%n"/>
+ </console>
+ <console name="Console-Information" target="SYSTEM_OUT">
+ <PatternLayout pattern="[%level] %m%n"/>
+ </console>
+ <File name="fixedTimeFileAppender" fileName="${LOG_PATH}/${LOG_FILE}"
append="false">
+ <PatternLayout pattern="%d{yyy-MM-dd HH:mm:ss,SSS} %p %c{1}(%L) -
%m%n"/>
+ </File>
+ </appenders>
+ <loggers>
+ <root level="OFF">
+ <!--<appender-ref ref="fixedTimeFileAppender"/>-->
+ </root>
+ <logger name="PlaintTextLogger" level="INFO" additivity="false">
+ <appender-ref ref="Console-Plain"/>
+ </logger>
+ <logger name="InformationLogger" level="INFO" additivity="false">
+ <appender-ref ref="Console-Information"/>
+ </logger>
+ <logger name="org.apache.linkis" level="INFO" additivity="false">
+ <appender-ref ref="fixedTimeFileAppender"/>
+ </logger>
+ </loggers>
+</configuration>
\ No newline at end of file
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala
b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala
index 1308bd941..743bca8ec 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala
@@ -31,7 +31,8 @@ object HttpConf {
val downloadURL: String = urlPrefix + "/download"
val downloadShareURL: String = urlPrefix + "/" + "downloadShareResource"
val updateProjectUrl: String = urlPrefix + "/" + "updateProjectUsers"
- val deleteURL: String = urlPrefix + "/delete"
+ val deleteURL: String = urlPrefix + "/deleteResource"
+ val batchDeleteURL: String = urlPrefix + "/deleteResources"
val updateVersionURL: String = urlPrefix + "/updateVersion"
val relateHdfsURL:String = gatewayInstance + urlPrefix + "/relateHdfs"
val relateStorageURL:String = gatewayInstance + urlPrefix + "/relateStorage"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
