summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenkata Harish K Kajur <vk250x@att.com>2018-03-02 19:04:32 -0500
committerVenkata Harish K Kajur <vk250x@att.com>2018-03-02 19:04:38 -0500
commit748613a171d3619e6de43ab04f217ca86d4a723f (patch)
tree51d5a807efd9196af3b465667401255fba61ea81
parent5b80f8813bca2d24d221186e0c2ba341e21d010b (diff)
Update to remove remaining nexus iq pom
Also change from using AJSC 6 to Spring Boot Issue-ID: AAI-595 Change-Id: I0a4d7cdbe01bb35ca4dc28124483e1abf165a979 Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
-rw-r--r--aai-resources/pom.xml45
-rw-r--r--aai-resources/src/test/java/org/onap/aai/schema/db/ManageSchemaTest.java6
2 files changed, 37 insertions, 14 deletions
diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 912a784..48ae636 100644
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -7,9 +7,9 @@
<version>1.2.0-SNAPSHOT</version>
<parent>
- <groupId>com.att.ajsc</groupId>
- <artifactId>sdk-java-starter-parent</artifactId>
- <version>6.1.0.4-oss</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>1.5.1.RELEASE</version>
</parent>
<properties>
@@ -123,6 +123,8 @@
<jackson.core.version>2.8.11.1</jackson.core.version>
<groovy.version>2.4.4</groovy.version>
+ <spring.test.version>4.3.6.RELEASE</spring.test.version>
+
<!-- This will be used for the docker images as the default format of maven build has issues -->
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
</properties>
@@ -245,6 +247,10 @@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -375,6 +381,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -603,6 +613,10 @@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -711,6 +725,18 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
+ <classifier>indy</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.test.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-test</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
@@ -817,6 +843,7 @@
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<phase>validate</phase>
@@ -858,13 +885,6 @@
<artifactId>gmaven-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>com.github.kongchen</groupId>
- <artifactId>swagger-maven-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
</plugin>
@@ -909,9 +929,12 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.7.201606060606</version>
+ <version>0.7.9</version>
<configuration>
<dumpOnExit>true</dumpOnExit>
+ <excludes>
+ <exclude>**/**/models/**/*.class</exclude>
+ </excludes>
</configuration>
<executions>
<execution>
diff --git a/aai-resources/src/test/java/org/onap/aai/schema/db/ManageSchemaTest.java b/aai-resources/src/test/java/org/onap/aai/schema/db/ManageSchemaTest.java
index 4eeb172..14e8bee 100644
--- a/aai-resources/src/test/java/org/onap/aai/schema/db/ManageSchemaTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/schema/db/ManageSchemaTest.java
@@ -21,12 +21,12 @@
*/
package org.onap.aai.schema.db;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.thinkaurelius.titan.core.TitanFactory;
import com.thinkaurelius.titan.core.TitanGraph;
import com.thinkaurelius.titan.core.schema.TitanManagement;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;