From 04cfaf48ddd04c1bac89c613ac402d7fb212a434 Mon Sep 17 00:00:00 2001
From: Guo Ruijing <ruijing.guo@intel.com>
Date: Tue, 23 May 2017 07:14:07 +0000
Subject: [PATCH] fix some build issues

1. use 1.1.1 rootpom
2. add verson for opendaylight-karaf-empty
3. use parameter for dblib-provider

Change-Id: Ia68a765011c70eae4a7275b33bc2906ed95ba5fb
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
---
 asdcApi/features/pom.xml    | 1 +
 dataChange/features/pom.xml | 1 +
 dmaap-listener/pom.xml      | 2 +-
 pom.xml                     | 2 +-
 ueb-listener/pom.xml        | 2 +-
 vnfapi/features/pom.xml     | 1 +
 vnftools/features/pom.xml   | 1 +
 7 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/asdcApi/features/pom.xml b/asdcApi/features/pom.xml
index 2e0e46cb..ff9c92bf 100755
--- a/asdcApi/features/pom.xml
+++ b/asdcApi/features/pom.xml
@@ -46,6 +46,7 @@
 		<dependency>
 			<groupId>org.opendaylight.controller</groupId>
 			<artifactId>opendaylight-karaf-empty</artifactId>
+			<version>${odl.karaf.empty.distro.version}</version>
 			<type>zip</type>
 		</dependency>
 
diff --git a/dataChange/features/pom.xml b/dataChange/features/pom.xml
index 2ca14724..9405e5a5 100755
--- a/dataChange/features/pom.xml
+++ b/dataChange/features/pom.xml
@@ -44,6 +44,7 @@
 		<dependency>
 			<groupId>org.opendaylight.controller</groupId>
 			<artifactId>opendaylight-karaf-empty</artifactId>
+			<version>${odl.karaf.empty.distro.version}</version>
 			<type>zip</type>
 		</dependency>
 
diff --git a/dmaap-listener/pom.xml b/dmaap-listener/pom.xml
index 944ca86d..9ddfd281 100755
--- a/dmaap-listener/pom.xml
+++ b/dmaap-listener/pom.xml
@@ -65,7 +65,7 @@
   		<dependency>
 			<groupId>org.openecomp.sdnc.core</groupId>
 			<artifactId>dblib-provider</artifactId>
- 			<version>1.1.0-SNAPSHOT</version>
+ 			<version>${sdnctl.dblib.version}</version>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/pom.xml b/pom.xml
index 294118b3..05b0ec7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openecomp.sdnc.core</groupId>
 		<artifactId>root</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/ueb-listener/pom.xml b/ueb-listener/pom.xml
index 23ebd531..02095c16 100755
--- a/ueb-listener/pom.xml
+++ b/ueb-listener/pom.xml
@@ -65,7 +65,7 @@
   		<dependency>
 			<groupId>org.openecomp.sdnc.core</groupId>
 			<artifactId>dblib-provider</artifactId>
- 			<version>1.1.0-SNAPSHOT</version>
+ 			<version>${sdnctl.dblib.version}</version>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/vnfapi/features/pom.xml b/vnfapi/features/pom.xml
index d4ac98c1..d43647da 100644
--- a/vnfapi/features/pom.xml
+++ b/vnfapi/features/pom.xml
@@ -44,6 +44,7 @@
 		<dependency>
 			<groupId>org.opendaylight.controller</groupId>
 			<artifactId>opendaylight-karaf-empty</artifactId>
+			<version>${odl.karaf.empty.distro.version}</version>
 			<type>zip</type>
 		</dependency>
 
diff --git a/vnftools/features/pom.xml b/vnftools/features/pom.xml
index 34cdacc7..0a69d853 100644
--- a/vnftools/features/pom.xml
+++ b/vnftools/features/pom.xml
@@ -42,6 +42,7 @@
 		<dependency>
 			<groupId>org.opendaylight.controller</groupId>
 			<artifactId>opendaylight-karaf-empty</artifactId>
+			<version>${odl.karaf.empty.distro.version}</version>
 			<type>zip</type>
 		</dependency>
 
-- 
2.16.6