fix the clm issue

fix the org.json:json issue and
fix the jackson.core issue by excluding them from policy-endpoints
remove the unused sdc-tosca package

Change-Id: I1eb96d95f9acade1b3d1203aa0ccff0aacd083de
Issue-ID: MULTICLOUD-514
Signed-off-by: liboNet <libo.zhu@intel.com>

diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml
index d6a8ccc..a8e37e9 100644 (file)
--- a/artifactbroker/plugins/reception-plugins/pom.xml
+++ b/artifactbroker/plugins/reception-plugins/pom.xml
@@ -35,11 +35,6 @@
             <artifactId>multicloud-framework-artifactbroker-reception</artifactId>
             <version>${project.version}</version>
         </dependency>
             <artifactId>multicloud-framework-artifactbroker-reception</artifactId>
             <version>${project.version}</version>
         </dependency>

-        <dependency>
-            <groupId>org.onap.sdc.sdc-tosca</groupId>
-            <artifactId>sdc-tosca</artifactId>
-            <version>1.4.1</version>
-        </dependency>

         <dependency>
             <groupId>org.onap.sdc.sdc-distribution-client</groupId>
             <artifactId>sdc-distribution-client</artifactId>
         <dependency>
             <groupId>org.onap.sdc.sdc-distribution-client</groupId>
             <artifactId>sdc-distribution-client</artifactId>

diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml
index 0553390..6373a31 100644 (file)
--- a/artifactbroker/pom.xml
+++ b/artifactbroker/pom.xml
@@ -34,7 +34,6 @@
         <nexusproxy>https://nexus.onap.org</nexusproxy>
         <version.logback>1.2.3</version.logback>
         <policy.common.version>1.3.4</policy.common.version>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
         <version.logback>1.2.3</version.logback>
         <policy.common.version>1.3.4</policy.common.version>

-        <policy.engine.version>1.3.5</policy.engine.version>

     </properties>
 
     <modules>
     </properties>
 
     <modules>


@@ -87,10 +86,32 @@
             <artifactId>capabilities</artifactId>
             <version>${policy.common.version}</version>
         </dependency>
             <artifactId>capabilities</artifactId>
             <version>${policy.common.version}</version>
         </dependency>

+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.9.8</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.json/json -->
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20160810</version>
+        </dependency>

         <dependency>
             <groupId>org.onap.policy.common</groupId>
             <artifactId>policy-endpoints</artifactId>
             <version>${policy.common.version}</version>
         <dependency>
             <groupId>org.onap.policy.common</groupId>
             <artifactId>policy-endpoints</artifactId>
             <version>${policy.common.version}</version>

+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
+                </exclusion>
+          </exclusions>

         </dependency>
         <dependency>
             <groupId>org.onap.policy.common</groupId>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.common</groupId>


@@ -220,3 +241,4 @@
         </pluginManagement>
     </build>
 </project>
         </pluginManagement>
     </build>
 </project>

+</project>