From: Giovanni Meo <gmeo@cisco.com>
Date: Fri, 14 Jun 2013 13:08:44 +0000 (+0200)
Subject: Disable unit tests on integration tests plugin
X-Git-Tag: releasepom-0.1.0~353^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=b2f965be2598b4f59e27335a4b5c327c6944a6ea;hp=44bd15ae3dda4c88a2a1ccfbd58fece806572356

Disable unit tests on integration tests plugin

- This patch disable unit tests to be even looked on the integration
tests bundles, so that we are sure that integration tests are only
looked by failsafe and so they can be disabled without impacting unit
tests.

Change-Id: I54a5c1f81e04ea9ebb0c4d398d214b7a93148ffc
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
---

diff --git a/opendaylight/commons/integrationtest/pom.xml b/opendaylight/commons/integrationtest/pom.xml
index 89dbb77ecd..4cd8582749 100644
--- a/opendaylight/commons/integrationtest/pom.xml
+++ b/opendaylight/commons/integrationtest/pom.xml
@@ -52,6 +52,14 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire.version}</version>
+        <configuration>
+          <skipTests>true</skipTests>
+        </configuration>
+      </plugin>
       <plugin>
        <groupId>org.ops4j.pax.exam</groupId>
        <artifactId>maven-paxexam-plugin</artifactId>
diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 142c9d5d6c..c3c9a5cd1e 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -24,7 +24,8 @@
     <projectinfo>2.6</projectinfo>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <compiler.version>2.3.2</compiler.version>
-    <surefire.version>2.13</surefire.version>
+    <surefire.version>2.15</surefire.version>
+    <failsafe.version>2.15</failsafe.version>
     <exam.version>3.0.0</exam.version>
     <url.version>1.5.0</url.version>
     <enunciate.version>1.26.2</enunciate.version>
@@ -310,16 +311,20 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.14.1</version>
+        <version>${failsafe.version}</version>
         <executions>
           <execution>
             <goals>
               <goal>integration-test</goal>
-              <goal>verify</goal>
             </goals>
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire.version}</version>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>