diff options
| author |   Michael Lando <ml636r@att.com> | 2017-02-27 22:14:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@openecomp.org> | 2017-02-27 22:14:16 +0000 |
| commit | 3db1568ddb6a1d8801de38f0aeeab70b81e8df24 (patch) | |
| tree | 66093ed05dbfadecd71595c61e0e9ffd9c86c4dd | |
| parent | 9b074cd5feb1ec7f2bfacb3730632a5c55645ca4 (diff) | |
| parent | c0ac015cec8813f835b2aec44c8e7e6c1eacf574 (diff) | |
Merge "update pom to remove spring from parent pom"
| -rw-r--r-- | asdc-tests/pom.xml | 1 | ||||
| -rw-r--r-- | asdctool/pom.xml | 54 | ||||
| -rw-r--r-- | catalog-be/pom.xml | 30 | ||||
| -rw-r--r-- | catalog-dao/pom.xml | 107 | ||||
| -rw-r--r-- | catalog-fe/pom.xml | 73 | ||||
| -rw-r--r-- | catalog-model/pom.xml | 95 | ||||
| -rw-r--r-- | common-app-api/pom.xml | 81 | ||||
| -rw-r--r-- | common-be/pom.xml | 77 | ||||
| -rw-r--r-- | openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml | 1 | ||||
| -rw-r--r-- | 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 @@ <dependencies> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> 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 @@ <dependencies> + + <!--<dependency>--> + <!--<groupId>org.springframework</groupId>--> + <!--<artifactId>spring-beans</artifactId>--> + <!--<version>${spring.version}</version>--> + <!--<scope>provided</scope>--> + <!--</dependency>--> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-messaging</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aspects</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + <!-- ASDC dependencies --> <dependency> <groupId>org.openecomp.sdc.be</groupId> @@ -240,17 +290,20 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> + <version>${spring.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> + <version>${spring.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> + <version>${spring.version}</version> <scope>compile</scope> </dependency> <dependency> @@ -262,6 +315,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> + <version>${spring.version}</version> <scope>compile</scope> </dependency> <!-- Spring 4 dependencies end --> 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 @@ <dependencies> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-messaging</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aspects</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.openecomp.sdc</groupId> <artifactId>security-utils</artifactId> @@ -228,42 +250,49 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> + <version>${spring.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> + <version>${spring.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> + <version>${spring.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> + <version>${spring.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> + <version>${spring.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> + <version>${spring.version}</version> <scope>compile</scope> </dependency> @@ -525,6 +554,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> + <version>${spring.version}</version> <scope>test</scope> </dependency> 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 @@ <dependencies> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-messaging</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aspects</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + <!-- Common of SD&C --> <dependency> <groupId>org.openecomp.sdc</groupId> @@ -77,24 +154,6 @@ <!-- SPRING --> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId> <version>${aspectj.version}</version> @@ -174,11 +233,6 @@ </dependency> <!-- TEST --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>junit</groupId> @@ -194,13 +248,8 @@ <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> + <version>${spring.version}</version> <scope>test</scope> </dependency> 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 @@ <dependencies> - + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-messaging</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aspects</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.functionaljava</groupId> <artifactId>functionaljava</artifactId> @@ -264,6 +334,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> + <version>${spring.version}</version> <scope>test</scope> </dependency> </dependencies> 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 @@ <dependencies> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-messaging</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aspects</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + <!-- Common of SD&C --> <dependency> @@ -72,17 +149,6 @@ </dependency> <!-- spring --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <scope>provided</scope> - </dependency> <dependency> <groupId>javax.validation</groupId> @@ -189,12 +255,6 @@ <artifactId>mockito-all</artifactId> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.aspectj</groupId> @@ -213,6 +273,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> + <version>${spring.version}</version> <scope>test</scope> </dependency> 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 @@ <dependencies> - <dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-messaging</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aspects</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + + + <dependency> <groupId>org.openecomp.sdc</groupId> <artifactId>security-utils</artifactId> <version>${security-utils.version}</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 @@ -26,6 +26,83 @@ <dependencies> <!-- Common of SD&C --> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-messaging</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aspects</artifactId> + <version>${spring.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.openecomp.sdc</groupId> <artifactId>common-app-api</artifactId> <version>${common-app-api.version}</version> 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 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> + <version>4.1.3.RELEASE</version> </dependency> </dependencies> @@ -419,83 +419,6 @@ </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${spring.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - <version>${spring.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-messaging</artifactId> - <version>${spring.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>${spring.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webmvc</artifactId> - <version>${spring.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - <version>${spring.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aspects</artifactId> - <version>${spring.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-yaml</artifactId> <version>${jackson.version}</version> |