Add method to skip karaf4 featureTest

Allow us to skip karaf4 featureTest seperately from karaf3 featureTest.

Change-Id: I235eafb777d62a95ca8ffb8010ef95754618421e
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/feature-repo-parent/pom.xml b/feature-repo-parent/pom.xml
index 10a5e06e984611965df25f789d95bccf105ed683..63bd3955c99877847b6d76c1fb8bcc9693f62937 100644 (file)
--- a/feature-repo-parent/pom.xml
+++ b/feature-repo-parent/pom.xml
@@ -38,7 +38,7 @@
 
     <properties>
         <karaf.version>${karaf4.version}</karaf.version>
-        <skip.karaf.featureTest>false</skip.karaf.featureTest>
+        <skip.karaf4.featureTest>false</skip.karaf4.featureTest>
         <jacoco.skip>true</jacoco.skip>
     </properties>
 
@@ -69,7 +69,7 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <skip>${skip.karaf.featureTest}</skip>
+                    <skip>${skip.karaf4.featureTest}</skip>
                     <dependenciesToScan>
                         <dependency>org.opendaylight.odlparent:features4-test</dependency>
                     </dependenciesToScan>

diff --git a/odlparent-lite/pom.xml b/odlparent-lite/pom.xml
index bbcbde7da0e8ea0ad963e2317af6e3dd33d54685..c08a9f12f65b44be975796d171be504b0abf6bd2 100644 (file)
--- a/odlparent-lite/pom.xml
+++ b/odlparent-lite/pom.xml
@@ -362,6 +362,7 @@
             <skipIT>true</skipIT>
             <skipITs>true</skipITs>
             <skip.karaf.featureTest>true</skip.karaf.featureTest>
+            <skip.karaf4.featureTest>true</skip.karaf4.featureTest>
             <jacoco.skip>true</jacoco.skip>
             <maven.javadoc.skip>true</maven.javadoc.skip>
             <maven.source.skip>true</maven.source.skip>

diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml
index 27b84758c72e023bc226c16da1d3a87ab86a93ea..9f6257741f46c7516217ad73c68876c7bb65c6d5 100644 (file)
--- a/single-feature-parent/pom.xml
+++ b/single-feature-parent/pom.xml
@@ -47,7 +47,7 @@
     <properties>
         <karaf.version>${karaf4.version}</karaf.version>
         <jacoco.skip>true</jacoco.skip>
-        <skip.karaf.featureTest>false</skip.karaf.featureTest>
+        <skip.karaf4.featureTest>false</skip.karaf4.featureTest>
     </properties>
 
     <dependencies>
@@ -78,7 +78,7 @@
                     <additionalClasspathElements>
                         <additionalClasspathElement>${project.build.directory}/feature</additionalClasspathElement>
                     </additionalClasspathElements>
-                    <skip>${skip.karaf.featureTest}</skip>
+                    <skip>${skip.karaf4.featureTest}</skip>
                 </configuration>
                 <executions>
                     <execution>