From c34b77cead2a33421d86e3a712b222bc8cef6a8f Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Tue, 28 Feb 2017 19:03:11 +0200 Subject: pom update Change-Id: I82eda3333c8bc7d152b4bd603247e33c59744dca Signed-off-by: Michael Lando --- asdc-tests/pom.xml | 19 ++++++- asdctool/pom.xml | 27 ++++++++++ catalog-be/pom.xml | 24 +++++++++ catalog-dao/pom.xml | 20 ++++++- catalog-fe/pom.xml | 34 +++++++++++- catalog-model/pom.xml | 32 ++++++++--- common-app-api/pom.xml | 19 +++++++ common-be/pom.xml | 25 +++++++++ distribution-ci/pom.xml | 30 +++++++++++ pom.xml | 131 +--------------------------------------------- security-utils/pom.xml | 1 + ui-ci-dev/pom.xml | 32 ++++++++++- ui-ci/pom.xml | 31 ++++++++++- webseal-simulator/pom.xml | 7 +++ 14 files changed, 287 insertions(+), 145 deletions(-) diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml index 8ad4db889a..b10e3b2309 100644 --- a/asdc-tests/pom.xml +++ b/asdc-tests/pom.xml @@ -14,11 +14,18 @@ + + org.apache.commons + commons-lang3 + ${lang3.version} + compile + com.google.guava guava + ${guava.version} compile @@ -120,18 +127,21 @@ org.slf4j slf4j-api + 1.7.10 compile ch.qos.logback logback-classic + ${logback.version} compile ch.qos.logback logback-core + ${logback.version} compile @@ -179,12 +189,14 @@ org.apache.httpcomponents httpclient + ${httpclient.version} compile org.apache.httpcomponents httpmime + ${httpclient.version} compile @@ -206,6 +218,7 @@ org.apache.httpcomponents httpcore + ${httpcore.version} compile @@ -246,14 +259,16 @@ com.fasterxml.jackson.core jackson-databind - 2.3.1 + + ${jackson.version} compile com.fasterxml.jackson.core jackson-core - 2.3.1 + + ${jackson.version} compile diff --git a/asdctool/pom.xml b/asdctool/pom.xml index 1773107822..99b4bbe0a2 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -14,6 +14,27 @@ + + org.testng + testng + 6.9.10 + test + + + + com.google.guava + guava + ${guava.version} + compile + + + + org.apache.commons + commons-lang3 + ${lang3.version} + compile + + @@ -160,24 +181,28 @@ org.slf4j slf4j-api + 1.7.10 compile ch.qos.logback logback-classic + ${logback.version} compile ch.qos.logback logback-core + ${logback.version} compile org.codehaus.groovy groovy-all + ${groovy.version} compile @@ -282,11 +307,13 @@ org.apache.httpcomponents httpclient + ${httpclient.version} compile org.apache.httpcomponents httpcore + ${httpcore.version} compile diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 878fce7db2..add2bd4e79 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -61,6 +61,15 @@ + + + + org.testng + testng + 6.9.10 + test + + org.springframework spring-context-support @@ -122,6 +131,7 @@ jersey-container-servlet-core + org.openecomp.sdc @@ -154,18 +164,21 @@ org.slf4j slf4j-api + 1.7.10 compile ch.qos.logback logback-classic + ${logback.version} compile ch.qos.logback logback-core + ${logback.version} compile @@ -211,12 +224,14 @@ org.apache.httpcomponents httpclient + ${httpclient.version} compile org.apache.httpcomponents httpcore + ${httpcore.version} compile @@ -303,12 +318,15 @@ org.codehaus.groovy groovy-all + ${groovy.version} compile + org.codehaus.janino janino + ${janino.version} compile @@ -323,6 +341,8 @@ com.google.guava guava + ${guava.version} + compile @@ -365,6 +385,7 @@ org.apache.commons commons-lang3 + ${lang3.version} compile @@ -406,6 +427,7 @@ org.aspectj aspectjrt + ${aspectjrt.version} compile @@ -546,12 +568,14 @@ junit junit + 4.12 test org.mockito mockito-all + 1.10.19 test diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index 2674fa12fd..65790d35a2 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -24,6 +24,14 @@ + + + org.testng + testng + 6.9.10 + test + + commons-logging commons-logging @@ -131,12 +139,14 @@ ch.qos.logback logback-classic + ${logback.version} provided ch.qos.logback logback-core + ${logback.version} provided @@ -181,12 +191,14 @@ com.fasterxml.jackson.core jackson-databind + ${jackson.version} provided org.slf4j slf4j-api + 1.7.10 provided @@ -204,7 +216,9 @@ org.mockito mockito-all - ${mockito.version} + + 1.10.19 + test @@ -232,12 +246,14 @@ org.apache.httpcomponents httpclient + ${httpclient.version} provided org.apache.httpcomponents httpcore + ${httpcore.version} provided @@ -253,6 +269,7 @@ junit junit + 4.12 test @@ -305,6 +322,7 @@ org.apache.commons commons-lang3 + ${lang3.version} provided diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index f9202c0ae0..248fad7700 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -17,6 +17,20 @@ + + junit + junit + 4.12 + test + + + + org.testng + testng + 6.9.10 + test + + org.springframework spring-core @@ -110,30 +124,35 @@ org.slf4j slf4j-api + 1.7.10 compile ch.qos.logback logback-classic + ${logback.version} compile ch.qos.logback logback-core + ${logback.version} compile org.codehaus.groovy groovy-all + ${groovy.version} compile org.codehaus.janino janino + ${janino.version} compile @@ -160,6 +179,7 @@ org.glassfish.jersey.containers jersey-container-servlet + 2.24 compile @@ -191,18 +211,21 @@ com.fasterxml.jackson.core jackson-core + ${jackson.version} compile com.fasterxml.jackson.core jackson-databind + ${jackson.version} compile com.fasterxml.jackson.core jackson-annotations + ${jackson.version} compile @@ -210,19 +233,22 @@ org.apache.httpcomponents httpclient + ${httpclient.version} compile org.apache.httpcomponents httpcore + ${httpcore.version} compile org.apache.httpcomponents httpmime - 4.3.2 + + ${httpclient.version} compile @@ -251,6 +277,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml + ${jackson.version} compile @@ -273,6 +300,7 @@ com.google.guava guava + ${guava.version} compile @@ -285,11 +313,13 @@ org.aspectj aspectjrt + ${aspectjrt.version} compile org.apache.commons commons-lang3 + ${lang3.version} compile @@ -334,6 +364,8 @@ org.mockito mockito-all + 1.10.19 + test diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index 93b21bf8df..3f21a91b5d 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -17,6 +17,20 @@ + + org.testng + testng + 6.9.10 + test + + + + org.slf4j + slf4j-api + 1.7.10 + provided + + org.yaml @@ -134,12 +148,14 @@ ch.qos.logback logback-classic + ${logback.version} provided ch.qos.logback logback-core + ${logback.version} provided @@ -228,6 +244,7 @@ org.apache.commons commons-lang3 + ${lang3.version} provided @@ -235,12 +252,14 @@ org.apache.httpcomponents httpclient + ${httpclient.version} provided org.apache.httpcomponents httpcore + ${httpcore.version} provided @@ -260,30 +279,27 @@ - - junit junit + 4.12 test org.mockito mockito-all + 1.10.19 test org.aspectj - aspectjrt - 1.7.4 + aspectjrt + ${aspectjrt.version} + test diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index 084bd063a7..777e01f506 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -14,6 +14,13 @@ + + org.testng + testng + 6.9.10 + test + + org.springframework spring-core @@ -109,6 +116,7 @@ org.slf4j slf4j-api + 1.7.10 provided @@ -121,6 +129,7 @@ org.glassfish.jersey.containers jersey-container-servlet + 2.24 provided @@ -151,12 +160,14 @@ org.apache.httpcomponents httpclient + ${httpclient.version} provided org.apache.httpcomponents httpcore + ${httpcore.version} provided @@ -190,36 +201,42 @@ org.aspectj aspectjrt + ${aspectjrt.version} provided org.apache.commons commons-lang3 + ${lang3.version} provided com.fasterxml.jackson.core jackson-databind + ${jackson.version} provided com.fasterxml.jackson.core jackson-core + ${jackson.version} provided ch.qos.logback logback-classic + ${logback.version} provided ch.qos.logback logback-core + ${logback.version} provided @@ -240,12 +257,14 @@ junit junit + 4.12 test org.mockito mockito-all + 1.10.19 test diff --git a/common-be/pom.xml b/common-be/pom.xml index 1a94d47771..5800257096 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -25,6 +25,27 @@ + + org.mockito + mockito-all + 1.10.19 + provided + + + + org.testng + testng + 6.9.10 + test + + + + org.apache.commons + commons-lang3 + ${lang3.version} + provided + + org.yaml @@ -139,18 +160,21 @@ ch.qos.logback logback-classic + ${logback.version} provided ch.qos.logback logback-core + ${logback.version} provided org.slf4j slf4j-api + 1.7.10 provided @@ -172,6 +196,7 @@ junit junit + 4.12 test diff --git a/distribution-ci/pom.xml b/distribution-ci/pom.xml index 8e8569ebce..d8603be39a 100644 --- a/distribution-ci/pom.xml +++ b/distribution-ci/pom.xml @@ -13,6 +13,35 @@ + + + org.testng + testng + 6.9.10 + test + + + + org.slf4j + slf4j-api + 1.7.10 + compile + + + + com.google.guava + guava + ${guava.version} + compile + + + + org.apache.commons + commons-lang3 + ${lang3.version} + compile + + org.yaml @@ -51,6 +80,7 @@ junit junit + 4.12 compile diff --git a/pom.xml b/pom.xml index 3e3b8a5404..d74e81107c 100644 --- a/pom.xml +++ b/pom.xml @@ -147,6 +147,7 @@ + 1.1.2 2.3.5 3.0.6 @@ -218,18 +219,6 @@ 1.4.0 - - com.google.guava - guava - ${guava.version} - - - - org.apache.commons - commons-lang3 - ${lang3.version} - - org.elasticsearch elasticsearch @@ -262,12 +251,6 @@ import - - org.slf4j - slf4j-api - 1.7.10 - - javax.servlet servlet-api @@ -275,12 +258,6 @@ provided - - org.glassfish.jersey.containers - jersey-container-servlet - 2.24 - provided - org.glassfish.jersey.media @@ -305,83 +282,12 @@ provided - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - provided - - - - org.apache.httpcomponents - httpmime - ${httpclient.version} - provided - - - - org.apache.httpcomponents - httpcore - ${httpcore.version} - provided - - - - ch.qos.logback - logback-classic - 1.1.2 - provided - - - - ch.qos.logback - logback-core - 1.1.2 - provided - - - - - org.codehaus.groovy - groovy-all - ${groovy.version} - provided - - - - org.codehaus.janino - janino - ${janino.version} - provided - - - - junit - junit - 4.12 - test - - - - org.testng - testng - 6.9.10 - test - com.relevantcodes extentreports 2.41.0 - - org.mockito - mockito-all - 1.10.19 - provided - - com.googlecode.json-simple json-simple @@ -389,34 +295,6 @@ provided - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - provided - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - provided - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - provided - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.annotations.version} - provided - - org.functionaljava @@ -432,12 +310,7 @@ ${jcabi.version} provided - - org.aspectj - aspectjrt - ${aspectjrt.version} - provided - + diff --git a/security-utils/pom.xml b/security-utils/pom.xml index 79feeb18a0..a9a8c68da4 100644 --- a/security-utils/pom.xml +++ b/security-utils/pom.xml @@ -16,6 +16,7 @@ junit junit + 4.12 diff --git a/ui-ci-dev/pom.xml b/ui-ci-dev/pom.xml index b84322c8f1..b33ab9166d 100644 --- a/ui-ci-dev/pom.xml +++ b/ui-ci-dev/pom.xml @@ -14,6 +14,28 @@ + + + org.slf4j + slf4j-api + 1.7.10 + compile + + + + com.google.guava + guava + ${guava.version} + compile + + + + org.apache.commons + commons-lang3 + ${lang3.version} + compile + + org.seleniumhq.selenium selenium-java @@ -57,12 +79,14 @@ org.apache.httpcomponents httpclient + ${httpclient.version} compile org.apache.httpcomponents httpmime + ${httpclient.version} compile @@ -83,6 +107,7 @@ org.apache.httpcomponents httpcore + ${httpcore.version} compile @@ -111,14 +136,16 @@ com.fasterxml.jackson.core jackson-databind - 2.3.1 + + ${jackson.version} compile com.fasterxml.jackson.core jackson-core - 2.3.1 + + ${jackson.version} compile @@ -131,6 +158,7 @@ junit junit + 4.12 compile diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml index 5c0726d399..a1d0d8213e 100644 --- a/ui-ci/pom.xml +++ b/ui-ci/pom.xml @@ -15,6 +15,27 @@ + + org.slf4j + slf4j-api + 1.7.10 + compile + + + + com.google.guava + guava + ${guava.version} + compile + + + + org.apache.commons + commons-lang3 + ${lang3.version} + compile + + org.seleniumhq.selenium selenium-java @@ -59,12 +80,14 @@ org.apache.httpcomponents httpclient + ${httpclient.version} compile org.apache.httpcomponents httpmime + ${httpclient.version} compile @@ -86,6 +109,7 @@ org.apache.httpcomponents httpcore + ${httpcore.version} compile @@ -114,14 +138,16 @@ com.fasterxml.jackson.core jackson-databind - 2.3.1 + + ${jackson.version} compile com.fasterxml.jackson.core jackson-core - 2.3.1 + + ${jackson.version} compile @@ -135,6 +161,7 @@ junit junit + 4.12 compile diff --git a/webseal-simulator/pom.xml b/webseal-simulator/pom.xml index 748e286c03..cbfcd7185f 100644 --- a/webseal-simulator/pom.xml +++ b/webseal-simulator/pom.xml @@ -19,6 +19,13 @@ + + + org.slf4j + slf4j-api + 1.7.10 + compile + junit junit -- cgit 1.2.3-korg