Update janusgraph to 1.0.0

- update Janusgraph (0.6.4 -> 1.0.0)
- update Tinkerpop (3.5.8 -> 3.7.1)

Issue-ID: AAI-3743
Change-Id: I2a8bb2594702bc7fe5968ca8d26b79b1f013e8ad
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/pom.xml b/pom.xml
index ac3ae76..aad4581 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -26,11 +26,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.14.7</version>
+        <version>1.15.0</version>
     </parent>
     <groupId>org.onap.aai.graphadmin</groupId>
     <artifactId>aai-graphadmin</artifactId>
-    <version>1.14.7-SNAPSHOT</version>
+    <version>1.15.0-SNAPSHOT</version>
 
     <properties>
 
@@ -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.5</aai.schema.service.version>
-        <aai.common.version>1.14.7</aai.common.version>
+        <aai.common.version>1.15.0</aai.common.version>
         <aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/
         </aai.build.directory>
         <aai.docker.namespace>onap</aai.docker.namespace>
@@ -101,8 +101,8 @@
         <activemq.version>5.16.7</activemq.version>
         <antlr.version>4.9.3</antlr.version>
         <jcommander.version>1.78</jcommander.version>
-        <gremlin.version>3.5.8</gremlin.version>
-        <janusgraph.version>0.6.4</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.4) is otherwise downgrading it to 4.9.0 -->
@@ -425,14 +425,6 @@
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-        </dependency>
 
         <!-- Start of Logback Dependencies -->
         <dependency>
@@ -1120,12 +1112,6 @@
             <name>AJSC repository</name>
             <url>https://mvnrepository.com/artifact/com.att.ajsc</url>
         </repository>
-        <repository>
-            <id>restlet</id>
-            <name>maven reslet</name>
-            <url>https://maven.restlet.com/</url>
-        </repository>
-
         <repository>
             <id>central</id>
             <name>Maven 2 repository 2</name>

diff --git a/src/main/java/org/onap/aai/migration/v12/UpdateAaiUriIndexMigration.java b/src/main/java/org/onap/aai/migration/v12/UpdateAaiUriIndexMigration.java
index dbb892d..9d7715e 100644 (file)
--- a/src/main/java/org/onap/aai/migration/v12/UpdateAaiUriIndexMigration.java
+++ b/src/main/java/org/onap/aai/migration/v12/UpdateAaiUriIndexMigration.java
@@ -200,7 +200,7 @@ public class UpdateAaiUriIndexMigration extends Migrator {
                        aaiUriIndex = graphMgmt.getGraphIndex(index.getIndexName());
                        if (aaiUriIndex.getIndexStatus(graphMgmt.getPropertyKey(index.getPropertyName())).equals(SchemaStatus.DISABLED)) {
                                logger.info("Removing index: " + index.getIndexName());
-                               graphMgmt.updateIndex(aaiUriIndex, SchemaAction.REMOVE_INDEX);
+                               graphMgmt.updateIndex(aaiUriIndex, SchemaAction.DISCARD_INDEX);
                                graphMgmt.commit();
                        }
                        if(graphMgmt.isOpen()) {

diff --git a/src/main/scripts/getDslResult.sh b/src/main/scripts/getDslResult.sh
index 9e6ece6..86a514e 100644 (file)
--- a/src/main/scripts/getDslResult.sh
+++ b/src/main/scripts/getDslResult.sh
@@ -51,7 +51,7 @@ RESULTDIR=$PROJECT_HOME/logs/data/migration-input-files
 
 if [ ! -d ${RESULTDIR} ]; then
         mkdir -p ${RESULTDIR}
-        chown aaiadmin:aaiadmin ${RESULTDIR}
+        # chown aaiadmin:aaiadmin ${RESULTDIR}
         chmod u+w ${RESULTDIR}
 fi
 
@@ -78,12 +78,6 @@ if [ ! -z "$4" ]; then
    XTRANSID=$4
 fi
 
-userid=$( id | cut -f2 -d"(" | cut -f1 -d")" )
-if [ "${userid}" != "aaiadmin" ]; then
-    echo "You must be aaiadmin to run $0. The id used $userid."
-    exit 1
-fi
-
 prop_file=$PROJECT_HOME/resources/etc/appprops/aaiconfig.properties
 log_dir=$PROJECT_HOME/logs/misc
 today=$(date +\%Y-\%m-\%d)