From 73c92d78f7be1ac98da0eb42bcc4d8f8293aebe9 Mon Sep 17 00:00:00 2001
From: Zoran Regvart <zoran@regvart.com>
Date: Tue, 25 Oct 2022 11:18:14 +0200
Subject: [PATCH] fix: adjust bouncy castle dependencies

Makes sure that the managed version of `wss4j-ws-security-common` is the
where the exclusions are handled, and excludes the Bouncy Castle version
1.69 dependency from `kubernetes-client`.
---
 app/connector/soap/pom.xml | 10 ----------
 app/pom.xml                | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/connector/soap/pom.xml b/app/connector/soap/pom.xml
index 6efe10fb58b..8ab5cbf783e 100644
--- a/app/connector/soap/pom.xml
+++ b/app/connector/soap/pom.xml
@@ -117,16 +117,6 @@
     <dependency>
       <groupId>org.apache.wss4j</groupId>
       <artifactId>wss4j-ws-security-common</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.bouncycastle</groupId>
-          <artifactId>bcpkix-jdk15on</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.bouncycastle</groupId>
-          <artifactId>bcprov-jdk15on</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
diff --git a/app/pom.xml b/app/pom.xml
index 09ba2f7b9bb..7b4032c5deb 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -1916,11 +1916,11 @@
           </exclusion>
           <exclusion>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk18on</artifactId>
+            <artifactId>bcpkix-jdk15on</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk18on</artifactId>
+            <artifactId>bcprov-jdk15on</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
@@ -3913,6 +3913,16 @@
         <groupId>io.fabric8</groupId>
         <artifactId>kubernetes-client</artifactId>
         <version>${kubernetes.client.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>io.fabric8</groupId>