summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Martella <amartell@research.att.com>2018-03-23 17:49:05 -0400
committerArthur Martella <amartell@research.att.com>2018-03-23 17:49:05 -0400
commit7a36c13b120629557398e84f8924f585fd9ff899 (patch)
tree675a6a2f4eada9017bc1b89ce7039cffe10fe8e9
parent72dc422f8ff2924ec43ad036e47f58ad43e42473 (diff)
Remove forbidden dependencies to fix Jenkins job
Change-Id: I5cdc138bb64d526d9b1baa8c2238cc9223004426 Issue-ID: SO-529 Signed-off-by: Arthur Martella <amartell@research.att.com>
-rw-r--r--asdc-controller/pom.xml16
-rw-r--r--bpmn/MSOCommonBPMN/pom.xml25
2 files changed, 35 insertions, 6 deletions
diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml
index ff21372240..94a8dd5249 100644
--- a/asdc-controller/pom.xml
+++ b/asdc-controller/pom.xml
@@ -98,11 +98,25 @@
<dependency>
+ <!-- This version should be upgraded in Beijing -->
<groupId>org.openecomp.sdc.sdc-tosca</groupId>
<artifactId>sdc-tosca</artifactId>
<version>1.2.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.openecomp.sdc.jtosca</groupId>
+ <artifactId>jtosca</artifactId>
+ <!-- <version>1.2.2-SNAPSHOT</version> -->
+ </exclusion>
+ </exclusions>
</dependency>
-
+ <dependency>
+ <!-- When the sdc-tosca version is upgraded from 1.2.3,
+ this dependency should be removed entirely -->
+ <groupId>org.openecomp.sdc.jtosca</groupId>
+ <artifactId>jtosca</artifactId>
+ <version>1.2.1</version>
+ </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index a0a5a24e3f..b0ec0c01bc 100644
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -350,11 +350,26 @@
<artifactId>spring-test</artifactId>
<version>4.3.14.RELEASE</version>
</dependency>
- <dependency>
- <groupId>org.openecomp.sdc.sdc-tosca</groupId>
- <artifactId>sdc-tosca</artifactId>
- <version>1.2.3</version>
- </dependency>
+ <dependency>
+ <!-- This version should be upgraded in Beijing -->
+ <groupId>org.openecomp.sdc.sdc-tosca</groupId>
+ <artifactId>sdc-tosca</artifactId>
+ <version>1.2.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.openecomp.sdc.jtosca</groupId>
+ <artifactId>jtosca</artifactId>
+ <!-- <version>1.2.2-SNAPSHOT</version> -->
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <!-- When the sdc-tosca version is upgraded from 1.2.3,
+ this dependency should be removed entirely -->
+ <groupId>org.openecomp.sdc.jtosca</groupId>
+ <artifactId>jtosca</artifactId>
+ <version>1.2.1</version>
+ </dependency>
<dependency>
<groupId>org.camunda.bpm</groupId>
<artifactId>camunda-engine-spring</artifactId>