From c0ac015cec8813f835b2aec44c8e7e6c1eacf574 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Mon, 27 Feb 2017 23:48:43 +0200 Subject: update pom to remove spring from parent pom Change-Id: I100ee305833f4409ad8417efee1c2f7ef9a24750 Signed-off-by: Michael Lando --- asdc-tests/pom.xml | 1 + asdctool/pom.xml | 54 +++++++++++ catalog-be/pom.xml | 30 ++++++ catalog-dao/pom.xml | 107 +++++++++++++++------ catalog-fe/pom.xml | 73 +++++++++++++- catalog-model/pom.xml | 95 ++++++++++++++---- common-app-api/pom.xml | 81 +++++++++++++++- common-be/pom.xml | 77 +++++++++++++++ .../onboarding-rest-war/pom.xml | 1 + pom.xml | 77 --------------- 10 files changed, 471 insertions(+), 125 deletions(-) diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml index cc41ca9019..6b5304c350 100644 --- a/asdc-tests/pom.xml +++ b/asdc-tests/pom.xml @@ -13,6 +13,7 @@ + com.google.guava guava diff --git a/asdctool/pom.xml b/asdctool/pom.xml index 0166c88c2f..20a6919468 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -13,6 +13,56 @@ + + + + + + + + + + org.springframework + spring-context-support + ${spring.version} + provided + + + + org.springframework + spring-messaging + ${spring.version} + provided + + + + org.springframework + spring-web + ${spring.version} + provided + + + + org.springframework + spring-webmvc + ${spring.version} + provided + + + + org.springframework + spring-aspects + ${spring.version} + provided + + + + org.springframework + spring-test + ${spring.version} + test + + org.openecomp.sdc.be @@ -240,17 +290,20 @@ org.springframework spring-core + ${spring.version} compile org.springframework spring-context + ${spring.version} compile org.springframework spring-expression + ${spring.version} compile @@ -262,6 +315,7 @@ org.springframework spring-aop + ${spring.version} compile diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index a13c9bb909..8975ee1157 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -60,6 +60,28 @@ + + + org.springframework + spring-context-support + ${spring.version} + provided + + + + org.springframework + spring-messaging + ${spring.version} + provided + + + + org.springframework + spring-aspects + ${spring.version} + provided + + org.openecomp.sdc security-utils @@ -228,42 +250,49 @@ org.springframework spring-core + ${spring.version} compile org.springframework spring-context + ${spring.version} compile org.springframework spring-web + ${spring.version} compile org.springframework spring-webmvc + ${spring.version} compile org.springframework spring-aop + ${spring.version} compile org.springframework spring-beans + ${spring.version} compile org.springframework spring-expression + ${spring.version} compile @@ -525,6 +554,7 @@ org.springframework spring-test + ${spring.version} test diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index e5767efeed..4a6201b1ad 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -24,6 +24,83 @@ + + org.springframework + spring-core + ${spring.version} + provided + + + + org.springframework + spring-beans + ${spring.version} + provided + + + + org.springframework + spring-context + ${spring.version} + provided + + + + org.springframework + spring-context-support + ${spring.version} + provided + + + + org.springframework + spring-messaging + ${spring.version} + provided + + + + org.springframework + spring-web + ${spring.version} + provided + + + + org.springframework + spring-webmvc + ${spring.version} + provided + + + + org.springframework + spring-aop + ${spring.version} + provided + + + + org.springframework + spring-aspects + ${spring.version} + provided + + + + org.springframework + spring-test + ${spring.version} + test + + + + org.springframework + spring-expression + ${spring.version} + test + + org.openecomp.sdc @@ -76,24 +153,6 @@ - - org.springframework - spring-context - provided - - - - org.springframework - spring-context-support - provided - - - - org.springframework - spring-beans - provided - - org.aspectj aspectjrt @@ -174,11 +233,6 @@ - - org.springframework - spring-test - test - junit @@ -192,15 +246,10 @@ test - - org.springframework - spring-expression - test - - org.springframework spring-aop + ${spring.version} test diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index b12c32b020..3783207fb9 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -16,7 +16,77 @@ - + + org.springframework + spring-core + ${spring.version} + provided + + + + org.springframework + spring-beans + ${spring.version} + provided + + + + org.springframework + spring-context + ${spring.version} + provided + + + + org.springframework + spring-context-support + ${spring.version} + provided + + + + org.springframework + spring-messaging + ${spring.version} + provided + + + + org.springframework + spring-web + ${spring.version} + provided + + + + org.springframework + spring-webmvc + ${spring.version} + provided + + + + org.springframework + spring-aop + ${spring.version} + provided + + + + org.springframework + spring-aspects + ${spring.version} + provided + + + + org.springframework + spring-expression + ${spring.version} + test + + + org.functionaljava functionaljava @@ -264,6 +334,7 @@ org.springframework spring-test + ${spring.version} test diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index 32116b2370..a65eebc817 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -16,6 +16,83 @@ + + org.springframework + spring-core + ${spring.version} + provided + + + + org.springframework + spring-beans + ${spring.version} + provided + + + + org.springframework + spring-context + ${spring.version} + provided + + + + org.springframework + spring-context-support + ${spring.version} + provided + + + + org.springframework + spring-messaging + ${spring.version} + provided + + + + org.springframework + spring-web + ${spring.version} + provided + + + + org.springframework + spring-webmvc + ${spring.version} + provided + + + + org.springframework + spring-aop + ${spring.version} + provided + + + + org.springframework + spring-aspects + ${spring.version} + provided + + + + org.springframework + spring-test + ${spring.version} + test + + + + org.springframework + spring-expression + ${spring.version} + test + + @@ -72,17 +149,6 @@ - - org.springframework - spring-beans - provided - - - - org.springframework - spring-context - provided - javax.validation @@ -189,12 +255,6 @@ mockito-all test - - - org.springframework - spring-test - test - org.aspectj @@ -213,6 +273,7 @@ org.springframework spring-web + ${spring.version} test diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index 955e721a94..342c5763fa 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -13,7 +13,86 @@ - + + + org.springframework + spring-core + ${spring.version} + provided + + + + org.springframework + spring-beans + ${spring.version} + provided + + + + org.springframework + spring-context + ${spring.version} + provided + + + + org.springframework + spring-context-support + ${spring.version} + provided + + + + org.springframework + spring-messaging + ${spring.version} + provided + + + + org.springframework + spring-web + ${spring.version} + provided + + + + org.springframework + spring-webmvc + ${spring.version} + provided + + + + org.springframework + spring-aop + ${spring.version} + provided + + + + org.springframework + spring-aspects + ${spring.version} + provided + + + + org.springframework + spring-test + ${spring.version} + test + + + + org.springframework + spring-expression + ${spring.version} + test + + + + org.openecomp.sdc security-utils ${security-utils.version} diff --git a/common-be/pom.xml b/common-be/pom.xml index 9d27eb8338..13bd8c2235 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -25,6 +25,83 @@ + + org.springframework + spring-core + ${spring.version} + provided + + + + org.springframework + spring-beans + ${spring.version} + provided + + + + org.springframework + spring-context + ${spring.version} + provided + + + + org.springframework + spring-context-support + ${spring.version} + provided + + + + org.springframework + spring-messaging + ${spring.version} + provided + + + + org.springframework + spring-web + ${spring.version} + provided + + + + org.springframework + spring-webmvc + ${spring.version} + provided + + + + org.springframework + spring-aop + ${spring.version} + provided + + + + org.springframework + spring-aspects + ${spring.version} + provided + + + + org.springframework + spring-test + ${spring.version} + test + + + + org.springframework + spring-expression + ${spring.version} + test + + org.openecomp.sdc common-app-api diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml index 0dea1b3ff9..f326d45cb2 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml @@ -100,6 +100,7 @@ org.springframework spring-web + 4.1.3.RELEASE diff --git a/pom.xml b/pom.xml index c4bba322a2..e432f07004 100644 --- a/pom.xml +++ b/pom.xml @@ -418,83 +418,6 @@ provided - - org.springframework - spring-core - ${spring.version} - provided - - - - org.springframework - spring-beans - ${spring.version} - provided - - - - org.springframework - spring-context - ${spring.version} - provided - - - - org.springframework - spring-context-support - ${spring.version} - provided - - - - org.springframework - spring-messaging - ${spring.version} - provided - - - - org.springframework - spring-web - ${spring.version} - provided - - - - org.springframework - spring-webmvc - ${spring.version} - provided - - - - org.springframework - spring-aop - ${spring.version} - provided - - - - org.springframework - spring-aspects - ${spring.version} - provided - - - - org.springframework - spring-test - ${spring.version} - test - - - - org.springframework - spring-expression - ${spring.version} - test - - com.fasterxml.jackson.dataformat jackson-dataformat-yaml -- cgit 1.2.3-korg