From 515d114a4d4021cca9a7212f9458a23352cfcfd5 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sun, 6 Oct 2024 15:00:37 +0100 Subject: [PATCH 01/13] upgrade poi and related dependencies to latest version (#5183) * upgrade poi and related dependencies to latest version * poi-shared-strings no longer loaded as transitive dependency --- linkis-commons/linkis-storage/pom.xml | 2 +- linkis-dist/release-docs/LICENSE | 13 ++++++------- pom.xml | 4 ++-- tool/dependencies/known-dependencies.txt | 13 ++++++------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/linkis-commons/linkis-storage/pom.xml b/linkis-commons/linkis-storage/pom.xml index 52f9ede595..6e04016fa7 100644 --- a/linkis-commons/linkis-storage/pom.xml +++ b/linkis-commons/linkis-storage/pom.xml @@ -76,7 +76,7 @@ com.github.pjfanning excel-streaming-reader - 4.3.0 + 5.0.2 diff --git a/linkis-dist/release-docs/LICENSE b/linkis-dist/release-docs/LICENSE index 6fcb383da0..1161ce48f0 100644 --- a/linkis-dist/release-docs/LICENSE +++ b/linkis-dist/release-docs/LICENSE @@ -288,9 +288,9 @@ See licenses/ for text of these licenses. (Apache License, Version 2.0) Apache Log4j JUL Adapter (org.apache.logging.log4j:log4j-jul:2.17.1 - https://logging.apache.org/log4j/2.x/log4j-jul/) (Apache License, Version 2.0) Apache Log4j SLF4J Binding (org.apache.logging.log4j:log4j-slf4j-impl:2.17.1 - https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/) (Apache License, Version 2.0) Apache Log4j Web (org.apache.logging.log4j:log4j-web:2.6.2 - http://logging.apache.org/log4j/2.x/log4j-web/) - (Apache License, Version 2.0) Apache POI (org.apache.poi:poi:5.2.5 - http://poi.apache.org/) - (Apache License, Version 2.0) Apache POI (org.apache.poi:poi-ooxml:5.2.5 - http://poi.apache.org/) - (Apache License, Version 2.0) Apache POI (org.apache.poi:poi-ooxml-lite:5.2.5 - http://poi.apache.org/) + (Apache License, Version 2.0) Apache POI (org.apache.poi:poi:5.3.0 - http://poi.apache.org/) + (Apache License, Version 2.0) Apache POI (org.apache.poi:poi-ooxml:5.3.0 - http://poi.apache.org/) + (Apache License, Version 2.0) Apache POI (org.apache.poi:poi-ooxml-lite:5.3.0 - http://poi.apache.org/) (Apache License, Version 2.0) Apache Velocity (org.apache.velocity:velocity:1.5 - http://velocity.apache.org/engine/releases/velocity-1.5/) (Apache License, Version 2.0) ApacheDS I18n (org.apache.directory.server:apacheds-i18n:2.0.0-M15 - http://directory.apache.org/apacheds/1.5/apacheds-i18n) (Apache License, Version 2.0) ApacheDS Protocol Kerberos Codec (org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15 - http://directory.apache.org/apacheds/1.5/apacheds-kerberos-codec) @@ -420,7 +420,7 @@ See licenses/ for text of these licenses. (Apache License, Version 2.0) Spring Web MVC (org.springframework:spring-webmvc:5.2.2.RELEASE - https://github.com/spring-projects/spring-framework) (Apache License, Version 2.0) Spring WebFlux (org.springframework:spring-webflux:5.2.2.RELEASE - https://github.com/spring-projects/spring-framework) (Apache License, Version 2.0) StAX API (stax:stax-api:1.0.1 - http://stax.codehaus.org/) - (Apache License, Version 2.0) Streaming Excel reader (com.github.pjfanning:excel-streaming-reader:4.3.0 - https://github.com/pjfanning/excel-streaming-reader) + (Apache License, Version 2.0) Streaming Excel reader (com.github.pjfanning:excel-streaming-reader:5.0.2 - https://github.com/pjfanning/excel-streaming-reader) (Apache License, Version 2.0) Woodstox (com.fasterxml.woodstox:woodstox-core:5.2.1 - https://github.com/FasterXML/woodstox) (Apache License, Version 2.0) XML Commons Resolver Component (xml-resolver:xml-resolver:1.2 - http://xml.apache.org/commons/components/resolver/) (Apache License, Version 2.0) Xerces2 Java (com.rackspace.apache:xerces2-xsd11:2.11.1 - http://xerces.apache.org/xerces2-j/) @@ -503,7 +503,7 @@ See licenses/ for text of these licenses. (Apache License, version 2.0) chill-java (com.twitter:chill-java:0.7.6 - https://github.com/twitter/chill) (Apache License, version 2.0) chill_2.11 (com.twitter:chill_2.11:0.7.6 - https://github.com/twitter/chill) (Apache License, version 2.0) druid (com.alibaba:druid:1.1.22 - https://github.com/alibaba/druid) - (Apache License, version 2.0) excel-streaming-reader (com.github.pjfanning:excel-streaming-reader:4.3.0 - https://github.com/pjfanning/excel-streaming-reader) + (Apache License, version 2.0) excel-streaming-reader (com.github.pjfanning:excel-streaming-reader:5.0.2 - https://github.com/pjfanning/excel-streaming-reader) (Apache License, version 2.0) failureaccess (com.google.guava:failureaccess:1.0.1) (Apache License, version 2.0) flink-connector-base (org.apache.flink:flink-connector-base:1.12.2 - https://flink.apache.org/) (Apache License, version 2.0) flink-connector-files (org.apache.flink:flink-connector-files:1.12.2 - https://flink.apache.org/) @@ -560,7 +560,6 @@ See licenses/ for text of these licenses. (Apache License, version 2.0) okhttp:Square’s meticulous HTTP client for Java and Kotlin. (com.squareup.okhttp:okhttp:2.7.5 - https://square.github.io/okhttp/) (Apache License, version 2.0) okio:A modern I/O API for Java (com.squareup.okio:okio:1.6.0 - https://github.com/square/okio/) (Apache License, version 2.0) opencsv:A simple library for reading and writing CSV in Java (net.sf.opencsv:opencsv:2.3 - http://opencsv.sf.net) - (Apache License, version 2.0) POI Shared Strings Memory efficient Shared Strings Table implementation for POI streaming (com.github.pjfanning:poi-shared-strings:2.8.0 - https://github.com/pjfanning/poi-shared-strings) (Apache License, version 2.0) snappy-java: A fast compression/decompression library (org.xerial.snappy:snappy-java:1.1.7.7 - https://github.com/xerial/snappy-java) (Apache License, version 2.0) SparseBitSet: An efficient sparse bitset implementation for Java (com.zaxxer:SparseBitSet:1.3 - https://github.com/brettwooldridge/SparseBitSet) (Apache License, version 2.0) Spring Plugin - Core Core plugin infrastructure (org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE - https://github.com/spring-projects/spring-plugin) @@ -578,7 +577,7 @@ See licenses/ for text of these licenses. (Apache License, version 2.0) swagger-annotations (io.swagger:swagger-annotations:1.5.22 - https://github.com/swagger-api) (Apache License, version 2.0) swagger-models (io.swagger:swagger-models:1.5.22 - https://github.com/swagger-api) (Apache License, version 2.0) token-provider (org.apache.kerby:token-provider:1.0.1) - (Apache License, version 2.0) XmlBeans:XmlBeans main jar (org.apache.xmlbeans:xmlbeans:5.2.0 - https://xmlbeans.apache.org/) + (Apache License, version 2.0) XmlBeans:XmlBeans main jar (org.apache.xmlbeans:xmlbeans:5.2.1 - https://xmlbeans.apache.org/) (Apache License, version 2.0) XStream Core (com.thoughtworks.xstream:xstream:1.4.18) (Apache License, version 2.0) Apache ZooKeeper - Server (org.apache.zookeeper:zookeeper:3.4.6 - https://zookeeper.apache.org/) (Apache License, version 2.0) Apache twill (org.apache.twill:* - https://twill.apache.org/) diff --git a/pom.xml b/pom.xml index b49645fdb9..0eeea76b4b 100644 --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,7 @@ 3.0.3 3.0.0 - 5.2.5 + 5.3.0 0.9.12 @@ -189,7 +189,7 @@ 1.2 1.10.0 3.6.1 - 2.11.0 + 2.17.0 1.9.4 1.26.1 1.10 diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt index 6587cbbb5b..dde592da55 100644 --- a/tool/dependencies/known-dependencies.txt +++ b/tool/dependencies/known-dependencies.txt @@ -91,7 +91,7 @@ commons-el-1.0.jar commons-exec-1.3.jar commons-fileupload-1.5.jar commons-httpclient-3.1.jar -commons-io-2.11.0.jar +commons-io-2.17.0.jar commons-jxpath-1.3.jar commons-lang-2.6.jar commons-lang3-3.12.0.jar @@ -130,7 +130,7 @@ esri-geometry-api-2.0.0.jar eureka-client-1.10.17.jar eureka-core-1.10.17.jar evictor-1.0.0.jar -excel-streaming-reader-4.3.0.jar +excel-streaming-reader-5.0.2.jar expiringmap-0.5.6.jar failsafe-2.4.0.jar failureaccess-1.0.1.jar @@ -629,10 +629,9 @@ pagehelper-5.3.1.jar paranamer-2.3.jar paranamer-2.8.jar parquet-hadoop-bundle-1.10.0.jar -poi-5.2.5.jar -poi-ooxml-5.2.5.jar -poi-ooxml-lite-5.2.5.jar -poi-shared-strings-2.8.0.jar +poi-5.3.0.jar +poi-ooxml-5.3.0.jar +poi-ooxml-lite-5.3.0.jar presto-client-0.234.jar presto-client-1.5.0.jar presto-resource-group-managers-0.234.jar @@ -794,7 +793,7 @@ xalan-2.7.0.jar xercesImpl-2.9.1.jar xml-apis-1.4.01.jar xml-apis-ext-1.3.04.jar -xmlbeans-5.2.0.jar +xmlbeans-5.2.1.jar xmlenc-0.52.jar xom-1.2.5.jar xstream-1.4.20.jar From 39bb9c889598a3b883f45ea6c5aa9c43e50ae294 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sun, 6 Oct 2024 15:02:18 +0100 Subject: [PATCH 02/13] bcprov 1.78.1 (#5180) * bcprov 1.78.1 * try to exclude bcpkix-jdk15on transitive deps --- linkis-commons/linkis-module/pom.xml | 9 +++++++++ .../src/main/assembly/distribution.xml | 4 ++-- .../src/main/assembly/distribution.xml | 4 ++-- linkis-dist/release-docs/LICENSE | 2 +- .../flink-core/src/main/assembly/distribution.xml | 4 ++-- .../src/main/assembly/distribution.xml | 4 ++-- .../src/main/assembly/distribution.xml | 4 ++-- .../hbase-core/src/main/assembly/distribution.xml | 4 ++-- .../hive/src/main/assembly/distribution.xml | 4 ++-- linkis-engineconn-plugins/nebula/pom.xml | 11 +++++++++++ .../sqoop/src/main/assembly/distribution.xml | 4 ++-- .../src/main/assembly/distribution.xml | 4 ++-- linkis-public-enhancements/distribution.xml | 4 ++-- .../src/main/assembly/distribution.xml | 4 ++-- .../server/src/main/assembly/distribution.xml | 4 ++-- .../service/hive/src/main/assembly/distribution.xml | 4 ++-- .../src/main/assembly/distribution.xml | 4 ++-- .../src/main/assembly/distribution.xml | 4 ++-- .../linkis-eureka/src/main/assembly/distribution.xml | 4 ++-- .../linkis-spring-cloud-gateway/pom.xml | 9 +++++++++ pom.xml | 6 +++--- tool/dependencies/known-dependencies.txt | 6 +++--- 22 files changed, 68 insertions(+), 39 deletions(-) diff --git a/linkis-commons/linkis-module/pom.xml b/linkis-commons/linkis-module/pom.xml index cb8d23c095..a640a8feee 100644 --- a/linkis-commons/linkis-module/pom.xml +++ b/linkis-commons/linkis-module/pom.xml @@ -162,8 +162,17 @@ org.springframework.boot spring-boot-starter + + org.bouncycastle + bcpkix-jdk15on + + + org.bouncycastle + bcpkix-jdk18on + ${bouncycastle.version} + org.springframework.cloud 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 da4e71662b..483190a75d 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 @@ -163,8 +163,8 @@ org.apache.logging.log4j:log4j-slf4j-impl:jar org.apache.zookeeper:zookeeper:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.codehaus.jackson:jackson-jaxrs:jar org.codehaus.jackson:jackson-xc:jar org.codehaus.jettison:jettison:jar diff --git a/linkis-computation-governance/linkis-entrance/src/main/assembly/distribution.xml b/linkis-computation-governance/linkis-entrance/src/main/assembly/distribution.xml index 313506fd08..e367ba5d2d 100644 --- a/linkis-computation-governance/linkis-entrance/src/main/assembly/distribution.xml +++ b/linkis-computation-governance/linkis-entrance/src/main/assembly/distribution.xml @@ -164,8 +164,8 @@ org.apache.logging.log4j:log4j-slf4j-impl:jar org.apache.zookeeper:zookeeper:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.codehaus.jackson:jackson-jaxrs:jar org.codehaus.jackson:jackson-xc:jar org.codehaus.jettison:jettison:jar diff --git a/linkis-dist/release-docs/LICENSE b/linkis-dist/release-docs/LICENSE index 1161ce48f0..553c9606b9 100644 --- a/linkis-dist/release-docs/LICENSE +++ b/linkis-dist/release-docs/LICENSE @@ -683,7 +683,7 @@ See licenses/ for text of these licenses. (MIT License) JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.16 - http://www.slf4j.org) (MIT License) SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org) (MIT License) pagehelper 5 (com.github.pagehelper:pagehelper:5.3.1 - https://github.com/pagehelper/Mybatis-PageHelper) - (MIT License) bcprov-jdk15on (org.bouncycastle:bcprov-jdk15on:1.64 - https://www.bouncycastle.org/java.html) + (MIT License) bcprov-jdk18on (org.bouncycastle:bcprov-jdk18on:1.78.1 - https://www.bouncycastle.org/java.html) (MIT License) oshi-core (com.github.oshi:oshi-core:5.3.4 - https://github.com/oshi/oshi) (CUP Parser Generator Copyright Notice, License, and Disclaimer) CUP Parser Generator for Java (edu.princeton.cup:java-cup:10k - http://www.cs.princeton.edu/~appel/modern/java/CUP/) (MIT License) scopt:a command line options parsing library (com.github.scopt:scopt_2.11:4.0.1 - https://github.com/scopt/scopt) diff --git a/linkis-engineconn-plugins/flink/flink-core/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/flink/flink-core/src/main/assembly/distribution.xml index 1e90d0f3b8..0c0e8a056f 100644 --- a/linkis-engineconn-plugins/flink/flink-core/src/main/assembly/distribution.xml +++ b/linkis-engineconn-plugins/flink/flink-core/src/main/assembly/distribution.xml @@ -110,8 +110,8 @@ org.apache.logging.log4j:*:jar org.apache.zookeeper:zookeeper:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.codehaus.jackson:jackson-jaxrs:jar org.codehaus.jackson:jackson-xc:jar org.codehaus.jettison:jettison:jar diff --git a/linkis-engineconn-plugins/flink/flink-shims-1.12.2/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/flink/flink-shims-1.12.2/src/main/assembly/distribution.xml index 1e90d0f3b8..0c0e8a056f 100644 --- a/linkis-engineconn-plugins/flink/flink-shims-1.12.2/src/main/assembly/distribution.xml +++ b/linkis-engineconn-plugins/flink/flink-shims-1.12.2/src/main/assembly/distribution.xml @@ -110,8 +110,8 @@ org.apache.logging.log4j:*:jar org.apache.zookeeper:zookeeper:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.codehaus.jackson:jackson-jaxrs:jar org.codehaus.jackson:jackson-xc:jar org.codehaus.jettison:jettison:jar diff --git a/linkis-engineconn-plugins/flink/flink-shims-1.16.2/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/flink/flink-shims-1.16.2/src/main/assembly/distribution.xml index 1e90d0f3b8..0c0e8a056f 100644 --- a/linkis-engineconn-plugins/flink/flink-shims-1.16.2/src/main/assembly/distribution.xml +++ b/linkis-engineconn-plugins/flink/flink-shims-1.16.2/src/main/assembly/distribution.xml @@ -110,8 +110,8 @@ org.apache.logging.log4j:*:jar org.apache.zookeeper:zookeeper:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.codehaus.jackson:jackson-jaxrs:jar org.codehaus.jackson:jackson-xc:jar org.codehaus.jettison:jettison:jar diff --git a/linkis-engineconn-plugins/hbase/hbase-core/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/hbase/hbase-core/src/main/assembly/distribution.xml index f6224af037..d7909885b5 100644 --- a/linkis-engineconn-plugins/hbase/hbase-core/src/main/assembly/distribution.xml +++ b/linkis-engineconn-plugins/hbase/hbase-core/src/main/assembly/distribution.xml @@ -126,8 +126,8 @@ org.apache.logging.log4j:log4j-slf4j-impl:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.codehaus.jackson:jackson-jaxrs:jar org.codehaus.jackson:jackson-xc:jar org.codehaus.jettison:jettison:jar diff --git a/linkis-engineconn-plugins/hive/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/hive/src/main/assembly/distribution.xml index bd9d705013..d7ed275905 100644 --- a/linkis-engineconn-plugins/hive/src/main/assembly/distribution.xml +++ b/linkis-engineconn-plugins/hive/src/main/assembly/distribution.xml @@ -126,8 +126,8 @@ log4j:log4j:jar org.apache.zookeeper:zookeeper:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.codehaus.jackson:jackson-jaxrs:jar org.codehaus.jackson:jackson-xc:jar org.codehaus.jettison:jettison:jar diff --git a/linkis-engineconn-plugins/nebula/pom.xml b/linkis-engineconn-plugins/nebula/pom.xml index bfe9714569..b724ea2b29 100644 --- a/linkis-engineconn-plugins/nebula/pom.xml +++ b/linkis-engineconn-plugins/nebula/pom.xml @@ -65,6 +65,17 @@ com.vesoft client ${nebula.version} + + + org.bouncycastle + bcpkix-jdk15on + + + + + org.bouncycastle + bcpkix-jdk18on + ${bouncycastle.version} diff --git a/linkis-engineconn-plugins/sqoop/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/sqoop/src/main/assembly/distribution.xml index 5c47d59138..b1407e1991 100644 --- a/linkis-engineconn-plugins/sqoop/src/main/assembly/distribution.xml +++ b/linkis-engineconn-plugins/sqoop/src/main/assembly/distribution.xml @@ -165,8 +165,8 @@ org.apache.logging.log4j:log4j-slf4j-impl:jar org.apache.zookeeper:zookeeper:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.codehaus.jackson:jackson-jaxrs:jar org.codehaus.jackson:jackson-xc:jar org.codehaus.jettison:jettison:jar diff --git a/linkis-extensions/linkis-et-monitor/src/main/assembly/distribution.xml b/linkis-extensions/linkis-et-monitor/src/main/assembly/distribution.xml index e606ed79f2..a71b527862 100644 --- a/linkis-extensions/linkis-et-monitor/src/main/assembly/distribution.xml +++ b/linkis-extensions/linkis-et-monitor/src/main/assembly/distribution.xml @@ -164,8 +164,8 @@ org.apache.logging.log4j:log4j-slf4j-impl:jar org.apache.zookeeper:zookeeper:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.codehaus.jackson:jackson-jaxrs:jar org.codehaus.jackson:jackson-xc:jar org.codehaus.jettison:jettison:jar diff --git a/linkis-public-enhancements/distribution.xml b/linkis-public-enhancements/distribution.xml index b000fc8539..3e3baf6396 100644 --- a/linkis-public-enhancements/distribution.xml +++ b/linkis-public-enhancements/distribution.xml @@ -160,8 +160,8 @@ org.apache.logging.log4j:log4j-slf4j-impl:jar org.apache.zookeeper:zookeeper:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.codehaus.jackson:jackson-core-asl:jar org.codehaus.jackson:jackson-jaxrs:jar org.codehaus.jackson:jackson-mapper-asl:jar diff --git a/linkis-public-enhancements/linkis-bml-server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-bml-server/src/main/assembly/distribution.xml index 8bb0f9ee49..a7b4d0381c 100644 --- a/linkis-public-enhancements/linkis-bml-server/src/main/assembly/distribution.xml +++ b/linkis-public-enhancements/linkis-bml-server/src/main/assembly/distribution.xml @@ -115,8 +115,8 @@ org.apache.logging.log4j:log4j-api:jar org.apache.zookeeper:zookeeper:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.codehaus.jettison:jettison:jar org.eclipse.jetty:jetty-continuation:jar org.eclipse.jetty:jetty-http:jar diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml index 8ff2fa8b51..26130980b3 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml @@ -108,8 +108,8 @@ org.apache.logging.log4j:*:jar org.apache.zookeeper:zookeeper:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.codehaus.jackson:jackson-jaxrs:jar org.codehaus.jackson:jackson-xc:jar org.codehaus.jettison:jettison:jar diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hive/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hive/src/main/assembly/distribution.xml index 51550e7f0b..1d72f6143b 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hive/src/main/assembly/distribution.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/hive/src/main/assembly/distribution.xml @@ -132,8 +132,8 @@ log4j:log4j:jar org.apache.zookeeper:zookeeper:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.codehaus.jackson:jackson-jaxrs:jar org.codehaus.jackson:jackson-xc:jar org.codehaus.jettison:jettison:jar diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/assembly/distribution.xml index d184d8358f..b5575f3fdf 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/assembly/distribution.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/assembly/distribution.xml @@ -115,8 +115,8 @@ org.apache.logging.log4j:log4j-api:jar org.apache.zookeeper:zookeeper:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.codehaus.jettison:jettison:jar org.eclipse.jetty:jetty-continuation:jar org.eclipse.jetty:jetty-http:jar diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-pes-publicservice/src/main/assembly/distribution.xml index c389e0b962..174686fb77 100644 --- a/linkis-public-enhancements/linkis-pes-publicservice/src/main/assembly/distribution.xml +++ b/linkis-public-enhancements/linkis-pes-publicservice/src/main/assembly/distribution.xml @@ -115,8 +115,8 @@ org.apache.logging.log4j:log4j-api:jar org.apache.zookeeper:zookeeper:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.codehaus.jettison:jettison:jar org.eclipse.jetty:jetty-continuation:jar org.eclipse.jetty:jetty-http:jar 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 09865e46f3..88e10e5a29 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 @@ -43,8 +43,8 @@ aopalliance:aopalliance:jar com.netflix.archaius:archaius-core:jar org.aspectj:aspectjweaver:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar + org.bouncycastle:bcpkix-jdk18on:jar + org.bouncycastle:bcprov-jdk18on:jar org.checkerframework:checker-qual:jar commons-collections:commons-collections:jar commons-configuration:commons-configuration:jar diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml index ce3e4f8091..eead24e624 100644 --- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml +++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml @@ -74,8 +74,17 @@ io.projectreactor reactor-core + + org.bouncycastle + bcpkix-jdk15on + + + org.bouncycastle + bcpkix-jdk18on + ${bouncycastle.version} + org.springframework.boot spring-boot-starter-log4j2 diff --git a/pom.xml b/pom.xml index 0eeea76b4b..d2f18f6540 100644 --- a/pom.xml +++ b/pom.xml @@ -199,7 +199,7 @@ 1.3.1 3.9.0 - 1.70 + 1.78.1 3.27.0-GA @@ -1226,12 +1226,12 @@ org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on ${bouncycastle.version} org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on ${bouncycastle.version} diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt index dde592da55..441a3a8fae 100644 --- a/tool/dependencies/known-dependencies.txt +++ b/tool/dependencies/known-dependencies.txt @@ -47,9 +47,9 @@ aws-java-sdk-s3-1.12.261.jar batik-css-1.7.jar batik-ext-1.7.jar batik-util-1.7.jar -bcpkix-jdk15on-1.70.jar -bcprov-jdk15on-1.70.jar -bcutil-jdk15on-1.70.jar +bcpkix-jdk18on-1.78.1.jar +bcprov-jdk18on-1.78.1.jar +bcutil-jdk18on-1.78.1.jar bonecp-0.8.0.RELEASE.jar bootstrap-0.191.jar brave-5.13.9.jar From aed8d533a8057d42039a2b06f1dc85cb0ab315b9 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 8 Oct 2024 05:41:36 +0100 Subject: [PATCH 03/13] [BRANCH] upgrade CI actions because old versions are no longer supported (#5185) --- .github/workflows/auto-format-pr.yaml | 2 +- .github/workflows/build-frontend.yml | 6 +++--- .github/workflows/check-code-format.yml | 4 ++-- .github/workflows/check-license.yml | 4 ++-- .github/workflows/check-sql-pg-script.yml | 2 +- .github/workflows/check-sql-script.yml | 2 +- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/integration-test.yml | 8 ++++---- .github/workflows/publish-docker.yaml | 8 ++++---- .github/workflows/publish-snapshot.yml | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/auto-format-pr.yaml b/.github/workflows/auto-format-pr.yaml index 722ef12b05..499a25f3b6 100644 --- a/.github/workflows/auto-format-pr.yaml +++ b/.github/workflows/auto-format-pr.yaml @@ -38,7 +38,7 @@ jobs: if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true - name: Set up JDK 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: '8' distribution: 'adopt' diff --git a/.github/workflows/build-frontend.yml b/.github/workflows/build-frontend.yml index a84a805d4b..4828a00ab7 100644 --- a/.github/workflows/build-frontend.yml +++ b/.github/workflows/build-frontend.yml @@ -30,11 +30,11 @@ jobs: # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: true - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: ~/.npm key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} @@ -42,7 +42,7 @@ jobs: ${{ runner.os }}-node- - name: Set Up NodeJS ${{ matrix.node-version }} - uses: actions/setup-node@v2-beta + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/check-code-format.yml b/.github/workflows/check-code-format.yml index 0323eb9803..3e2d68f040 100644 --- a/.github/workflows/check-code-format.yml +++ b/.github/workflows/check-code-format.yml @@ -24,9 +24,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout source - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: '8' distribution: 'adopt' diff --git a/.github/workflows/check-license.yml b/.github/workflows/check-license.yml index 2a6cf67f23..088aaf3830 100644 --- a/.github/workflows/check-license.yml +++ b/.github/workflows/check-license.yml @@ -24,9 +24,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout source - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: '8' distribution: 'adopt' diff --git a/.github/workflows/check-sql-pg-script.yml b/.github/workflows/check-sql-pg-script.yml index 059fab5f11..ed7d84d7a1 100644 --- a/.github/workflows/check-sql-pg-script.yml +++ b/.github/workflows/check-sql-pg-script.yml @@ -35,7 +35,7 @@ jobs: options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - name: Checkout source - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Verify linkis init pg sql run: | diff --git a/.github/workflows/check-sql-script.yml b/.github/workflows/check-sql-script.yml index ec965372b1..43caa03cf9 100644 --- a/.github/workflows/check-sql-script.yml +++ b/.github/workflows/check-sql-script.yml @@ -32,7 +32,7 @@ jobs: options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 steps: - name: Checkout source - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Verify linkis init sql run: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3dac63672b..c163936975 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -34,7 +34,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: submodules: true - name: Set up JDK 1.8 @@ -43,7 +43,7 @@ jobs: java-version: 1.8 - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 5c97ec8229..355ef1f33f 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -75,24 +75,24 @@ jobs: df -h - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 submodules: true - name: Set up JDK 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 8 - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - name: Set up Docker Buildx diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 73e8d840b5..76e1565042 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -37,21 +37,21 @@ jobs: LINKIS_VERSION: 1.6.0 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up JDK 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 8 - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - name: Set up QEMU diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 93e34ab9c2..db6de687ee 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -32,11 +32,11 @@ jobs: - dev-1.6.0 steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: ${{ matrix.branch }} - name: Setup JDK 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 8 From 3f552070ef05b790690a8291164fbdf328ada7cd Mon Sep 17 00:00:00 2001 From: Linhao-Qian <17768709606@163.com> Date: Wed, 16 Oct 2024 02:22:56 -0700 Subject: [PATCH 04/13] [linkis-web-next]: Modules refactoring & Bug fixing (#5169) * GlobalHistoryManagement and SideBar modules refactoring & previous bug fixing * [Linkis-web-next]: parameterConfig Module Refactor * [Linkis-web-next]: Add code comments to ParameterConfig Module * [linkis-web-next]: Refactored Navbar & Login Page * [linkis-web-next]: 1. TaskResults & TaskDetails Refactoring; 2. Code Improvement & Bug Fixing; * [linkis-web-next]: Refactored GlobalVariables Module * [linkis-web-next]: Add license to newly created file * [linkis-web-next]: Microservice Management Module Refactoring * [linkis-web-next]: Resource Management Module Refactoring * [linkis-web-next]: ECM Management Module Refactoring * [linkis-web-next]: Base Data Management & Data Source Management & UDF Function Management Modules Refactoring * [linkis-web-next]: remove duplicate codes * [linkis-web-next]: Modify README files --- linkis-web-next/README.md | 65 +++--- linkis-web-next/README_CN.md | 65 +++--- .../src/components/sidebar/index.vue | 31 ++- linkis-web-next/src/locales/en.ts | 9 + linkis-web-next/src/locales/zh.ts | 7 + .../EnginePluginManagement/index.vue | 28 +++ .../configManagement/index.vue | 28 +++ .../basedataManagement/errorCode/index.vue | 183 +++++++++++++++++ .../basedataManagement/errorCode/modal.vue | 141 +++++++++++++ .../gatewayAuthToken/index.vue | 28 +++ .../ipListManagement/index.vue | 28 +++ .../rmExternalResourceProvider/index.vue | 28 +++ .../tenantTagManagement/index.vue | 28 +++ .../dataSourceManagement/index.vue | 28 +++ .../datasourceAccess/index.vue | 193 ++++++++++++++++++ .../datasourceAccess/modal.vue | 164 +++++++++++++++ .../dataSourceManage/datasourceEnv/index.vue | 28 +++ .../dataSourceManage/datasourceType/index.vue | 28 +++ .../datasourceTypeKey/index.vue | 28 +++ .../src/pages/resource/manage/index.vue | 2 +- .../functionManagement/index.vue | 28 +++ .../udfFunctionManage/index.vue | 28 +++ .../udfFunctionTitle/udfManager/index.vue | 175 ++++++++++++++++ .../udfFunctionTitle/udfManager/modal.vue | 98 +++++++++ .../pages/udfFunctionTitle/udfTree/index.vue | 28 +++ linkis-web-next/src/router/index.ts | 193 ++++++++++++++++++ 26 files changed, 1599 insertions(+), 91 deletions(-) create mode 100644 linkis-web-next/src/pages/basedataManagement/EnginePluginManagement/index.vue create mode 100644 linkis-web-next/src/pages/basedataManagement/configManagement/index.vue create mode 100644 linkis-web-next/src/pages/basedataManagement/errorCode/index.vue create mode 100644 linkis-web-next/src/pages/basedataManagement/errorCode/modal.vue create mode 100644 linkis-web-next/src/pages/basedataManagement/gatewayAuthToken/index.vue create mode 100644 linkis-web-next/src/pages/basedataManagement/ipListManagement/index.vue create mode 100644 linkis-web-next/src/pages/basedataManagement/rmExternalResourceProvider/index.vue create mode 100644 linkis-web-next/src/pages/basedataManagement/tenantTagManagement/index.vue create mode 100644 linkis-web-next/src/pages/dataSourceManage/dataSourceManagement/index.vue create mode 100644 linkis-web-next/src/pages/dataSourceManage/datasourceAccess/index.vue create mode 100644 linkis-web-next/src/pages/dataSourceManage/datasourceAccess/modal.vue create mode 100644 linkis-web-next/src/pages/dataSourceManage/datasourceEnv/index.vue create mode 100644 linkis-web-next/src/pages/dataSourceManage/datasourceType/index.vue create mode 100644 linkis-web-next/src/pages/dataSourceManage/datasourceTypeKey/index.vue create mode 100644 linkis-web-next/src/pages/udfFunctionTitle/functionManagement/index.vue create mode 100644 linkis-web-next/src/pages/udfFunctionTitle/udfFunctionManage/index.vue create mode 100644 linkis-web-next/src/pages/udfFunctionTitle/udfManager/index.vue create mode 100644 linkis-web-next/src/pages/udfFunctionTitle/udfManager/modal.vue create mode 100644 linkis-web-next/src/pages/udfFunctionTitle/udfTree/index.vue diff --git a/linkis-web-next/README.md b/linkis-web-next/README.md index 6377bcefb6..d0bde35766 100644 --- a/linkis-web-next/README.md +++ b/linkis-web-next/README.md @@ -1,5 +1,5 @@

- Apache Linkis Web + Apache Linkis Web Next

@@ -56,7 +56,28 @@ Linkis builds a layer of computation middleware between upper applications and underlying engines. By using standard interfaces such as REST/WS/JDBC provided by Linkis, the upper applications can easily access the underlying engines such as MySQL/Spark/Hive/Presto/Flink, etc., and achieve the intercommunication of user resources like unified variables, scripts, UDFs, functions and resource files at the same time. -Linkis Web provides a management system for easy management of user resources. + Linkis Web provides a web management system to facilitate the management of user resources. However, the original Linkis Web project was developed using Vue2 and related technologies, but Vue2 has stopped maintenance and lacks community support. In addition, the file structure of the project itself is unclear, the module division is unreasonable, the component library used is also lacking maintenance, and the user experience of the interactive interface needs to be optimized. + + As mentioned above, still iterating on the original project may leave various difficult problems. Therefore, we finally considered refactoring the project under the Linkis Web Next project, upgrading the core technology stack from Vue2 + Webpack to Vue3 + Vite, obtaining more community support, greatly improving the project starting and building rate, and solving various historical problems. Besides, using the internally maintained open-source UI component library Fes-Design, the problems can be promptly fed back and repaired. + +The modules that have been refactored are as follows: + +| The modules that have been refactored +| --------------------------------------- +| Login Page +| Nav Bar +| Side Bar +| Global History Management +| Parameter Config +| Global Variables +| Microservice Management +| Resource Management +| ECM Management +| Base Data Management (SubModule Error Management) +| Data Source Management (SubModule Data Source Access Permissions) +| UDF Function Management (SubModule UDF User Management) + +Sub-modules in Base Data Management, Data Source Management, and UDF Function Management will still need to be refactored in the future. # Start @@ -70,46 +91,6 @@ npm run dev npm run build ``` -# File Structure - -> ├── README.md -> ├── README_CN.md -> ├── index.html -> ├── node_modules -> ├── package-lock.json -> ├── package.json -> ├── pom.xml -> ├── public -> │ ├── favicon.ico` -> │ ├── sidebar -> │ └── vite.svg -> ├── release-docs -> │ ├── LICENSE -> │ ├── NOTICE -> │ └── licenses -> ├── src -> │ ├── App.vue -> │ ├── assets -> │ ├── components -> │ ├── config -> │ ├── dss -> │ ├── env.d.ts -> │ ├── helper -> │ ├── index.d.ts -> │ ├── layout.vue -> │ ├── locales -> │ ├── main.ts -> │ ├── pages -> │ ├── router -> │ ├── scriptis -> │ ├── service -> │ ├── style -> │ ├── util -> │ └── vite-env.d.ts -> ├── tsconfig.json -> ├── tsconfig.node.json -> └── vite.config.ts - # Contributing Contributions are always welcomed, we need more contributors to build Linkis together. either code, or doc, or other supports that could help the community. diff --git a/linkis-web-next/README_CN.md b/linkis-web-next/README_CN.md index 5779a8e5df..df548ffa56 100644 --- a/linkis-web-next/README_CN.md +++ b/linkis-web-next/README_CN.md @@ -1,5 +1,5 @@

- Apache Linkis Web + Apache Linkis Web Next

@@ -56,7 +56,28 @@ Linkis 在上层应用程序和底层引擎之间构建了一层计算中间件。通过使用 Linkis 提供的 REST/WebSocket/JDBC 等标准接口， 上层应用可以方便地连接访问 MySQL/Spark/Hive/Presto/Flink 等底层引擎，同时实现变量、脚本、函数和资源文件等用户资源的跨上层应用互通。 -Linkis Web 提供了一个可视化的后台管理系统，便于对用户资源进行管理。 +Linkis Web 提供了一个可视化的后台管理系统，便于对用户资源进行管理。然而，原有的 Linkis Web 项目使用了 Vue2 及相关技术进行开发，而 Vue2 已停止维护，缺乏社区生态支持，并且项目本身文件结构不清晰，模块划分不合理，所使用的组件库也缺乏维护，并且交互界面的用户体验也有待优化。 + +在此背景下，选择在原有的项目上继续进行迭代可能留下各种难以解决的问题。所以最终考虑在 Linkis Web Next 子项目下重构该项目，将核心技术栈从 Vue2 + Webpack 升级到 Vue3 + Vite，获得更多的社区生态支持并大大提高项目启动和构建速率，同时解决各种历史遗留问题。再使用内部长期维护的开源组件库 Fes-Design，就能使组件库支持的问题能够得到及时的反馈和修复，保障项目迭代的顺利进行。 + +当前已重构完成的模块如下所示： + +| 已重构完成模块 +| --------------------------------------- +| Login Page +| Nav Bar +| Side Bar +| Global History Management +| Parameter Config +| Global Variables +| Microservice Management +| Resource Management +| ECM Management +| Base Data Management (SubModule Error Management) +| Data Source Management (SubModule Data Source Access Permissions) +| UDF Function Management (SubModule UDF User Management) + +后续仍需继续重构Base Data Management、Data Source Management、UDF Function Management中的子模块。 # 启动 @@ -70,46 +91,6 @@ npm run dev npm run build ``` -# 文件结构 - -> ├── README.md -> ├── README_CN.md -> ├── index.html -> ├── node_modules -> ├── package-lock.json -> ├── package.json -> ├── pom.xml -> ├── public -> │ ├── favicon.ico` -> │ ├── sidebar -> │ └── vite.svg -> ├── release-docs -> │ ├── LICENSE -> │ ├── NOTICE -> │ └── licenses -> ├── src -> │ ├── App.vue -> │ ├── assets -> │ ├── components -> │ ├── config -> │ ├── dss -> │ ├── env.d.ts -> │ ├── helper -> │ ├── index.d.ts -> │ ├── layout.vue -> │ ├── locales -> │ ├── main.ts -> │ ├── pages -> │ ├── router -> │ ├── scriptis -> │ ├── service -> │ ├── style -> │ ├── util -> │ └── vite-env.d.ts -> ├── tsconfig.json -> ├── tsconfig.node.json -> └── vite.config.ts - # 贡献 我们非常欢迎和期待更多的贡献者参与共建 Linkis, 不论是代码、文档，或是其他能够帮助到社区的贡献形式。 diff --git a/linkis-web-next/src/components/sidebar/index.vue b/linkis-web-next/src/components/sidebar/index.vue index 763f78625a..a6d59b7b8e 100644 --- a/linkis-web-next/src/components/sidebar/index.vue +++ b/linkis-web-next/src/components/sidebar/index.vue @@ -114,20 +114,39 @@ const menuItemsConfig = [ { title: 'message.linkis.sideNavList.function.children.dataSourceManage', icon: '/sidebar/dataSourceManage.svg', - path: '/xxxx', - items: [{ title: 'xxx', path: '/xxxx' }], + path: '/console/dataSourceManage', + items: [ + { title: 'message.linkis.sideNavList.function.children.dataSourceManage', path: '/console/dataSourceManage/dataSourceManagement' }, + { title: 'message.linkis.sideNavList.function.children.datasourceEnv', path: '/console/dataSourceManage/datasourceEnv' }, + { title: 'message.linkis.sideNavList.function.children.datasourceType', path: '/console/dataSourceManage/datasourceType' }, + { title: 'message.linkis.sideNavList.function.children.datasourceAccess', path: '/console/dataSourceManage/datasourceAccess' }, + { title: 'message.linkis.sideNavList.function.children.datasourceTypeKey', path: '/console/dataSourceManage/datasourceTypeKey' }, + ], }, { title: 'message.linkis.sideNavList.function.children.udfFunctionTitle', icon: '/sidebar/udfFunctionTitle.svg', - path: '/xxxxx', - items: [{ title: 'xxx', path: '/xxxxx' }], + path: '/console/udfFunctionTitle', + items: [ + { title: 'message.linkis.sideNavList.function.children.udfFunctionManage', path: '/console/udfFunctionTitle/udfFunctionManage' }, + { title: 'message.linkis.sideNavList.function.children.functionManagement', path: '/console/udfFunctionTitle/functionManagement' }, + { title: 'message.linkis.sideNavList.function.children.udfManager', path: '/console/udfFunctionTitle/udfManager' }, + { title: 'message.linkis.sideNavList.function.children.udfTree', path: '/console/udfFunctionTitle/udfTree' }, + ], }, { title: 'message.linkis.sideNavList.function.children.basedataManagement', icon: '/sidebar/basedataManagement.svg', - path: '/xxxxxx', - items: [{ title: 'xxx', path: '/xxxxxx' }], + path: '/console/basedataManagement', + items: [ + { title: 'message.linkis.sideNavList.function.children.gatewayAuthToken', path: '/console/basedataManagement/gatewayAuthToken' }, + { title: 'message.linkis.sideNavList.function.children.errorCode', path: '/console/basedataManagement/errorCode' }, + { title: 'message.linkis.sideNavList.function.children.rmExternalResourceProvider', path: '/console/basedataManagement/rmExternalResourceProvider' }, + { title: 'message.linkis.sideNavList.function.children.EnginePluginManagement', path: '/console/basedataManagement/EnginePluginManagement' }, + { title: 'message.linkis.sideNavList.function.children.tenantTagManagement', path: '/console/basedataManagement/tenantTagManagement' }, + { title: 'message.linkis.sideNavList.function.children.ipListManagement', path: '/console/basedataManagement/ipListManagement' }, + { title: 'message.linkis.sideNavList.function.children.configManagement', path: '/console/basedataManagement/configManagement' }, + ], }, { title: 'message.linkis.sideNavList.function.children.codeQuery', diff --git a/linkis-web-next/src/locales/en.ts b/linkis-web-next/src/locales/en.ts index 94b6df48e7..9e481863e1 100644 --- a/linkis-web-next/src/locales/en.ts +++ b/linkis-web-next/src/locales/en.ts @@ -41,6 +41,7 @@ export default { resultList: 'Resultset', process: 'Execution Time:', ok: 'OK', + add: 'Add', cancel: 'Cancel', delete: 'Delete', failedNotice: 'Invalid items found, please check and then retry!', @@ -562,6 +563,7 @@ export default { startTime: 'Start Time', costTime: 'Time Elapsed', executeApplicationName: 'Execution Engine', + requestApplicationName: 'Application', creator: 'Created From', user: 'User', createdTime: 'Created at', @@ -604,6 +606,7 @@ export default { ECMManage: 'ECM Management', udfFunctionTitle: 'UDF Function', udfFunctionManage: 'UDF Management', + functionManagement: 'Function Management', dataSourceManage: 'DataSource Management', userResourceManagement: 'User Resource Management', tenantTagManagement: 'Tenant Tag Management', @@ -614,6 +617,7 @@ export default { 'Engine Configuration Template', rmExternalResourceProvider: 'External Resource Provider Manage', + configManagement: 'Config Management', udfManager: 'UDF User Manage', udfTree: 'UDF Tree', datasourceAccess: 'Data source access permissions', @@ -893,6 +897,11 @@ export default { search: 'Search', action: 'Action', categoryMaxLength: 'The length cannot exceed 100', + tableId: 'Table ID', + applicationId: 'Application ID', + visitor: 'Visitor', + field: 'Field', + accessTime: 'Access Time', modal: { confirm: 'Confirm', cancel: 'Cancel', diff --git a/linkis-web-next/src/locales/zh.ts b/linkis-web-next/src/locales/zh.ts index 8b741b6967..ba9044efb6 100644 --- a/linkis-web-next/src/locales/zh.ts +++ b/linkis-web-next/src/locales/zh.ts @@ -40,6 +40,7 @@ export default { resultList: '结果集', process: '任务ID', ok: '确认', + add: '新增', cancel: '取消', delete: '删除', failedNotice: '验证项未通过，请检查后再试！', @@ -584,6 +585,7 @@ export default { errorCode: '错误码管理', gatewayAuthToken: '令牌管理', rmExternalResourceProvider: '扩展资源管理', + configManagement: '配置项管理', udfManager: '用户管理', udfTree: 'UDF分类', datasourceAccess: '数据源权限', @@ -856,6 +858,11 @@ export default { search: '搜索', action: '操作', categoryMaxLength: '分类名长度不能超过100', + tableId: '表ID', + applicationId: '应用ID', + visitor: '访问者', + field: '字段', + accessTime: '访问时间', modal: { confirm: '确定', cancel: '取消', diff --git a/linkis-web-next/src/pages/basedataManagement/EnginePluginManagement/index.vue b/linkis-web-next/src/pages/basedataManagement/EnginePluginManagement/index.vue new file mode 100644 index 0000000000..d1ebe117c8 --- /dev/null +++ b/linkis-web-next/src/pages/basedataManagement/EnginePluginManagement/index.vue @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/basedataManagement/configManagement/index.vue b/linkis-web-next/src/pages/basedataManagement/configManagement/index.vue new file mode 100644 index 0000000000..d1ebe117c8 --- /dev/null +++ b/linkis-web-next/src/pages/basedataManagement/configManagement/index.vue @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/basedataManagement/errorCode/index.vue b/linkis-web-next/src/pages/basedataManagement/errorCode/index.vue new file mode 100644 index 0000000000..2ff6fd906d --- /dev/null +++ b/linkis-web-next/src/pages/basedataManagement/errorCode/index.vue @@ -0,0 +1,183 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/basedataManagement/errorCode/modal.vue b/linkis-web-next/src/pages/basedataManagement/errorCode/modal.vue new file mode 100644 index 0000000000..b3738ec431 --- /dev/null +++ b/linkis-web-next/src/pages/basedataManagement/errorCode/modal.vue @@ -0,0 +1,141 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/basedataManagement/gatewayAuthToken/index.vue b/linkis-web-next/src/pages/basedataManagement/gatewayAuthToken/index.vue new file mode 100644 index 0000000000..d1ebe117c8 --- /dev/null +++ b/linkis-web-next/src/pages/basedataManagement/gatewayAuthToken/index.vue @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/basedataManagement/ipListManagement/index.vue b/linkis-web-next/src/pages/basedataManagement/ipListManagement/index.vue new file mode 100644 index 0000000000..d1ebe117c8 --- /dev/null +++ b/linkis-web-next/src/pages/basedataManagement/ipListManagement/index.vue @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/basedataManagement/rmExternalResourceProvider/index.vue b/linkis-web-next/src/pages/basedataManagement/rmExternalResourceProvider/index.vue new file mode 100644 index 0000000000..d1ebe117c8 --- /dev/null +++ b/linkis-web-next/src/pages/basedataManagement/rmExternalResourceProvider/index.vue @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/basedataManagement/tenantTagManagement/index.vue b/linkis-web-next/src/pages/basedataManagement/tenantTagManagement/index.vue new file mode 100644 index 0000000000..d1ebe117c8 --- /dev/null +++ b/linkis-web-next/src/pages/basedataManagement/tenantTagManagement/index.vue @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/dataSourceManage/dataSourceManagement/index.vue b/linkis-web-next/src/pages/dataSourceManage/dataSourceManagement/index.vue new file mode 100644 index 0000000000..d1ebe117c8 --- /dev/null +++ b/linkis-web-next/src/pages/dataSourceManage/dataSourceManagement/index.vue @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/dataSourceManage/datasourceAccess/index.vue b/linkis-web-next/src/pages/dataSourceManage/datasourceAccess/index.vue new file mode 100644 index 0000000000..9d6fe6c6bc --- /dev/null +++ b/linkis-web-next/src/pages/dataSourceManage/datasourceAccess/index.vue @@ -0,0 +1,193 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/dataSourceManage/datasourceAccess/modal.vue b/linkis-web-next/src/pages/dataSourceManage/datasourceAccess/modal.vue new file mode 100644 index 0000000000..3f7dadb3df --- /dev/null +++ b/linkis-web-next/src/pages/dataSourceManage/datasourceAccess/modal.vue @@ -0,0 +1,164 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/dataSourceManage/datasourceEnv/index.vue b/linkis-web-next/src/pages/dataSourceManage/datasourceEnv/index.vue new file mode 100644 index 0000000000..d1ebe117c8 --- /dev/null +++ b/linkis-web-next/src/pages/dataSourceManage/datasourceEnv/index.vue @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/dataSourceManage/datasourceType/index.vue b/linkis-web-next/src/pages/dataSourceManage/datasourceType/index.vue new file mode 100644 index 0000000000..d1ebe117c8 --- /dev/null +++ b/linkis-web-next/src/pages/dataSourceManage/datasourceType/index.vue @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/dataSourceManage/datasourceTypeKey/index.vue b/linkis-web-next/src/pages/dataSourceManage/datasourceTypeKey/index.vue new file mode 100644 index 0000000000..d1ebe117c8 --- /dev/null +++ b/linkis-web-next/src/pages/dataSourceManage/datasourceTypeKey/index.vue @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/resource/manage/index.vue b/linkis-web-next/src/pages/resource/manage/index.vue index 13cb63d4c6..ab71584f88 100644 --- a/linkis-web-next/src/pages/resource/manage/index.vue +++ b/linkis-web-next/src/pages/resource/manage/index.vue @@ -54,7 +54,7 @@

- + {{ t('message.linkis.find') }} diff --git a/linkis-web-next/src/pages/udfFunctionTitle/functionManagement/index.vue b/linkis-web-next/src/pages/udfFunctionTitle/functionManagement/index.vue new file mode 100644 index 0000000000..d1ebe117c8 --- /dev/null +++ b/linkis-web-next/src/pages/udfFunctionTitle/functionManagement/index.vue @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/udfFunctionTitle/udfFunctionManage/index.vue b/linkis-web-next/src/pages/udfFunctionTitle/udfFunctionManage/index.vue new file mode 100644 index 0000000000..d1ebe117c8 --- /dev/null +++ b/linkis-web-next/src/pages/udfFunctionTitle/udfFunctionManage/index.vue @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/udfFunctionTitle/udfManager/index.vue b/linkis-web-next/src/pages/udfFunctionTitle/udfManager/index.vue new file mode 100644 index 0000000000..ec1295ae6b --- /dev/null +++ b/linkis-web-next/src/pages/udfFunctionTitle/udfManager/index.vue @@ -0,0 +1,175 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/udfFunctionTitle/udfManager/modal.vue b/linkis-web-next/src/pages/udfFunctionTitle/udfManager/modal.vue new file mode 100644 index 0000000000..0f61c2562c --- /dev/null +++ b/linkis-web-next/src/pages/udfFunctionTitle/udfManager/modal.vue @@ -0,0 +1,98 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/pages/udfFunctionTitle/udfTree/index.vue b/linkis-web-next/src/pages/udfFunctionTitle/udfTree/index.vue new file mode 100644 index 0000000000..d1ebe117c8 --- /dev/null +++ b/linkis-web-next/src/pages/udfFunctionTitle/udfTree/index.vue @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/linkis-web-next/src/router/index.ts b/linkis-web-next/src/router/index.ts index 7e3981a500..5f5fb1dc6d 100644 --- a/linkis-web-next/src/router/index.ts +++ b/linkis-web-next/src/router/index.ts @@ -130,6 +130,199 @@ const routes: Array = [ }, children: [], }, + { + name: 'dataSourceManage', + path: '/console/dataSourceManage', + redirect: '/console/dataSourceManage/dataSourceManagement', + meta: { + title: 'Data Source Manage', + publicPage: true, + }, + children: [ + { + name: 'dataSourceManagement', + path: '/console/dataSourceManage/dataSourceManagement', + component: () => + import('@/pages/dataSourceManage/dataSourceManagement/index.vue'), + meta: { + title: 'Data Source Management', + publicPage: true, + }, + }, + { + name: 'datasourceEnv', + path: '/console/dataSourceManage/datasourceEnv', + component: () => + import('@/pages/dataSourceManage/datasourceEnv/index.vue'), + meta: { + title: 'Data Source Env', + publicPage: true, + }, + }, + { + name: 'datasourceType', + path: '/console/dataSourceManage/datasourceType', + component: () => + import('@/pages/dataSourceManage/datasourceType/index.vue'), + meta: { + title: 'Data Source Type', + publicPage: true, + }, + }, + { + name: 'datasourceAccess', + path: '/console/dataSourceManage/datasourceAccess', + component: () => + import('@/pages/dataSourceManage/datasourceAccess/index.vue'), + meta: { + title: 'Data Source Access', + publicPage: true, + }, + }, + { + name: 'datasourceTypeKey', + path: '/console/dataSourceManage/datasourceTypeKey', + component: () => + import('@/pages/dataSourceManage/datasourceTypeKey/index.vue'), + meta: { + title: 'Data Source Type Key', + publicPage: true, + }, + }, + ], + }, + { + name: 'udfFunctionTitle', + path: '/console/udfFunctionTitle', + redirect: '/console/udfFunctionTitle/udfFunctionManage', + meta: { + title: 'UDF Function', + publicPage: true, + }, + children: [ + { + name: 'udfFunctionManage', + path: '/console/udfFunctionTitle/udfFunctionManage', + component: () => + import('@/pages/udfFunctionTitle/udfFunctionManage/index.vue'), + meta: { + title: 'UDF Management', + publicPage: true, + }, + }, + { + name: 'functionManagement', + path: '/console/udfFunctionTitle/functionManagement', + component: () => + import('@/pages/udfFunctionTitle/functionManagement/index.vue'), + meta: { + title: 'Function Management', + publicPage: true, + }, + }, + { + name: 'udfManager', + path: '/console/udfFunctionTitle/udfManager', + component: () => + import('@/pages/udfFunctionTitle/udfManager/index.vue'), + meta: { + title: 'UDF Manager', + publicPage: true, + }, + }, + { + name: 'udfTree', + path: '/console/udfFunctionTitle/udfTree', + component: () => + import('@/pages/udfFunctionTitle/udfTree/index.vue'), + meta: { + title: 'UDF Tree', + publicPage: true, + }, + }, + ], + }, + { + name: 'basedataManagement', + path: '/console/basedataManagement', + redirect: '/console/basedataManagement/gatewayAuthToken', + meta: { + title: 'Base Data Management', + publicPage: true, + }, + children: [ + { + name: 'gatewayAuthToken', + path: '/console/basedataManagement/gatewayAuthToken', + component: () => + import('@/pages/basedataManagement/gatewayAuthToken/index.vue'), + meta: { + title: 'Gateway Auth Token', + publicPage: true, + }, + }, + { + name: 'errorCode', + path: '/console/basedataManagement/errorCode', + component: () => + import('@/pages/basedataManagement/errorCode/index.vue'), + meta: { + title: 'Error Code', + publicPage: true, + }, + }, + { + name: 'rmExternalResourceProvider', + path: '/console/basedataManagement/rmExternalResourceProvider', + component: () => + import('@/pages/basedataManagement/rmExternalResourceProvider/index.vue'), + meta: { + title: 'Rm External Resource Provider', + publicPage: true, + }, + }, + { + name: 'EnginePluginManagement', + path: '/console/basedataManagement/EnginePluginManagement', + component: () => + import('@/pages/basedataManagement/EnginePluginManagement/index.vue'), + meta: { + title: 'Engine Plugin Management', + publicPage: true, + }, + }, + { + name: 'tenantTagManagement', + path: '/console/basedataManagement/tenantTagManagement', + component: () => + import('@/pages/basedataManagement/tenantTagManagement/index.vue'), + meta: { + title: 'Tenant Tag Management', + publicPage: true, + }, + }, + { + name: 'ipListManagement', + path: '/console/basedataManagement/ipListManagement', + component: () => + import('@/pages/basedataManagement/ipListManagement/index.vue'), + meta: { + title: 'Ip List Management', + publicPage: true, + }, + }, + { + name: 'configManagement', + path: '/console/basedataManagement/configManagement', + component: () => + import('@/pages/basedataManagement/configManagement/index.vue'), + meta: { + title: 'Config Management', + publicPage: true, + }, + }, + ], + }, ] }, ], From a0fbc457c01f96f7c46334f714f418324ff6f93c Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 16 Oct 2024 10:23:31 +0100 Subject: [PATCH 05/13] Upgrade to Jetty 9.4.56.v20240826 (#5189) --- linkis-dist/release-docs/LICENSE | 40 ++++++++++----------- pom.xml | 2 +- tool/dependencies/known-dependencies.txt | 44 ++++++++++++------------ 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/linkis-dist/release-docs/LICENSE b/linkis-dist/release-docs/LICENSE index 553c9606b9..53ddb1be68 100644 --- a/linkis-dist/release-docs/LICENSE +++ b/linkis-dist/release-docs/LICENSE @@ -218,26 +218,26 @@ The following components are provided under the Apache 2.0 License. See licenses/ for text of these licenses. (Apache License, Version 2.0) (Eclipse Distribution License - v 1.0) fastinfoset (com.sun.xml.fastinfoset:FastInfoset:1.2.16 - https://projects.eclipse.org/projects/ee4j.jaxb-impl/FastInfoset) (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Aggregate :: All core Jetty (org.eclipse.jetty.aggregate:jetty-all:7.6.0.v20120127 - http://www.eclipse.org/jetty/jetty-aggregate-project/jetty-all) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.48.v20220622 - http://www.eclipse.org/jetty) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.48.v20220622 - http://www.eclipse.org/jetty) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.48.v20220622 - http://www.eclipse.org/jetty) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.48.v20220622 - http://www.eclipse.org/jetty) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Plus (org.eclipse.jetty:jetty-plus:9.4.48.v20220622 - http://www.eclipse.org/jetty) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.48.v20220622 - http://www.eclipse.org/jetty) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.48.v20220622 - http://www.eclipse.org/jetty) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Servlet Annotations (org.eclipse.jetty:jetty-annotations:9.4.48.v20220622 - http://www.eclipse.org/jetty) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.48.v20220622 - http://www.eclipse.org/jetty) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.48.v20220622 - http://www.eclipse.org/jetty) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.48.v20220622 - http://www.eclipse.org/jetty) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.48.v20220622 - http://www.eclipse.org/jetty) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Websocket :: API (org.eclipse.jetty.websocket:websocket-api:9.4.48.v20220622 - http://www.eclipse.org/jetty/websocket-api) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Websocket :: Client (org.eclipse.jetty.websocket:websocket-client:9.4.48.v20220622 - http://www.eclipse.org/jetty/websocket-client) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Websocket :: Common (org.eclipse.jetty.websocket:websocket-common:9.4.48.v20220622 - http://www.eclipse.org/jetty/websocket-common) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Websocket :: Server (org.eclipse.jetty.websocket:websocket-server:9.4.48.v20220622 - http://www.eclipse.org/jetty/websocket-server) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Websocket :: Servlet Interface (org.eclipse.jetty.websocket:websocket-servlet:9.4.48.v20220622 - http://www.eclipse.org/jetty/websocket-servlet) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Websocket :: javax.websocket :: Client Implementation (org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.48.v20220622 - http://www.eclipse.org/jetty/javax-websocket-client-impl) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Websocket :: javax.websocket.server :: Server Implementation (org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.48.v20220622 - http://www.eclipse.org/jetty/javax-websocket-server-impl) - (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.48.v20220622 - http://www.eclipse.org/jetty) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.56.v20240826 - http://www.eclipse.org/jetty) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.56.v20240826 - http://www.eclipse.org/jetty) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.56.v20240826 - http://www.eclipse.org/jetty) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.56.v20240826 - http://www.eclipse.org/jetty) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Plus (org.eclipse.jetty:jetty-plus:9.4.56.v20240826 - http://www.eclipse.org/jetty) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.56.v20240826 - http://www.eclipse.org/jetty) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.56.v20240826 - http://www.eclipse.org/jetty) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Servlet Annotations (org.eclipse.jetty:jetty-annotations:9.4.56.v20240826 - http://www.eclipse.org/jetty) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.56.v20240826 - http://www.eclipse.org/jetty) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.56.v20240826 - http://www.eclipse.org/jetty) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.56.v20240826 - http://www.eclipse.org/jetty) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.56.v20240826 - http://www.eclipse.org/jetty) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Websocket :: API (org.eclipse.jetty.websocket:websocket-api:9.4.56.v20240826 - http://www.eclipse.org/jetty/websocket-api) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Websocket :: Client (org.eclipse.jetty.websocket:websocket-client:9.4.56.v20240826 - http://www.eclipse.org/jetty/websocket-client) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Websocket :: Common (org.eclipse.jetty.websocket:websocket-common:9.4.56.v20240826 - http://www.eclipse.org/jetty/websocket-common) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Websocket :: Server (org.eclipse.jetty.websocket:websocket-server:9.4.56.v20240826 - http://www.eclipse.org/jetty/websocket-server) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Websocket :: Servlet Interface (org.eclipse.jetty.websocket:websocket-servlet:9.4.56.v20240826 - http://www.eclipse.org/jetty/websocket-servlet) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Websocket :: javax.websocket :: Client Implementation (org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.56.v20240826 - http://www.eclipse.org/jetty/javax-websocket-client-impl) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: Websocket :: javax.websocket.server :: Server Implementation (org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.56.v20240826 - http://www.eclipse.org/jetty/javax-websocket-server-impl) + (Apache License, Version 2.0) (Eclipse Public License - Version 1.0) Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.56.v20240826 - http://www.eclipse.org/jetty) (Apache License, Version 2.0) rest (org.elasticsearch.client:elasticsearch-rest-client:7.6.2 - https://github.com/elastic/elasticsearch) (Apache License, Version 2.0) sniffer (org.elasticsearch.client:elasticsearch-rest-client-sniffer:7.6.2 - https://github.com/elastic/elasticsearch) (Apache License, Version 2.0) (GNU Lesser General Public License (LGPL), Version 2.1) JAX-RS provider for JSON content type (org.codehaus.jackson:jackson-jaxrs:1.9.13 - http://jackson.codehaus.org) diff --git a/pom.xml b/pom.xml index d2f18f6540..740e5afe8d 100644 --- a/pom.xml +++ b/pom.xml @@ -164,7 +164,7 @@ 1.19.4 2.23.1 4.1.86.Final - 9.4.48.v20220622 + 9.4.56.v20240826 4.5.13 ${httpclient.version} diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt index 441a3a8fae..b09b3780d0 100644 --- a/tool/dependencies/known-dependencies.txt +++ b/tool/dependencies/known-dependencies.txt @@ -393,8 +393,8 @@ janino-3.1.9.jar jasper-compiler-5.5.23.jar jasper-runtime-5.5.23.jar javassist-3.27.0-GA.jar -javax-websocket-client-impl-9.4.48.v20220622.jar -javax-websocket-server-impl-9.4.48.v20220622.jar +javax-websocket-client-impl-9.4.56.v20240826.jar +javax-websocket-server-impl-9.4.56.v20240826.jar javax.activation-api-1.2.0.jar javax.annotation-api-1.3.2.jar javax.inject-1.jar @@ -433,23 +433,23 @@ jersey-server-1.19.4.jar jersey-server-2.23.1.jar jersey-servlet-1.19.4.jar jettison-1.5.4.jar -jetty-annotations-9.4.48.v20220622.jar -jetty-client-9.4.48.v20220622.jar -jetty-continuation-9.4.48.v20220622.jar -jetty-http-9.4.48.v20220622.jar -jetty-io-9.4.48.v20220622.jar -jetty-plus-9.4.48.v20220622.jar -jetty-rewrite-9.4.48.v20220622.jar -jetty-security-9.4.48.v20220622.jar -jetty-server-9.4.48.v20220622.jar -jetty-servlet-9.4.48.v20220622.jar -jetty-servlets-9.4.48.v20220622.jar +jetty-annotations-9.4.56.v20240826.jar +jetty-client-9.4.56.v20240826.jar +jetty-continuation-9.4.56.v20240826.jar +jetty-http-9.4.56.v20240826.jar +jetty-io-9.4.56.v20240826.jar +jetty-plus-9.4.56.v20240826.jar +jetty-rewrite-9.4.56.v20240826.jar +jetty-security-9.4.56.v20240826.jar +jetty-server-9.4.56.v20240826.jar +jetty-servlet-9.4.56.v20240826.jar +jetty-servlets-9.4.56.v20240826.jar jetty-sslengine-6.1.26.jar jetty-util-6.1.26.jar -jetty-util-9.4.48.v20220622.jar -jetty-util-ajax-9.4.48.v20220622.jar -jetty-webapp-9.4.48.v20220622.jar -jetty-xml-9.4.48.v20220622.jar +jetty-util-9.4.56.v20240826.jar +jetty-util-ajax-9.4.56.v20240826.jar +jetty-webapp-9.4.56.v20240826.jar +jetty-xml-9.4.56.v20240826.jar jline-2.14.6.jar jline-3.9.0.jar jmespath-java-1.12.261.jar @@ -783,11 +783,11 @@ txw2-2.3.8.jar units-1.3.jar units-1.6.jar validation-api-2.0.1.Final.jar -websocket-api-9.4.48.v20220622.jar -websocket-client-9.4.48.v20220622.jar -websocket-common-9.4.48.v20220622.jar -websocket-server-9.4.48.v20220622.jar -websocket-servlet-9.4.48.v20220622.jar +websocket-api-9.4.56.v20240826.jar +websocket-client-9.4.56.v20240826.jar +websocket-common-9.4.56.v20240826.jar +websocket-server-9.4.56.v20240826.jar +websocket-servlet-9.4.56.v20240826.jar woodstox-core-6.4.0.jar xalan-2.7.0.jar xercesImpl-2.9.1.jar From a07e51bfcc351463013c520efda8358d2c00fb0b Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 16 Oct 2024 10:24:39 +0100 Subject: [PATCH 06/13] CI: use latest action versions (#5190) --- .github/workflows/auto-format-pr.yaml | 4 ++-- .github/workflows/build-backend.yml | 8 ++++---- .github/workflows/check-code-format.yml | 2 +- .github/workflows/check-license.yml | 2 +- .github/workflows/dead-link-checker.yaml | 2 +- .github/workflows/integration-test.yml | 2 +- .github/workflows/publish-docker.yaml | 2 +- .github/workflows/publish-snapshot.yml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/auto-format-pr.yaml b/.github/workflows/auto-format-pr.yaml index 499a25f3b6..1cb3d95e5a 100644 --- a/.github/workflows/auto-format-pr.yaml +++ b/.github/workflows/auto-format-pr.yaml @@ -34,14 +34,14 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true - name: Set up JDK 8 uses: actions/setup-java@v4 with: java-version: '8' - distribution: 'adopt' + distribution: 'temurin' - name: Code Format Apply run: diff --git a/.github/workflows/build-backend.yml b/.github/workflows/build-backend.yml index f881f92517..04aac9632a 100644 --- a/.github/workflows/build-backend.yml +++ b/.github/workflows/build-backend.yml @@ -31,9 +31,9 @@ jobs: hadoop: [2.7, 3.3] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 8 @@ -63,9 +63,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout source - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 8 diff --git a/.github/workflows/check-code-format.yml b/.github/workflows/check-code-format.yml index 3e2d68f040..d894814288 100644 --- a/.github/workflows/check-code-format.yml +++ b/.github/workflows/check-code-format.yml @@ -29,7 +29,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: '8' - distribution: 'adopt' + distribution: 'temurin' - name: Code format check run: ./mvnw spotless:check diff --git a/.github/workflows/check-license.yml b/.github/workflows/check-license.yml index 088aaf3830..b68c524661 100644 --- a/.github/workflows/check-license.yml +++ b/.github/workflows/check-license.yml @@ -29,7 +29,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: '8' - distribution: 'adopt' + distribution: 'temurin' - name: License check with Maven run: | rat_file=`mvn apache-rat:check | { grep -oe "\\S\\+/rat.txt" || true; }` diff --git a/.github/workflows/dead-link-checker.yaml b/.github/workflows/dead-link-checker.yaml index 98aa19ab5e..9b5c015a81 100644 --- a/.github/workflows/dead-link-checker.yaml +++ b/.github/workflows/dead-link-checker.yaml @@ -26,7 +26,7 @@ jobs: timeout-minutes: 30 if: (github.repository == 'apache/linkis') steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: gaurav-nelson/github-action-markdown-link-check@v1 with: use-quiet-mode: 'no' diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 355ef1f33f..85d3b9a23e 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -82,7 +82,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'temurin' java-version: 8 - name: Cache local Maven repository uses: actions/cache@v4 diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 76e1565042..d385cb70ac 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -41,7 +41,7 @@ jobs: - name: Set up JDK 8 uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'temurin' java-version: 8 - name: Cache local Maven repository uses: actions/cache@v4 diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index db6de687ee..35701625cf 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -38,7 +38,7 @@ jobs: - name: Setup JDK 8 uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'temurin' java-version: 8 - name: Get Version From 903d2e5cf334b8948812d92acc500591b1586347 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:27:02 +0800 Subject: [PATCH 07/13] Bump org.apache.avro:avro in /linkis-engineconn-plugins/sqoop (#5187) Bumps org.apache.avro:avro from 1.11.3 to 1.11.4. --- updated-dependencies: - dependency-name: org.apache.avro:avro dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- linkis-engineconn-plugins/sqoop/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linkis-engineconn-plugins/sqoop/pom.xml b/linkis-engineconn-plugins/sqoop/pom.xml index 76319e98bf..87fdae7c86 100644 --- a/linkis-engineconn-plugins/sqoop/pom.xml +++ b/linkis-engineconn-plugins/sqoop/pom.xml @@ -41,7 +41,7 @@ org.apache.avro avro - 1.11.3 + 1.11.4 provided From 887c042f126371c9a0ae45035327a7114f744c93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:27:31 +0800 Subject: [PATCH 08/13] Bump org.apache.zookeeper:zookeeper from 3.5.9 to 3.8.4 (#5186) * Bump org.apache.zookeeper:zookeeper from 3.5.9 to 3.8.4 Bumps org.apache.zookeeper:zookeeper from 3.5.9 to 3.8.4. --- updated-dependencies: - dependency-name: org.apache.zookeeper:zookeeper dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Update known-dependencies.txt * use v3.9.3 due to ZOOKEEPER-4820 * need to avoid zookeeper logback dependency * Update known-dependencies.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: PJ Fanning --- pom.xml | 10 +++++++++- tool/dependencies/known-dependencies.txt | 12 ++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 740e5afe8d..25593be149 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ 1.6.0 - 3.5.9 + 3.9.2 4.2.0 3.3.4 hadoop-hdfs-client @@ -1191,6 +1191,14 @@ log4j log4j + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + org.slf4j slf4j-log4j12 diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt index b09b3780d0..873414fb12 100644 --- a/tool/dependencies/known-dependencies.txt +++ b/tool/dependencies/known-dependencies.txt @@ -35,6 +35,7 @@ asm-analysis-9.3.jar asm-commons-9.3.jar asm-tree-9.3.jar aspectjweaver-1.9.7.jar +audience-annotations-0.12.0.jar audience-annotations-0.13.0.jar audience-annotations-0.5.0.jar automaton-1.11-8.jar @@ -596,6 +597,13 @@ netty-resolver-dns-4.1.86.Final.jar netty-resolver-dns-classes-macos-4.1.86.Final.jar netty-resolver-dns-native-macos-4.1.86.Final-osx-aarch_64.jar netty-resolver-dns-native-macos-4.1.86.Final-osx-x86_64.jar +netty-tcnative-boringssl-static-2.0.54.Final-linux-aarch_64.jar +netty-tcnative-boringssl-static-2.0.54.Final-linux-x86_64.jar +netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar +netty-tcnative-boringssl-static-2.0.54.Final-osx-x86_64.jar +netty-tcnative-boringssl-static-2.0.54.Final-windows-x86_64.jar +netty-tcnative-boringssl-static-2.0.54.Final.jar +netty-tcnative-classes-2.0.54.Final.jar netty-transport-4.1.86.Final.jar netty-transport-classes-epoll-4.1.86.Final.jar netty-transport-classes-kqueue-4.1.86.Final.jar @@ -802,7 +810,7 @@ zipkin-2.23.2.jar zipkin-reporter-2.16.3.jar zipkin-reporter-brave-2.16.3.jar zjsonpatch-0.3.0.jar -zookeeper-3.5.9.jar -zookeeper-jute-3.5.9.jar +zookeeper-3.9.2.jar +zookeeper-jute-3.9.2.jar zstd-jni-1.4.5-6.jar zstd-jni-1.5.0-4.jar From 8ae4d68fe811a5b09c02c02f2c9bd427a50eafab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:28:51 +0800 Subject: [PATCH 09/13] Bump com.google.protobuf:protobuf-java from 3.16.3 to 3.25.5 (#5175) * Bump com.google.protobuf:protobuf-java from 3.16.3 to 3.25.5 Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.16.3 to 3.25.5. - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.16.3...v3.25.5) --- updated-dependencies: - dependency-name: com.google.protobuf:protobuf-java dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Update known-dependencies.txt * version number --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: PJ Fanning --- linkis-dist/release-docs/LICENSE | 2 +- pom.xml | 2 +- tool/dependencies/known-dependencies.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linkis-dist/release-docs/LICENSE b/linkis-dist/release-docs/LICENSE index 53ddb1be68..462e0be824 100644 --- a/linkis-dist/release-docs/LICENSE +++ b/linkis-dist/release-docs/LICENSE @@ -654,7 +654,7 @@ See licenses/ for text of these licenses. (The 3-Clause BSD License) (WTFPL) Reflections (org.reflections:reflections:0.9.10 - http://github.com/ronmamo/reflections) (The 3-Clause BSD License) Commons Compiler (org.codehaus.janino:commons-compiler:2.7.6 - http://docs.codehaus.org/display/JANINO/Home/commons-compiler) (The 3-Clause BSD License) Hamcrest Core (org.hamcrest:hamcrest-core:1.3 - https://github.com/hamcrest/JavaHamcrest/hamcrest-core) - (The 3-Clause BSD License) Protocol Buffer Java API (com.google.protobuf:protobuf-java:3.16.3 - http://code.google.com/p/protobuf) + (The 3-Clause BSD License) Protocol Buffer Java API (com.google.protobuf:protobuf-java:3.25.5 - http://code.google.com/p/protobuf) (The 3-Clause BSD License) Py4J (net.sf.py4j:py4j:0.10.4 - http://nexus.sonatype.org/oss-repository-hosting.html/py4j) (The 3-Clause BSD License) Scala Compiler (org.scala-lang:scala-compiler:2.11.12 - http://www.scala-lang.org/) (The 3-Clause BSD License) Scala Compiler (org.scala-lang:scala-reflect:2.11.12 - http://www.scala-lang.org/) diff --git a/pom.xml b/pom.xml index 25593be149..ebbd1308c5 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ 6.4.0 1.33 - 3.16.3 + 3.25.5 1.10.0 1.5.8 diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt index 873414fb12..ce62898ae7 100644 --- a/tool/dependencies/known-dependencies.txt +++ b/tool/dependencies/known-dependencies.txt @@ -644,7 +644,7 @@ presto-client-0.234.jar presto-client-1.5.0.jar presto-resource-group-managers-0.234.jar presto-spi-0.234.jar -protobuf-java-3.16.3.jar +protobuf-java-3.25.5.jar protostuff-api-1.6.2.jar protostuff-collectionschema-1.6.2.jar protostuff-core-1.6.2.jar From 87d25be1b637c1da50e9b5f99e42781b39003b8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:33:10 +0800 Subject: [PATCH 10/13] Bump com.jayway.jsonpath:json-path from 2.7.0 to 2.9.0 (#5123) * Bump com.jayway.jsonpath:json-path from 2.7.0 to 2.9.0 Bumps [com.jayway.jsonpath:json-path](https://github.com/jayway/JsonPath) from 2.7.0 to 2.9.0. - [Release notes](https://github.com/jayway/JsonPath/releases) - [Changelog](https://github.com/json-path/JsonPath/blob/master/changelog.md) - [Commits](https://github.com/jayway/JsonPath/compare/json-path-2.7.0...json-path-2.9.0) --- updated-dependencies: - dependency-name: com.jayway.jsonpath:json-path dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Update known-dependencies.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: PJ Fanning --- pom.xml | 2 +- tool/dependencies/known-dependencies.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ebbd1308c5..d500b6bac1 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ 2.8.9 2.13.4.20221013 - 2.7.0 + 2.9.0 1.5.4 1.4.20 6.4.0 diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt index ce62898ae7..48c82ce8b6 100644 --- a/tool/dependencies/known-dependencies.txt +++ b/tool/dependencies/known-dependencies.txt @@ -469,7 +469,7 @@ jruby-complete-9.3.4.0.jar json-0.191.jar json-0.193.jar json-1.8.jar -json-path-2.7.0.jar +json-path-2.9.0.jar json-smart-2.4.10.jar jsp-2.1-6.1.14.jar jsp-api-2.1-6.1.14.jar From 96fd44cc3d26f3ccf78f0ca6f5664cfbd4a73802 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:37:10 +0800 Subject: [PATCH 11/13] Bump com.hazelcast:hazelcast from 5.3.0 to 5.3.5 in /linkis-engineconn-plugins/seatunnel (#5131) * Bump com.hazelcast:hazelcast in /linkis-engineconn-plugins/seatunnel Bumps [com.hazelcast:hazelcast](https://github.com/hazelcast/hazelcast) from 5.3.0 to 5.3.5. - [Release notes](https://github.com/hazelcast/hazelcast/releases) - [Commits](https://github.com/hazelcast/hazelcast/compare/v5.3.0...v5.3.5) --- updated-dependencies: - dependency-name: com.hazelcast:hazelcast dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Update known-dependencies.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: PJ Fanning --- linkis-engineconn-plugins/seatunnel/pom.xml | 2 +- tool/dependencies/known-dependencies.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linkis-engineconn-plugins/seatunnel/pom.xml b/linkis-engineconn-plugins/seatunnel/pom.xml index 1a836b6b19..1cbe9e6886 100644 --- a/linkis-engineconn-plugins/seatunnel/pom.xml +++ b/linkis-engineconn-plugins/seatunnel/pom.xml @@ -89,7 +89,7 @@ com.hazelcast hazelcast - 5.3.0 + 5.3.5 org.apache.seatunnel diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt index 48c82ce8b6..fa9e2af9f2 100644 --- a/tool/dependencies/known-dependencies.txt +++ b/tool/dependencies/known-dependencies.txt @@ -259,7 +259,7 @@ hadoop-yarn-server-nodemanager-2.5.1.jar hadoop-yarn-server-nodemanager-2.7.4.jar hamcrest-2.2.jar hamcrest-core-2.2.jar -hazelcast-5.3.0.jar +hazelcast-5.3.5.jar hbase-annotations-1.2.0.jar hbase-annotations-1.4.3.jar hbase-asyncfs-2.5.3.jar From 73b5dd363ae650f50ecf718080366e5238d13b8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:38:26 +0800 Subject: [PATCH 12/13] Bump org.apache.kafka:kafka-clients from 2.7.0 to 2.7.2 in /linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/kafka (#5027) * Bump org.apache.kafka:kafka-clients Bumps org.apache.kafka:kafka-clients from 2.7.0 to 2.7.2. --- updated-dependencies: - dependency-name: org.apache.kafka:kafka-clients dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Update known-dependencies.txt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: PJ Fanning --- .../linkis-datasource-manager/service/kafka/pom.xml | 2 +- tool/dependencies/known-dependencies.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/kafka/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/kafka/pom.xml index 1cf433c847..abe25aa7e3 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/kafka/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/kafka/pom.xml @@ -49,7 +49,7 @@ org.apache.kafka kafka-clients - 2.7.0 + 2.7.2 diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt index fa9e2af9f2..3f06260e81 100644 --- a/tool/dependencies/known-dependencies.txt +++ b/tool/dependencies/known-dependencies.txt @@ -483,7 +483,7 @@ jta-1.1.jar jts-core-1.16.1.jar jul-to-slf4j-1.7.36.jar junit-4.13.2.jar -kafka-clients-2.7.0.jar +kafka-clients-2.7.2.jar kafka-clients-3.1.2.jar kerb-admin-1.0.1.jar kerb-client-1.0.1.jar From 3647c318edf57470408a31aa5965a0c32f017e7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:42:13 +0800 Subject: [PATCH 13/13] Bump rollup from 3.28.1 to 3.29.5 in /linkis-web-next (#5176) Bumps [rollup](https://github.com/rollup/rollup) from 3.28.1 to 3.29.5. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v3.28.1...v3.29.5) --- updated-dependencies: - dependency-name: rollup dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- linkis-web-next/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/linkis-web-next/package-lock.json b/linkis-web-next/package-lock.json index 3c9797fad1..94e593012a 100644 --- a/linkis-web-next/package-lock.json +++ b/linkis-web-next/package-lock.json @@ -5207,9 +5207,9 @@ } }, "node_modules/rollup": { - "version": "3.28.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.28.1.tgz", - "integrity": "sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "bin": { "rollup": "dist/bin/rollup" }, @@ -10123,9 +10123,9 @@ } }, "rollup": { - "version": "3.28.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.28.1.tgz", - "integrity": "sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "requires": { "fsevents": "~2.3.2" }