aboutsummaryrefslogtreecommitdiffstats
path: root/aai-service
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-06-26 12:51:36 +0000
committerGerrit Code Review <gerrit@onap.org>2019-06-26 12:51:36 +0000
commitf63cbc60cea79e8dc338b722d385618e98a8c78b (patch)
tree732617b4b2f561705e6cc81948b1061671d74a88 /aai-service
parenta84cf02aae22c3e8c3887dc79f5c28dcf9caa9b1 (diff)
parent793f714168f7ec92b5a9d77fbda0d832ab109898 (diff)
Merge "Remove versions from project poms"
Diffstat (limited to 'aai-service')
-rw-r--r--aai-service/features/ccsdk-aai-service/pom.xml1
-rwxr-xr-xaai-service/provider/pom.xml8
-rwxr-xr-xaai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java7
3 files changed, 6 insertions, 10 deletions
diff --git a/aai-service/features/ccsdk-aai-service/pom.xml b/aai-service/features/ccsdk-aai-service/pom.xml
index 5226ab20..15034fde 100644
--- a/aai-service/features/ccsdk-aai-service/pom.xml
+++ b/aai-service/features/ccsdk-aai-service/pom.xml
@@ -29,6 +29,7 @@
<version>${ccsdk.sli.core.version}</version>
<type>xml</type>
<classifier>features</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/aai-service/provider/pom.xml b/aai-service/provider/pom.xml
index 7b5a8050..4bff806c 100755
--- a/aai-service/provider/pom.xml
+++ b/aai-service/provider/pom.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>utils-provider</artifactId>
- <version>${sdnctl.sli.version}</version>
+ <version>${ccsdk.sli.core.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -76,22 +76,18 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>${apache.httpcomponents.core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${apache.httpcomponents.client.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -117,13 +113,11 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.8.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>4.3.5.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java
index a17c36bf..f0be4587 100755
--- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java
+++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java
@@ -146,9 +146,10 @@ public class AAIServiceTest {
String url = "https://aai.api.simpledemo.onap.org:8443/aai/v11/cloud-infrastructure/pservers/pserver/chcil129snd";
setConnMock();
- when(aaiServiceSpy.getConfiguredConnection(new URL(url), HttpMethod.GET)).thenReturn(connMock);
- when(connMock.getResponseCode()).thenReturn(500);
- when(connMock.getInputStream()).thenReturn(getClass().getClassLoader().getResourceAsStream(fileLocation));
+ // The following lines are not needed and cause latest version of mockito to throw an exception
+// when(aaiServiceSpy.getConfiguredConnection(new URL(url), HttpMethod.GET)).thenReturn(connMock);
+// when(connMock.getResponseCode()).thenReturn(500);
+// when(connMock.getInputStream()).thenReturn(getClass().getClassLoader().getResourceAsStream(fileLocation));
aaiServiceSpy.dataChangeRequestAaiData(url, Class.class);
}