Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bcprov 1.78.1 #5180

Merged
merged 2 commits into from
Oct 6, 2024
Merged

bcprov 1.78.1 #5180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4b6855
bcprov 1.78.1
pjfanning Sep 27, 2024
9e49e0c
try to exclude bcpkix-jdk15on transitive deps
pjfanning Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions linkis-commons/linkis-module/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...is-engineconn-manager/linkis-engineconn-manager-server/src/main/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions linkis-computation-governance/linkis-entrance/src/main/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion linkis-dist/release-docs/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,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)
Expand Down
4 changes: 2 additions & 2 deletions linkis-engineconn-plugins/flink/flink-core/src/main/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions linkis-engineconn-plugins/flink/flink-shims-1.12.2/src/main/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions linkis-engineconn-plugins/flink/flink-shims-1.16.2/src/main/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions linkis-engineconn-plugins/hbase/hbase-core/src/main/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions linkis-engineconn-plugins/hive/src/main/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 11 additions & 0 deletions linkis-engineconn-plugins/nebula/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions linkis-engineconn-plugins/sqoop/src/main/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions linkis-extensions/linkis-et-monitor/src/main/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions linkis-public-enhancements/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions linkis-public-enhancements/linkis-bml-server/src/main/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...nts/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...nkis-datasource/linkis-datasource-manager/service/hive/src/main/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...-public-enhancements/linkis-datasource/linkis-metadata/src/main/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions linkis-public-enhancements/linkis-pes-publicservice/src/main/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...-cloud-services/linkis-service-discovery/linkis-eureka/src/main/assembly/distribution.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 9 additions & 0 deletions linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions tool/dependencies/known-dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading