From 3cd31c39b0ea2a4db9c03534761519f94101f6c8 Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Fri, 12 Jul 2024 10:52:39 +0200
Subject: Update Janusgraph to 0.6.0 in graphadmin

- update Janusgraph (0.5.3 -> 0.6.0)
- update Tinkerpop (3.4.13 -> 3.5.1)
- bump version to 1.14.5-SNAPSHOT

Issue-ID: AAI-3929
Change-Id: I75bccadca63eb7cd67bd8f9ebbb8d79978138bcc
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---
 pom.xml | 46 ++++++----------------------------------------
 1 file changed, 6 insertions(+), 40 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index f20edbd..17645cb 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.14.4</version>
+        <version>1.14.5</version>
     </parent>
     <groupId>org.onap.aai.graphadmin</groupId>
     <artifactId>aai-graphadmin</artifactId>
@@ -55,15 +55,10 @@
         <docker.push.registry>localhost:5000</docker.push.registry>
         <aai.docker.version>1.0.0</aai.docker.version>
         <aai.schema.service.version>1.12.5</aai.schema.service.version>
-        <aai.common.version>1.14.4</aai.common.version>
+        <aai.common.version>1.14.5</aai.common.version>
         <aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/
         </aai.build.directory>
         <aai.docker.namespace>onap</aai.docker.namespace>
-        <!-- base image for aai-common -->
-        <aai.base.image>alpine</aai.base.image>
-        <!-- aai-common image version -->
-        <aai.base.image.version>1.13.4</aai.base.image.version>
-        <!-- End of Docker Related Properties -->
 
         <license.goal.type>check</license.goal.type>
 
@@ -102,8 +97,6 @@
         <schema.uri.base.path>/aai</schema.uri.base.path>
         <!-- End of Default ONAP Schema Properties -->
 
-        <janusgraph.version>0.5.3</janusgraph.version>
-        <gremlin.version>3.4.13</gremlin.version>
         <micrometer.version>1.8.1</micrometer.version>
         <activemq.version>5.16.7</activemq.version>
         <antlr.version>4.9.3</antlr.version>
@@ -245,37 +238,6 @@
             <id>docker</id>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.groovy.maven</groupId>
-                        <artifactId>gmaven-plugin</artifactId>
-                        <version>1.0</version>
-                        <executions>
-                            <execution>
-                                <phase>pre-clean</phase>
-                            </execution>
-                            <execution>
-                                <id>parse-base</id>
-                                <phase>prepare-package</phase>
-                                <goals>
-                                    <goal>execute</goal>
-                                </goals>
-                                <configuration>
-                                    <source>
-                                        def userAaiBaseImage = session.userProperties['aai.base.image'];
-                                        def userAaiCommonVersion = session.userProperties['aai.base.image.version'];
-                                        if (userAaiCommonVersion != null) {
-                                            project.properties['aai.base.image.version'] = userAaiCommonVersion;
-                                        }
-                                        if (userAaiBaseImage != null) {
-                                            project.properties['aai.base.image'] = userAaiBaseImage;
-                                        }
-                                        log.info 'Base image flavour: ' + project.properties['aai.base.image'];
-                                        log.info 'Base image version: ' + project.properties['aai.base.image.version'];
-                                    </source>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
@@ -477,6 +439,10 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-validator</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
-- 
cgit 1.2.3-korg