This is an automated email from the ASF dual-hosted git repository.
cgivre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new 9cefe0c4aa DRILL-8463. Bouncy Castle 1.77 (#2849)
9cefe0c4aa is described below
commit 9cefe0c4aacdb1f1ccc3212c42355178a91871c4
Author: PJ Fanning <[email protected]>
AuthorDate: Mon Nov 27 02:10:16 2023 +0100
DRILL-8463. Bouncy Castle 1.77 (#2849)
---
exec/java-exec/pom.xml | 16 +++++++++++++++-
exec/jdbc-all/pom.xml | 4 ++--
pom.xml | 10 ++++++++--
3 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 30a82ac128..fc61697944 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -107,6 +107,16 @@
<groupId>com.box</groupId>
<artifactId>box-java-sdk</artifactId>
<version>3.7.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.drill.contrib.data</groupId>
@@ -243,7 +253,11 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index 2e2b7b0f0a..e3d58155e0 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -33,7 +33,7 @@
"package.namespace.prefix" equals to "oadd.". It can be overridden if
necessary within any profile -->
<properties>
<package.namespace.prefix>oadd.</package.namespace.prefix>
- <jdbc-all-jar.maxsize>44500000</jdbc-all-jar.maxsize>
+ <jdbc-all-jar.maxsize>54000000</jdbc-all-jar.maxsize>
</properties>
<dependencies>
@@ -892,7 +892,7 @@
<profile>
<id>hadoop-2</id>
<properties>
- <jdbc-all-jar.maxsize>51000000</jdbc-all-jar.maxsize>
+ <jdbc-all-jar.maxsize>54000000</jdbc-all-jar.maxsize>
</properties>
</profile>
</profiles>
diff --git a/pom.xml b/pom.xml
index 1bd009dab6..0b3333c817 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,7 @@
<msgpack.version>0.6.6</msgpack.version>
<reflections.version>0.9.10</reflections.version>
<avro.version>1.11.3</avro.version>
+ <bouncycastle.version>1.77</bouncycastle.version>
<metrics.version>4.2.19</metrics.version>
<jetty.version>9.4.51.v20230217</jetty.version>
<jersey.version>2.40</jersey.version>
@@ -2766,8 +2767,13 @@
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>1.60</version>
+ <artifactId>bcprov-jdk18on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk18on</artifactId>
+ <version>${bouncycastle.version}</version>
</dependency>
<!--Eclipse Jetty dependecies-->
