Update aai-common to 1.14.1 in resources

- includes tinkerpop update from 3.3.0 to 3.3.11
- update guava from 18 to 25.0-jre
- resolve maven build warnings (undeclared dep versions, duplicate deps, reporting configuration)

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

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 242c4a3..8ef378c 100644 (file)
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.aai.resources</groupId>
         <artifactId>resources</artifactId>
-        <version>1.14.0-SNAPSHOT</version>
+        <version>1.14.1-SNAPSHOT</version>
     </parent>
     <properties>
         <java.version>1.8</java.version>
@@ -497,10 +497,6 @@
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.onap.aaf.authz</groupId>
             <artifactId>aaf-cadi-aaf</artifactId>
@@ -739,14 +735,11 @@
                 <version>${spring-cloud.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
-              </dependency>
-            <!-- Keeping guava at 19 is necessary here, since the janusgraph-cql driver in version
-                 2.3 has a dependency on it. Remove this override, once we are using janusgraph > 0.2.3/tinkerpop > 3.2.3
-            -->
+            </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>19.0</version>
+                <version>25.0-jre</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -943,6 +936,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
index 44f7a4f..8bd1cc1 100644 (file)
--- 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.0</version>
+        <version>1.14.1</version>
     </parent>
     <groupId>org.onap.aai.resources</groupId>
     <artifactId>resources</artifactId>
-    <version>1.14.0-SNAPSHOT</version>
+    <version>1.14.1-SNAPSHOT</version>
     <name>aai-resources</name>
     <packaging>pom</packaging>
     <modules>
@@ -48,7 +48,7 @@
         <staging.path>/content/repositories/staging/</staging.path>
         <!-- GMaven plugin uses this property to figure out the name of the docker tag -->
         <aai.project.version>${project.version}</aai.project.version>
-        <aai.common.version>1.14.0</aai.common.version>
+        <aai.common.version>1.14.1</aai.common.version>
         <aai.schema.service.version>1.12.4</aai.schema.service.version>
     </properties>
     <build>

diff --git a/version.properties b/version.properties
index 5dfb2dd..654a031 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=14
-patch_version=0
+patch_version=1
 
 base_version=${major_version}.${minor_version}.${patch_version}