From 4c1b25091dd21229ada3f7c9e98293dd05be33a2 Mon Sep 17 00:00:00 2001
From: Marc Nuri <marc@marcnuri.com>
Date: Wed, 29 Mar 2023 09:06:14 +0200
Subject: [PATCH 1/2] deps: bump BouncyCastle to 1.72

Signed-off-by: Marc Nuri <marc@marcnuri.com>
---
 CHANGELOG.md | 1 +
 pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 479bfca4399..fe65c95c184 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * Fix #4998: removing the internal usage of the Serialization yaml mapper
 
 #### Dependency Upgrade
+* Fix #5006: Bump BouncyCastle to 1.72
 
 #### New Features
 
diff --git a/pom.xml b/pom.xml
index 470deb1d173..804c246a5c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
     <lombok.version>1.18.26</lombok.version>
     <snakeyaml.version>2.6</snakeyaml.version>
     <snakeyaml.bundle.version>1.33</snakeyaml.bundle.version>
-    <bouncycastle.version>1.70</bouncycastle.version>
+    <bouncycastle.version>1.72</bouncycastle.version>
     <commons-compress.version>1.23.0</commons-compress.version>
     <scr.annotations.version>1.12.0</scr.annotations.version>
     <jsonschema2pojo.version>1.1.0</jsonschema2pojo.version>

From 8750b0add175919cfdad5238a07976e5d94d0b96 Mon Sep 17 00:00:00 2001
From: Marc Nuri <marc@marcnuri.com>
Date: Wed, 29 Mar 2023 09:06:43 +0200
Subject: [PATCH 2/2] deps: use BouncyCastle JDK 1.8 compatible jars

Signed-off-by: Marc Nuri <marc@marcnuri.com>
---
 CHANGELOG.md                           | 1 +
 doc/FAQ.md                             | 2 +-
 junit/kubernetes-junit-jupiter/pom.xml | 4 ++--
 kubernetes-client-api/pom.xml          | 4 ++--
 kubernetes-client/pom.xml              | 4 ++--
 kubernetes-tests/pom.xml               | 6 +++---
 pom.xml                                | 4 ++--
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe65c95c184..cc457cfa637 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 
 #### Dependency Upgrade
 * Fix #5006: Bump BouncyCastle to 1.72
+* Fix #5006: Use BouncyCastle JDK 1.8 compatible jars
 
 #### New Features
 
diff --git a/doc/FAQ.md b/doc/FAQ.md
index ae9449f43ae..dd68c93b86e 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -23,7 +23,7 @@ If you wish to use another HttpClient implementation typically you will exclude
 ```xml
 <dependency>
     <groupId>org.bouncycastle</groupId>
-    <artifactId>bcpkix-jdk15on</artifactId>
+    <artifactId>bcpkix-jdk18on</artifactId>
     <version>${bouncycastle.version}</version>
 </dependency>
 ```
diff --git a/junit/kubernetes-junit-jupiter/pom.xml b/junit/kubernetes-junit-jupiter/pom.xml
index a386557e865..b8f41fe850c 100644
--- a/junit/kubernetes-junit-jupiter/pom.xml
+++ b/junit/kubernetes-junit-jupiter/pom.xml
@@ -42,12 +42,12 @@
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
+      <artifactId>bcprov-jdk18on</artifactId>
       <optional>false</optional>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <artifactId>bcpkix-jdk18on</artifactId>
       <optional>false</optional>
     </dependency>
     <dependency>
diff --git a/kubernetes-client-api/pom.xml b/kubernetes-client-api/pom.xml
index 30ec9c8fd09..e9fa12fb1b7 100644
--- a/kubernetes-client-api/pom.xml
+++ b/kubernetes-client-api/pom.xml
@@ -159,12 +159,12 @@
 
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
+      <artifactId>bcprov-jdk18on</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <artifactId>bcpkix-jdk18on</artifactId>
       <optional>true</optional>
     </dependency>
 
diff --git a/kubernetes-client/pom.xml b/kubernetes-client/pom.xml
index fbfbc5590cc..0d0181cf3d9 100644
--- a/kubernetes-client/pom.xml
+++ b/kubernetes-client/pom.xml
@@ -79,12 +79,12 @@
 
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
+      <artifactId>bcprov-jdk18on</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <artifactId>bcpkix-jdk18on</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/kubernetes-tests/pom.xml b/kubernetes-tests/pom.xml
index 3040488977e..d2c2947333c 100644
--- a/kubernetes-tests/pom.xml
+++ b/kubernetes-tests/pom.xml
@@ -49,7 +49,7 @@
       <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
-    
+
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
@@ -97,11 +97,11 @@
 
     <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>
   </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 804c246a5c5..09e5ea26f7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -732,13 +732,13 @@
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-jdk15on</artifactId>
+        <artifactId>bcprov-jdk18on</artifactId>
         <version>${bouncycastle.version}</version>
         <optional>true</optional>
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcpkix-jdk15on</artifactId>
+        <artifactId>bcpkix-jdk18on</artifactId>
         <version>${bouncycastle.version}</version>
         <optional>true</optional>
       </dependency>