diff options
| -rw-r--r-- | asdc-controller/pom.xml | 15 | ||||
| -rw-r--r-- | bpmn/MSOCommonBPMN/pom.xml | 25 |
2 files changed, 35 insertions, 5 deletions
diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index 94447c30e3..20a3566181 100644 --- a/asdc-controller/pom.xml +++ b/asdc-controller/pom.xml @@ -88,6 +88,21 @@ <groupId>org.onap.sdc.sdc-tosca</groupId> <artifactId>sdc-tosca</artifactId> <version>1.3.3</version> + <!-- sdc-tosca:1.3.3 depends on jtosca:1.3.4-SNAPSHOT, + which must be excluded, and the release version + of jtosca must be pulled in using an additional + dependency, below --> + <exclusions> + <exclusion> + <groupId>org.onap.sdc.jtosca</groupId> + <artifactId>jtosca</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.onap.sdc.jtosca</groupId> + <artifactId>jtosca</artifactId> + <version>1.3.4</version> </dependency> <dependency> diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml index 80860ec3ce..6cbd0175f6 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.onap.sdc.sdc-tosca</groupId> - <artifactId>sdc-tosca</artifactId> - <version>1.3.3</version> - </dependency> + <dependency> + <groupId>org.onap.sdc.sdc-tosca</groupId> + <artifactId>sdc-tosca</artifactId> + <version>1.3.3</version> + <!-- sdc-tosca:1.3.3 depends on jtosca:1.3.4-SNAPSHOT, + which must be excluded, and the release version + of jtosca must be pulled in using an additional + dependency, below --> + <exclusions> + <exclusion> + <groupId>org.onap.sdc.jtosca</groupId> + <artifactId>jtosca</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.onap.sdc.jtosca</groupId> + <artifactId>jtosca</artifactId> + <version>1.3.4</version> + </dependency> <dependency> <groupId>org.camunda.bpm</groupId> <artifactId>camunda-engine-spring</artifactId> |