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>

diff --git a/asdcApi/features/pom.xml b/asdcApi/features/pom.xml
index 2e0e46c..ff9c92b 100755 (executable)
--- 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 2ca1472..9405e5a 100755 (executable)
--- 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 944ca86..9ddfd28 100755 (executable)
--- 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 294118b..05b0ec7 100644 (file)
--- 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 23ebd53..02095c1 100755 (executable)
--- 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 d4ac98c..d43647d 100644 (file)
--- 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 34cdacc..0a69d85 100644 (file)
--- 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>