Patch to bring us into alignment with skip.karaf.featureTest from odlparent

Sam Hague was kind enough to point out the use of skip.karaf, which is a
brilliant idea incorporated into the odlparent by this patch:

https://git.opendaylight.org/gerrit/#/c/16493/

This patch simply makes sure that -Dskip.karaf.featureTest does the right
thing in ovsdb.

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

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 3fa43dc7b6a10182ce09f5f737487da2b6954d11..73d8bc241a76cc791b623d4eb65ff75fb321caa3 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -51,7 +51,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <skip.coverage>true</skip.coverage>
     <skip.distribution>false</skip.distribution>
     <skip.integrationtest>true</skip.integrationtest>
-    <skip.karaf>false</skip.karaf>
+    <skip.karaf.featureTest>false</skip.karaf.featureTest>
     <!-- The directory where maven was executed TODO see if this can be removed -->
     <root.directory>${env.PWD}</root.directory>
     <!-- IT report is aggregated to enable PAX Exam coverage to be logged -->
@@ -656,7 +656,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <activeByDefault>false</activeByDefault>
       </activation>
       <properties>
-        <skip.karaf>false</skip.karaf>
+        <skip.karaf.featureTest>false</skip.karaf.featureTest>
       </properties>
     </profile>
   </profiles>

diff --git a/features/ovs-sfc/pom.xml b/features/ovs-sfc/pom.xml
index 84af9578155dbe5988ea30f9d2eabeacb9d2eb89..e3605510d6d8474023c8d00b4e89eed1968e6e67 100644 (file)
--- a/features/ovs-sfc/pom.xml
+++ b/features/ovs-sfc/pom.xml
@@ -72,7 +72,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <skip>${skip.karaf}</skip>
+          <skip>${skip.karaf.featureTest}</skip>
           <systemPropertyVariables>
             <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
             <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>

diff --git a/features/ovsdb/pom.xml b/features/ovsdb/pom.xml
index deb657ed3ff00d2ce3bd76c0fd305aa79df411ef..fbbbe191505a58110b66f4fd7b7ec50c4a5ab0b2 100644 (file)
--- a/features/ovsdb/pom.xml
+++ b/features/ovsdb/pom.xml
@@ -203,7 +203,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <skip>${skip.karaf}</skip>
+          <skip>${skip.karaf.featureTest}</skip>
           <systemPropertyVariables>
             <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
             <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>

diff --git a/southbound/southbound-features/pom.xml b/southbound/southbound-features/pom.xml
index ebd70ed8849fc81e37a706bc20fe1be3d6fd4436..b8b64466145c2ccf628e961d24280ac8b99411a3 100644 (file)
--- a/southbound/southbound-features/pom.xml
+++ b/southbound/southbound-features/pom.xml
@@ -23,7 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <properties>
     <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
     <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-    <skip.karaf>false</skip.karaf>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -74,15 +73,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>${skip.karaf}</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>