Skip to content

Commit 9cefe0c

Browse files
authored
DRILL-8463. Bouncy Castle 1.77 (#2849)
1 parent 4b13326 commit 9cefe0c

3 files changed

Lines changed: 25 additions & 5 deletions

File tree

exec/java-exec/pom.xml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,16 @@
107107
<groupId>com.box</groupId>
108108
<artifactId>box-java-sdk</artifactId>
109109
<version>3.7.1</version>
110+
<exclusions>
111+
<exclusion>
112+
<groupId>org.bouncycastle</groupId>
113+
<artifactId>bcprov-jdk15on</artifactId>
114+
</exclusion>
115+
<exclusion>
116+
<groupId>org.bouncycastle</groupId>
117+
<artifactId>bcpkix-jdk15on</artifactId>
118+
</exclusion>
119+
</exclusions>
110120
</dependency>
111121
<dependency>
112122
<groupId>org.apache.drill.contrib.data</groupId>
@@ -243,7 +253,11 @@
243253
</dependency>
244254
<dependency>
245255
<groupId>org.bouncycastle</groupId>
246-
<artifactId>bcpkix-jdk15on</artifactId>
256+
<artifactId>bcprov-jdk18on</artifactId>
257+
</dependency>
258+
<dependency>
259+
<groupId>org.bouncycastle</groupId>
260+
<artifactId>bcpkix-jdk18on</artifactId>
247261
</dependency>
248262
<dependency>
249263
<groupId>org.freemarker</groupId>

exec/jdbc-all/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"package.namespace.prefix" equals to "oadd.". It can be overridden if necessary within any profile -->
3434
<properties>
3535
<package.namespace.prefix>oadd.</package.namespace.prefix>
36-
<jdbc-all-jar.maxsize>44500000</jdbc-all-jar.maxsize>
36+
<jdbc-all-jar.maxsize>54000000</jdbc-all-jar.maxsize>
3737
</properties>
3838

3939
<dependencies>
@@ -892,7 +892,7 @@
892892
<profile>
893893
<id>hadoop-2</id>
894894
<properties>
895-
<jdbc-all-jar.maxsize>51000000</jdbc-all-jar.maxsize>
895+
<jdbc-all-jar.maxsize>54000000</jdbc-all-jar.maxsize>
896896
</properties>
897897
</profile>
898898
</profiles>

pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
<msgpack.version>0.6.6</msgpack.version>
8585
<reflections.version>0.9.10</reflections.version>
8686
<avro.version>1.11.3</avro.version>
87+
<bouncycastle.version>1.77</bouncycastle.version>
8788
<metrics.version>4.2.19</metrics.version>
8889
<jetty.version>9.4.51.v20230217</jetty.version>
8990
<jersey.version>2.40</jersey.version>
@@ -2766,8 +2767,13 @@
27662767

27672768
<dependency>
27682769
<groupId>org.bouncycastle</groupId>
2769-
<artifactId>bcpkix-jdk15on</artifactId>
2770-
<version>1.60</version>
2770+
<artifactId>bcprov-jdk18on</artifactId>
2771+
<version>${bouncycastle.version}</version>
2772+
</dependency>
2773+
<dependency>
2774+
<groupId>org.bouncycastle</groupId>
2775+
<artifactId>bcpkix-jdk18on</artifactId>
2776+
<version>${bouncycastle.version}</version>
27712777
</dependency>
27722778

27732779
<!--Eclipse Jetty dependecies-->

0 commit comments

Comments
 (0)