diff options
| author |   Michael Lando <ml636r@att.com> | 2017-02-28 09:18:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@openecomp.org> | 2017-02-28 09:18:34 +0000 |
| commit | 8440797eac059039ac9846610288f7ad5b4f3a6f (patch) | |
| tree | 3e635674e2fbca8530ce6a1bc34a624273dd260e | |
| parent | 402bb77c30277a1141d9e3bb7e6a57105183a53a (diff) | |
| parent | 0de99c29bb4f8784a5b96948f916ad0fb3b9c3f9 (diff) | |
Merge "pom update"
| -rw-r--r-- | asdc-tests/pom.xml | 3 | ||||
| -rw-r--r-- | asdctool/pom.xml | 1 | ||||
| -rw-r--r-- | catalog-be/pom.xml | 1 | ||||
| -rw-r--r-- | catalog-dao/pom.xml | 1 | ||||
| -rw-r--r-- | catalog-fe/pom.xml | 1 | ||||
| -rw-r--r-- | catalog-model/pom.xml | 8 | ||||
| -rw-r--r-- | common-app-api/pom.xml | 1 | ||||
| -rw-r--r-- | common-be/pom.xml | 9 | ||||
| -rw-r--r-- | distribution-ci/pom.xml | 7 | ||||
| -rw-r--r-- | openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml | 2 | ||||
| -rw-r--r-- | openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml | 10 | ||||
| -rw-r--r-- | openecomp-be/lib/openecomp-tosca-lib/pom.xml | 5 | ||||
| -rw-r--r-- | openecomp-be/tools/swagger-ui/api-docs/api.html | 38 | ||||
| -rw-r--r-- | pom.xml | 7 |
14 files changed, 53 insertions, 41 deletions
diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml index 07439ed904..8ad4db889a 100644 --- a/asdc-tests/pom.xml +++ b/asdc-tests/pom.xml @@ -169,8 +169,11 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> + <version>1.14</version> <scope>compile</scope> </dependency> + + <!-- http client --> <dependency> diff --git a/asdctool/pom.xml b/asdctool/pom.xml index f2e67e354d..1773107822 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -332,6 +332,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> + <version>1.14</version> <scope>compile</scope> </dependency> <dependency> diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index cd67d24fa9..878fce7db2 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -173,6 +173,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> + <version>1.14</version> <scope>compile</scope> </dependency> diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index 65685cae76..2674fa12fd 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -210,6 +210,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> + <version>1.14</version> <scope>provided</scope> </dependency> diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index b2ff19a43e..f9202c0ae0 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -140,6 +140,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> + <version>1.14</version> <scope>compile</scope> </dependency> diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index 59f499f186..93b21bf8df 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -17,6 +17,14 @@ <dependencies> + <!-- yaml to object converter --> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>1.14</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index e0a2190e67..084bd063a7 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -128,6 +128,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> + <version>1.14</version> <scope>provided</scope> </dependency> diff --git a/common-be/pom.xml b/common-be/pom.xml index a905c1b297..1a94d47771 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -24,6 +24,15 @@ <dependencies> + + <!-- yaml to object converter --> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>1.14</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> diff --git a/distribution-ci/pom.xml b/distribution-ci/pom.xml index 8308d92a00..8e8569ebce 100644 --- a/distribution-ci/pom.xml +++ b/distribution-ci/pom.xml @@ -13,6 +13,13 @@ <dependencies> + <!-- yaml to object converter --> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>1.14</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml index c22df85a87..ea5d2dd26b 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml @@ -16,7 +16,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.14</version> + <version>1.17</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml index 5d1dc4ffa5..da9ebe6ac7 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml @@ -14,12 +14,6 @@ <dependencies> <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - <version>1.17</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> <version>2.3.1</version> @@ -88,10 +82,6 @@ <artifactId>openecomp-heat-lib</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - </dependency> </dependencies> diff --git a/openecomp-be/lib/openecomp-tosca-lib/pom.xml b/openecomp-be/lib/openecomp-tosca-lib/pom.xml index 66c9ef5639..b775e20787 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-lib/pom.xml @@ -53,10 +53,7 @@ <artifactId>guava</artifactId> <version>19.0</version> </dependency> - <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - </dependency> + </dependencies> diff --git a/openecomp-be/tools/swagger-ui/api-docs/api.html b/openecomp-be/tools/swagger-ui/api-docs/api.html index f62de6767c..b89547e308 100644 --- a/openecomp-be/tools/swagger-ui/api-docs/api.html +++ b/openecomp-be/tools/swagger-ui/api-docs/api.html @@ -9572,11 +9572,11 @@ Performs one of the following actions on a action: |Checkout: Locks it for edits </tr> <tr> - <td>contentId</td> + <td>contentDisposition</td> <td> + <a href="#/definitions/ContentDisposition">ContentDisposition</a> - string </td> <td>optional</td> @@ -9585,10 +9585,10 @@ Performs one of the following actions on a action: |Checkout: Locks it for edits </tr> <tr> - <td>contentDisposition</td> + <td>dataHandler</td> <td> - <a href="#/definitions/ContentDisposition">ContentDisposition</a> + <a href="#/definitions/DataHandler">DataHandler</a> </td> @@ -9598,11 +9598,11 @@ Performs one of the following actions on a action: |Checkout: Locks it for edits </tr> <tr> - <td>dataHandler</td> + <td>contentId</td> <td> - <a href="#/definitions/DataHandler">DataHandler</a> + string </td> <td>optional</td> @@ -10105,19 +10105,6 @@ Performs one of the following actions on a action: |Checkout: Locks it for edits </tr> <tr> - <td>subType</td> - <td> - - - string - - </td> - <td>optional</td> - <td>-</td> - <td></td> - </tr> - - <tr> <td>defaultRepresentationClassAsString</td> <td> @@ -10286,6 +10273,19 @@ Performs one of the following actions on a action: |Checkout: Locks it for edits <td></td> </tr> + <tr> + <td>subType</td> + <td> + + + string + + </td> + <td>optional</td> + <td>-</td> + <td></td> + </tr> + </table> ## <a name="/definitions/DataHandler">DataHandler</a> @@ -296,13 +296,6 @@ <scope>compile</scope> </dependency> - <!-- yaml to object converter --> - <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - <version>1.14</version> - <scope>provided</scope> - </dependency> <!-- listen to file changes --> <dependency> |