This is an automated email from the ASF dual-hosted git repository.

peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git


The following commit(s) were added to refs/heads/master by this push:
     new 39bb9c8895 bcprov 1.78.1 (#5180)
39bb9c8895 is described below

commit 39bb9c889598a3b883f45ea6c5aa9c43e50ae294
Author: PJ Fanning <pjfann...@users.noreply.github.com>
AuthorDate: Sun Oct 6 15:02:18 2024 +0100

    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 ++--
 .../linkis-entrance/src/main/assembly/distribution.xml        |  4 ++--
 linkis-dist/release-docs/LICENSE                              |  2 +-
 .../flink/flink-core/src/main/assembly/distribution.xml       |  4 ++--
 .../flink-shims-1.12.2/src/main/assembly/distribution.xml     |  4 ++--
 .../flink-shims-1.16.2/src/main/assembly/distribution.xml     |  4 ++--
 .../hbase/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 ++--
 .../linkis-et-monitor/src/main/assembly/distribution.xml      |  4 ++--
 linkis-public-enhancements/distribution.xml                   |  4 ++--
 .../linkis-bml-server/src/main/assembly/distribution.xml      |  4 ++--
 .../server/src/main/assembly/distribution.xml                 |  4 ++--
 .../service/hive/src/main/assembly/distribution.xml           |  4 ++--
 .../linkis-metadata/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 @@
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-starter</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcpkix-jdk15on</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <version>${bouncycastle.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>org.springframework.cloud</groupId>
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 @@
                 
<exclude>org.apache.logging.log4j:log4j-slf4j-impl:jar</exclude>
                 <exclude>org.apache.zookeeper:zookeeper:jar</exclude>
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
                 <exclude>org.codehaus.jettison:jettison:jar</exclude>
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 @@
                 
<exclude>org.apache.logging.log4j:log4j-slf4j-impl:jar</exclude>
                 <exclude>org.apache.zookeeper:zookeeper:jar</exclude>
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
                 <exclude>org.codehaus.jettison:jettison:jar</exclude>
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 @@
                 <exclude>org.apache.logging.log4j:*:jar</exclude>
                 <exclude>org.apache.zookeeper:zookeeper:jar</exclude>
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
                 <exclude>org.codehaus.jettison:jettison:jar</exclude>
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 @@
                 <exclude>org.apache.logging.log4j:*:jar</exclude>
                 <exclude>org.apache.zookeeper:zookeeper:jar</exclude>
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
                 <exclude>org.codehaus.jettison:jettison:jar</exclude>
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 @@
                 <exclude>org.apache.logging.log4j:*:jar</exclude>
                 <exclude>org.apache.zookeeper:zookeeper:jar</exclude>
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
                 <exclude>org.codehaus.jettison:jettison:jar</exclude>
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 @@
                 
<exclude>org.apache.logging.log4j:log4j-slf4j-impl:jar</exclude>
 <!--                <exclude>log4j:log4j:jar</exclude>-->
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
                 <exclude>org.codehaus.jettison:jettison:jar</exclude>
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 @@
                 <exclude>log4j:log4j:jar</exclude>
                 <exclude>org.apache.zookeeper:zookeeper:jar</exclude>
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
                 <exclude>org.codehaus.jettison:jettison:jar</exclude>
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 @@
       <groupId>com.vesoft</groupId>
       <artifactId>client</artifactId>
       <version>${nebula.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcpkix-jdk15on</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <version>${bouncycastle.version}</version>
     </dependency>
   </dependencies>
 
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 @@
                 
<exclude>org.apache.logging.log4j:log4j-slf4j-impl:jar</exclude>
                 <exclude>org.apache.zookeeper:zookeeper:jar</exclude>
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
                 <exclude>org.codehaus.jettison:jettison:jar</exclude>
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 @@
                 
<exclude>org.apache.logging.log4j:log4j-slf4j-impl:jar</exclude>
                 <exclude>org.apache.zookeeper:zookeeper:jar</exclude>
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
                 <exclude>org.codehaus.jettison:jettison:jar</exclude>
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 @@
                 
<exclude>org.apache.logging.log4j:log4j-slf4j-impl:jar</exclude>
                 <exclude>org.apache.zookeeper:zookeeper:jar</exclude>
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-core-asl:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-mapper-asl:jar</exclude>
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 @@
                 <exclude>org.apache.logging.log4j:log4j-api:jar</exclude>
                 <exclude>org.apache.zookeeper:zookeeper:jar</exclude>
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.codehaus.jettison:jettison:jar</exclude>
                 <exclude>org.eclipse.jetty:jetty-continuation:jar</exclude>
                 <exclude>org.eclipse.jetty:jetty-http:jar</exclude>
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 @@
                 <exclude>org.apache.logging.log4j:*:jar</exclude>
                 <exclude>org.apache.zookeeper:zookeeper:jar</exclude>
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
                 <exclude>org.codehaus.jettison:jettison:jar</exclude>
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 @@
                 <exclude>log4j:log4j:jar</exclude>
                 <exclude>org.apache.zookeeper:zookeeper:jar</exclude>
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
                 <exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
                 <exclude>org.codehaus.jettison:jettison:jar</exclude>
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 @@
                 <exclude>org.apache.logging.log4j:log4j-api:jar</exclude>
                 <exclude>org.apache.zookeeper:zookeeper:jar</exclude>
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.codehaus.jettison:jettison:jar</exclude>
                 <exclude>org.eclipse.jetty:jetty-continuation:jar</exclude>
                 <exclude>org.eclipse.jetty:jetty-http:jar</exclude>
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 @@
                 <exclude>org.apache.logging.log4j:log4j-api:jar</exclude>
                 <exclude>org.apache.zookeeper:zookeeper:jar</exclude>
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.codehaus.jettison:jettison:jar</exclude>
                 <exclude>org.eclipse.jetty:jetty-continuation:jar</exclude>
                 <exclude>org.eclipse.jetty:jetty-http:jar</exclude>
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 @@
                 <exclude>aopalliance:aopalliance:jar</exclude>
                 <exclude>com.netflix.archaius:archaius-core:jar</exclude>
                 <exclude>org.aspectj:aspectjweaver:jar</exclude>
-                <exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
-                <exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
+                <exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
+                <exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
                 <exclude>org.checkerframework:checker-qual:jar</exclude>
                 <exclude>commons-collections:commons-collections:jar</exclude>
                 
<exclude>commons-configuration:commons-configuration:jar</exclude>
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 @@
           <groupId>io.projectreactor</groupId>
           <artifactId>reactor-core</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcpkix-jdk15on</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <version>${bouncycastle.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-log4j2</artifactId>
diff --git a/pom.xml b/pom.xml
index 0eeea76b4b..d2f18f6540 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,7 +199,7 @@
     <commons-cli.version>1.3.1</commons-cli.version>
     <jline.version>3.9.0</jline.version>
 
-    <bouncycastle.version>1.70</bouncycastle.version>
+    <bouncycastle.version>1.78.1</bouncycastle.version>
 
     <!-- java byte code modification -->
     <javassist.version>3.27.0-GA</javassist.version>
@@ -1226,12 +1226,12 @@
       <!-- crypto -->
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-jdk15on</artifactId>
+        <artifactId>bcprov-jdk18on</artifactId>
         <version>${bouncycastle.version}</version>
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcpkix-jdk15on</artifactId>
+        <artifactId>bcpkix-jdk18on</artifactId>
         <version>${bouncycastle.version}</version>
       </dependency>
 
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


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@linkis.apache.org
For additional commands, e-mail: commits-h...@linkis.apache.org

Reply via email to