From: Arthur Martella <amartell@research.att.com>
Date: Fri, 23 Mar 2018 21:49:05 +0000 (-0400)
Subject: Remove forbidden dependencies to fix Jenkins job
X-Git-Tag: v1.2.1~316
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F38205%2F1;p=so.git

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 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>