From 0de99c29bb4f8784a5b96948f916ad0fb3b9c3f9 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Tue, 28 Feb 2017 10:54:57 +0200 Subject: [PATCH] pom update Change-Id: I9f6efd301ebed94fc9b90235d111f04058445899 Signed-off-by: Michael Lando --- asdc-tests/pom.xml | 3 ++ asdctool/pom.xml | 1 + catalog-be/pom.xml | 1 + catalog-dao/pom.xml | 1 + catalog-fe/pom.xml | 1 + catalog-model/pom.xml | 8 +++++ common-app-api/pom.xml | 1 + common-be/pom.xml | 9 +++++ distribution-ci/pom.xml | 7 ++++ .../openecomp-utilities-lib/pom.xml | 2 +- .../openecomp-sdc-validation-impl/pom.xml | 10 ------ openecomp-be/lib/openecomp-tosca-lib/pom.xml | 5 +-- openecomp-be/tools/swagger-ui/api-docs/api.html | 38 +++++++++++----------- 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 @@ org.yaml snakeyaml + 1.14 compile + + 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 @@ org.yaml snakeyaml + 1.14 compile 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 @@ org.yaml snakeyaml + 1.14 compile 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 @@ org.yaml snakeyaml + 1.14 provided 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 @@ org.yaml snakeyaml + 1.14 compile 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 @@ + + + org.yaml + snakeyaml + 1.14 + provided + + commons-logging commons-logging 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 @@ org.yaml snakeyaml + 1.14 provided 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 @@ + + + + org.yaml + snakeyaml + 1.14 + provided + + com.google.code.gson gson 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 @@ + + + org.yaml + snakeyaml + 1.14 + provided + com.google.code.gson gson 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 @@ org.yaml snakeyaml - 1.14 + 1.17 org.apache.commons 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 @@ -13,12 +13,6 @@ openecomp-sdc-validation-impl - - org.yaml - snakeyaml - 1.17 - test - com.google.code.gson gson @@ -88,10 +82,6 @@ openecomp-heat-lib ${project.version} - - org.yaml - snakeyaml - 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 @@ guava 19.0 - - org.yaml - snakeyaml - + 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 - contentId + contentDisposition + ContentDisposition - string optional @@ -9585,10 +9585,10 @@ Performs one of the following actions on a action: |Checkout: Locks it for edits - contentDisposition + dataHandler - ContentDisposition + DataHandler @@ -9598,11 +9598,11 @@ Performs one of the following actions on a action: |Checkout: Locks it for edits - dataHandler + contentId - DataHandler + string optional @@ -10104,19 +10104,6 @@ Performs one of the following actions on a action: |Checkout: Locks it for edits - - subType - - - - string - - - optional - - - - - defaultRepresentationClassAsString @@ -10286,6 +10273,19 @@ Performs one of the following actions on a action: |Checkout: Locks it for edits + + subType + + + + string + + + optional + - + + + ## DataHandler diff --git a/pom.xml b/pom.xml index 8be1d2ee9e..3e3b8a5404 100644 --- a/pom.xml +++ b/pom.xml @@ -296,13 +296,6 @@ compile - - - org.yaml - snakeyaml - 1.14 - provided - -- 2.16.6