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: I9504edf269ea702ad8d88864531bc6c609b506ab
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index 66ab01d..7586d52 100644 (file)
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -91,8 +91,8 @@
                <schema.uri.base.path>/aai</schema.uri.base.path>
 
                <!-- versions -->
-               <janusgraph.version>0.6.4</janusgraph.version>
-               <gremlin.version>3.5.8</gremlin.version>
+               <janusgraph.version>1.0.0</janusgraph.version>
+               <gremlin.version>3.7.1</gremlin.version>
 
                <spring-cloud.version>2020.0.6</spring-cloud.version>
 
@@ -378,6 +378,11 @@
                        <artifactId>janino</artifactId>
                        <version>3.1.12</version>
                </dependency>
+               <dependency>
+                       <groupId>org.glassfish</groupId>
+                       <artifactId>javax.json</artifactId>
+                       <version>1.1.4</version>
+               </dependency>
                <dependency>
                        <groupId>org.janusgraph</groupId>
                        <artifactId>janusgraph-cql</artifactId>
@@ -464,10 +469,6 @@
                        <groupId>org.onap.aai.aai-common</groupId>
                        <artifactId>aai-core</artifactId>
             <exclusions>
-                <exclusion>
-                    <groupId>org.onap.aai.aai-common</groupId>
-                    <artifactId>aai-aaf-auth</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-http</artifactId>
@@ -497,12 +498,6 @@
                <dependency>
                        <groupId>org.onap.aai.aai-common</groupId>
                        <artifactId>aai-rest</artifactId>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.onap.aai.aai-common</groupId>
-                                       <artifactId>aai-aaf-auth</artifactId>
-                               </exclusion>
-                       </exclusions>
                </dependency>
                <!-- Explicitly stating the security spring framework and exclude the bouncy
                        castle since that is somehow overwriting our p12 file decryption that's built

diff --git a/pom.xml b/pom.xml
index 6ab1d77..724b110 100644 (file)
--- 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.0-SNAPSHOT</version>
+        <version>1.15.0</version>
     </parent>
     <groupId>org.onap.aai.traversal</groupId>
     <artifactId>traversal</artifactId>
@@ -42,7 +42,7 @@
             Nexus Proxy Properties and Snapshot Locations
             Ideally this can be overwritten at runtime per internal environment specific values at runtime
         -->
-        <aai.common.version>1.15.0-SNAPSHOT</aai.common.version>
+        <aai.common.version>1.15.0</aai.common.version>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
         <site.path>/content/sites/site/org/onap/aai/traversal/${project.artifactId}/${project.version}</site.path>
         <release.path>/content/repositories/releases/</release.path>