From 5da2fa5e95ec3361eba2bfcde46ee9f910576d7b Mon Sep 17 00:00:00 2001
From: Mark Donszelmann <Mark.Donszelmann@gmail.com>
Date: Tue, 13 Oct 2009 23:06:19 +0200
Subject: Fixed NAR-39

---
 src/it/it0001-executable/pom.xml                | 10 +---------
 src/it/it0002-executable-static/pom.xml         | 10 +---------
 src/it/it0003-jni/pom.xml                       | 13 +++----------
 src/it/it0004-java-dep-jni/pom.xml              | 10 ++++------
 src/it/it0005-jni-static/pom.xml                | 11 ++---------
 src/it/it0006-jni-3rdparty/pom.xml              | 11 ++---------
 src/it/it0007-lib-shared/pom.xml                | 11 ++---------
 src/it/it0008-executable-dep-lib-shared/pom.xml | 10 ++++------
 src/it/it0009-jni-dep-lib-shared/pom.xml        | 10 ++++------
 src/it/it0010-lib-static/pom.xml                | 11 ++---------
 src/it/it0011-executable-dep-lib-static/pom.xml | 10 ++++------
 src/it/it0012-jni-dep-lib-static/pom.xml        | 10 ++++------
 12 files changed, 33 insertions(+), 94 deletions(-)

(limited to 'src/it')

diff --git a/src/it/it0001-executable/pom.xml b/src/it/it0001-executable/pom.xml
index 63391cf..d938b5d 100644
--- a/src/it/it0001-executable/pom.xml
+++ b/src/it/it0001-executable/pom.xml
@@ -39,11 +39,9 @@ under the License.
   </description>
   <url>http://maven.apache.org/</url>
 
-<!--
   <properties>
-    <maven.test.skip>true</maven.test.skip>
+    <maven.test.skip.exec>true</maven.test.skip.exec>
   </properties>
--->
 
   <build>
     <defaultGoal>integration-test</defaultGoal>
@@ -60,12 +58,6 @@ under the License.
           </libraries>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/src/it/it0002-executable-static/pom.xml b/src/it/it0002-executable-static/pom.xml
index 42d4e8b..9a22bae 100644
--- a/src/it/it0002-executable-static/pom.xml
+++ b/src/it/it0002-executable-static/pom.xml
@@ -38,11 +38,9 @@ under the License.
     Simple executable statically linked with the c runtime
   </description>
 
-<!--
   <properties>
-    <maven.test.skip>true</maven.test.skip>
+    <maven.test.skip.exec>true</maven.test.skip.exec>
   </properties>
--->
 
   <build>
     <defaultGoal>integration-test</defaultGoal>
@@ -60,12 +58,6 @@ under the License.
           </libraries>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/src/it/it0003-jni/pom.xml b/src/it/it0003-jni/pom.xml
index 18ad2d8..6941f3d 100644
--- a/src/it/it0003-jni/pom.xml
+++ b/src/it/it0003-jni/pom.xml
@@ -38,11 +38,10 @@ under the License.
     Simple JNI Library
   </description>
   <url>http://maven.apache.org/</url>
-<!--
+  
   <properties>
-    <maven.test.skip>true</maven.test.skip>
-  </properties>
--->  
+    <maven.test.skip.exec>true</maven.test.skip.exec>
+  </properties>  
 
   <build>
     <defaultGoal>install</defaultGoal>
@@ -63,12 +62,6 @@ under the License.
           </libraries>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/src/it/it0004-java-dep-jni/pom.xml b/src/it/it0004-java-dep-jni/pom.xml
index 2901f12..97d0e55 100644
--- a/src/it/it0004-java-dep-jni/pom.xml
+++ b/src/it/it0004-java-dep-jni/pom.xml
@@ -37,6 +37,10 @@ under the License.
     Java class which depends on a separate JNI library
   </description>
   
+  <properties>
+    <maven.test.skip.exec>true</maven.test.skip.exec>
+  </properties>  
+  
   <build>
     <defaultGoal>integration-test</defaultGoal>
     <plugins>
@@ -44,12 +48,6 @@ under the License.
         <artifactId>maven-nar-plugin</artifactId>
         <extensions>true</extensions>
       </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   
diff --git a/src/it/it0005-jni-static/pom.xml b/src/it/it0005-jni-static/pom.xml
index f27a874..4c14526 100644
--- a/src/it/it0005-jni-static/pom.xml
+++ b/src/it/it0005-jni-static/pom.xml
@@ -38,11 +38,10 @@ under the License.
     Simple Static JNI Library
   </description>
   <url>http://maven.apache.org/</url>
-<!--
+  
   <properties>
-    <maven.test.skip>true</maven.test.skip>
+    <maven.test.skip.exec>true</maven.test.skip.exec>
   </properties>
--->  
 
   <build>
     <defaultGoal>install</defaultGoal>
@@ -61,12 +60,6 @@ under the License.
           </libraries>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/src/it/it0006-jni-3rdparty/pom.xml b/src/it/it0006-jni-3rdparty/pom.xml
index 65602e6..b3f5647 100644
--- a/src/it/it0006-jni-3rdparty/pom.xml
+++ b/src/it/it0006-jni-3rdparty/pom.xml
@@ -38,11 +38,10 @@ under the License.
     Java class that uses a 3rd party JNI and its library
   </description>  
   <url>http://maven.apache.org/</url>
-<!--
+
   <properties>
-    <maven.test.skip>true</maven.test.skip>
+    <maven.test.skip.exec>true</maven.test.skip.exec>
   </properties>
--->  
 
   <build>
     <defaultGoal>integration-test</defaultGoal>
@@ -58,12 +57,6 @@ under the License.
           </libraries>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/src/it/it0007-lib-shared/pom.xml b/src/it/it0007-lib-shared/pom.xml
index 893ced1..aa6d790 100644
--- a/src/it/it0007-lib-shared/pom.xml
+++ b/src/it/it0007-lib-shared/pom.xml
@@ -38,11 +38,10 @@ under the License.
     Simple shared library and test file
   </description>
   <url>http://maven.apache.org/</url>
-<!--
+
   <properties>
-    <maven.test.skip>true</maven.test.skip>
+    <maven.test.skip.exec>true</maven.test.skip.exec>
   </properties>
--->  
   
   <build>
     <defaultGoal>install</defaultGoal>
@@ -64,12 +63,6 @@ under the License.
           </tests>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/src/it/it0008-executable-dep-lib-shared/pom.xml b/src/it/it0008-executable-dep-lib-shared/pom.xml
index 7ce981b..1f12ed5 100644
--- a/src/it/it0008-executable-dep-lib-shared/pom.xml
+++ b/src/it/it0008-executable-dep-lib-shared/pom.xml
@@ -37,6 +37,10 @@ under the License.
   <description>
     Executable depending on a shared library.
   </description>
+
+  <properties>
+    <maven.test.skip.exec>true</maven.test.skip.exec>
+  </properties>
    
   <build>
     <defaultGoal>integration-test</defaultGoal>
@@ -53,12 +57,6 @@ under the License.
           </libraries>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/src/it/it0009-jni-dep-lib-shared/pom.xml b/src/it/it0009-jni-dep-lib-shared/pom.xml
index e211c83..a1e570a 100644
--- a/src/it/it0009-jni-dep-lib-shared/pom.xml
+++ b/src/it/it0009-jni-dep-lib-shared/pom.xml
@@ -38,6 +38,10 @@ under the License.
     JNI depending on a shared library.
   </description>
 
+  <properties>
+    <maven.test.skip.exec>true</maven.test.skip.exec>
+  </properties>
+
   <build>
     <defaultGoal>integration-test</defaultGoal>
     <plugins>
@@ -54,12 +58,6 @@ under the License.
           </libraries>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   
diff --git a/src/it/it0010-lib-static/pom.xml b/src/it/it0010-lib-static/pom.xml
index 864019b..dfcf047 100644
--- a/src/it/it0010-lib-static/pom.xml
+++ b/src/it/it0010-lib-static/pom.xml
@@ -38,11 +38,10 @@ under the License.
     Simple static library and test file
   </description>
   <url>http://maven.apache.org/</url>
-<!--
+
   <properties>
-    <maven.test.skip>true</maven.test.skip>
+    <maven.test.skip.exec>true</maven.test.skip.exec>
   </properties>
--->  
 
   <build>
     <defaultGoal>install</defaultGoal>
@@ -64,12 +63,6 @@ under the License.
           </tests>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/src/it/it0011-executable-dep-lib-static/pom.xml b/src/it/it0011-executable-dep-lib-static/pom.xml
index 74b92cd..62795a5 100644
--- a/src/it/it0011-executable-dep-lib-static/pom.xml
+++ b/src/it/it0011-executable-dep-lib-static/pom.xml
@@ -38,6 +38,10 @@ under the License.
     Executable depending on a static library.
   </description>
 
+  <properties>
+    <maven.test.skip.exec>true</maven.test.skip.exec>
+  </properties>
+
   <build>
     <defaultGoal>integration-test</defaultGoal>
     <plugins>
@@ -53,12 +57,6 @@ under the License.
           </libraries>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   
diff --git a/src/it/it0012-jni-dep-lib-static/pom.xml b/src/it/it0012-jni-dep-lib-static/pom.xml
index d63def0..e09f463 100644
--- a/src/it/it0012-jni-dep-lib-static/pom.xml
+++ b/src/it/it0012-jni-dep-lib-static/pom.xml
@@ -38,6 +38,10 @@ under the License.
     JNI
   </description>
 
+  <properties>
+    <maven.test.skip.exec>true</maven.test.skip.exec>
+  </properties>
+
   <build>
     <defaultGoal>integration-test</defaultGoal>
     <plugins>
@@ -54,12 +58,6 @@ under the License.
           </libraries>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   
-- 
cgit v1.2.3