From: Arthur Martella <amartell@research.att.com>
Date: Mon, 16 Apr 2018 15:25:22 +0000 (-0400)
Subject: Change version of sdc-tosca dependency
X-Git-Tag: v1.2.1~146^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8dac1f8a7143ea213ab6989c2c6113389ae31356;p=so.git

Change version of sdc-tosca dependency

Rolling back version of sdc-tosca library to
 1.3.0 to match sdc-distribution-client
Removing the exclusion of jtosca and letting
 sdc-tosca pick the version it wants

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

diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml
index 20a3566181..88bfa6c651 100644
--- a/asdc-controller/pom.xml
+++ b/asdc-controller/pom.xml
@@ -87,22 +87,7 @@
 		<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>
+  			<version>1.3.0</version>
 		</dependency> 
 
 		<dependency>
diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index 32e7d4a6ac..1d255c4eb4 100644
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -353,22 +353,7 @@
 		<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>
+			<version>1.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.camunda.bpm</groupId>