Merge "Adding TSDR features to integration project."

diff --git a/distributions/karaf/pom.xml b/distributions/karaf/pom.xml
index b62be53a9a9afb081ec7c6d572d6266da015f7cc..4f2410856d0fab40b996e447d1b0c50c0fed765c 100644 (file)
--- a/distributions/karaf/pom.xml
+++ b/distributions/karaf/pom.xml
@@ -236,7 +236,6 @@
       <plugin>
         <groupId>org.apache.karaf.tooling</groupId>
         <artifactId>karaf-maven-plugin</artifactId>
-        <version>${karaf.version}</version>
         <extensions>true</extensions>
         <configuration>
           <!-- no startupFeatures -->

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 9842e91a6876033478b025fd73f7611e3746ce59..56685f3b0d0180a709695669465952f98638cfb2 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -360,7 +360,6 @@
          <plugin>
             <groupId>org.apache.karaf.tooling</groupId>
             <artifactId>karaf-maven-plugin</artifactId>
-            <version>${karaf.version}</version>
             <extensions>true</extensions>
             <executions>
                <execution>

diff --git a/features/test/pom.xml b/features/test/pom.xml
index 50b70d45ca168e8b7f24be8e3614683adbc57fd9..afb3e4510ac5118b44c188efdc4e7cc125fb2429 100644 (file)
--- a/features/test/pom.xml
+++ b/features/test/pom.xml
@@ -56,7 +56,6 @@
          <plugin>
             <groupId>org.apache.karaf.tooling</groupId>
             <artifactId>karaf-maven-plugin</artifactId>
-            <version>${karaf.version}</version>
             <extensions>true</extensions>
             <executions>
                <execution>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index d2c394300fa22d98d68c3f1ce478162602a361b6..da9fed4815186bd5c79223d59e6f884ebc764f87 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -106,7 +106,6 @@
         <feature version='${feature.usc.version}'>odl-usc-channel</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel-rest</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
-        <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
     </feature>
 
     <!-- Please use aphabetical order for non-compatible features -->
@@ -124,6 +123,7 @@
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
         <feature version='${feature.tsdr.version}'>odl-tsdr-all</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-all</feature>
+        <feature version='${feature.vpnservice.version}'>odl-vpnservice-core</feature>
     </feature>
 
 </features>