Re-enable running of SingleFeaturesTest

For reasons I have not yet figured out, depending on the
yangtools version of features-test causes features tests
to no longer run.  This patch changes controller
to depending on the features-tests from odlparent

Change-Id: I45397f042cc367addde2ada74a27aba98fc98126
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/features/akka/pom.xml b/features/akka/pom.xml
index f804505c64d2c57ef8d95fc0091a2b0b74285ed6..418597218085fb9fcaf1f078f5456c2ff12f0ec2 100644 (file)
--- a/features/akka/pom.xml
+++ b/features/akka/pom.xml
@@ -174,9 +174,8 @@
     -->
     <!-- test to validate features.xml -->
     <dependency>
     -->
     <!-- test to validate features.xml -->
     <dependency>

-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.odlparent</groupId>

       <artifactId>features-test</artifactId>
       <artifactId>features-test</artifactId>

-      <version>${feature.test.version}</version>

       <scope>test</scope>
     </dependency>
     <!-- dependency for opendaylight-karaf-empty for use by testing -->
       <scope>test</scope>
     </dependency>
     <!-- dependency for opendaylight-karaf-empty for use by testing -->


@@ -249,7 +248,7 @@
                 <karaf.distro.version>${karaf.empty.version}</karaf.distro.version>
               </systemPropertyVariables>
               <dependenciesToScan>
                 <karaf.distro.version>${karaf.empty.version}</karaf.distro.version>
               </systemPropertyVariables>
               <dependenciesToScan>

-               <dependency>org.opendaylight.yangtools:features-test</dependency>
+               <dependency>org.opendaylight.odlparent:features-test</dependency>

               </dependenciesToScan>
             </configuration>
           </plugin>
               </dependenciesToScan>
             </configuration>
           </plugin>

diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml
index 0057fc05c71fe915868058d2eaca20936075a604..71b28415b5148791483c73b5a131838caa6d2754 100644 (file)
--- a/features/config-netty/pom.xml
+++ b/features/config-netty/pom.xml
@@ -56,7 +56,7 @@
     </dependency>
     <!-- test to validate features.xml -->
     <dependency>
     </dependency>
     <!-- test to validate features.xml -->
     <dependency>

-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.odlparent</groupId>

       <artifactId>features-test</artifactId>
     </dependency>
   </dependencies>
       <artifactId>features-test</artifactId>
     </dependency>
   </dependencies>


@@ -114,7 +114,7 @@
             <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>
             <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>

-           <dependency>org.opendaylight.yangtools:features-test</dependency>
+           <dependency>org.opendaylight.odlparent:features-test</dependency>

           </dependenciesToScan>
         </configuration>
       </plugin>
           </dependenciesToScan>
         </configuration>
       </plugin>

diff --git a/features/config-persister/pom.xml b/features/config-persister/pom.xml
index f3b42ca143785607fa635c2856d0810286ba7177..6fae0e76417d896dbc09bbf4a193170676befd8b 100644 (file)
--- a/features/config-persister/pom.xml
+++ b/features/config-persister/pom.xml
@@ -81,7 +81,7 @@
     </dependency>
     <!-- test to validate features.xml -->
     <dependency>
     </dependency>
     <!-- test to validate features.xml -->
     <dependency>

-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.odlparent</groupId>

       <artifactId>features-test</artifactId>
     </dependency>
   </dependencies>
       <artifactId>features-test</artifactId>
     </dependency>
   </dependencies>


@@ -139,7 +139,7 @@
             <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>
             <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>

-           <dependency>org.opendaylight.yangtools:features-test</dependency>
+           <dependency>org.opendaylight.odlparent:features-test</dependency>

           </dependenciesToScan>
         </configuration>
       </plugin>
           </dependenciesToScan>
         </configuration>
       </plugin>

diff --git a/features/config/pom.xml b/features/config/pom.xml
index 1fa248615c06a0974d5d741eaca91c03c579e06f..683ce3dab1c38aac465f93b0870348c3a892a743 100644 (file)
--- a/features/config/pom.xml
+++ b/features/config/pom.xml
@@ -88,7 +88,7 @@
     </dependency>
     <!-- test the features.xml -->
     <dependency>
     </dependency>
     <!-- test the features.xml -->
     <dependency>

-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.odlparent</groupId>

       <artifactId>features-test</artifactId>
     </dependency>
   </dependencies>
       <artifactId>features-test</artifactId>
     </dependency>
   </dependencies>


@@ -146,7 +146,7 @@
             <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>
             <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>

-           <dependency>org.opendaylight.yangtools:features-test</dependency>
+           <dependency>org.opendaylight.odlparent:features-test</dependency>

           </dependenciesToScan>
         </configuration>
       </plugin>
           </dependenciesToScan>
         </configuration>
       </plugin>

diff --git a/features/extras/pom.xml b/features/extras/pom.xml
index 20089c726a3c9df7a1f1690bbacfe4c295d35dd1..6ac5872f0086b05bcdd965ed5d90c81cc4858afd 100644 (file)
--- a/features/extras/pom.xml
+++ b/features/extras/pom.xml
@@ -23,7 +23,6 @@
         <branding.version>1.1.0-SNAPSHOT</branding.version>
         <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
         <karaf.version>3.0.1</karaf.version>
         <branding.version>1.1.0-SNAPSHOT</branding.version>
         <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
         <karaf.version>3.0.1</karaf.version>

-        <feature.test.version>0.7.0-SNAPSHOT</feature.test.version>

         <karaf.empty.version>1.5.0-SNAPSHOT</karaf.empty.version>
         <surefire.version>2.16</surefire.version>
     </properties>
         <karaf.empty.version>1.5.0-SNAPSHOT</karaf.empty.version>
         <surefire.version>2.16</surefire.version>
     </properties>


@@ -34,9 +33,8 @@
             <version>${jolokia.version}</version>
         </dependency>
         <dependency>
             <version>${jolokia.version}</version>
         </dependency>
         <dependency>

-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.odlparent</groupId>

             <artifactId>features-test</artifactId>
             <artifactId>features-test</artifactId>

-            <version>${feature.test.version}</version>

             <scope>test</scope>
         </dependency>
         <!-- dependency for opendaylight-karaf-empty for use by testing -->
             <scope>test</scope>
         </dependency>
         <!-- dependency for opendaylight-karaf-empty for use by testing -->


@@ -101,7 +99,7 @@
                         <karaf.distro.version>${karaf.empty.version}</karaf.distro.version>
                     </systemPropertyVariables>
                     <dependenciesToScan>
                         <karaf.distro.version>${karaf.empty.version}</karaf.distro.version>
                     </systemPropertyVariables>
                     <dependenciesToScan>

-                        <dependency>org.opendaylight.yangtools:features-test</dependency>
+                        <dependency>org.opendaylight.odlparent:features-test</dependency>

                     </dependenciesToScan>
                 </configuration>
             </plugin>
                     </dependenciesToScan>
                 </configuration>
             </plugin>

diff --git a/features/flow/pom.xml b/features/flow/pom.xml
index 53b45d28103e5ea02df441083748616341147e2e..ad513e5d564db03f3a8226de6a139713590b20d8 100644 (file)
--- a/features/flow/pom.xml
+++ b/features/flow/pom.xml
@@ -74,7 +74,7 @@
     </dependency>
     <!-- test to validate features.xml -->
     <dependency>
     </dependency>
     <!-- test to validate features.xml -->
     <dependency>

-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.odlparent</groupId>

       <artifactId>features-test</artifactId>
     </dependency>
   </dependencies>
       <artifactId>features-test</artifactId>
     </dependency>
   </dependencies>


@@ -132,7 +132,7 @@
             <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>
             <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>

-           <dependency>org.opendaylight.yangtools:features-test</dependency>
+           <dependency>org.opendaylight.odlparent:features-test</dependency>

           </dependenciesToScan>
         </configuration>
       </plugin>
           </dependenciesToScan>
         </configuration>
       </plugin>

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index c63b39c74d50df358e2393624a4de99eb97bf839..0cdd784a17a4cdffc82c7bed9c208125e23fff37 100644 (file)
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -354,9 +354,8 @@
 
     <!-- test to validate features.xml -->
     <dependency>
 
     <!-- test to validate features.xml -->
     <dependency>

-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.odlparent</groupId>

       <artifactId>features-test</artifactId>
       <artifactId>features-test</artifactId>

-      <version>0.7.0-SNAPSHOT</version>

     </dependency>
   </dependencies>
 
     </dependency>
   </dependencies>
 


@@ -413,7 +412,7 @@
             <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>
             <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>

-           <dependency>org.opendaylight.yangtools:features-test</dependency>
+           <dependency>org.opendaylight.odlparent:features-test</dependency>

           </dependenciesToScan>
         </configuration>
       </plugin>
           </dependenciesToScan>
         </configuration>
       </plugin>

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 4e94996634716590376611354356a7085e4e3d38..8a209e5436668c501d238599acff71e1e6480f72 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -168,9 +168,8 @@
     <!-- test to validate features.xml -->
    <!--FIXME BUG-2195 When running single feature tests for netconf connector, features including ssh proxy server always fail (this behavior does not appear when running karaf distro directly)-->
     <dependency>
     <!-- test to validate features.xml -->
    <!--FIXME BUG-2195 When running single feature tests for netconf connector, features including ssh proxy server always fail (this behavior does not appear when running karaf distro directly)-->
     <dependency>

-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.odlparent</groupId>

       <artifactId>features-test</artifactId>
       <artifactId>features-test</artifactId>

-      <version>${yangtools.version}</version>

       <scope>test</scope>
     </dependency>
     <!-- dependency for opendaylight-karaf-empty for use by testing -->
       <scope>test</scope>
     </dependency>
     <!-- dependency for opendaylight-karaf-empty for use by testing -->


@@ -242,7 +241,7 @@
                 <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
               </systemPropertyVariables>
               <dependenciesToScan>
                 <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
               </systemPropertyVariables>
               <dependenciesToScan>

-               <dependency>org.opendaylight.yangtools:features-test</dependency>
+               <dependency>org.opendaylight.odlparent:features-test</dependency>

               </dependenciesToScan>
             </configuration>
           </plugin>
               </dependenciesToScan>
             </configuration>
           </plugin>

diff --git a/features/netconf-connector/src/main/resources/features.xml b/features/netconf-connector/src/main/resources/features.xml
index 92e6507d2178a5a17997be74d6bb59b4d9006ee9..7cabbb492910502c8e0ebe2818414a65604e959e 100644 (file)
--- a/features/netconf-connector/src/main/resources/features.xml
+++ b/features/netconf-connector/src/main/resources/features.xml
@@ -105,6 +105,7 @@
     </feature>
     <feature name='odl-netconf-ssh' version='${netconf.version}' description="OpenDaylight :: Netconf Connector :: SSH">
         <feature version='${netconf.version}'>odl-netconf-tcp</feature>
     </feature>
     <feature name='odl-netconf-ssh' version='${netconf.version}' description="OpenDaylight :: Netconf Connector :: SSH">
         <feature version='${netconf.version}'>odl-netconf-tcp</feature>

+        <feature version='${config.version}'>odl-config-netty</feature>

         <!-- FIXME: This introduces cycle between projects, which makes version updates
                     harder. Should be moved to different.
         -->
         <!-- FIXME: This introduces cycle between projects, which makes version updates
                     harder. Should be moved to different.
         -->

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 4edd93629408d1e1fec37e96b879976ec0f23677..b28a53b65c72a0dbf0860a0febbed3fc88c4c69f 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -150,9 +150,8 @@
     </dependency>
     <!-- test to validate features.xml -->
     <dependency>
     </dependency>
     <!-- test to validate features.xml -->
     <dependency>

-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.odlparent</groupId>

       <artifactId>features-test</artifactId>
       <artifactId>features-test</artifactId>

-      <version>${yangtools.version}</version>

       <scope>test</scope>
     </dependency>
     <!-- dependency for opendaylight-karaf-empty for use by testing -->
       <scope>test</scope>
     </dependency>
     <!-- dependency for opendaylight-karaf-empty for use by testing -->


@@ -218,7 +217,7 @@
             <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>
             <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>

-            <dependency>org.opendaylight.yangtools:features-test</dependency>
+            <dependency>org.opendaylight.odlparent:features-test</dependency>

           </dependenciesToScan>
         </configuration>
       </plugin>
           </dependenciesToScan>
         </configuration>
       </plugin>

diff --git a/features/protocol-framework/pom.xml b/features/protocol-framework/pom.xml
index d5387b43c3ee7c0bfd56de52e466297828074eb1..f663c1ce3e94b564907fec3ddf4847c8942722f5 100644 (file)
--- a/features/protocol-framework/pom.xml
+++ b/features/protocol-framework/pom.xml
@@ -28,7 +28,7 @@
     </dependency>
     <!-- test to validate features.xml -->
     <dependency>
     </dependency>
     <!-- test to validate features.xml -->
     <dependency>

-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.odlparent</groupId>

       <artifactId>features-test</artifactId>
     </dependency>
   </dependencies>
       <artifactId>features-test</artifactId>
     </dependency>
   </dependencies>


@@ -86,7 +86,7 @@
             <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>
             <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
           </systemPropertyVariables>
           <dependenciesToScan>

-           <dependency>org.opendaylight.yangtools:features-test</dependency>
+           <dependency>org.opendaylight.odlparent:features-test</dependency>

           </dependenciesToScan>
         </configuration>
       </plugin>
           </dependenciesToScan>
         </configuration>
       </plugin>

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index 632b4cd592277304b70e832a093853881e360ecd..347a19a75af50cf293728f80f68ee8c0465a0dde 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -256,9 +256,8 @@
     -->
     <!-- test to validate features.xml -->
     <dependency>
     -->
     <!-- test to validate features.xml -->
     <dependency>

-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.odlparent</groupId>

       <artifactId>features-test</artifactId>
       <artifactId>features-test</artifactId>

-      <version>${yangtools.version}</version>

       <scope>test</scope>
     </dependency>
     <!-- dependency for opendaylight-karaf-empty for use by testing -->
       <scope>test</scope>
     </dependency>
     <!-- dependency for opendaylight-karaf-empty for use by testing -->


@@ -331,7 +330,7 @@
                 <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
               </systemPropertyVariables>
               <dependenciesToScan>
                 <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
               </systemPropertyVariables>
               <dependenciesToScan>

-               <dependency>org.opendaylight.yangtools:features-test</dependency>
+               <dependency>org.opendaylight.odlparent:features-test</dependency>

               </dependenciesToScan>
             </configuration>
           </plugin>
               </dependenciesToScan>
             </configuration>
           </plugin>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 338db8b03a04e0db32be91b42abea3f752cad48c..5d7046a2df9bd622d0268328208fb129a167c800 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -81,6 +81,7 @@
     <!-- OpenEXI third party lib for netconf-->
     <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
     <felix.util.version>1.6.0</felix.util.version>
     <!-- OpenEXI third party lib for netconf-->
     <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
     <felix.util.version>1.6.0</felix.util.version>

+    <features.test.version>1.5.0-SNAPSHOT</features.test.version>

     <filtervalve.version>1.5.0-SNAPSHOT</filtervalve.version>
     <findbugs.maven.plugin.version>2.4.0</findbugs.maven.plugin.version>
     <flowprogrammer.northbound.version>0.5.0-SNAPSHOT</flowprogrammer.northbound.version>
     <filtervalve.version>1.5.0-SNAPSHOT</filtervalve.version>
     <findbugs.maven.plugin.version>2.4.0</findbugs.maven.plugin.version>
     <flowprogrammer.northbound.version>0.5.0-SNAPSHOT</flowprogrammer.northbound.version>


@@ -1194,6 +1195,12 @@
         <version>${yangtools.version}</version>
         <scope>test</scope>
       </dependency>
         <version>${yangtools.version}</version>
         <scope>test</scope>
       </dependency>

+      <dependency>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>features-test</artifactId>
+        <version>${features.test.version}</version>
+        <scope>test</scope>
+      </dependency>

       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>features-yangtools</artifactId>
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>features-yangtools</artifactId>