svn commit: r636544 - in /maven/plugins/trunk/maven-war-plugin: pom.xml src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java

[ol...@apache.org]

Author: olamy
Date: Wed Mar 12 15:32:14 2008
New Revision: 636544

URL: http://svn.apache.org/viewvc?rev=636544&view=rev
Log:
- fix possible NPE when building a war project without dependency
- upgrade to parent snapshot (temove redundant plugin declaration)


Modified:
    maven/plugins/trunk/maven-war-plugin/pom.xml
    maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java

Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=636544&r1=636543&r2=636544&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Wed Mar 12 15:32:14 2008
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>10</version>
+    <version>11-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-war-plugin</artifactId>
@@ -118,14 +118,6 @@
     </dependency>
   </dependencies>
   <build>
-    <pluginManagement>
-       <plugins>
-         <plugin>
-           <artifactId>maven-surefire-plugin</artifactId>
-           <version>2.4.1</version>
-         </plugin>
-       </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java?rev=636544&r1=636543&r2=636544&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java Wed Mar 12 15:32:14 2008
@@ -25,6 +25,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -447,7 +448,7 @@
     {
         if ( dependencies == null )
         {
-            return null;
+            return Collections.EMPTY_LIST;
         }
         final List result = new ArrayList();
         final Iterator it = dependencies.iterator();