diff options
| author |   Michael Lando <ml636r@att.com> | 2017-02-28 06:23:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@openecomp.org> | 2017-02-28 06:23:44 +0000 |
| commit | 402bb77c30277a1141d9e3bb7e6a57105183a53a (patch) | |
| tree | a6daa07e4bf6fe5a0f7f70b99626018befc3a896 | |
| parent | fdf4f9e898f7597c3b5d5f6b7eaf54520d04aad2 (diff) | |
| parent | 9744a93978945ba102bd56168e5e5b2ec12e450f (diff) | |
Merge "pom fix"
| -rw-r--r-- | asdc-tests/pom.xml | 3 | ||||
| -rw-r--r-- | asdctool/pom.xml | 3 | ||||
| -rw-r--r-- | catalog-be/pom.xml | 1 | ||||
| -rw-r--r-- | catalog-dao/pom.xml | 2 | ||||
| -rw-r--r-- | catalog-fe/pom.xml | 1 | ||||
| -rw-r--r-- | catalog-model/pom.xml | 1 | ||||
| -rw-r--r-- | common-app-api/pom.xml | 1 | ||||
| -rw-r--r-- | common-be/pom.xml | 6 | ||||
| -rw-r--r-- | distribution-ci/pom.xml | 6 | ||||
| -rw-r--r-- | pom.xml | 8 |
10 files changed, 22 insertions, 10 deletions
diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml index 90f442a892..07439ed904 100644 --- a/asdc-tests/pom.xml +++ b/asdc-tests/pom.xml @@ -14,6 +14,8 @@ <dependencies> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> @@ -159,6 +161,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> + <version>2.3.1</version> <scope>compile</scope> </dependency> diff --git a/asdctool/pom.xml b/asdctool/pom.xml index ee757ee79f..f2e67e354d 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -21,8 +21,6 @@ <!--<scope>provided</scope>--> <!--</dependency>--> - - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId> @@ -278,6 +276,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> + <version>2.3.1</version> <scope>compile</scope> </dependency> <dependency> diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 05ac518397..cd67d24fa9 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -189,6 +189,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> + <version>2.3.1</version> <scope>compile</scope> </dependency> diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index 96cb609763..65685cae76 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -216,9 +216,11 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> + <version>2.3.1</version> <scope>provided</scope> </dependency> + <dependency> <groupId>org.functionaljava</groupId> <artifactId>functionaljava</artifactId> diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index b3942b179b..b2ff19a43e 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -152,6 +152,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> + <version>2.3.1</version> <scope>compile</scope> </dependency> diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index ed409a0bd5..59f499f186 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -181,6 +181,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> + <version>2.3.1</version> <scope>provided</scope> </dependency> diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index aacaa35ef8..e0a2190e67 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -142,6 +142,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> + <version>2.3.1</version> <scope>provided</scope> </dependency> diff --git a/common-be/pom.xml b/common-be/pom.xml index ce7b0d944e..a905c1b297 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -25,6 +25,12 @@ <dependencies> <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.3.1</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.2.1-SNAPSHOT</version> diff --git a/distribution-ci/pom.xml b/distribution-ci/pom.xml index f770a34ee9..8308d92a00 100644 --- a/distribution-ci/pom.xml +++ b/distribution-ci/pom.xml @@ -13,6 +13,12 @@ <dependencies> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.3.1</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.json</groupId> @@ -312,14 +312,6 @@ <scope>provided</scope> </dependency> - <!-- Gson --> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>2.3.1</version> - <scope>provided</scope> - </dependency> - <!-- http client --> <dependency> <groupId>org.apache.httpcomponents</groupId> |