From: Vratko Polak <vrpolak@cisco.com>
Date: Thu, 24 Mar 2016 15:32:18 +0000 (+0100)
Subject: Make features-test pom.xml use versions from properties
X-Git-Tag: release/boron~71
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=2b72640a5ca0dd9d9e8991a2de7d4ac58f8fc0c9;p=integration%2Fdistribution.git

Make features-test pom.xml use versions from properties

This is an analogue to the last three edited lines
to feature-index/pom.xml done in Change 36241.

Change-Id: Ifde6430386ba0932c0a0693ff23485f464255a31
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
(cherry-picked from 5ad2565bbc81c19018eab87d0291e00b410c78de)
---

diff --git a/features-test/pom.xml b/features-test/pom.xml
index f09d6a52..488db894 100644
--- a/features-test/pom.xml
+++ b/features-test/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>features-test</artifactId>
-      <version>1.7.0-SNAPSHOT</version>
+      <version>${feature.odlparent.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>opendaylight-karaf-empty</artifactId>
-      <version>1.7.0-SNAPSHOT</version>
+      <version>${feature.odlparent.version}</version>
       <type>zip</type>
     </dependency>
    </dependencies>
@@ -117,7 +117,7 @@
               <systemPropertyVariables>
                 <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
                 <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-                <karaf.distro.version>1.7.0-SNAPSHOT</karaf.distro.version>
+                <karaf.distro.version>${feature.odlparent.version}</karaf.distro.version>
               </systemPropertyVariables>
               <dependenciesToScan>
                <dependency>org.opendaylight.odlparent:features-test</dependency>