From 793f714168f7ec92b5a9d77fbda0d832ab109898 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Thu, 20 Jun 2019 19:16:28 -0400 Subject: Remove versions from project poms Remove versions from project poms and rely instead on dependencyManagement. Change-Id: I68171346273325e8dee0f7d2538549d2d8c154c8 Issue-ID: CCSDK-1416 Signed-off-by: Timoney, Dan (dt5972) --- aai-service/features/ccsdk-aai-service/pom.xml | 1 + aai-service/provider/pom.xml | 8 +------- .../org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java | 7 ++++--- ansible-adapter/ansible-adapter-bundle/pom.xml | 4 ---- ansible-adapter/ansible-adapter-installer/pom.xml | 6 +----- ansible-adapter/pom.xml | 7 ------- netbox-client/features/ccsdk-netbox-client/pom.xml | 1 + netbox-client/provider/pom.xml | 5 ++--- resource-assignment/provider/pom.xml | 2 -- saltstack-adapter/saltstack-adapter-installer/pom.xml | 5 ----- saltstack-adapter/saltstack-adapter-provider/pom.xml | 17 +++-------------- 11 files changed, 13 insertions(+), 50 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 @@ ${ccsdk.sli.core.version} xml features + provided 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 @@ org.onap.ccsdk.sli.core utils-provider - ${sdnctl.sli.version} + ${ccsdk.sli.core.version} org.osgi @@ -76,22 +76,18 @@ org.glassfish.jersey.core jersey-client - ${jersey.version} org.glassfish.jersey.core jersey-common - ${jersey.version} org.apache.httpcomponents httpcore - ${apache.httpcomponents.core.version} org.apache.httpcomponents httpclient - ${apache.httpcomponents.client.version} com.fasterxml.jackson.core @@ -117,13 +113,11 @@ org.jsoup jsoup - 1.8.3 test org.springframework spring-core - 4.3.5.RELEASE test 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); } diff --git a/ansible-adapter/ansible-adapter-bundle/pom.xml b/ansible-adapter/ansible-adapter-bundle/pom.xml index 66d25cd2..5a8a9ee0 100644 --- a/ansible-adapter/ansible-adapter-bundle/pom.xml +++ b/ansible-adapter/ansible-adapter-bundle/pom.xml @@ -56,13 +56,11 @@ commons-logging commons-logging - 1.2 org.apache.httpcomponents httpclient - ${apache.httpcomponents.client.version} @@ -70,14 +68,12 @@ org.glassfish.jersey.core jersey-common - 2.9.1 test org.codehaus.jackson jackson-jaxrs - 1.9.13 test diff --git a/ansible-adapter/ansible-adapter-installer/pom.xml b/ansible-adapter/ansible-adapter-installer/pom.xml index 49a52580..562bd179 100644 --- a/ansible-adapter/ansible-adapter-installer/pom.xml +++ b/ansible-adapter/ansible-adapter-installer/pom.xml @@ -61,11 +61,7 @@ ${project.version} - - javax - javaee-api - 7.0 - + diff --git a/ansible-adapter/pom.xml b/ansible-adapter/pom.xml index 25b45b39..6b6f4cbe 100644 --- a/ansible-adapter/pom.xml +++ b/ansible-adapter/pom.xml @@ -165,13 +165,6 @@ ${project.version} - - junit - junit - 4.11 - test - - diff --git a/netbox-client/features/ccsdk-netbox-client/pom.xml b/netbox-client/features/ccsdk-netbox-client/pom.xml index bf8e76f0..6586a5cd 100644 --- a/netbox-client/features/ccsdk-netbox-client/pom.xml +++ b/netbox-client/features/ccsdk-netbox-client/pom.xml @@ -36,6 +36,7 @@ ${project.version} + org.opendaylight.controller diff --git a/netbox-client/provider/pom.xml b/netbox-client/provider/pom.xml index 6a552c57..583d1581 100644 --- a/netbox-client/provider/pom.xml +++ b/netbox-client/provider/pom.xml @@ -89,9 +89,9 @@ junit junit - ${junit.version} test + org.mockito mockito-core @@ -101,9 +101,9 @@ com.github.tomakehurst wiremock - 2.7.1 test + org.eclipse.jetty jetty-server @@ -113,7 +113,6 @@ ch.qos.logback logback-classic - 1.2.3 test diff --git a/resource-assignment/provider/pom.xml b/resource-assignment/provider/pom.xml index e77ad92d..510e1620 100755 --- a/resource-assignment/provider/pom.xml +++ b/resource-assignment/provider/pom.xml @@ -74,7 +74,6 @@ org.mariadb.jdbc mariadb-java-client - ${mariadb.connector.version} jar runtime @@ -89,7 +88,6 @@ org.springframework spring-jdbc - ${spring.version} diff --git a/saltstack-adapter/saltstack-adapter-installer/pom.xml b/saltstack-adapter/saltstack-adapter-installer/pom.xml index 65f5e121..063caf2b 100644 --- a/saltstack-adapter/saltstack-adapter-installer/pom.xml +++ b/saltstack-adapter/saltstack-adapter-installer/pom.xml @@ -64,11 +64,6 @@ ${project.version} - - javax - javaee-api - 7.0 - diff --git a/saltstack-adapter/saltstack-adapter-provider/pom.xml b/saltstack-adapter/saltstack-adapter-provider/pom.xml index 98590a0c..91e72d5f 100644 --- a/saltstack-adapter/saltstack-adapter-provider/pom.xml +++ b/saltstack-adapter/saltstack-adapter-provider/pom.xml @@ -72,31 +72,20 @@ + + + org.apache.sshd sshd-core 0.12.0 - - - - - - - - - - - - - org.apache.commons commons-io - 1.3.2 -- cgit 1.2.3-korg