summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-06-20 19:16:28 -0400
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-06-25 13:29:50 -0400
commit793f714168f7ec92b5a9d77fbda0d832ab109898 (patch)
tree4fa247809ff5eaaf812f827f6676528914cb0081
parent056b4e088e4d8df0e642ea9603f7a82fc98ab58c (diff)
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) <dtimoney@att.com>
-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
-rw-r--r--ansible-adapter/ansible-adapter-bundle/pom.xml4
-rw-r--r--ansible-adapter/ansible-adapter-installer/pom.xml6
-rw-r--r--ansible-adapter/pom.xml7
-rw-r--r--netbox-client/features/ccsdk-netbox-client/pom.xml1
-rw-r--r--netbox-client/provider/pom.xml5
-rwxr-xr-xresource-assignment/provider/pom.xml2
-rw-r--r--saltstack-adapter/saltstack-adapter-installer/pom.xml5
-rw-r--r--saltstack-adapter/saltstack-adapter-provider/pom.xml17
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 @@
<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);
}
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 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${apache.httpcomponents.client.version}</version>
</dependency>
@@ -70,14 +68,12 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
- <version>2.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
- <version>1.9.13</version>
<scope>test</scope>
</dependency>
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 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>7.0</version>
- </dependency>
+
</dependencies>
<build>
<plugins>
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 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
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 @@
<ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
</properties>
+
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
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 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
+ <!-- Requires mockito v2 -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
@@ -101,9 +101,9 @@
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
- <version>2.7.1</version>
<scope>test</scope>
</dependency>
+ <!-- Need to override ODL version of jetty-server to get test to compile -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
@@ -113,7 +113,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.2.3</version>
<scope>test</scope>
</dependency>
</dependencies>
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 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>${mariadb.connector.version}</version>
<type>jar</type>
<scope>runtime</scope>
</dependency>
@@ -89,7 +88,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
</dependency>
</dependencies>
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 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>7.0</version>
- </dependency>
</dependencies>
<build>
<plugins>
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 @@
</dependency>
<!-- Needed to run SSH -->
+ <!-- VERSION CONFLICT !!!!! -->
+ <!-- OpenDaylight Fluorine comes with version 1.7.0 installed, which is not compatible -->
+ <!-- Code must be updated to use version 1.7.0 before this can be safely installed -->
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>0.12.0</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.onap.appc</groupId>-->
- <!--<artifactId>appc-common</artifactId>-->
- <!--<version>1.3.0</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.onap.appc</groupId>-->
- <!--<artifactId>appc-ssh-adapter-api</artifactId>-->
- <!--<version>1.3.0</version>-->
- <!--<scope>provided</scope>-->
- <!--</dependency>-->
-
<!-- Needed to run test cases -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-io</artifactId>
- <version>1.3.2</version>
</dependency>
<dependency>