Skip to content

Commit a0aafe2

Browse files
vishesh92harikrishna-patnala
vishesh92
and
harikrishna-patnala
authored
Update bouncy castle (#12794)
Co-authored-by: Harikrishna Patnala <harikrishna.patnala@gmail.com>
1 parent 67b849f commit a0aafe2

9 files changed

Lines changed: 89 additions & 34 deletions

File tree

‎client/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -716,17 +716,17 @@
716716
</dependency>
717717
<dependency>
718718
<groupId>org.bouncycastle</groupId>
719-
<artifactId>bcprov-jdk15on</artifactId>
719+
<artifactId>bcprov-jdk18on</artifactId>
720720
<version>${cs.bcprov.version}</version>
721721
</dependency>
722722
<dependency>
723723
<groupId>org.bouncycastle</groupId>
724-
<artifactId>bcpkix-jdk15on</artifactId>
724+
<artifactId>bcpkix-jdk18on</artifactId>
725725
<version>${cs.bcprov.version}</version>
726726
</dependency>
727727
<dependency>
728728
<groupId>org.bouncycastle</groupId>
729-
<artifactId>bctls-jdk15on</artifactId>
729+
<artifactId>bctls-jdk18on</artifactId>
730730
<version>${cs.bcprov.version}</version>
731731
</dependency>
732732
</dependencies>
@@ -906,13 +906,13 @@
906906
</artifactItem>
907907
<artifactItem>
908908
<groupId>org.bouncycastle</groupId>
909-
<artifactId>bcprov-jdk15on</artifactId>
909+
<artifactId>bcprov-jdk18on</artifactId>
910910
<overWrite>false</overWrite>
911911
<outputDirectory>${project.build.directory}/lib</outputDirectory>
912912
</artifactItem>
913913
<artifactItem>
914914
<groupId>org.bouncycastle</groupId>
915-
<artifactId>bcpkix-jdk15on</artifactId>
915+
<artifactId>bcpkix-jdk18on</artifactId>
916916
<overWrite>false</overWrite>
917917
<outputDirectory>${project.build.directory}/lib</outputDirectory>
918918
</artifactItem>
@@ -936,7 +936,7 @@
936936
</artifactItem>
937937
<artifactItem>
938938
<groupId>org.bouncycastle</groupId>
939-
<artifactId>bctls-jdk15on</artifactId>
939+
<artifactId>bctls-jdk18on</artifactId>
940940
<overWrite>false</overWrite>
941941
<outputDirectory>${project.build.directory}/lib</outputDirectory>
942942
</artifactItem>
@@ -971,9 +971,9 @@
971971
<exclude>org.apache.tomcat.embed:tomcat-embed-core</exclude>
972972
<exclude>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</exclude>
973973
<exclude>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</exclude>
974-
<exclude>org.bouncycastle:bcprov-jdk15on</exclude>
975-
<exclude>org.bouncycastle:bcpkix-jdk15on</exclude>
976-
<exclude>org.bouncycastle:bctls-jdk15on</exclude>
974+
<exclude>org.bouncycastle:bcprov-jdk18on</exclude>
975+
<exclude>org.bouncycastle:bcpkix-jdk18on</exclude>
976+
<exclude>org.bouncycastle:bctls-jdk18on</exclude>
977977
<exclude>com.mysql:mysql-connector-j</exclude>
978978
<exclude>org.apache.cloudstack:cloud-plugin-storage-volume-storpool</exclude>
979979
<exclude>org.apache.cloudstack:cloud-plugin-storage-volume-linstor</exclude>

‎plugins/integrations/kubernetes-service/pom.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,6 @@
124124
<version>${cs.hamcrest.version}</version>
125125
<scope>test</scope>
126126
</dependency>
127-
<dependency>
128-
<groupId>org.bouncycastle</groupId>
129-
<artifactId>bcprov-jdk15on</artifactId>
130-
<version>${cs.bcprov.version}</version>
131-
</dependency>
132-
<dependency>
133-
<groupId>org.bouncycastle</groupId>
134-
<artifactId>bctls-jdk15on</artifactId>
135-
<version>${cs.bcprov.version}</version>
136-
</dependency>
137127
<dependency>
138128
<groupId>joda-time</groupId>
139129
<artifactId>joda-time</artifactId>

‎plugins/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,13 @@
202202
<dependency>
203203
<groupId>io.minio</groupId>
204204
<artifactId>minio</artifactId>
205-
<version>8.5.2</version>
205+
<version>${cs.minio.version}</version>
206206
<scope>compile</scope>
207207
</dependency>
208208
<dependency>
209209
<groupId>io.minio</groupId>
210210
<artifactId>minio-admin</artifactId>
211-
<version>8.5.2</version>
211+
<version>${cs.minio.version}</version>
212212
<scope>compile</scope>
213213
</dependency>
214214
<dependency>

‎plugins/storage/object/minio/pom.xml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,24 @@
4646
<dependency>
4747
<groupId>io.minio</groupId>
4848
<artifactId>minio</artifactId>
49-
<version>8.5.2</version>
49+
<version>${cs.minio.version}</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>io.minio</groupId>
5353
<artifactId>minio-admin</artifactId>
54-
<version>8.5.2</version>
54+
<version>${cs.minio.version}</version>
55+
</dependency>
56+
<!-- Pin okhttp3 to the version required by minio 8.6.0+, overriding the older
57+
version transitively pulled by influxdb-java -->
58+
<dependency>
59+
<groupId>com.squareup.okhttp3</groupId>
60+
<artifactId>okhttp</artifactId>
61+
<version>5.1.0</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>com.squareup.okhttp3</groupId>
65+
<artifactId>logging-interceptor</artifactId>
66+
<version>5.1.0</version>
5567
</dependency>
5668
</dependencies>
5769
</project>

‎plugins/storage/object/simulator/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646
<dependency>
4747
<groupId>io.minio</groupId>
4848
<artifactId>minio</artifactId>
49-
<version>8.5.2</version>
49+
<version>${cs.minio.version}</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>io.minio</groupId>
5353
<artifactId>minio-admin</artifactId>
54-
<version>8.5.2</version>
54+
<version>${cs.minio.version}</version>
5555
</dependency>
5656
</dependencies>
5757
</project>

‎plugins/user-authenticators/ldap/pom.xml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,18 @@
172172
<groupId>org.apache.directory.shared</groupId>
173173
<artifactId>shared-ldap-schema</artifactId>
174174
</exclusion>
175+
<exclusion>
176+
<groupId>org.bouncycastle</groupId>
177+
<artifactId>bcprov-jdk15on</artifactId>
178+
</exclusion>
179+
<exclusion>
180+
<groupId>org.bouncycastle</groupId>
181+
<artifactId>bcpkix-jdk15on</artifactId>
182+
</exclusion>
183+
<exclusion>
184+
<groupId>org.bouncycastle</groupId>
185+
<artifactId>bcutil-jdk15on</artifactId>
186+
</exclusion>
175187
</exclusions>
176188
</dependency>
177189
<dependency>
@@ -191,12 +203,40 @@
191203
<artifactId>apacheds-core</artifactId>
192204
<version>${ads.version}</version>
193205
<scope>test</scope>
206+
<exclusions>
207+
<exclusion>
208+
<groupId>org.bouncycastle</groupId>
209+
<artifactId>bcprov-jdk15on</artifactId>
210+
</exclusion>
211+
<exclusion>
212+
<groupId>org.bouncycastle</groupId>
213+
<artifactId>bcpkix-jdk15on</artifactId>
214+
</exclusion>
215+
<exclusion>
216+
<groupId>org.bouncycastle</groupId>
217+
<artifactId>bcutil-jdk15on</artifactId>
218+
</exclusion>
219+
</exclusions>
194220
</dependency>
195221
<dependency>
196222
<groupId>org.apache.directory.server</groupId>
197223
<artifactId>apacheds-protocol-ldap</artifactId>
198224
<version>${ads.version}</version>
199225
<scope>test</scope>
226+
<exclusions>
227+
<exclusion>
228+
<groupId>org.bouncycastle</groupId>
229+
<artifactId>bcprov-jdk15on</artifactId>
230+
</exclusion>
231+
<exclusion>
232+
<groupId>org.bouncycastle</groupId>
233+
<artifactId>bcpkix-jdk15on</artifactId>
234+
</exclusion>
235+
<exclusion>
236+
<groupId>org.bouncycastle</groupId>
237+
<artifactId>bcutil-jdk15on</artifactId>
238+
</exclusion>
239+
</exclusions>
200240
</dependency>
201241
<dependency>
202242
<groupId>org.apache.directory.server</groupId>

‎pom.xml‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<cs.axiom.version>1.2.8</cs.axiom.version>
133133
<cs.axis2.version>1.6.4</cs.axis2.version>
134134
<cs.batik.version>1.14</cs.batik.version>
135-
<cs.bcprov.version>1.70</cs.bcprov.version>
135+
<cs.bcprov.version>1.83</cs.bcprov.version>
136136
<cs.cglib.version>3.3.0</cs.cglib.version>
137137
<cs.checkstyle-lib.version>8.18</cs.checkstyle-lib.version>
138138
<cs.cron-utils.version>9.2.0</cs.cron-utils.version>
@@ -191,6 +191,7 @@
191191
<cs.ini.version>0.5.4</cs.ini.version>
192192
<cs.caffeine.version>3.1.7</cs.caffeine.version>
193193
<cs.protobuf.version>3.25.5</cs.protobuf.version>
194+
<cs.minio.version>8.6.0</cs.minio.version>
194195
</properties>
195196

196197
<distributionManagement>
@@ -583,17 +584,17 @@
583584
</dependency>
584585
<dependency>
585586
<groupId>org.bouncycastle</groupId>
586-
<artifactId>bcpkix-jdk15on</artifactId>
587+
<artifactId>bcpkix-jdk18on</artifactId>
587588
<version>${cs.bcprov.version}</version>
588589
</dependency>
589590
<dependency>
590591
<groupId>org.bouncycastle</groupId>
591-
<artifactId>bcprov-jdk15on</artifactId>
592+
<artifactId>bcprov-jdk18on</artifactId>
592593
<version>${cs.bcprov.version}</version>
593594
</dependency>
594595
<dependency>
595596
<groupId>org.bouncycastle</groupId>
596-
<artifactId>bctls-jdk15on</artifactId>
597+
<artifactId>bctls-jdk18on</artifactId>
597598
<version>${cs.bcprov.version}</version>
598599
</dependency>
599600
<dependency>
@@ -668,6 +669,18 @@
668669
<groupId>org.slf4j</groupId>
669670
<artifactId>log4j-over-slf4j</artifactId>
670671
</exclusion>
672+
<exclusion>
673+
<groupId>org.bouncycastle</groupId>
674+
<artifactId>bcprov-jdk15on</artifactId>
675+
</exclusion>
676+
<exclusion>
677+
<groupId>org.bouncycastle</groupId>
678+
<artifactId>bcpkix-jdk15on</artifactId>
679+
</exclusion>
680+
<exclusion>
681+
<groupId>org.bouncycastle</groupId>
682+
<artifactId>bcutil-jdk15on</artifactId>
683+
</exclusion>
671684
</exclusions>
672685
</dependency>
673686
<dependency>

‎services/console-proxy/rdpconsole/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
<!-- Another implementation of SSL protocol. Does not work with broken MS RDP SSL too. -->
4747
<dependency>
4848
<groupId>org.bouncycastle</groupId>
49-
<artifactId>bcprov-jdk15on</artifactId>
49+
<artifactId>bcprov-jdk18on</artifactId>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.bouncycastle</groupId>
53-
<artifactId>bctls-jdk15on</artifactId>
53+
<artifactId>bctls-jdk18on</artifactId>
5454
</dependency>
5555
<dependency>
5656
<groupId>com.sun.xml.security</groupId>

‎utils/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@
6868
</dependency>
6969
<dependency>
7070
<groupId>org.bouncycastle</groupId>
71-
<artifactId>bcprov-jdk15on</artifactId>
71+
<artifactId>bcprov-jdk18on</artifactId>
7272
</dependency>
7373
<dependency>
7474
<groupId>org.bouncycastle</groupId>
75-
<artifactId>bcpkix-jdk15on</artifactId>
75+
<artifactId>bcpkix-jdk18on</artifactId>
7676
</dependency>
7777
<dependency>
7878
<groupId>org.bouncycastle</groupId>
79-
<artifactId>bctls-jdk15on</artifactId>
79+
<artifactId>bctls-jdk18on</artifactId>
8080
</dependency>
8181
<dependency>
8282
<groupId>com.jcraft</groupId>

0 commit comments

Comments
 (0)