Convert to aai-parent

Issue-ID: AAI-2802
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: I6cc00fd63bf57db139d94d1d727e21934b543c2a

diff --git a/pom.xml b/pom.xml
index 10a4f2c..e3c18fd 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,9 +24,9 @@
        <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.6-SNAPSHOT</version>
                <relativePath />
        </parent>
 
@@ -35,30 +35,14 @@
        <name>aai-model-loader</name>
        <version>1.6.0-SNAPSHOT</version>
 
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.springframework.boot</groupId>
-                               <artifactId>spring-boot-dependencies</artifactId>
-                               <version>${spring-boot.version}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-
        <properties>
                <start-class>org.onap.aai.modelloader.service.ModelLoaderApplication</start-class>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <docker.location>${basedir}/target</docker.location>
-               <spring-boot.version>2.1.6.RELEASE</spring-boot.version>
-               <apache.commons-text.version>1.1</apache.commons-text.version>
-               <commons-compress.version>1.18</commons-compress.version>
                <hamcrest-all.version>1.3</hamcrest-all.version>
                <babel.version>1.3.1</babel.version>
                <aai.rest.client.version>1.2.1</aai.rest.client.version>
                <sdc-distribution-client.version>1.3.0</sdc-distribution-client.version>
-               <logback.version>1.2.3</logback.version>
                <!-- docker related properties -->
                <docker.fabric.version>0.28.0</docker.fabric.version>
                <aai.docker.version>1.0.0</aai.docker.version>
@@ -233,7 +217,6 @@
                <dependency>
                        <groupId>org.onap.aai</groupId>
                        <artifactId>rest-client</artifactId>
-                       <version>${aai.rest.client.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.google.code.gson</groupId>
@@ -252,17 +235,14 @@
                <dependency>
                        <groupId>org.onap.aai.logging-service</groupId>
                        <artifactId>common-logging</artifactId>
-                       <version>1.5.0</version>
                </dependency>
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-classic</artifactId>
-                       <version>${logback.version}</version><!--$NO-MVN-MAN-VER$ -->
                </dependency>
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-core</artifactId>
-                       <version>${logback.version}</version><!--$NO-MVN-MAN-VER$ -->
                </dependency>
                <dependency>
                        <groupId>org.onap.sdc.sdc-distribution-client</groupId>
@@ -272,7 +252,6 @@
                <dependency>
                        <groupId>org.json</groupId>
                        <artifactId>json</artifactId>
-                       <version>20131018</version><!--$NO-MVN-MAN-VER$ -->
                </dependency>
                <dependency>
                        <groupId>org.eclipse.jetty</groupId>
@@ -286,17 +265,14 @@
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-compress</artifactId>
-                       <version>${commons-compress.version}</version>
                </dependency>
                <dependency>
                        <groupId>commons-io</groupId>
                        <artifactId>commons-io</artifactId>
-                       <version>2.4</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-text</artifactId>
-                       <version>${apache.commons-text.version}</version>
                </dependency>
 
                <!-- Test dependencies -->
@@ -364,7 +340,6 @@
                        <plugin>
                                <groupId>org.springframework.boot</groupId>
                                <artifactId>spring-boot-maven-plugin</artifactId>
-                               <version>${spring-boot.version}</version>
                                <configuration>
                                        <executable>true</executable>
                                </configuration>