pom update

Change-Id: I9f6efd301ebed94fc9b90235d111f04058445899
Signed-off-by: Michael Lando <ml636r@att.com>

diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml
index 07439ed..8ad4db8 100644 (file)
--- 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 f2e67e3..1773107 100644 (file)
--- 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 cd67d24..878fce7 100644 (file)
--- 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 65685ca..2674fa1 100644 (file)
--- 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 b2ff19a..f9202c0 100644 (file)
--- 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 59f499f..93b21bf 100644 (file)
--- 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 e0a2190..084bd06 100644 (file)
--- 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 a905c1b..1a94d47 100644 (file)
--- 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 8308d92..8e8569e 100644 (file)
--- 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 c22df85..ea5d2dd 100644 (file)
--- 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 5d1dc4f..da9ebe6 100644 (file)
--- 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 @@
     <artifactId>openecomp-sdc-validation-impl</artifactId>
 
     <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>
@@ -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 66c9ef5..b775e20 100644 (file)
--- 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 f62de67..b89547e 100644 (file)
--- 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>
@@ -10104,19 +10104,6 @@ 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>
-    
         <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>

diff --git a/pom.xml b/pom.xml
index 8be1d2e..3e3b8a5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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>