From 8af66e885a492465d94399b9198487ce8550fa96 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Mon, 24 Jun 2019 11:15:57 -0400 Subject: Remove versions form project poms Remove versions from project poms and instead drive version from dependencyManagement declaration in parent pom. Change-Id: I6d5923fb51040aa5e238638464150f8d455bc095 Issue-ID: CCSDK-1416 Signed-off-by: Timoney, Dan (dt5972) --- .../adaptors/data-adaptor-provider/pom.xml | 7 ---- .../adaptors/rest-adaptor-provider/pom.xml | 8 ----- .../plugin/assignment-provider/pom.xml | 4 --- .../plugin/generator-provider/pom.xml | 6 ---- blueprints-processor/plugin/model-provider/pom.xml | 10 ------ sdnr/wt/apigateway/provider/pom.xml | 1 - sdnr/wt/devicemanager/provider/pom.xml | 37 ---------------------- sdnr/wt/helpserver/provider/pom.xml | 1 - sdnr/wt/websocketmanager2/provider/pom.xml | 5 --- 9 files changed, 79 deletions(-) diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml index 2397d77fe..7e5486e4a 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml @@ -53,40 +53,33 @@ org.mariadb.jdbc mariadb-java-client - ${mariadb.connector.version} runtime org.springframework spring-context - ${spring.version} org.springframework spring-jdbc - ${spring.version} com.att.eelf eelf-core - ${eelf.version} org.springframework spring-test - ${spring.version} test com.h2database h2 - ${h2database.version} test junit junit - ${junit.version} test diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml index 45eb292a6..ed1c619d0 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml @@ -36,37 +36,30 @@ org.apache.commons commons-lang3 - ${commons.lang3.version} com.fasterxml.jackson.core jackson-databind - ${jackson.version} com.fasterxml.jackson.core jackson-core - ${jackson.version} org.apache.httpcomponents httpcore - ${apache.httpcomponents.core.version} org.apache.httpcomponents httpclient - ${apache.httpcomponents.client.version} org.springframework spring-web - ${spring.version} com.att.eelf eelf-core - ${eelf.version} org.osgi @@ -76,7 +69,6 @@ junit junit - ${junit.version} test diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml index 5b738e026..04b8fe04a 100644 --- a/blueprints-processor/plugin/assignment-provider/pom.xml +++ b/blueprints-processor/plugin/assignment-provider/pom.xml @@ -61,25 +61,21 @@ junit junit - ${junit.version} test org.apache.sling org.apache.sling.testing.osgi-mock - 2.3.2 test org.powermock powermock-api-mockito - 1.6.6 test org.powermock powermock-module-junit4 - 1.6.6 test diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml index e8d97472f..b2d0f1467 100644 --- a/blueprints-processor/plugin/generator-provider/pom.xml +++ b/blueprints-processor/plugin/generator-provider/pom.xml @@ -46,32 +46,26 @@ com.fasterxml.jackson.core jackson-core - ${jackson.version} com.fasterxml.jackson.core jackson-databind - ${jackson.version} com.fasterxml.jackson.core jackson-annotations - ${jackson.version} com.fasterxml.jackson.module jackson-module-jsonSchema - ${jackson.version} commons-io commons-io - 2.5 org.apache.velocity velocity - 1.7 org.powermock diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml index 4395d27a2..34c285a9d 100644 --- a/blueprints-processor/plugin/model-provider/pom.xml +++ b/blueprints-processor/plugin/model-provider/pom.xml @@ -36,27 +36,22 @@ com.fasterxml.jackson.core jackson-core - ${jackson.version} com.fasterxml.jackson.core jackson-databind - ${jackson.version} com.fasterxml.jackson.core jackson-annotations - ${jackson.version} com.fasterxml.jackson.module jackson-module-jsonSchema - ${jackson.version} com.jayway.jsonpath json-path - 2.3.0 org.onap.ccsdk.features @@ -71,31 +66,26 @@ org.powermock powermock-api-mockito - 1.6.6 test org.powermock powermock-module-junit4 - 1.6.6 test org.apache.sling org.apache.sling.testing.osgi-mock - 2.3.2 test junit junit - ${junit.version} test commons-collections commons-collections - 3.2.2 org.osgi diff --git a/sdnr/wt/apigateway/provider/pom.xml b/sdnr/wt/apigateway/provider/pom.xml index 7fb88fccd..c5411a539 100644 --- a/sdnr/wt/apigateway/provider/pom.xml +++ b/sdnr/wt/apigateway/provider/pom.xml @@ -33,7 +33,6 @@ javax.servlet servlet-api - 2.5 org.slf4j diff --git a/sdnr/wt/devicemanager/provider/pom.xml b/sdnr/wt/devicemanager/provider/pom.xml index 897fb389e..5f37220b4 100644 --- a/sdnr/wt/devicemanager/provider/pom.xml +++ b/sdnr/wt/devicemanager/provider/pom.xml @@ -124,79 +124,66 @@ org.elasticsearch elasticsearch - 2.2.0 provided com.spatial4j spatial4j - 0.5 provided org.elasticsearch securesm - 1.0 provided com.carrotsearch hppc - 0.7.1 provided joda-time joda-time - 2.8.2 provided org.joda joda-convert - 1.2 provided com.fasterxml.jackson.core jackson-core - 2.6.3 provided com.fasterxml.jackson.core jackson-annotations - 2.6.3 provided com.fasterxml.jackson.core jackson-databind - 2.6.3 provided com.fasterxml.jackson.dataformat jackson-dataformat-smile - 2.6.3 provided com.fasterxml.jackson.dataformat jackson-dataformat-yaml - 2.6.3 provided com.fasterxml.jackson.dataformat jackson-dataformat-cbor - 2.6.3 provided org.yaml snakeyaml - 1.15 provided @@ -208,145 +195,121 @@ com.ning compress-lzf - 1.0.2 provided com.tdunning t-digest - 3.0 provided org.hdrhistogram HdrHistogram - 2.1.6 provided com.twitter jsr166e - 1.1.0 provided org.apache.lucene lucene-core - 5.4.1 provided org.apache.lucene lucene-backward-codecs - 5.4.1 provided org.apache.lucene lucene-analyzers-common - 5.4.1 provided org.apache.lucene lucene-queries - 5.4.1 provided org.apache.lucene lucene-memory - 5.4.1 provided org.apache.lucene lucene-highlighter - 5.4.1 provided org.apache.lucene lucene-queryparser - 5.4.1 provided org.apache.lucene lucene-sandbox - 5.4.1 provided org.apache.lucene lucene-suggest - 5.4.1 provided org.apache.lucene lucene-misc - 5.4.1 provided org.apache.lucene lucene-join - 5.4.1 provided org.apache.lucene lucene-grouping - 5.4.1 provided org.apache.lucene lucene-spatial - 5.4.1 provided org.apache.lucene lucene-spatial3d - 5.4.1 provided jakarta-regexp jakarta-regexp - 1.4 provided commons-collections commons-collections - 3.2.2 provided commons-logging commons-logging - 1.2 provided commons-cli commons-cli - 1.3.1 provided org.apache.commons commons-lang3 - 3.4 provided org.elasticsearch.plugin delete-by-query - 2.2.0 provided diff --git a/sdnr/wt/helpserver/provider/pom.xml b/sdnr/wt/helpserver/provider/pom.xml index b8dad8fc2..251c7b569 100644 --- a/sdnr/wt/helpserver/provider/pom.xml +++ b/sdnr/wt/helpserver/provider/pom.xml @@ -33,7 +33,6 @@ javax.servlet servlet-api - 2.5 org.slf4j diff --git a/sdnr/wt/websocketmanager2/provider/pom.xml b/sdnr/wt/websocketmanager2/provider/pom.xml index 2e58da030..7653e46cd 100644 --- a/sdnr/wt/websocketmanager2/provider/pom.xml +++ b/sdnr/wt/websocketmanager2/provider/pom.xml @@ -54,17 +54,14 @@ javax.servlet servlet-api - 2.5 org.eclipse.jetty.websocket websocket-api - 9.3.24.v20180605 org.eclipse.jetty.websocket websocket-servlet - 9.3.24.v20180605 io.netty @@ -90,7 +87,6 @@ org.java-websocket Java-WebSocket - 1.3.8 org.mockito @@ -118,7 +114,6 @@ org.eclipse.jetty jetty-servlet - 9.3.24.v20180605 test -- cgit 1.2.3-korg