From 498b357833a128211aac0bf6c4325f0b100b72b6 Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Fri, 6 Dec 2024 13:58:51 +0100
Subject: [PATCH] Remove dependency management for spring-security-rsa
 dependency

- remove spring-security-rsa from aai-parent
- bump snapshot version to 1.15.4-SNAPSHOT

Issue-ID: AAI-4081
Change-Id: I8ae022bc7307efeac7cfd90415e2d412f83cfd9b
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---
 aai-annotations/pom.xml                     |  2 +-
 aai-auth/pom.xml                            |  2 +-
 aai-common-docker/aai-common-images/pom.xml |  4 ++--
 aai-common-docker/aai-haproxy-image/pom.xml |  4 ++--
 aai-common-docker/pom.xml                   |  2 +-
 aai-core/pom.xml                            |  2 +-
 aai-els-onap-logging/pom.xml                |  2 +-
 aai-failover/pom.xml                        |  2 +-
 aai-parent/pom.xml                          |  9 +--------
 aai-rest/pom.xml                            | 21 +--------------------
 aai-schema-abstraction/pom.xml              |  2 +-
 aai-schema-ingest/pom.xml                   |  2 +-
 aai-utils/pom.xml                           |  2 +-
 pom.xml                                     |  2 +-
 version.properties                          |  2 +-
 15 files changed, 17 insertions(+), 43 deletions(-)

diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index 20549156..3adefbea 100644
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.4-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-annotations</artifactId>
diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml
index deae9a0a..7d6d13ff 100644
--- a/aai-auth/pom.xml
+++ b/aai-auth/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.4-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-auth</artifactId>
diff --git a/aai-common-docker/aai-common-images/pom.xml b/aai-common-docker/aai-common-images/pom.xml
index ebfc7938..e45ee662 100644
--- a/aai-common-docker/aai-common-images/pom.xml
+++ b/aai-common-docker/aai-common-images/pom.xml
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common-docker</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>aai-common-images</artifactId>
-    <version>1.15.3-SNAPSHOT</version>
+    <version>1.15.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>aai-aai-common-images</name>
     <description>Contains dockerfiles for aai-common images (alpine and ubuntu based).</description>
diff --git a/aai-common-docker/aai-haproxy-image/pom.xml b/aai-common-docker/aai-haproxy-image/pom.xml
index b0ad4d06..a15e01ff 100644
--- a/aai-common-docker/aai-haproxy-image/pom.xml
+++ b/aai-common-docker/aai-haproxy-image/pom.xml
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common-docker</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>aai-haproxy-image</artifactId>
-    <version>1.15.3-SNAPSHOT</version>
+    <version>1.15.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>aai-aai-haproxy-image</name>
     <description>Contains dockerfiles for aai-haproxy image.</description>
diff --git a/aai-common-docker/pom.xml b/aai-common-docker/pom.xml
index f34eab43..cbe1c584 100644
--- a/aai-common-docker/pom.xml
+++ b/aai-common-docker/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.4-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 29b8cf90..ae6c6088 100644
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
 	<parent>
 		<groupId>org.onap.aai.aai-common</groupId>
 		<artifactId>aai-parent</artifactId>
-		<version>1.15.3-SNAPSHOT</version>
+		<version>1.15.4-SNAPSHOT</version>
 		<relativePath>../aai-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>aai-core</artifactId>
diff --git a/aai-els-onap-logging/pom.xml b/aai-els-onap-logging/pom.xml
index 4447c011..50319a05 100644
--- a/aai-els-onap-logging/pom.xml
+++ b/aai-els-onap-logging/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.4-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-els-onap-logging</artifactId>
diff --git a/aai-failover/pom.xml b/aai-failover/pom.xml
index c9be3141..a3c55dfc 100644
--- a/aai-failover/pom.xml
+++ b/aai-failover/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.4-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml
index e45c009f..c55f7b14 100644
--- a/aai-parent/pom.xml
+++ b/aai-parent/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <parent>
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-common</artifactId>
-    <version>1.15.3-SNAPSHOT</version>
+    <version>1.15.4-SNAPSHOT</version>
   </parent>
   <artifactId>aai-parent</artifactId>
   <name>aai-parent</name>
@@ -122,7 +122,6 @@ limitations under the License.
 
     <sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
 
-    <spring.security.rsa.version>1.0.8.RELEASE</spring.security.rsa.version>
     <json.simple.version>1.1.1</json.simple.version>
     <aspectj.version>1.9.1</aspectj.version>
     <logging.analytics.version>1.5.1</logging.analytics.version>
@@ -144,12 +143,6 @@ limitations under the License.
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <!-- TODO: check if this can be updated to something > 1.0.8 -->
-      <dependency>
-        <groupId>org.springframework.security</groupId>
-        <artifactId>spring-security-rsa</artifactId>
-        <version>${spring.security.rsa.version}</version>
-      </dependency>
 
       <dependency>
         <groupId>com.googlecode.json-simple</groupId>
diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml
index 1f94d3a3..542db413 100644
--- a/aai-rest/pom.xml
+++ b/aai-rest/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.4-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-rest</artifactId>
@@ -37,7 +37,6 @@
 
     <properties>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-        <spring.security.version>1.0.8.RELEASE</spring.security.version>
     </properties>
 
     <dependencies>
@@ -75,24 +74,6 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
-        <!--
-            Explicitly stating the security spring framework and
-            exclude the bouncy castle since that is somehow overwriting
-            our p12 file decryption that's built into java security
-            This will cause the password is incorrect
-            This needs to be added back if org.bouncy castle dependency
-            sneaks backs in and causing issues with the two way ssl
-        -->
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-rsa</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcpkix-jdk15on</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml
index 512fa0d9..6f497ed4 100644
--- a/aai-schema-abstraction/pom.xml
+++ b/aai-schema-abstraction/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-parent</artifactId>
-    <version>1.15.3-SNAPSHOT</version>
+    <version>1.15.4-SNAPSHOT</version>
     <relativePath>../aai-parent/pom.xml</relativePath>
   </parent>
 
diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml
index 3ee4f2eb..23404b20 100644
--- a/aai-schema-ingest/pom.xml
+++ b/aai-schema-ingest/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
 	<parent>
 		<groupId>org.onap.aai.aai-common</groupId>
 		<artifactId>aai-parent</artifactId>
-		<version>1.15.3-SNAPSHOT</version>
+		<version>1.15.4-SNAPSHOT</version>
 		<relativePath>../aai-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>aai-schema-ingest</artifactId>
diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml
index a38890d4..c39cda68 100644
--- a/aai-utils/pom.xml
+++ b/aai-utils/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.3-SNAPSHOT</version>
+        <version>1.15.4-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index b3c0535e..0786290d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-common</artifactId>
-    <version>1.15.3-SNAPSHOT</version>
+    <version>1.15.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>aai-aai-common</name>
     <description>Contains all of the common code for resources and traversal repos</description>
diff --git a/version.properties b/version.properties
index 08fc17cd..6129e4a7 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=15
-patch_version=3
+patch_version=4
 
 base_version=${major_version}.${minor_version}.${patch_version}
 
-- 
2.16.6