From 360ad7fd3dadf81426c71c3c86a071e99cb62171 Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Thu, 2 Jan 2025 15:35:47 +0100
Subject: Use aai-common 1.15.4 in graphadmin

- use aai-common 1.15.4 that contains dependency updates

Issue-ID: AAI-4096
Change-Id: Ibfa644de29d6ead1cd4b9139aab098e4d4b2a1c1
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---
 pom.xml | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0b5013a..6439a55 100755
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.15.3</version>
+        <version>1.15.4</version>
     </parent>
     <groupId>org.onap.aai.graphadmin</groupId>
     <artifactId>aai-graphadmin</artifactId>
@@ -55,7 +55,7 @@
         <docker.push.registry>localhost:5000</docker.push.registry>
         <aai.docker.version>1.0.0</aai.docker.version>
         <aai.schema.service.version>1.12.7</aai.schema.service.version>
-        <aai.common.version>1.15.3</aai.common.version>
+        <aai.common.version>1.15.4</aai.common.version>
         <aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/
         </aai.build.directory>
         <aai.docker.namespace>onap</aai.docker.namespace>
@@ -100,8 +100,8 @@
         <!-- <micrometer.version>1.8.1</micrometer.version> -->
         <antlr.version>4.9.3</antlr.version>
         <jcommander.version>1.78</jcommander.version>
-        <gremlin.version>3.7.1</gremlin.version>
-        <janusgraph.version>1.0.0</janusgraph.version>
+        <!-- <gremlin.version>3.7.1</gremlin.version>
+        <janusgraph.version>1.0.0</janusgraph.version> -->
 
         <!-- fix the driver version to match the one defined in janusgraph-cql
             spring-boot (2.6) is otherwise downgrading it to 4.13.0 -->
@@ -510,24 +510,6 @@
             <artifactId>httpclient</artifactId>
         </dependency>
         <!-- Start of Spring Framework Dependencies -->
-        <!--
-            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-web</artifactId>
-- 
cgit 1.2.3-korg