This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new dec1e74c24fc [SPARK-46411][BUILD] Change to use
`bcprov/bcpkix-jdk18on` for UT
dec1e74c24fc is described below
commit dec1e74c24fc07b171c0878815c9e97820889f40
Author: yangjie01 <yangji...@baidu.com>
AuthorDate: Mon Dec 18 12:19:20 2023 -0800
[SPARK-46411][BUILD] Change to use `bcprov/bcpkix-jdk18on` for UT
This PR migrates the test dependency `bcprov/bcpkix` from `jdk15on` to
`jdk18on`, and upgrades the version from 1.70 to 1.77, the `jdk18on` jars are
compiled to work with anything from Java 1.8 up.
The full release notes as follows:
- https://www.bouncycastle.org/releasenotes.html#r1rv77
No, just for test.
Pass GitHub Actions.
No
Closes #44359 from LuciferYang/bouncycastle-177.
Lead-authored-by: yangjie01 <yangji...@baidu.com>
Co-authored-by: YangJie <yangji...@baidu.com>
Signed-off-by: Dongjoon Hyun <dh...@apple.com>
---
common/network-common/pom.xml | 13 +++++++++++++
pom.xml | 6 +++---
resource-managers/yarn/pom.xml | 4 ++--
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml
index 27a53b0f9f3b..3916cf16f1de 100644
--- a/common/network-common/pom.xml
+++ b/common/network-common/pom.xml
@@ -147,6 +147,19 @@
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
+<<<<<<< HEAD
+=======
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk18on</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk18on</artifactId>
+ <scope>test</scope>
+ </dependency>
+>>>>>>> 9a75a1d69aa ([SPARK-46411][BUILD] Change to use
`bcprov/bcpkix-jdk18on` for UT)
<dependency>
<groupId>org.apache.spark</groupId>
diff --git a/pom.xml b/pom.xml
index 269a42d41f17..b579ed31612e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,7 +218,7 @@
<maven-antrun.version>3.1.0</maven-antrun.version>
<commons-crypto.version>1.1.0</commons-crypto.version>
<commons-cli.version>1.5.0</commons-cli.version>
- <bouncycastle.version>1.70</bouncycastle.version>
+ <bouncycastle.version>1.77</bouncycastle.version>
<tink.version>1.9.0</tink.version>
<netty.version>4.1.96.Final</netty.version>
<!--
@@ -1434,13 +1434,13 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
<scope>test</scope>
</dependency>
diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml
index b432973d4386..05cea6034666 100644
--- a/resource-managers/yarn/pom.xml
+++ b/resource-managers/yarn/pom.xml
@@ -54,12 +54,12 @@
<!-- Used by MiniYARNCluster -->
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
