This is an automated email from the ASF dual-hosted git repository.
winterhazel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new a0aafe2fa73 Update bouncy castle (#12794)
a0aafe2fa73 is described below
commit a0aafe2fa73132f08d7ae67b302d2e1fa6d02068
Author: Vishesh <[email protected]>
AuthorDate: Fri May 22 19:37:44 2026 +0530
Update bouncy castle (#12794)
Co-authored-by: Harikrishna Patnala <[email protected]>
---
client/pom.xml | 18 +++++------
plugins/integrations/kubernetes-service/pom.xml | 10 -------
plugins/pom.xml | 4 +--
plugins/storage/object/minio/pom.xml | 16 ++++++++--
plugins/storage/object/simulator/pom.xml | 4 +--
plugins/user-authenticators/ldap/pom.xml | 40 +++++++++++++++++++++++++
pom.xml | 21 ++++++++++---
services/console-proxy/rdpconsole/pom.xml | 4 +--
utils/pom.xml | 6 ++--
9 files changed, 89 insertions(+), 34 deletions(-)
diff --git a/client/pom.xml b/client/pom.xml
index 55123de0f98..ba16cc5d34a 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -716,17 +716,17 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<version>${cs.bcprov.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<version>${cs.bcprov.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bctls-jdk15on</artifactId>
+ <artifactId>bctls-jdk18on</artifactId>
<version>${cs.bcprov.version}</version>
</dependency>
</dependencies>
@@ -906,13 +906,13 @@
</artifactItem>
<artifactItem>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</artifactItem>
@@ -936,7 +936,7 @@
</artifactItem>
<artifactItem>
<groupId>org.bouncycastle</groupId>
- <artifactId>bctls-jdk15on</artifactId>
+ <artifactId>bctls-jdk18on</artifactId>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</artifactItem>
@@ -971,9 +971,9 @@
<exclude>org.apache.tomcat.embed:tomcat-embed-core</exclude>
<exclude>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</exclude>
<exclude>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</exclude>
-
<exclude>org.bouncycastle:bcprov-jdk15on</exclude>
-
<exclude>org.bouncycastle:bcpkix-jdk15on</exclude>
-
<exclude>org.bouncycastle:bctls-jdk15on</exclude>
+
<exclude>org.bouncycastle:bcprov-jdk18on</exclude>
+
<exclude>org.bouncycastle:bcpkix-jdk18on</exclude>
+
<exclude>org.bouncycastle:bctls-jdk18on</exclude>
<exclude>com.mysql:mysql-connector-j</exclude>
<exclude>org.apache.cloudstack:cloud-plugin-storage-volume-storpool</exclude>
<exclude>org.apache.cloudstack:cloud-plugin-storage-volume-linstor</exclude>
diff --git a/plugins/integrations/kubernetes-service/pom.xml
b/plugins/integrations/kubernetes-service/pom.xml
index 6b5cec95aab..f638dbde7f3 100644
--- a/plugins/integrations/kubernetes-service/pom.xml
+++ b/plugins/integrations/kubernetes-service/pom.xml
@@ -124,16 +124,6 @@
<version>${cs.hamcrest.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>${cs.bcprov.version}</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bctls-jdk15on</artifactId>
- <version>${cs.bcprov.version}</version>
- </dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 3262404032f..44220481a6f 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -202,13 +202,13 @@
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
- <version>8.5.2</version>
+ <version>${cs.minio.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio-admin</artifactId>
- <version>8.5.2</version>
+ <version>${cs.minio.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/plugins/storage/object/minio/pom.xml
b/plugins/storage/object/minio/pom.xml
index d69c2a7498f..64d62cf8d34 100644
--- a/plugins/storage/object/minio/pom.xml
+++ b/plugins/storage/object/minio/pom.xml
@@ -46,12 +46,24 @@
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
- <version>8.5.2</version>
+ <version>${cs.minio.version}</version>
</dependency>
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio-admin</artifactId>
- <version>8.5.2</version>
+ <version>${cs.minio.version}</version>
+ </dependency>
+ <!-- Pin okhttp3 to the version required by minio 8.6.0+, overriding
the older
+ version transitively pulled by influxdb-java -->
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>5.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>logging-interceptor</artifactId>
+ <version>5.1.0</version>
</dependency>
</dependencies>
</project>
diff --git a/plugins/storage/object/simulator/pom.xml
b/plugins/storage/object/simulator/pom.xml
index dc4ab014606..bd6c6ef9905 100644
--- a/plugins/storage/object/simulator/pom.xml
+++ b/plugins/storage/object/simulator/pom.xml
@@ -46,12 +46,12 @@
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
- <version>8.5.2</version>
+ <version>${cs.minio.version}</version>
</dependency>
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio-admin</artifactId>
- <version>8.5.2</version>
+ <version>${cs.minio.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/plugins/user-authenticators/ldap/pom.xml
b/plugins/user-authenticators/ldap/pom.xml
index c9e5a083725..24a58653e10 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -172,6 +172,18 @@
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-schema</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcutil-jdk15on</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -191,12 +203,40 @@
<artifactId>apacheds-core</artifactId>
<version>${ads.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcutil-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ldap</artifactId>
<version>${ads.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcutil-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
diff --git a/pom.xml b/pom.xml
index d25e8a8369e..a29a656ce51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
<cs.axiom.version>1.2.8</cs.axiom.version>
<cs.axis2.version>1.6.4</cs.axis2.version>
<cs.batik.version>1.14</cs.batik.version>
- <cs.bcprov.version>1.70</cs.bcprov.version>
+ <cs.bcprov.version>1.83</cs.bcprov.version>
<cs.cglib.version>3.3.0</cs.cglib.version>
<cs.checkstyle-lib.version>8.18</cs.checkstyle-lib.version>
<cs.cron-utils.version>9.2.0</cs.cron-utils.version>
@@ -191,6 +191,7 @@
<cs.ini.version>0.5.4</cs.ini.version>
<cs.caffeine.version>3.1.7</cs.caffeine.version>
<cs.protobuf.version>3.25.5</cs.protobuf.version>
+ <cs.minio.version>8.6.0</cs.minio.version>
</properties>
<distributionManagement>
@@ -583,17 +584,17 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<version>${cs.bcprov.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<version>${cs.bcprov.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bctls-jdk15on</artifactId>
+ <artifactId>bctls-jdk18on</artifactId>
<version>${cs.bcprov.version}</version>
</dependency>
<dependency>
@@ -668,6 +669,18 @@
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcutil-jdk15on</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/services/console-proxy/rdpconsole/pom.xml
b/services/console-proxy/rdpconsole/pom.xml
index 058ea891f9c..9e722be37a0 100644
--- a/services/console-proxy/rdpconsole/pom.xml
+++ b/services/console-proxy/rdpconsole/pom.xml
@@ -46,11 +46,11 @@
<!-- Another implementation of SSL protocol. Does not work with broken
MS RDP SSL too. -->
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bctls-jdk15on</artifactId>
+ <artifactId>bctls-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.security</groupId>
diff --git a/utils/pom.xml b/utils/pom.xml
index 4b6e547e451..775f5529d91 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -68,15 +68,15 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bctls-jdk15on</artifactId>
+ <artifactId>bctls-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
