Update graphadmin to remove exception

[aai/graphadmin.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 46d6d0b..482e3a2 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,6 +46,8 @@
         <skip.integration.tests>true</skip.integration.tests>
         <!-- End of Test Related Properties -->
 
+        <spring.boot.version>1.5.15.RELEASE</spring.boot.version>
+
         <!-- Start of Sonar Related Properties -->
         <sonar.language>java</sonar.language>
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -82,28 +84,28 @@
         <aai.project.version>${project.version}</aai.project.version>
 
         <!-- Start of Database Related Properties -->
-        <hbase.version>1.0.2</hbase.version>
         <janusgraph.version>0.2.0</janusgraph.version>
         <gremlin.driver.version>3.0.1-incubating</gremlin.driver.version>
         <gremlin.version>3.2.2</gremlin.version>
         <!-- End of Database Related Properties -->
 
-        <activemq.version>5.14.3</activemq.version>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+
+        <activemq.version>5.15.6</activemq.version>
         <logback.version>1.2.3</logback.version>
         <mockito.version>1.10.19</mockito.version>
-        <httpclient.version>4.5.1</httpclient.version>
+        <httpclient.version>4.5.3</httpclient.version>
 
         <gson.version>2.7</gson.version>
         <json.version>20090211</json.version>
 
-        <aai.core.version>1.3.0-SNAPSHOT</aai.core.version>
-        <aai.schema.version>1.3.0-SNAPSHOT</aai.schema.version>
+        <aai.core.version>1.3.0</aai.core.version>
+        <aai.schema.version>1.3.0</aai.schema.version>
 
         <netty.handler.version>4.1.9.Final</netty.handler.version>
-        <netty.version>4.0.37.Final</netty.version>
+        <netty.version>4.0.56.Final</netty.version>
 
         <spring.test.version>4.3.6.RELEASE</spring.test.version>
-        <spring.web.version>4.3.6.RELEASE</spring.web.version>
 
         <cxf.version>3.2.2</cxf.version>
 
@@ -114,8 +116,10 @@
         <antlr4.listener>true</antlr4.listener>
         <antlr.version>4.7</antlr.version>
 
+        <plexus.utils.version>3.1.0</plexus.utils.version>
+
         <eelf.core.version>1.0.0</eelf.core.version>
-        <google.guava.version>16.0</google.guava.version>
+        <google.guava.version>19.0</google.guava.version>
         <jaxb.version>2.2.11</jaxb.version>
         <eclipse.persistence.version>2.6.2</eclipse.persistence.version>
         <dmaap.client.version>0.2.12</dmaap.client.version>
@@ -130,7 +134,7 @@
         <start-class>org.onap.aai.GraphAdminApp</start-class>
 
         <snapshot.file>${project.basedir}/snapshots/int1-data.graphson</snapshot.file>
-        <jacoco.line.coverage.limit>0.27</jacoco.line.coverage.limit>
+        <jacoco.line.coverage.limit>0.46</jacoco.line.coverage.limit>
 
         <!-- Start of Default ONAP Schema Properties -->
         <schema.source.name>onap</schema.source.name>
@@ -353,7 +357,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-parent</artifactId>
-                <version>1.5.12.RELEASE</version>
+               <version>${spring.boot.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -398,35 +402,31 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.janusgraph</groupId>
-            <artifactId>janusgraph-hbase-parent</artifactId>
-            <version>${janusgraph.version}</version>
-            <type>pom</type>
-            <exclusions>
                 <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>org.janusgraph</groupId>
-            <artifactId>janusgraph-hbase</artifactId>
+            <artifactId>janusgraph-cassandra</artifactId>
             <version>${janusgraph.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>org.janusgraph</groupId>
-            <artifactId>janusgraph-cassandra</artifactId>
-            <version>${janusgraph.version}</version>
+            <artifactId>janusgraph-cql</artifactId>
+           <version>${janusgraph.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -441,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>
@@ -450,6 +456,12 @@
             <groupId>org.apache.tinkerpop</groupId>
             <artifactId>gremlin-driver</artifactId>
             <version>${gremlin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- End of Tinkerpop Dependencies -->
         <dependency>
@@ -531,6 +543,22 @@
                     <groupId>org.apache.cxf</groupId>
                     <artifactId>cxf-core</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-http</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-server</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-web</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-mapper-asl</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -542,6 +570,12 @@
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-json</artifactId>
             <version>1.18</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-mapper-asl</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Do not use the jersey-client since jersey client 1.0 version clashes
             with jersey 2 which we are using -->
@@ -603,11 +637,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jersey</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring.web.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -646,6 +681,13 @@
             </exclusions>
         </dependency>
         <!-- End of Antlr dependencies for DSL -->
+        <!-- Start of Plexus dependencies for DSL -->
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <version>${plexus.utils.version}</version>
+        </dependency>
+        <!-- End of Plexus dependencies for DSL -->
         <!-- Start of Junit Test Dependencies -->
         <dependency>
             <groupId>org.hamcrest</groupId>
@@ -973,6 +1015,12 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <!-- 
+                  Issue with the spring 1.5.15.RELEASE plugin is causing build errors
+                  due to the fact that the plugin 1.5.15.RELEASE was built using maven 3.5 while
+                  the current build version being used by our jenkins is 3.3.9
+                -->
+                <version>1.5.12.RELEASE</version>
                 <configuration>
                     <mainClass>${start-class}</mainClass>
                     <layout>ZIP</layout>