Change to aai-parent
Issue-ID: AAI-2738
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: Ibc0fdbf9ab4f26532cbc209f85b66bad2497064b
diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml
index fcce83a..21f414e 100644
--- a/aai-schema-service/pom.xml
+++ b/aai-schema-service/pom.xml
@@ -23,22 +23,17 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
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>
- <groupId>org.onap.aai.schema-service</groupId>
- <artifactId>aai-schema-service</artifactId>
- <version>1.6.1-SNAPSHOT</version>
<parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
<version>1.6.1-SNAPSHOT</version>
</parent>
+ <groupId>org.onap.aai.schema-service</groupId>
+ <artifactId>aai-schema-service</artifactId>
<properties>
<java.version>1.8</java.version>
<start-class>org.onap.aai.schemaservice.SchemaServiceApp</start-class>
- <aai.core.version>1.5.3</aai.core.version>
-
- <spring.boot.version>1.5.21.RELEASE</spring.boot.version>
-
<!-- Start of the jacoco plugin properties -->
<sonar.language>java</sonar.language>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -48,19 +43,6 @@
<sonar.projectVersion>${project.version}</sonar.projectVersion>
<!-- End of the jacoco plugin properties -->
- <!-- Start of Application Dependencies -->
- <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>
- <google.guava.version>16.0.1</google.guava.version>
- <janusgraph.version>0.2.3</janusgraph.version>
- <mockito.version>1.10.19</mockito.version>
- <powermock.version>1.6.2</powermock.version>
- <jaxb.version>2.2.11</jaxb.version>
- <eclipse.persistence.version>2.6.2</eclipse.persistence.version>
- <!-- End of Application Dependencies -->
-
<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>
@@ -295,42 +277,26 @@
</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>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.onap.aai.aai-common</groupId>
<artifactId>aai-core</artifactId>
- <version>${aai.core.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun.jersey</groupId>
@@ -361,18 +327,15 @@
<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>com.fasterxml.jackson.jaxrs</groupId>
@@ -381,38 +344,19 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>${mockito.version}</version>
<scope>test</scope>
</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>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>
@@ -450,13 +394,11 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-junit</artifactId>
- <version>${hamcrest.junit.version}</version>
</dependency>
</dependencies>
<build>