summaryrefslogtreecommitdiffstats
path: root/artifactbroker
diff options
context:
space:
mode:
authorliboNet <libo.zhu@intel.com>2019-03-28 07:08:06 +0800
committerliboNet <libo.zhu@intel.com>2019-03-28 07:10:43 +0800
commitece7c6197ca79fb149c17dfbf86c972286cb262f (patch)
tree3650d7796ef6c588fcee6fd573d682e1e3c39069 /artifactbroker
parent0c2c5169090e61fb00d8c10b0e539acaf39d6d22 (diff)
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>
Diffstat (limited to 'artifactbroker')
-rw-r--r--artifactbroker/plugins/reception-plugins/pom.xml5
-rw-r--r--artifactbroker/pom.xml24
2 files changed, 23 insertions, 6 deletions
diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml
index d6a8ccc..a8e37e9 100644
--- a/artifactbroker/plugins/reception-plugins/pom.xml
+++ b/artifactbroker/plugins/reception-plugins/pom.xml
@@ -36,11 +36,6 @@
<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>
<version>1.3.0</version>
diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml
index 0553390..6373a31 100644
--- 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>
- <policy.engine.version>1.3.5</policy.engine.version>
</properties>
<modules>
@@ -87,10 +86,32 @@
<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>
+ <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>
@@ -220,3 +241,4 @@
</pluginManagement>
</build>
</project>
+</project>