This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 02fd51d8bb Consolidate bouncycastle libraries (#12706)
02fd51d8bb is described below
commit 02fd51d8bbcbb2f29b39bb5672279b8322b814b4
Author: Xiang Fu <[email protected]>
AuthorDate: Fri Mar 22 22:15:11 2024 +0100
Consolidate bouncycastle libraries (#12706)
---
.../pinot-stream-ingestion/pinot-kafka-2.0/pom.xml | 7 ++----
.../pinot-stream-ingestion/pinot-pulsar/pom.xml | 4 ----
pom.xml | 28 ++++++++++++++++++++++
3 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml
b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml
index 3925a70c66..71567e099d 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-kafka-2.0/pom.xml
@@ -37,7 +37,6 @@
<pinot.root>${basedir}/../../..</pinot.root>
<kafka.lib.version>2.8.1</kafka.lib.version>
<phase.prop>package</phase.prop>
- <bouncycastle.version>1.70</bouncycastle.version>
</properties>
<dependencies>
@@ -114,14 +113,12 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
+ <artifactId>bcprov-jdk18on</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
+ <artifactId>bcpkix-jdk18on</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
index 05f3a1fa04..6dcd29eb18 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
@@ -44,7 +44,6 @@
<simpleclient_common.version>0.16.0</simpleclient_common.version>
<grpc-proto.version>2.29.0</grpc-proto.version>
<grpc-context.version>1.60.1</grpc-context.version>
- <bouncycastle.version>1.75</bouncycastle.version>
<caffeine.version>2.6.2</caffeine.version>
<codehaus-annotations.version>1.17</codehaus-annotations.version>
<javax.annotation-api.version>1.2</javax.annotation-api.version>
@@ -188,17 +187,14 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15to18</artifactId>
- <version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-ext-jdk15to18</artifactId>
- <version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15to18</artifactId>
- <version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
diff --git a/pom.xml b/pom.xml
index 2b36857003..e50a1e2097 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,6 +216,7 @@
<jettison.version>1.5.4</jettison.version>
<eclipse.jetty.version>9.4.54.v20240208</eclipse.jetty.version>
<nimbus-jose-jwt.version>9.37.3</nimbus-jose-jwt.version>
+ <bouncycastle.version>1.77</bouncycastle.version>
</properties>
<profiles>
@@ -1482,6 +1483,33 @@
<version>${sslcontext.kickstart.version}</version>
</dependency>
+ <!-- bouncycastle libraries are used by Kafka and Pulsar plugins -->
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk18on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk18on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15to18</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-ext-jdk15to18</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15to18</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
<build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
