[zookeeper] branch master updated: ZOOKEEPER-4719. Upgrade Bouncycastle from jdk15on to jdk18on (#2033)

[tison]

This is an automated email from the ASF dual-hosted git repository.

tison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 4882f7b63 ZOOKEEPER-4719. Upgrade Bouncycastle from jdk15on to jdk18on 
(#2033)
4882f7b63 is described below

commit 4882f7b63490971e44a669e98428615ef7bf472f
Author: ZhangJian He <shoot...@gmail.com>
AuthorDate: Mon Jul 17 18:21:45 2023 +0800

    ZOOKEEPER-4719. Upgrade Bouncycastle from jdk15on to jdk18on (#2033)
---
 pom.xml                                                             | 6 +++---
 zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md        | 2 +-
 zookeeper-server/pom.xml                                            | 4 ++--
 .../src/test/java/org/apache/zookeeper/common/X509TestHelpers.java  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index a538c1bb9..1622c638e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -564,7 +564,7 @@
     <jline.version>2.14.6</jline.version>
     <snappy.version>1.1.10.1</snappy.version>
     <kerby.version>2.0.0</kerby.version>
-    <bouncycastle.version>1.60</bouncycastle.version>
+    <bouncycastle.version>1.75</bouncycastle.version>
     <commons-collections.version>4.4</commons-collections.version>
     <dropwizard.version>4.1.12.1</dropwizard.version>
     <spotbugsannotations.version>4.0.2</spotbugsannotations.version>
@@ -642,12 +642,12 @@
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-jdk15on</artifactId>
+        <artifactId>bcprov-jdk18on</artifactId>
         <version>${bouncycastle.version}</version>
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcpkix-jdk15on</artifactId>
+        <artifactId>bcpkix-jdk18on</artifactId>
         <version>${bouncycastle.version}</version>
       </dependency>
       <dependency>
diff --git a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md 
b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
index e6e7eb1c8..7a99cd346 100644
--- a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
+++ b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
@@ -1565,7 +1565,7 @@ and [SASL authentication for 
ZooKeeper](https://cwiki.apache.org/confluence/disp
 
              ```
              For example:
-             copy bcprov-jdk15on-1.60.jar to $JAVA_HOME/jre/lib/ext/
+             copy bcprov-jdk18on-1.60.jar to $JAVA_HOME/jre/lib/ext/
              ```
 
     - How to migrate from one digest algorithm to another?
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index 3d6da7678..2fc653817 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -109,12 +109,12 @@
     </dependency>
     <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>
     <dependency>
diff --git 
a/zookeeper-server/src/test/java/org/apache/zookeeper/common/X509TestHelpers.java
 
b/zookeeper-server/src/test/java/org/apache/zookeeper/common/X509TestHelpers.java
index fb1371a3d..b9f2f6db9 100644
--- 
a/zookeeper-server/src/test/java/org/apache/zookeeper/common/X509TestHelpers.java
+++ 
b/zookeeper-server/src/test/java/org/apache/zookeeper/common/X509TestHelpers.java
@@ -270,7 +270,7 @@ public class X509TestHelpers {
         JcaPEMWriter pemWriter = new JcaPEMWriter(stringWriter);
         OutputEncryptor encryptor = null;
         if (password != null && password.length() > 0) {
-            encryptor = new 
JceOpenSSLPKCS8EncryptorBuilder(PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC).setProvider(BouncyCastleProvider.PROVIDER_NAME).setRandom(PRNG).setPasssword(password.toCharArray()).build();
+            encryptor = new 
JceOpenSSLPKCS8EncryptorBuilder(PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC).setProvider(BouncyCastleProvider.PROVIDER_NAME).setRandom(PRNG).setPassword(password.toCharArray()).build();
         }
         pemWriter.writeObject(new JcaPKCS8Generator(key, encryptor));
         pemWriter.close();