diff --git a/client/pom.xml b/client/pom.xml index b8dffe65d4fb..d9513144592c 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -716,17 +716,17 @@ org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on ${cs.bcprov.version} org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on ${cs.bcprov.version} org.bouncycastle - bctls-jdk15on + bctls-jdk18on ${cs.bcprov.version} @@ -906,13 +906,13 @@ org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on false ${project.build.directory}/lib org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on false ${project.build.directory}/lib @@ -936,7 +936,7 @@ org.bouncycastle - bctls-jdk15on + bctls-jdk18on false ${project.build.directory}/lib @@ -971,9 +971,9 @@ org.apache.tomcat.embed:tomcat-embed-core org.apache.geronimo.specs:geronimo-servlet_3.0_spec org.apache.geronimo.specs:geronimo-javamail_1.4_spec - org.bouncycastle:bcprov-jdk15on - org.bouncycastle:bcpkix-jdk15on - org.bouncycastle:bctls-jdk15on + org.bouncycastle:bcprov-jdk18on + org.bouncycastle:bcpkix-jdk18on + org.bouncycastle:bctls-jdk18on com.mysql:mysql-connector-j org.apache.cloudstack:cloud-plugin-storage-volume-storpool org.apache.cloudstack:cloud-plugin-storage-volume-linstor diff --git a/plugins/integrations/kubernetes-service/pom.xml b/plugins/integrations/kubernetes-service/pom.xml index 6b5cec95aab9..f638dbde7f3b 100644 --- a/plugins/integrations/kubernetes-service/pom.xml +++ b/plugins/integrations/kubernetes-service/pom.xml @@ -124,16 +124,6 @@ ${cs.hamcrest.version} test - - org.bouncycastle - bcprov-jdk15on - ${cs.bcprov.version} - - - org.bouncycastle - bctls-jdk15on - ${cs.bcprov.version} - joda-time joda-time diff --git a/plugins/pom.xml b/plugins/pom.xml index e7d13871285e..00d63d010dbe 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -203,13 +203,13 @@ io.minio minio - 8.5.2 + ${cs.minio.version} compile io.minio minio-admin - 8.5.2 + ${cs.minio.version} compile diff --git a/plugins/storage/object/minio/pom.xml b/plugins/storage/object/minio/pom.xml index d69c2a7498fa..64d62cf8d347 100644 --- a/plugins/storage/object/minio/pom.xml +++ b/plugins/storage/object/minio/pom.xml @@ -46,12 +46,24 @@ io.minio minio - 8.5.2 + ${cs.minio.version} io.minio minio-admin - 8.5.2 + ${cs.minio.version} + + + + com.squareup.okhttp3 + okhttp + 5.1.0 + + + com.squareup.okhttp3 + logging-interceptor + 5.1.0 diff --git a/plugins/storage/object/simulator/pom.xml b/plugins/storage/object/simulator/pom.xml index dc4ab0146067..bd6c6ef99059 100644 --- a/plugins/storage/object/simulator/pom.xml +++ b/plugins/storage/object/simulator/pom.xml @@ -46,12 +46,12 @@ io.minio minio - 8.5.2 + ${cs.minio.version} io.minio minio-admin - 8.5.2 + ${cs.minio.version} diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml index c9e5a083725c..24a58653e10d 100644 --- a/plugins/user-authenticators/ldap/pom.xml +++ b/plugins/user-authenticators/ldap/pom.xml @@ -172,6 +172,18 @@ org.apache.directory.shared shared-ldap-schema + + org.bouncycastle + bcprov-jdk15on + + + org.bouncycastle + bcpkix-jdk15on + + + org.bouncycastle + bcutil-jdk15on + @@ -191,12 +203,40 @@ apacheds-core ${ads.version} test + + + org.bouncycastle + bcprov-jdk15on + + + org.bouncycastle + bcpkix-jdk15on + + + org.bouncycastle + bcutil-jdk15on + + org.apache.directory.server apacheds-protocol-ldap ${ads.version} test + + + org.bouncycastle + bcprov-jdk15on + + + org.bouncycastle + bcpkix-jdk15on + + + org.bouncycastle + bcutil-jdk15on + + org.apache.directory.server diff --git a/pom.xml b/pom.xml index 17935c526922..296c8e11be20 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ 1.2.8 1.6.4 1.14 - 1.70 + 1.83 3.3.0 8.18 9.2.0 @@ -191,6 +191,7 @@ 0.5.4 3.1.7 3.25.5 + 8.6.0 @@ -583,17 +584,17 @@ org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on ${cs.bcprov.version} org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on ${cs.bcprov.version} org.bouncycastle - bctls-jdk15on + bctls-jdk18on ${cs.bcprov.version} @@ -668,6 +669,18 @@ org.slf4j log4j-over-slf4j + + org.bouncycastle + bcprov-jdk15on + + + org.bouncycastle + bcpkix-jdk15on + + + org.bouncycastle + bcutil-jdk15on + diff --git a/services/console-proxy/rdpconsole/pom.xml b/services/console-proxy/rdpconsole/pom.xml index 058ea891f9cd..9e722be37a09 100644 --- a/services/console-proxy/rdpconsole/pom.xml +++ b/services/console-proxy/rdpconsole/pom.xml @@ -46,11 +46,11 @@ org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on org.bouncycastle - bctls-jdk15on + bctls-jdk18on com.sun.xml.security diff --git a/utils/pom.xml b/utils/pom.xml index 4b6e547e4519..775f5529d917 100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -68,15 +68,15 @@ org.bouncycastle - bcprov-jdk15on + bcprov-jdk18on org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on org.bouncycastle - bctls-jdk15on + bctls-jdk18on com.jcraft