This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.11 by this push:
new 67850fdafe4 [fix] [broker] fix multiple versions of bouncy-castle
(#20960)
67850fdafe4 is described below
commit 67850fdafe4d30afacfb31d84330bf6c0bec3d47
Author: fengyubiao <[email protected]>
AuthorDate: Mon Aug 14 11:23:37 2023 +0800
[fix] [broker] fix multiple versions of bouncy-castle (#20960)
---
bouncy-castle/bc/LICENSE | 6 +++---
pom.xml | 22 ++++++++++++++++++++++
pulsar-functions/secrets/pom.xml | 14 --------------
pulsar-io/aerospike/pom.xml | 6 ++++++
tiered-storage/file-system/pom.xml | 4 ++++
5 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/bouncy-castle/bc/LICENSE b/bouncy-castle/bc/LICENSE
index 5921755346e..b8da1efd053 100644
--- a/bouncy-castle/bc/LICENSE
+++ b/bouncy-castle/bc/LICENSE
@@ -205,6 +205,6 @@
This projects includes binary packages with the following licenses:
Bouncy Castle License
* Bouncy Castle -- licenses/LICENSE-bouncycastle.txt
- - org.bouncycastle-bcpkix-jdk15on-1.60.jar
- - org.bouncycastle-bcprov-jdk15on-1.60.jar
- - org.bouncycastle-bcprov-ext-jdk15on-1.60.jar
+ - org.bouncycastle-bcpkix-jdk15on-1.69.jar
+ - org.bouncycastle-bcprov-jdk15on-1.69.jar
+ - org.bouncycastle-bcprov-ext-jdk15on-1.69.jar
diff --git a/pom.xml b/pom.xml
index bf795993b7b..4b99290429c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -848,12 +848,24 @@ flexible messaging model and an intuitive client
API.</description>
<groupId>com.yahoo.athenz</groupId>
<artifactId>athenz-zts-java-client-core</artifactId>
<version>${athenz.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.yahoo.athenz</groupId>
<artifactId>athenz-zpe-java-client</artifactId>
<version>${athenz.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -995,6 +1007,10 @@ flexible messaging model and an intuitive client
API.</description>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1332,6 +1348,12 @@ flexible messaging model and an intuitive client
API.</description>
<version>${scala-library.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.kubernetes</groupId>
+ <artifactId>client-java</artifactId>
+ <version>${kubernetesclient.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
diff --git a/pulsar-functions/secrets/pom.xml b/pulsar-functions/secrets/pom.xml
index 66ce912be21..bf8b17d2c65 100644
--- a/pulsar-functions/secrets/pom.xml
+++ b/pulsar-functions/secrets/pom.xml
@@ -35,20 +35,6 @@
<groupId>io.kubernetes</groupId>
<artifactId>client-java</artifactId>
<version>${kubernetesclient.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>bcpkix-jdk18on</artifactId>
- <groupId>org.bouncycastle</groupId>
- </exclusion>
- <exclusion>
- <artifactId>bcutil-jdk18on</artifactId>
- <groupId>org.bouncycastle</groupId>
- </exclusion>
- <exclusion>
- <artifactId>bcprov-jdk18on</artifactId>
- <groupId>org.bouncycastle</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/pulsar-io/aerospike/pom.xml b/pulsar-io/aerospike/pom.xml
index cb59602319d..a1fad60cedd 100644
--- a/pulsar-io/aerospike/pom.xml
+++ b/pulsar-io/aerospike/pom.xml
@@ -52,6 +52,12 @@
<groupId>com.aerospike</groupId>
<artifactId>aerospike-client-bc</artifactId>
<version>${aerospike-client.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/tiered-storage/file-system/pom.xml
b/tiered-storage/file-system/pom.xml
index d21e67aa0b4..c46dcbce643 100644
--- a/tiered-storage/file-system/pom.xml
+++ b/tiered-storage/file-system/pom.xml
@@ -114,6 +114,10 @@
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
