This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 86bbdfc33e HDDS-10194. Upgrade Bouncy Castle to 1.77 (#6077)
86bbdfc33e is described below
commit 86bbdfc33e762f3018188ca740690d8bfa6851e5
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Jan 30 07:51:18 2024 +0100
HDDS-10194. Upgrade Bouncy Castle to 1.77 (#6077)
---
hadoop-hdds/common/pom.xml | 4 ++--
hadoop-hdds/framework/pom.xml | 2 +-
.../x509/certificate/utils/TestCertificateSignRequest.java | 2 +-
hadoop-hdds/server-scm/pom.xml | 2 +-
hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 5 +++--
hadoop-ozone/dist/src/main/license/bin/NOTICE.txt | 4 ++--
hadoop-ozone/dist/src/main/license/jar-report.txt | 5 +++--
hadoop-ozone/ozone-manager/pom.xml | 2 +-
pom.xml | 8 ++++----
9 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml
index 36ff3952f7..20dce15d4d 100644
--- a/hadoop-hdds/common/pom.xml
+++ b/hadoop-hdds/common/pom.xml
@@ -105,7 +105,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -141,7 +141,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml
index 8f7f32b58d..5ead355066 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -112,7 +112,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/utils/TestCertificateSignRequest.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/utils/TestCertificateSignRequest.java
index 82974f2aa2..81cbb89f8c 100644
---
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/utils/TestCertificateSignRequest.java
+++
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/utils/TestCertificateSignRequest.java
@@ -290,7 +290,7 @@ public class TestCertificateSignRequest {
assertEquals("2.16.840.1.113730.3.1.34", oid);
}
if (o instanceof DERTaggedObject) {
- String serviceName = ((DERTaggedObject)o).getObject().toString();
+ String serviceName =
((DERTaggedObject)o).toASN1Primitive().toString();
assertEquals("OzoneMarketingCluster003", serviceName);
}
}
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index 39de9bbf19..bb2bdec140 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -67,7 +67,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
index 36f1d6c4c7..e75cc7a912 100644
--- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
@@ -449,8 +449,9 @@ MIT
com.bettercloud:vault-java-driver
com.kstruct:gethostname4j
- org.bouncycastle:bcpkix-jdk15on
- org.bouncycastle:bcprov-jdk15on
+ org.bouncycastle:bcpkix-jdk18on
+ org.bouncycastle:bcprov-jdk18on
+ org.bouncycastle:bcutil-jdk18on
org.checkerframework:checker-qual
org.codehaus.mojo:animal-sniffer-annotations
org.kohsuke.metainf-services:metainf-services
diff --git a/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt
b/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt
index dafb8905d0..44492fd26f 100644
--- a/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt
@@ -482,10 +482,10 @@ For additional credits (generally to people who reported
problems)
see CREDITS file.
-org.bouncycastle:bcprov-jdk15on
+org.bouncycastle:bcpkix-jdk18on
====================
-Copyright (c) 2000 - 2019 The Legion of the Bouncy Castle Inc.
(https://www.bouncycastle.org)
+Copyright (c) 2000 - 2023 The Legion of the Bouncy Castle Inc.
(https://www.bouncycastle.org)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt
b/hadoop-ozone/dist/src/main/license/jar-report.txt
index 2b582ddaf6..51e3086236 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -9,8 +9,9 @@ share/ozone/lib/aspectjweaver.jar
share/ozone/lib/aws-java-sdk-core.jar
share/ozone/lib/aws-java-sdk-kms.jar
share/ozone/lib/aws-java-sdk-s3.jar
-share/ozone/lib/bcpkix-jdk15on.jar
-share/ozone/lib/bcprov-jdk15on.jar
+share/ozone/lib/bcpkix-jdk18on.jar
+share/ozone/lib/bcprov-jdk18on.jar
+share/ozone/lib/bcutil-jdk18on.jar
share/ozone/lib/bonecp.RELEASE.jar
share/ozone/lib/cdi-api.jar
share/ozone/lib/checker-qual.jar
diff --git a/hadoop-ozone/ozone-manager/pom.xml
b/hadoop-ozone/ozone-manager/pom.xml
index 817d0ab5f7..d076e12932 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -87,7 +87,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
diff --git a/pom.xml b/pom.xml
index 93cc5bb965..112a206099 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<assertj.version>3.12.2</assertj.version>
<asm.version>5.0.4</asm.version>
<bonecp.version>0.8.0.RELEASE</bonecp.version>
- <bouncycastle.version>1.67</bouncycastle.version>
+ <bouncycastle.version>1.77</bouncycastle.version>
<cglib.version>3.3.0</cglib.version>
<derby.version>10.14.2.0</derby.version>
<codahale-metrics.version>3.0.2</codahale-metrics.version>
@@ -1432,17 +1432,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<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>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
+ <artifactId>bcutil-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
