From 14ec987d4740d982f63d0b3f651d93f546b650f4 Mon Sep 17 00:00:00 2001
From: Rob Daugherty <rd472p@att.com>
Date: Tue, 27 Mar 2018 18:43:24 -0400
Subject: sdc-tosca:1.3.3 depends on a SNAPSHOT artifact

We have to exclude jtosca:1.3.4-SNAPSHOT and import jtosca:1.3.4.
This is really a defect in SDC, but we have to work around it for M4.

Change-Id: I4f204da9c5f3f601ae9a832203439bef7554079d
Issue-ID: SO-536
Signed-off-by: Rob Daugherty <rd472p@att.com>
---
 bpmn/MSOCommonBPMN/pom.xml | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'bpmn/MSOCommonBPMN')

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index 669a3cb353..b0cf1d96bf 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>
-- 
cgit 1.2.3-korg