Update graphadmin to use schema ingest changes for

[aai/graphadmin.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index e733f72..24ef98f 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <groupId>org.onap.aai.graphadmin</groupId>
     <artifactId>aai-graphadmin</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
 
     <properties>
 
@@ -46,7 +46,7 @@
         <skip.integration.tests>true</skip.integration.tests>
         <!-- End of Test Related Properties -->
 
-        <spring.boot.version>1.5.15.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.19.RELEASE</spring.boot.version>
 
         <!-- Start of Sonar Related Properties -->
         <sonar.language>java</sonar.language>
@@ -99,13 +99,13 @@
         <gson.version>2.7</gson.version>
         <json.version>20090211</json.version>
 
-        <aai.core.version>1.3.0</aai.core.version>
-        <aai.schema.version>1.3.0</aai.schema.version>
+        <aai.core.version>1.4.2</aai.core.version>
+        <aai.schema.version>1.0.1</aai.schema.version>
 
         <netty.handler.version>4.1.9.Final</netty.handler.version>
         <netty.version>4.0.56.Final</netty.version>
 
-        <spring.test.version>4.3.6.RELEASE</spring.test.version>
+        <spring.test.version>4.3.22.RELEASE</spring.test.version>
 
         <cxf.version>3.2.2</cxf.version>
 
@@ -124,7 +124,7 @@
         <eclipse.persistence.version>2.6.2</eclipse.persistence.version>
         <dmaap.client.version>0.2.12</dmaap.client.version>
 
-        <springframework.version>4.3.4.RELEASE</springframework.version>
+        <springframework.version>4.3.22.RELEASE</springframework.version>
         <spring.jms.version>4.3.2.RELEASE</spring.jms.version>
         <spring.security.version>1.0.3.RELEASE</spring.security.version>
 
@@ -141,13 +141,13 @@
         <schema.configuration.location>N/A</schema.configuration.location>
         <schema.nodes.location>${project.basedir}/src/main/resources/schema/${schema.source.name}/oxm</schema.nodes.location>
         <schema.edges.location>${project.basedir}/src/main/resources/schema/${schema.source.name}/dbedgerules</schema.edges.location>
-        <schema.version.depth.start>v9</schema.version.depth.start>
+        <schema.version.depth.start>v10</schema.version.depth.start>
         <schema.version.related.link.start>v10</schema.version.related.link.start>
         <schema.version.app.root.start>v11</schema.version.app.root.start>
         <schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
         <schema.version.edge.label.start>v12</schema.version.edge.label.start>
-        <schema.version.api.default>v14</schema.version.api.default>
-        <schema.version.list>v8,v9,v10,v11,v12,v13,v14</schema.version.list>
+        <schema.version.api.default>v16</schema.version.api.default>
+        <schema.version.list>v10,v11,v12,v13,v14,v15,v16</schema.version.list>
         <schema.uri.base.path>/aai</schema.uri.base.path>
         <!-- End of Default ONAP Schema Properties -->
     </properties>
@@ -195,7 +195,7 @@
             <properties>
                 <schema.source.name>onap</schema.source.name>
                 <schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
-                <schema.version.list>v8,v9,v10,v11,v12,v13,v14</schema.version.list>
+                <schema.version.list>v10,v11,v12,v13,v14,v15,v16</schema.version.list>
             </properties>
         </profile>
         <!-- End of ONAP Profile -->
@@ -357,7 +357,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-parent</artifactId>
-               <version>${spring.boot.version}</version>
+                <version>${spring.boot.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -423,6 +423,17 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.janusgraph</groupId>
+            <artifactId>janusgraph-cql</artifactId>
+            <version>${janusgraph.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <!-- End of Janus Graph Dependencies -->
         <!-- Start of Tinkerpop Dependencies -->
         <dependency>
@@ -430,6 +441,12 @@
             <artifactId>tinkergraph-gremlin</artifactId>
             <version>${gremlin.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4-runtime</artifactId>
+            <version>${antlr.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>
             <artifactId>gremlin-core</artifactId>
@@ -620,6 +637,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jersey</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -736,7 +759,7 @@
                             <configuration>
                                 <artifactItems>
                                     <artifactItem>
-                                        <groupId>org.onap.aai.aai-common</groupId>
+                                        <groupId>org.onap.aai.schema-service</groupId>
                                         <artifactId>aai-schema</artifactId>
                                         <version>${aai.schema.version}</version>
                                         <outputDirectory>${project.basedir}/src/main/resources/schema/</outputDirectory>
@@ -755,7 +778,7 @@
                             <configuration>
                                 <artifactItems>
                                     <artifactItem>
-                                        <groupId>org.onap.aai.aai-common</groupId>
+                                        <groupId>org.onap.aai.schema-service</groupId>
                                         <artifactId>aai-schema</artifactId>
                                         <version>${aai.schema.version}</version>
                                         <outputDirectory>${project.basedir}/src/main/resources/schema/</outputDirectory>
@@ -826,7 +849,7 @@
                             <include>src/test/java/**</include>
                             <include>pom.xml</include>
                         </includes>
-                        <skipExistingHeaders>false</skipExistingHeaders>
+                        <skipExistingHeaders>true</skipExistingHeaders>
                         <skip>false</skip>
                     </configuration>
                     <executions>
@@ -842,6 +865,39 @@
             </plugins>
         </pluginManagement>
         <plugins>
+            <!--
+            Using https://code.revelc.net/formatter-maven-plugin/ for Eclipse formatter
+            Using https://github.com/diffplug/spotless/tree/master/plugin-maven for import order
+            Use in combination to rewrite code and imports, then checkstyle
+
+            mvn formatter:format spotless:apply process-sources
+            -->
+            <plugin>
+                 <groupId>net.revelc.code.formatter</groupId>
+                 <artifactId>formatter-maven-plugin</artifactId>
+                 <version>2.8.1</version>
+                 <configuration>
+                    <configFile>${project.basedir}/onap-java-formatter.xml</configFile>
+                 </configuration>
+                 <!-- https://code.revelc.net/formatter-maven-plugin/
+                      use mvn formatter:format to rewrite source files
+                      use mvn formatter:validate to validate source files -->
+             </plugin>
+            <plugin>
+              <groupId>com.diffplug.spotless</groupId>
+              <artifactId>spotless-maven-plugin</artifactId>
+              <version>1.18.0</version>
+              <configuration>
+                <java>
+                 <importOrder>
+                   <order>com,java,javax,org</order>
+                 </importOrder>
+                </java>
+              </configuration>
+            <!-- https://github.com/diffplug/spotless/tree/master/plugin-maven
+                 use mvn spotless:apply to rewrite source files
+                 use mvn spotless:check to validate source files -->
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>