This is an automated email from the ASF dual-hosted git repository.
prozsa pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
The following commit(s) were added to refs/heads/master by this push:
new 7ad940065 IMPALA-13044: Upgrade bouncycastle to 1.78
7ad940065 is described below
commit 7ad94006563b88d9221b4ac978dbf5b4fc0a3ca1
Author: Peter Rozsa <[email protected]>
AuthorDate: Mon Apr 29 18:56:20 2024 +0200
IMPALA-13044: Upgrade bouncycastle to 1.78
This patch upgrades bouncycastle to 1.78. As of bouncycastle:1.71, the
*-jdk15on artifact is no longer available, the artifact is changed to
*-jdk18on.
Tests:
- core tests ran
Change-Id: I8372916ab79b863e7a07d22e8333abd54492fa29
Reviewed-on: http://gerrit.cloudera.org:8080/21371
Reviewed-by: Impala Public Jenkins <[email protected]>
Tested-by: Impala Public Jenkins <[email protected]>
---
bin/impala-config.sh | 2 +-
fe/pom.xml | 26 ++++++++++++++++++++++----
java/pom.xml | 4 ++--
java/shaded-deps/hive-exec/pom.xml | 4 ++++
java/test-hive-udfs/pom.xml | 4 ++++
5 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index bdcacb8a5..af391a3d7 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -278,7 +278,7 @@ export APACHE_OZONE_VERSION=1.3.0
# Java dependencies that are not also runtime components. Declaring versions
here allows
# other branches to override them in impala-config-branch.sh for cleaner
patches.
-export IMPALA_BOUNCY_CASTLE_VERSION=1.68
+export IMPALA_BOUNCY_CASTLE_VERSION=1.78
export IMPALA_COS_VERSION=3.1.0-8.0.8
export IMPALA_DERBY_VERSION=10.14.2.0
export IMPALA_GUAVA_VERSION=32.0.1-jre
diff --git a/fe/pom.xml b/fe/pom.xml
index 1e1f7d121..9dd29855a 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -413,6 +413,12 @@ under the License.
<artifactId>apacheds-test-framework</artifactId>
<version>2.0.0.AM25</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -492,6 +498,10 @@ under the License.
<groupId>com.cloudera</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -599,19 +609,23 @@ under the License.
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
</exclusion>
+ <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.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.72</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>1.72</version>
- <scope>test</scope>
</dependency>
</dependencies>
@@ -886,6 +900,10 @@ under the License.
<exclude>org.apache.avro:*</exclude>
<exclude>org.apache.orc:*</exclude>
<exclude>org.jdom:jdom</exclude>
+ <exclude>org.bouncycastle:bcprov-jdk15on:*</exclude>
+ <exclude>org.bouncycastle:bcprov-jdk15to18:*</exclude>
+ <exclude>org.bouncycastle:bcprov-jdk15on:*</exclude>
+ <exclude>org.bouncycastle:bcpkix-jdk15to18:*</exclude>
</excludes>
<includes>
<!-- ranger-plugins-audit depends on jetty-client, which
in turn pulls in jetty-http and jetty-io. -->
diff --git a/java/pom.xml b/java/pom.xml
index bc5f193dc..1fa5198b9 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -313,12 +313,12 @@ under the License.
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<version>${bouncy-castle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<version>${bouncy-castle.version}</version>
</dependency>
diff --git a/java/shaded-deps/hive-exec/pom.xml
b/java/shaded-deps/hive-exec/pom.xml
index e22e7c33b..f0bce94ac 100644
--- a/java/shaded-deps/hive-exec/pom.xml
+++ b/java/shaded-deps/hive-exec/pom.xml
@@ -52,6 +52,10 @@ the same dependencies
<groupId>com.cloudera</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/java/test-hive-udfs/pom.xml b/java/test-hive-udfs/pom.xml
index df8b7bf55..2b3af5103 100644
--- a/java/test-hive-udfs/pom.xml
+++ b/java/test-hive-udfs/pom.xml
@@ -59,6 +59,10 @@ under the License.
<groupId>com.cloudera</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
