Skip to content

Commit 39bb9c8

Browse files
pjfanningpjfanning
authored
bcprov 1.78.1 (#5180)
* bcprov 1.78.1 * try to exclude bcpkix-jdk15on transitive deps
1 parent 515d114 commit 39bb9c8

File tree

22 files changed

+68
-39
lines changed

22 files changed

+68
-39
lines changed

‎linkis-commons/linkis-module/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,17 @@
162162
<groupId>org.springframework.boot</groupId>
163163
<artifactId>spring-boot-starter</artifactId>
164164
</exclusion>
165+
<exclusion>
166+
<groupId>org.bouncycastle</groupId>
167+
<artifactId>bcpkix-jdk15on</artifactId>
168+
</exclusion>
165169
</exclusions>
166170
</dependency>
171+
<dependency>
172+
<groupId>org.bouncycastle</groupId>
173+
<artifactId>bcpkix-jdk18on</artifactId>
174+
<version>${bouncycastle.version}</version>
175+
</dependency>
167176

168177
<dependency>
169178
<groupId>org.springframework.cloud</groupId>

‎linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/assembly/distribution.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@
163163
<exclude>org.apache.logging.log4j:log4j-slf4j-impl:jar</exclude>
164164
<exclude>org.apache.zookeeper:zookeeper:jar</exclude>
165165
<exclude>org.aspectj:aspectjweaver:jar</exclude>
166-
<exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
167-
<exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
166+
<exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
167+
<exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
168168
<exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
169169
<exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
170170
<exclude>org.codehaus.jettison:jettison:jar</exclude>

‎linkis-computation-governance/linkis-entrance/src/main/assembly/distribution.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@
164164
<exclude>org.apache.logging.log4j:log4j-slf4j-impl:jar</exclude>
165165
<exclude>org.apache.zookeeper:zookeeper:jar</exclude>
166166
<exclude>org.aspectj:aspectjweaver:jar</exclude>
167-
<exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
168-
<exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
167+
<exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
168+
<exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
169169
<exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
170170
<exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
171171
<exclude>org.codehaus.jettison:jettison:jar</exclude>

‎linkis-dist/release-docs/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ See licenses/ for text of these licenses.
683683
(MIT License) JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.16 - http://www.slf4j.org)
684684
(MIT License) SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org)
685685
(MIT License) pagehelper 5 (com.github.pagehelper:pagehelper:5.3.1 - https://github.com/pagehelper/Mybatis-PageHelper)
686-
(MIT License) bcprov-jdk15on (org.bouncycastle:bcprov-jdk15on:1.64 - https://www.bouncycastle.org/java.html)
686+
(MIT License) bcprov-jdk18on (org.bouncycastle:bcprov-jdk18on:1.78.1 - https://www.bouncycastle.org/java.html)
687687
(MIT License) oshi-core (com.github.oshi:oshi-core:5.3.4 - https://github.com/oshi/oshi)
688688
(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/)
689689
(MIT License) scopt:a command line options parsing library (com.github.scopt:scopt_2.11:4.0.1 - https://github.com/scopt/scopt)

‎linkis-engineconn-plugins/flink/flink-core/src/main/assembly/distribution.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@
110110
<exclude>org.apache.logging.log4j:*:jar</exclude>
111111
<exclude>org.apache.zookeeper:zookeeper:jar</exclude>
112112
<exclude>org.aspectj:aspectjweaver:jar</exclude>
113-
<exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
114-
<exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
113+
<exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
114+
<exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
115115
<exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
116116
<exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
117117
<exclude>org.codehaus.jettison:jettison:jar</exclude>

‎linkis-engineconn-plugins/flink/flink-shims-1.12.2/src/main/assembly/distribution.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@
110110
<exclude>org.apache.logging.log4j:*:jar</exclude>
111111
<exclude>org.apache.zookeeper:zookeeper:jar</exclude>
112112
<exclude>org.aspectj:aspectjweaver:jar</exclude>
113-
<exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
114-
<exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
113+
<exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
114+
<exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
115115
<exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
116116
<exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
117117
<exclude>org.codehaus.jettison:jettison:jar</exclude>

‎linkis-engineconn-plugins/flink/flink-shims-1.16.2/src/main/assembly/distribution.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@
110110
<exclude>org.apache.logging.log4j:*:jar</exclude>
111111
<exclude>org.apache.zookeeper:zookeeper:jar</exclude>
112112
<exclude>org.aspectj:aspectjweaver:jar</exclude>
113-
<exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
114-
<exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
113+
<exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
114+
<exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
115115
<exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
116116
<exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
117117
<exclude>org.codehaus.jettison:jettison:jar</exclude>

‎linkis-engineconn-plugins/hbase/hbase-core/src/main/assembly/distribution.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@
126126
<exclude>org.apache.logging.log4j:log4j-slf4j-impl:jar</exclude>
127127
<!-- <exclude>log4j:log4j:jar</exclude>-->
128128
<exclude>org.aspectj:aspectjweaver:jar</exclude>
129-
<exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
130-
<exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
129+
<exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
130+
<exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
131131
<exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
132132
<exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
133133
<exclude>org.codehaus.jettison:jettison:jar</exclude>

‎linkis-engineconn-plugins/hive/src/main/assembly/distribution.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@
126126
<exclude>log4j:log4j:jar</exclude>
127127
<exclude>org.apache.zookeeper:zookeeper:jar</exclude>
128128
<exclude>org.aspectj:aspectjweaver:jar</exclude>
129-
<exclude>org.bouncycastle:bcpkix-jdk15on:jar</exclude>
130-
<exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
129+
<exclude>org.bouncycastle:bcpkix-jdk18on:jar</exclude>
130+
<exclude>org.bouncycastle:bcprov-jdk18on:jar</exclude>
131131
<exclude>org.codehaus.jackson:jackson-jaxrs:jar</exclude>
132132
<exclude>org.codehaus.jackson:jackson-xc:jar</exclude>
133133
<exclude>org.codehaus.jettison:jettison:jar</exclude>

‎linkis-engineconn-plugins/nebula/pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,17 @@
6565
<groupId>com.vesoft</groupId>
6666
<artifactId>client</artifactId>
6767
<version>${nebula.version}</version>
68+
<exclusions>
69+
<exclusion>
70+
<groupId>org.bouncycastle</groupId>
71+
<artifactId>bcpkix-jdk15on</artifactId>
72+
</exclusion>
73+
</exclusions>
74+
</dependency>
75+
<dependency>
76+
<groupId>org.bouncycastle</groupId>
77+
<artifactId>bcpkix-jdk18on</artifactId>
78+
<version>${bouncycastle.version}</version>
6879
</dependency>
6980
</dependencies>
7081

0 commit comments

Comments
 (0)