From bfe32fa8112c622d29026549091716776240ba3b Mon Sep 17 00:00:00 2001
From: Mark Donszelmann <Mark.Donszelmann@gmail.com>
Date: Fri, 18 Dec 2009 14:31:04 +0100
Subject: Fixed NAR-121

---
 src/it/it0004-java-dep-jni/pom.xml                                    | 1 +
 src/it/it0008-executable-dep-lib-shared/pom.xml                       | 2 ++
 src/it/it0009-jni-dep-lib-shared/pom.xml                              | 1 +
 src/it/it0011-executable-dep-lib-static/pom.xml                       | 1 +
 src/it/it0012-jni-dep-lib-static/pom.xml                              | 1 +
 src/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml          | 2 +-
 src/it/it0014-multi-module/it0014-lib-shared/pom.xml                  | 1 -
 src/it/it0014-multi-module/pom.xml                                    | 4 ++--
 .../it0016-layout/it0016-executable-dep-lib-shared-layout20/pom.xml   | 2 ++
 .../it0016-layout/it0016-executable-dep-lib-shared-layout21/pom.xml   | 2 ++
 src/it/it0021-executable-dep-lib-3rdparty/pom.xml                     | 2 ++
 11 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'src/it')

diff --git a/src/it/it0004-java-dep-jni/pom.xml b/src/it/it0004-java-dep-jni/pom.xml
index 4f013fd..fc7a90d 100644
--- a/src/it/it0004-java-dep-jni/pom.xml
+++ b/src/it/it0004-java-dep-jni/pom.xml
@@ -56,6 +56,7 @@ under the License.
       <groupId>org.apache.maven.its.nar</groupId>
       <artifactId>it0003-jni</artifactId>
       <version>1.0-SNAPSHOT</version>
+      <type>nar</type>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/it/it0008-executable-dep-lib-shared/pom.xml b/src/it/it0008-executable-dep-lib-shared/pom.xml
index 85ea407..8abea53 100644
--- a/src/it/it0008-executable-dep-lib-shared/pom.xml
+++ b/src/it/it0008-executable-dep-lib-shared/pom.xml
@@ -59,11 +59,13 @@ under the License.
       </plugin>
     </plugins>
   </build>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.its.nar</groupId>
       <artifactId>it0007-lib-shared</artifactId>
       <version>1.0-SNAPSHOT</version>
+      <type>nar</type>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/it/it0009-jni-dep-lib-shared/pom.xml b/src/it/it0009-jni-dep-lib-shared/pom.xml
index 42ebba5..f893424 100644
--- a/src/it/it0009-jni-dep-lib-shared/pom.xml
+++ b/src/it/it0009-jni-dep-lib-shared/pom.xml
@@ -66,6 +66,7 @@ under the License.
       <groupId>org.apache.maven.its.nar</groupId>
       <artifactId>it0007-lib-shared</artifactId>
       <version>1.0-SNAPSHOT</version>
+      <type>nar</type>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/it/it0011-executable-dep-lib-static/pom.xml b/src/it/it0011-executable-dep-lib-static/pom.xml
index 476ef0d..95a11a6 100644
--- a/src/it/it0011-executable-dep-lib-static/pom.xml
+++ b/src/it/it0011-executable-dep-lib-static/pom.xml
@@ -65,6 +65,7 @@ under the License.
       <groupId>org.apache.maven.its.nar</groupId>
       <artifactId>it0010-lib-static</artifactId>
       <version>1.0-SNAPSHOT</version>
+      <type>nar</type>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/it/it0012-jni-dep-lib-static/pom.xml b/src/it/it0012-jni-dep-lib-static/pom.xml
index 0dcd7c3..adee1ac 100644
--- a/src/it/it0012-jni-dep-lib-static/pom.xml
+++ b/src/it/it0012-jni-dep-lib-static/pom.xml
@@ -66,6 +66,7 @@ under the License.
       <groupId>org.apache.maven.its.nar</groupId>
       <artifactId>it0010-lib-static</artifactId>
       <version>1.0-SNAPSHOT</version>
+      <type>nar</type>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml b/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml
index 997ec91..90439ad 100644
--- a/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml
+++ b/src/it/it0014-multi-module/it0014-jni-dep-lib-shared/pom.xml
@@ -42,7 +42,6 @@ under the License.
   </properties>
 
   <build>
-    <defaultGoal>integration-test</defaultGoal>
     <plugins>
       <plugin>
         <artifactId>maven-nar-plugin</artifactId>
@@ -65,6 +64,7 @@ under the License.
       <groupId>org.apache.maven.its.nar</groupId>
       <artifactId>it0014-lib-shared</artifactId>
       <version>1.0-SNAPSHOT</version>
+      <type>nar</type>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/it/it0014-multi-module/it0014-lib-shared/pom.xml b/src/it/it0014-multi-module/it0014-lib-shared/pom.xml
index d18fb04..8a71389 100644
--- a/src/it/it0014-multi-module/it0014-lib-shared/pom.xml
+++ b/src/it/it0014-multi-module/it0014-lib-shared/pom.xml
@@ -43,7 +43,6 @@ under the License.
   </properties>
   
   <build>
-    <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
         <artifactId>maven-nar-plugin</artifactId>
diff --git a/src/it/it0014-multi-module/pom.xml b/src/it/it0014-multi-module/pom.xml
index 1b349dc..67f3f7c 100644
--- a/src/it/it0014-multi-module/pom.xml
+++ b/src/it/it0014-multi-module/pom.xml
@@ -40,10 +40,10 @@ under the License.
   <url>http://maven.apache.org/</url>
 
   <build>
-<!--
     <defaultGoal>integration-test</defaultGoal>
--->
+<!--
     <defaultGoal>install</defaultGoal>
+-->
   </build>
 
   <modules>
diff --git a/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/pom.xml b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/pom.xml
index 9974d0a..3ec4393 100644
--- a/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/pom.xml
+++ b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/pom.xml
@@ -60,11 +60,13 @@ under the License.
       </plugin>
     </plugins>
   </build>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.its.nar</groupId>
       <artifactId>it0016-lib-shared-layout20</artifactId>
       <version>1.0-SNAPSHOT</version>
+      <type>nar</type>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/pom.xml b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/pom.xml
index 3322daa..d5e21ef 100644
--- a/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/pom.xml
+++ b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/pom.xml
@@ -58,11 +58,13 @@ under the License.
       </plugin>
     </plugins>
   </build>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.its.nar</groupId>
       <artifactId>it0016-lib-shared-layout21</artifactId>
       <version>1.0-SNAPSHOT</version>
+      <type>nar</type>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/it/it0021-executable-dep-lib-3rdparty/pom.xml b/src/it/it0021-executable-dep-lib-3rdparty/pom.xml
index b39096b..60e5504 100644
--- a/src/it/it0021-executable-dep-lib-3rdparty/pom.xml
+++ b/src/it/it0021-executable-dep-lib-3rdparty/pom.xml
@@ -59,11 +59,13 @@ under the License.
       </plugin>
     </plugins>
   </build>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.its.nar</groupId>
       <artifactId>it0020-lib-3rdparty</artifactId>
       <version>1.0-SNAPSHOT</version>
+      <type>nar</type>
     </dependency>
   </dependencies>
 </project>
-- 
cgit v1.2.3