You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/03/14 03:50:20 UTC
[incubator-linkis] branch dev-1.1.0 updated: use spring-boot-starter-jetty(wip) (#1660)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.0 by this push:
new adf550a use spring-boot-starter-jetty(wip) (#1660)
adf550a is described below
commit adf550aaf3f85ed9475354190d84b865c503601a
Author: Casion <ca...@gmail.com>
AuthorDate: Mon Mar 14 11:49:49 2022 +0800
use spring-boot-starter-jetty(wip) (#1660)
* use spring-boot-starter-jetty
* update maven-assembly-plugin version
* adjust known-dependencies.txt
---
.../assembly-combined/conf/token.properties | 5 ++++-
linkis-commons/linkis-module/pom.xml | 24 +---------------------
.../linkis-datasource-manager/server/pom.xml | 2 +-
.../linkis-metadata-manager/server/pom.xml | 2 +-
.../service/elasticsearch/pom.xml | 2 +-
.../linkis-metadata-manager/service/kafka/pom.xml | 2 +-
.../linkis-metadata-manager/service/mysql/pom.xml | 2 +-
linkis-public-enhancements/pom.xml | 2 +-
.../linkis-gateway-core/pom.xml | 15 --------------
tool/dependencies/known-dependencies.txt | 17 ++++++++-------
10 files changed, 21 insertions(+), 52 deletions(-)
diff --git a/assembly-combined-package/assembly-combined/conf/token.properties b/assembly-combined-package/assembly-combined/conf/token.properties
index 7d9019f..f7cc2d4 100644
--- a/assembly-combined-package/assembly-combined/conf/token.properties
+++ b/assembly-combined-package/assembly-combined/conf/token.properties
@@ -12,7 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
+## http API token authentication
+## Token-Code=Token-User
+##eg:TEST-AUTH=hadoop,root,user01
+### http request with header { Token-Code:TEST-AUTH,Token-User:user01}
QML-AUTH=*
BML-AUTH=*
WS-AUTH=*
diff --git a/linkis-commons/linkis-module/pom.xml b/linkis-commons/linkis-module/pom.xml
index 2a83017..7e797f1 100644
--- a/linkis-commons/linkis-module/pom.xml
+++ b/linkis-commons/linkis-module/pom.xml
@@ -133,16 +133,9 @@
<artifactId>asm</artifactId>
<groupId>org.ow2.asm</groupId>
</exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- </exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
@@ -331,21 +324,6 @@
<artifactId>commons-dbcp</artifactId>
<version>1.4</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
index 43ec443..c973fc7 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
@@ -123,7 +123,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
+ <version>3.2.0</version>
<inherited>false</inherited>
<executions>
<execution>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/pom.xml
index 0534067..2bdc0fe 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/pom.xml
@@ -76,7 +76,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
+ <version>3.2.0</version>
<inherited>false</inherited>
<executions>
<execution>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/pom.xml
index 7816a61..0013fbb 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/pom.xml
@@ -77,7 +77,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
+ <version>3.2.0</version>
<inherited>false</inherited>
<executions>
<execution>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/pom.xml
index 1aaa3d7..9a9f4ec 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/pom.xml
@@ -76,7 +76,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
+ <version>3.2.0</version>
<inherited>false</inherited>
<executions>
<execution>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/pom.xml
index 9a758b5..14e7c64 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/pom.xml
@@ -80,7 +80,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
+ <version>3.2.0</version>
<inherited>false</inherited>
<executions>
<execution>
diff --git a/linkis-public-enhancements/pom.xml b/linkis-public-enhancements/pom.xml
index 90bb168..95a248e 100644
--- a/linkis-public-enhancements/pom.xml
+++ b/linkis-public-enhancements/pom.xml
@@ -77,7 +77,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
+ <version>3.2.0</version>
<inherited>false</inherited>
<executions>
<execution>
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/pom.xml
index 5d62c8b..12c2c73 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/pom.xml
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/pom.xml
@@ -39,10 +39,6 @@
<artifactId>spring-boot-starter-web</artifactId>
</exclusion>
<exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jetty</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</exclusion>
@@ -69,17 +65,6 @@
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-client</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-servlet</artifactId>
- <version>${jetty.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt
index 2123457..b2187b8 100644
--- a/tool/dependencies/known-dependencies.txt
+++ b/tool/dependencies/known-dependencies.txt
@@ -23,8 +23,13 @@ api-asn1-api-1.0.0-M20.jar
api-util-1.0.0-M20.jar
archaius-core-0.7.7.jar
asm-3.3.1.jar
+asm-5.0.4.jar
+asm-9.0.jar
+asm-analysis-9.0.jar
asm-commons-3.1.jar
+asm-commons-9.0.jar
asm-tree-3.1.jar
+asm-tree-9.0.jar
aspectjweaver-1.9.6.jar
avatica-1.8.0.jar
avatica-metrics-1.8.0.jar
@@ -239,7 +244,6 @@ javax.annotation-api-1.3.2.jar
javax.inject-1.jar
javax.inject-2.4.0-b34.jar
javax.servlet-3.0.0.v201112011016.jar
-javax.servlet-api-4.0.1.jar
javax.ws.rs-api-2.0.1.jar
jaxb-api-2.3.1.jar
jaxb-impl-2.2.3-1.jar
@@ -269,18 +273,20 @@ jettison-1.1.jar
jettison-1.4.0.jar
jetty-6.1.26.jar
jetty-all-7.6.0.v20120127.jar
+jetty-annotations-9.4.42.v20210604.jar
jetty-client-9.4.42.v20210604.jar
+jetty-continuation-9.4.42.v20210604.jar
jetty-http-9.4.42.v20210604.jar
jetty-io-9.4.42.v20210604.jar
+jetty-plus-9.4.42.v20210604.jar
jetty-security-9.4.42.v20210604.jar
jetty-server-9.4.42.v20210604.jar
-jetty-server-9.4.44.v20210927.jar
jetty-servlet-9.4.42.v20210604.jar
+jetty-servlets-9.4.42.v20210604.jar
jetty-util-6.1.26.jar
jetty-util-9.4.42.v20210604.jar
jetty-util-ajax-9.4.42.v20210604.jar
jetty-webapp-9.4.42.v20210604.jar
-jetty-webapp-9.4.44.v20210927.jar
jetty-xml-9.4.42.v20210604.jar
jline-0.9.94.jar
jline-2.12.jar
@@ -485,12 +491,9 @@ validation-api-2.0.1.Final.jar
velocity-1.5.jar
websocket-api-9.4.42.v20210604.jar
websocket-client-9.4.42.v20210604.jar
-websocket-client-9.4.44.v20210927.jar
websocket-common-9.4.42.v20210604.jar
websocket-server-9.4.42.v20210604.jar
-websocket-server-9.4.44.v20210927.jar
websocket-servlet-9.4.42.v20210604.jar
-websocket-servlet-9.4.44.v20210927.jar
woodstox-core-6.2.1.jar
xercesImpl-2.9.1.jar
xml-apis-1.3.04.jar
@@ -500,4 +503,4 @@ xstream-1.4.19.jar
xz-1.0.jar
zookeeper-3.4.6.jar
zstd-jni-1.4.4-7.jar
-zstd-jni-1.4.5-6.jar
+zstd-jni-1.4.5-6.jar
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org