diff options
author | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-06-21 17:22:27 -0400 |
---|---|---|
committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-06-21 17:22:27 -0400 |
commit | bd8a4d04337eed46be669f70272e6583f48ba249 (patch) | |
tree | 2642982c0133e6dee78e6d7cdc2bcb1f93b88fde | |
parent | b43008aa2dce75efdf704d1a5e2529e58b4fbde1 (diff) |
Remove versions from project poms
Remove versions from project poms and instead drive version from
dependencyManagement to ensure consistency.
Change-Id: I2a3238163e49878c4c7528db1271c83b488263c3
Issue-ID: CCSDK-1416
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
-rwxr-xr-x | grToolkit/provider/pom.xml | 4 | ||||
-rwxr-xr-x | restapi-call-node/provider/pom.xml | 7 | ||||
-rwxr-xr-x | restconf-client/provider/pom.xml | 19 | ||||
-rwxr-xr-x | sshapi-call-node/provider/pom.xml | 1 | ||||
-rw-r--r-- | template-node/provider/pom.xml | 1 |
5 files changed, 7 insertions, 25 deletions
diff --git a/grToolkit/provider/pom.xml b/grToolkit/provider/pom.xml index ee61d7d4..b624e069 100755 --- a/grToolkit/provider/pom.xml +++ b/grToolkit/provider/pom.xml @@ -74,13 +74,11 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.10.19</version> <scope>test</scope> </dependency> <dependency> @@ -95,13 +93,11 @@ <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-cluster_2.12</artifactId> - <version>${akka.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.github.stefanbirkner</groupId> <artifactId>system-rules</artifactId> - <version>1.19.0</version> <scope>test</scope> </dependency> </dependencies> diff --git a/restapi-call-node/provider/pom.xml b/restapi-call-node/provider/pom.xml index a7a0842a..0d23912f 100755 --- a/restapi-call-node/provider/pom.xml +++ b/restapi-call-node/provider/pom.xml @@ -47,17 +47,14 @@ <dependency> <groupId>org.glassfish.jersey.bundles.repackaged</groupId> <artifactId>jersey-guava</artifactId> - <version>2.22.2</version> </dependency> <dependency> <groupId>org.glassfish.jersey.security</groupId> <artifactId>oauth1-signature</artifactId> - <version>${jersey.version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.security</groupId> <artifactId>oauth1-client</artifactId> - <version>${jersey.version}</version> </dependency> <dependency> <groupId>org.codehaus.jettison</groupId> @@ -66,12 +63,10 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> - <version>${jersey.version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-multipart</artifactId> - <version>${jersey.version}</version> </dependency> <!-- For test --> @@ -83,13 +78,11 @@ <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet</artifactId> - <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-grizzly2-http</artifactId> - <version>${jersey.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/restconf-client/provider/pom.xml b/restconf-client/provider/pom.xml index 70f84e09..9fa24755 100755 --- a/restconf-client/provider/pom.xml +++ b/restconf-client/provider/pom.xml @@ -36,7 +36,6 @@ <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-sse</artifactId> - <version>${jersey.version}</version> </dependency> <dependency> <groupId>javax.ws.rs</groupId> @@ -47,14 +46,17 @@ <artifactId>sli-common</artifactId> </dependency> <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-provider</artifactId> + </dependency> + <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>properties-node-provider</artifactId> - <version>0.5.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-impl</artifactId> - <version>2.0.6.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -63,17 +65,15 @@ <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - <version>1.6.1</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>${gson.version}</version> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restapi-call-node-provider</artifactId> - <version>0.5.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> @@ -82,7 +82,6 @@ <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-parser-impl</artifactId> - <version>2.0.6.1</version> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -99,37 +98,31 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet</artifactId> - <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-grizzly2-http</artifactId> - <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-library</artifactId> - <version>1.3</version> <scope>test</scope> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-test-util</artifactId> - <version>2.0.6.1</version> <scope>test</scope> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> - <version>${jersey.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/sshapi-call-node/provider/pom.xml b/sshapi-call-node/provider/pom.xml index 81ab8811..39f99d4b 100755 --- a/sshapi-call-node/provider/pom.xml +++ b/sshapi-call-node/provider/pom.xml @@ -46,6 +46,7 @@ <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> </dependency> + <!-- ILLEGAL DEPENDENCY : creates circular dependency between CCSDK and APPC --> <dependency> <groupId>org.onap.appc</groupId> <artifactId>appc-ssh-adapter-api</artifactId> diff --git a/template-node/provider/pom.xml b/template-node/provider/pom.xml index b47c6040..08ff17ca 100644 --- a/template-node/provider/pom.xml +++ b/template-node/provider/pom.xml @@ -44,7 +44,6 @@ <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> - <version>1.7</version> </dependency> </dependencies> </project> |