Turn on feature testing for those features that pass

(includes a fix for features/config)

From this point onward, those features should
break the build if they are broken.

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

diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml
index 2f4b4b1e2198bb4e85cd1c66f19fb6e009cf4626..5fbc463df32f798c757a293da391fc0bc77f76bb 100644 (file)
--- a/features/config-netty/pom.xml
+++ b/features/config-netty/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <artifactId>features-config-netty</artifactId>
 
   </parent>
   <artifactId>features-config-netty</artifactId>
 

-  <packaging>pom</packaging>
+  <packaging>jar</packaging>

 
   <properties>
     <features.file>features.xml</features.file>
 
   <properties>
     <features.file>features.xml</features.file>


@@ -21,7 +21,6 @@
       <artifactId>features-config-persister</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <artifactId>features-config-persister</artifactId>
       <classifier>features</classifier>
       <type>xml</type>

-      <scope>runtime</scope>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>


@@ -47,6 +46,11 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-netty-config</artifactId>
     </dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-netty-config</artifactId>
     </dependency>

+    <!-- test to validate features.xml -->
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>features-test</artifactId>
+    </dependency>

   </dependencies>
 
   <build>
   </dependencies>
 
   <build>


@@ -92,6 +96,20 @@
           </execution>
         </executions>
       </plugin>
           </execution>
         </executions>
       </plugin>

+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
+            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
+          </systemPropertyVariables>
+          <dependenciesToScan>
+           <dependency>org.opendaylight.yangtools:features-test</dependency>
+          </dependenciesToScan>
+        </configuration>
+      </plugin>

     </plugins>
   </build>
   <scm>
     </plugins>
   </build>
   <scm>

diff --git a/features/config-persister/pom.xml b/features/config-persister/pom.xml
index 6dc894134546fabde2a2d7ef2bf71d0673fab5b0..3346c754d628f8fbb03add426db0026bc4af0615 100644 (file)
--- a/features/config-persister/pom.xml
+++ b/features/config-persister/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <artifactId>features-config-persister</artifactId>
 
   </parent>
   <artifactId>features-config-persister</artifactId>
 

-  <packaging>pom</packaging>
+  <packaging>jar</packaging>

 
   <properties>
     <features.file>features.xml</features.file>
 
   <properties>
     <features.file>features.xml</features.file>


@@ -22,21 +22,18 @@
       <version>${yangtools.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <version>${yangtools.version}</version>
       <classifier>features</classifier>
       <type>xml</type>

-      <scope>runtime</scope>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-netconf</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-netconf</artifactId>
       <classifier>features</classifier>
       <type>xml</type>

-      <scope>runtime</scope>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-config</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-config</artifactId>
       <classifier>features</classifier>
       <type>xml</type>

-      <scope>runtime</scope>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>


@@ -82,6 +79,11 @@
       <groupId>org.eclipse.persistence</groupId>
       <artifactId>org.eclipse.persistence.moxy</artifactId>
     </dependency>
       <groupId>org.eclipse.persistence</groupId>
       <artifactId>org.eclipse.persistence.moxy</artifactId>
     </dependency>

+    <!-- test to validate features.xml -->
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>features-test</artifactId>
+    </dependency>

   </dependencies>
 
   <build>
   </dependencies>
 
   <build>


@@ -127,6 +129,20 @@
           </execution>
         </executions>
       </plugin>
           </execution>
         </executions>
       </plugin>

+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
+            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
+          </systemPropertyVariables>
+          <dependenciesToScan>
+           <dependency>org.opendaylight.yangtools:features-test</dependency>
+          </dependenciesToScan>
+        </configuration>
+      </plugin>

     </plugins>
   </build>
   <scm>
     </plugins>
   </build>
   <scm>

diff --git a/features/config/pom.xml b/features/config/pom.xml
index c69e11bed2c91e2a08d936dbffad02c601b12d7f..8c061c27361946cd3bfc62edde9252d2dd069b9b 100644 (file)
--- a/features/config/pom.xml
+++ b/features/config/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <artifactId>features-config</artifactId>
 
   </parent>
   <artifactId>features-config</artifactId>
 

-  <packaging>pom</packaging>
+  <packaging>jar</packaging>

 
   <properties>
     <features.file>features.xml</features.file>
 
   <properties>
     <features.file>features.xml</features.file>


@@ -22,7 +22,6 @@
       <version>${yangtools.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <version>${yangtools.version}</version>
       <classifier>features</classifier>
       <type>xml</type>

-      <scope>runtime</scope>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>


@@ -92,6 +91,11 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-manager</artifactId>
     </dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-manager</artifactId>
     </dependency>

+    <!-- test the features.xml -->
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>features-test</artifactId>
+    </dependency>

   </dependencies>
 
   <build>
   </dependencies>
 
   <build>


@@ -137,6 +141,20 @@
           </execution>
         </executions>
       </plugin>
           </execution>
         </executions>
       </plugin>

+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
+            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
+          </systemPropertyVariables>
+          <dependenciesToScan>
+           <dependency>org.opendaylight.yangtools:features-test</dependency>
+          </dependenciesToScan>
+        </configuration>
+      </plugin>

     </plugins>
   </build>
   <scm>
     </plugins>
   </build>
   <scm>

diff --git a/features/flow/pom.xml b/features/flow/pom.xml
index 09bb6c91e6a0bde381f3902c299e59d4d4c7fa11..ac189737d937cd0fb36186847327acff27a74c18 100644 (file)
--- a/features/flow/pom.xml
+++ b/features/flow/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <artifactId>features-flow</artifactId>
 
   </parent>
   <artifactId>features-flow</artifactId>
 

-  <packaging>pom</packaging>
+  <packaging>jar</packaging>

 
   <properties>
     <features.file>features.xml</features.file>
 
   <properties>
     <features.file>features.xml</features.file>


@@ -22,7 +22,6 @@
       <version>${mdsal.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <version>${mdsal.version}</version>
       <classifier>features</classifier>
       <type>xml</type>

-      <scope>runtime</scope>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>


@@ -64,6 +63,11 @@
       <groupId>org.opendaylight.controller.md</groupId>
       <artifactId>forwardingrules-manager</artifactId>
     </dependency>
       <groupId>org.opendaylight.controller.md</groupId>
       <artifactId>forwardingrules-manager</artifactId>
     </dependency>

+    <!-- test to validate features.xml -->
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>features-test</artifactId>
+    </dependency>

   </dependencies>
 
   <build>
   </dependencies>
 
   <build>


@@ -109,6 +113,20 @@
           </execution>
         </executions>
       </plugin>
           </execution>
         </executions>
       </plugin>

+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
+            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
+          </systemPropertyVariables>
+          <dependenciesToScan>
+           <dependency>org.opendaylight.yangtools:features-test</dependency>
+          </dependenciesToScan>
+        </configuration>
+      </plugin>

     </plugins>
   </build>
   <scm>
     </plugins>
   </build>
   <scm>

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index 4f1ba98e5c5d4f60cc4d0a5a2fcbe7c06706d429..e7b825c48b1173b783291e3e2a1797c4cea64ebc 100644 (file)
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <artifactId>features-mdsal</artifactId>
 
   </parent>
   <artifactId>features-mdsal</artifactId>
 

-  <packaging>pom</packaging>
+  <packaging>jar</packaging>

 
   <properties>
     <features.file>features.xml</features.file>
 
   <properties>
     <features.file>features.xml</features.file>


@@ -21,28 +21,24 @@
       <artifactId>features-yangtools</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <artifactId>features-yangtools</artifactId>
       <classifier>features</classifier>
       <type>xml</type>

-      <scope>runtime</scope>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-config</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-config</artifactId>
       <classifier>features</classifier>
       <type>xml</type>

-      <scope>runtime</scope>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-config-persister</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-config-persister</artifactId>
       <classifier>features</classifier>
       <type>xml</type>

-      <scope>runtime</scope>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-config-netty</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-config-netty</artifactId>
       <classifier>features</classifier>
       <type>xml</type>

-      <scope>runtime</scope>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>


@@ -172,6 +168,12 @@
       <groupId>org.opendaylight.controller.samples</groupId>
       <artifactId>toaster-config</artifactId>
     </dependency>
       <groupId>org.opendaylight.controller.samples</groupId>
       <artifactId>toaster-config</artifactId>
     </dependency>

+    <!-- test to validate features.xml -->
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>features-test</artifactId>
+      <version>0.6.2-SNAPSHOT</version>
+    </dependency>

   </dependencies>
 
   <build>
   </dependencies>
 
   <build>


@@ -217,6 +219,20 @@
           </execution>
         </executions>
       </plugin>
           </execution>
         </executions>
       </plugin>

+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
+            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
+          </systemPropertyVariables>
+          <dependenciesToScan>
+           <dependency>org.opendaylight.yangtools:features-test</dependency>
+          </dependenciesToScan>
+        </configuration>
+      </plugin>

     </plugins>
   </build>
   <scm>
     </plugins>
   </build>
   <scm>

diff --git a/features/protocol-framework/pom.xml b/features/protocol-framework/pom.xml
index 97836be4552f88e4ad960981ebea186e664a090f..dcd24d62169ee16d8e21d24d0469af5a9ba4bbbb 100644 (file)
--- a/features/protocol-framework/pom.xml
+++ b/features/protocol-framework/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <artifactId>features-protocol-framework</artifactId>
   <version>${protocol-framework.version}</version>
   </parent>
   <artifactId>features-protocol-framework</artifactId>
   <version>${protocol-framework.version}</version>

-  <packaging>pom</packaging>
+  <packaging>jar</packaging>

 
   <properties>
     <features.file>features.xml</features.file>
 
   <properties>
     <features.file>features.xml</features.file>


@@ -21,12 +21,16 @@
       <artifactId>features-config</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <artifactId>features-config</artifactId>
       <classifier>features</classifier>
       <type>xml</type>

-      <scope>runtime</scope>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>protocol-framework</artifactId>
     </dependency>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>protocol-framework</artifactId>
     </dependency>

+    <!-- test to validate features.xml -->
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>features-test</artifactId>
+    </dependency>

   </dependencies>
 
   <build>
   </dependencies>
 
   <build>


@@ -72,6 +76,20 @@
           </execution>
         </executions>
       </plugin>
           </execution>
         </executions>
       </plugin>

+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
+            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
+          </systemPropertyVariables>
+          <dependenciesToScan>
+           <dependency>org.opendaylight.yangtools:features-test</dependency>
+          </dependenciesToScan>
+        </configuration>
+      </plugin>

     </plugins>
   </build>
   <scm>
     </plugins>
   </build>
   <scm>