Remove forbidden dependencies to fix Jenkins job

Change-Id: I5cdc138bb64d526d9b1baa8c2238cc9223004426
Issue-ID: SO-529
Signed-off-by: Arthur Martella <amartell@research.att.com>

diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml
index ff21372..94a8dd5 100644 (file)
--- 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 a0a5a24..b0ec0c0 100644 (file)
--- 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>