From 1c79cd7bc64599ac398daba94e91a3d9bce2eebe Mon Sep 17 00:00:00 2001
From: Jimmy Forsyth <jf2512@att.com>
Date: Thu, 7 Nov 2019 11:58:15 -0500
Subject: Allow parent to set versions on deps

Issue-ID: AAI-2704
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: I62d87119974482738d184bef9836051d7cb119c0
---
 aai-resources/pom.xml | 121 ++++----------------------------------------------
 pom.xml               |   6 +--
 2 files changed, 12 insertions(+), 115 deletions(-)

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 1c5d436..6324dba 100644
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -36,11 +36,9 @@
         <start-class>org.onap.aai.ResourcesApp</start-class>
 
         <aai.schema.version>1.6.0</aai.schema.version>
-        <aai.core.version>1.5.3</aai.core.version>
-        <aai.schema.ingest.version>1.5.3</aai.schema.ingest.version>
-        <hbase.version>1.0.2</hbase.version>
+        <aai.core.version>1.6.0</aai.core.version>
+        <aai.schema.ingest.version>1.6.0</aai.schema.ingest.version>
 
-        <spring.boot.version>1.5.21.RELEASE</spring.boot.version>
 
         <!-- Start of the jacoco plugin properties -->
         <sonar.language>java</sonar.language>
@@ -54,44 +52,7 @@
         <jopt.simple.version>4.9</jopt.simple.version>
 
         <io.swagger.version>1.5.8</io.swagger.version>
-        <apache.log4j.version>1.2.17</apache.log4j.version>
 
-        <commons.beanutils.version>1.9.2</commons.beanutils.version>
-        <commons.compress.version>1.10</commons.compress.version>
-        <commons.configuration.version>1.9</commons.configuration.version>
-
-        <googlecode.diffutils.version>1.3.0</googlecode.diffutils.version>
-        <scamper.encryption.version>1.8.20</scamper.encryption.version>
-        <httpcomponents.httpmime.version>4.5.2</httpcomponents.httpmime.version>
-        <scamper.version>1.8.36</scamper.version>
-        <dom4j.version>1.6.1</dom4j.version>
-        <commons.lang.version>2.6</commons.lang.version>
-        <eelf.core.version>1.0.0</eelf.core.version>
-        <logback.version>1.2.3</logback.version>
-        <hamcrest.junit.version>2.0.0.0</hamcrest.junit.version>
-        <junit.version>4.12</junit.version>
-        <aaf.version>2.1.4</aaf.version>
-        <janino.version>2.7.8</janino.version>
-        <google.guava.version>19.0</google.guava.version>
-        <janusgraph.version>0.2.3</janusgraph.version>
-        <jnr.ffi.version>2.1.9</jnr.ffi.version>
-        <gremlin.driver.version>3.2.2</gremlin.driver.version>
-        <gremlin.core.version>3.2.2</gremlin.core.version>
-        <gremlin.version>3.2.2</gremlin.version>
-        <groovy.version>2.4.15</groovy.version>
-        <hbase.version>1.0.2</hbase.version>
-        <smack.version>3.0.4</smack.version>
-        <json.simple.version>1.1.1</json.simple.version>
-        <mockito.version>1.10.19</mockito.version>
-        <powermock.version>1.6.2</powermock.version>
-        <jcommander.version>1.48</jcommander.version>
-        <json.version>20090211</json.version>
-        <freemarker.version>2.3.21</freemarker.version>
-        <jaxb.version>2.2.11</jaxb.version>
-        <eclipse.persistence.version>2.6.2</eclipse.persistence.version>
-        <json.patch.version>1.9</json.patch.version>
-        <javatuples.version>1.2</javatuples.version>
-        <gson.version>2.7</gson.version>
         <dmaap.client.version>0.2.12</dmaap.client.version>
         <httpcore.version>4.4</httpcore.version>
         <json.path.version>2.2.0</json.path.version>
@@ -107,7 +68,10 @@
 
         <eclipse.jetty.version>9.4.1.v20170120</eclipse.jetty.version>
 
-        <docker.fabric.version>0.28.0</docker.fabric.version>
+        <!-- 
+        	inherit from parent 
+        	<docker.fabric.version>0.28.0</docker.fabric.version>
+        -->
         <!-- Default docker registry that maven fabric plugin will try to pull from -->
         <docker.registry>docker.io</docker.registry>
         <!-- Specifying the docker push registry where the image should be pushed -->
@@ -360,17 +324,7 @@
             </build>
         </profile>
     </profiles>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-parent</artifactId>
-                <version>${spring.boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>net.sf.jopt-simple</groupId>
@@ -396,7 +350,6 @@
         <dependency>
             <groupId>commons-configuration</groupId>
             <artifactId>commons-configuration</artifactId>
-            <version>${commons.configuration.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>commons-lang</artifactId>
@@ -442,49 +395,40 @@
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>${commons.lang.version}</version>
         </dependency>
         <!-- eelf dependency -->
         <dependency>
             <groupId>com.att.eelf</groupId>
             <artifactId>eelf-core</artifactId>
-            <version>${eelf.core.version}</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
-            <version>${logback.version}</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-access</artifactId>
-            <version>${logback.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-junit</artifactId>
-            <version>${hamcrest.junit.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>${google.guava.version}</version>
         </dependency>
         <dependency>
             <groupId>org.janusgraph</groupId>
             <artifactId>janusgraph-core</artifactId>
-            <version>${janusgraph.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -499,7 +443,6 @@
         <dependency>
             <groupId>org.janusgraph</groupId>
             <artifactId>janusgraph-cassandra</artifactId>
-            <version>${janusgraph.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -519,12 +462,11 @@
         <dependency>
             <groupId>com.github.jnr</groupId>
             <artifactId>jnr-ffi</artifactId>
-            <version>${jnr.ffi.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.janusgraph</groupId>
             <artifactId>janusgraph-cql</artifactId>
-            <version>${janusgraph.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -532,21 +474,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.tinkerpop</groupId>
-            <artifactId>tinkergraph-gremlin</artifactId>
-            <version>${gremlin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tinkerpop</groupId>
-            <artifactId>gremlin-core</artifactId>
-            <version>${gremlin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tinkerpop</groupId>
-            <artifactId>gremlin-driver</artifactId>
-            <version>${gremlin.version}</version>
-        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
@@ -554,87 +482,59 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
             <version>${powermock.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.beust</groupId>
             <artifactId>jcommander</artifactId>
-            <version>${jcommander.version}</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>${json.version}</version>
         </dependency>
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>${freemarker.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>${jaxb.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>${jaxb.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-            <version>${jaxb.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.aaf.authz</groupId>
             <artifactId>aaf-cadi-aaf</artifactId>
-            <version>${aaf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-            <version>${jaxb.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>eclipselink</artifactId>
-            <version>${eclipse.persistence.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.moxy</artifactId>
-            <version>${eclipse.persistence.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.github.fge</groupId>
             <artifactId>json-patch</artifactId>
-            <version>${json.patch.version}</version>
         </dependency>
         <dependency>
             <groupId>org.javatuples</groupId>
             <artifactId>javatuples</artifactId>
-            <version>${javatuples.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.att.nsa</groupId>
@@ -777,7 +677,6 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy</artifactId>
-            <version>${groovy.version}</version>
             <classifier>indy</classifier>
         </dependency>
         <dependency>
@@ -794,7 +693,6 @@
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>
             <artifactId>gremlin-groovy</artifactId>
-            <version>${gremlin.version}</version>
         </dependency>
     </dependencies>
     <build>
@@ -1104,7 +1002,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                 <configuration>
                     <mainClass>${start-class}</mainClass>
                     <layout>ZIP</layout>
diff --git a/pom.xml b/pom.xml
index 3426874..64082a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,9 +24,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>2.0.0</version>
+        <groupId>org.onap.aai.aai-common</groupId>
+        <artifactId>aai-parent</artifactId>
+        <version>1.6.0</version>
     </parent>
     <groupId>org.onap.aai.resources</groupId>
     <artifactId>resources</artifactId>
-- 
cgit 1.2.3-korg