diff options
| -rw-r--r-- | asdc-controller/pom.xml | 16 | ||||
| -rw-r--r-- | bpmn/MSOCommonBPMN/pom.xml | 25 |
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> |