maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From and...@apache.org
Subject svn commit: r1636454 - in /maven/plugins/trunk/maven-war-plugin: pom.xml src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
Date Mon, 03 Nov 2014 21:40:10 GMT
Author: andham
Date: Mon Nov  3 21:40:10 2014
New Revision: 1636454

URL: http://svn.apache.org/r1636454
Log:
[MWAR-335] Upgrade maven-archiver dependency to v2.6 (including aligning transitive deps)

Modified:
    maven/plugins/trunk/maven-war-plugin/pom.xml
    maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.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=1636454&r1=1636453&r2=1636454&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Mon Nov  3 21:40:10 2014
@@ -57,7 +57,7 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <mavenArchiverVersion>2.5</mavenArchiverVersion>
+    <mavenArchiverVersion>2.6</mavenArchiverVersion>
     <mavenFilteringVersion>1.3</mavenFilteringVersion>
     <mavenVersion>2.2.1</mavenVersion>
     <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
@@ -120,7 +120,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-io</artifactId>
-      <version>2.2</version>
+      <version>2.3.2</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
@@ -130,16 +130,12 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>2.7.1</version>
+      <version>2.8.1</version>
       <exclusions>
         <exclusion>
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-container-default</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-component-api</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java?rev=1636454&r1=1636453&r2=1636454&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
(original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
Mon Nov  3 21:40:10 2014
@@ -19,12 +19,6 @@ package org.apache.maven.plugin.war;
  * under the License.
  */
 
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.stub.MavenProject4CopyConstructor;
-import org.apache.maven.plugin.war.stub.ProjectHelperStub;
-import org.apache.maven.plugin.war.stub.WarArtifact4CCStub;
-import org.codehaus.plexus.util.IOUtil;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.Enumeration;
@@ -35,6 +29,12 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.war.stub.MavenProject4CopyConstructor;
+import org.apache.maven.plugin.war.stub.ProjectHelperStub;
+import org.apache.maven.plugin.war.stub.WarArtifact4CCStub;
+import org.codehaus.plexus.util.IOUtil;
+
 /**
  * comprehensive test on buildExplodedWebApp is done on WarExplodedMojoTest
  */
@@ -88,8 +88,8 @@ public class WarMojoTest
         // validate jar file
         File expectedJarFile = new File( outputDir, "simple.war" );
         assertJarContent( expectedJarFile, new String[] { "META-INF/MANIFEST.MF", "WEB-INF/web.xml",
"pansit.jsp",
-            "org/web/app/last-exile.jsp", "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
-            "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties" }, new
String[] { null,
+            "org/web/app/last-exile.jsp", "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.xml",
+            "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.properties"
}, new String[] { null,
             mojo.getWebXml().toString(), null, null, null, null } );
     }
 
@@ -118,8 +118,8 @@ public class WarMojoTest
         // validate jar file
         File expectedJarFile = new File( outputDir, "simple.war" );
         assertJarContent( expectedJarFile, new String[] { "META-INF/MANIFEST.MF", "WEB-INF/web.xml",
"pansit.jsp",
-            "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
-            "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties" }, new
String[] { null,
+            "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.xml",
+            "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.properties"
}, new String[] { null,
             mojo.getWebXml().toString(), null, null, null, }, new String[] { "org/web/app/last-exile.jsp"
} );
     }
 
@@ -150,8 +150,8 @@ public class WarMojoTest
         // validate jar file
         File expectedJarFile = new File( outputDir, "simple-test-classifier.war" );
         assertJarContent( expectedJarFile, new String[] { "META-INF/MANIFEST.MF", "WEB-INF/web.xml",
"pansit.jsp",
-            "org/web/app/last-exile.jsp", "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
-            "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties" }, new
String[] { null,
+            "org/web/app/last-exile.jsp", "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.xml",
+            "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.properties"
}, new String[] { null,
             mojo.getWebXml().toString(), null, null, null, null } );
     }
 
@@ -182,8 +182,8 @@ public class WarMojoTest
         // validate jar file
         File expectedJarFile = new File( outputDir, "simple.war" );
         assertJarContent( expectedJarFile, new String[] { "META-INF/MANIFEST.MF", "WEB-INF/web.xml",
"pansit.jsp",
-            "org/web/app/last-exile.jsp", "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
-            "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties" }, new
String[] { null,
+            "org/web/app/last-exile.jsp", "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.xml",
+            "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.properties"
}, new String[] { null,
             mojo.getWebXml().toString(), null, null, null, null } );
     }
 
@@ -218,8 +218,8 @@ public class WarMojoTest
         // validate jar file
         File expectedJarFile = new File( outputDir, "simple.war" );
         assertJarContent( expectedJarFile, new String[] { "META-INF/MANIFEST.MF", "WEB-INF/web.xml",
"pansit.jsp",
-            "org/web/app/last-exile.jsp", "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
-            "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties" }, new
String[] { null,
+            "org/web/app/last-exile.jsp", "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.xml",
+            "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.properties"
}, new String[] { null,
             mojo.getWebXml().toString(), null, null, null, null } );
     }
 
@@ -252,8 +252,8 @@ public class WarMojoTest
         File expectedJarFile = new File( outputDir, "simple.war" );
         assertJarContent( expectedJarFile, new String[] { "META-INF/MANIFEST.MF", "META-INF/config.xml",
             "WEB-INF/web.xml", "pansit.jsp", "org/web/app/last-exile.jsp",
-            "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
-            "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties" }, new
String[] { null, null,
+            "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.xml",
+            "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.properties"
}, new String[] { null, null,
             mojo.getWebXml().toString(), null, null, null, null } );
     }
 
@@ -287,8 +287,8 @@ public class WarMojoTest
         File expectedJarFile = new File( outputDir, "simple.war" );
         assertJarContent( expectedJarFile, new String[] { "META-INF/MANIFEST.MF", "META-INF/config.xml",
             "WEB-INF/web.xml", "pansit.jsp", "org/web/app/last-exile.jsp",
-            "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
-            "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties" }, new
String[] { null, null,
+            "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.xml",
+            "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.properties"
}, new String[] { null, null,
             mojo.getWebXml().toString(), null, null, null, null } );
     }
 
@@ -316,8 +316,8 @@ public class WarMojoTest
         File expectedJarFile = new File( outputDir, "simple.war" );
         final Map<String, JarEntry> jarContent =
             assertJarContent( expectedJarFile, new String[] { "META-INF/MANIFEST.MF", "pansit.jsp",
-                "org/web/app/last-exile.jsp", "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.xml",
-                "META-INF/maven/org.apache.maven.test/maven-test-plugin/pom.properties" },
new String[] { null, null,
+                "org/web/app/last-exile.jsp", "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.xml",
+                "META-INF/maven/org.apache.maven.plugin.test/maven-war-plugin-test/pom.properties"
}, new String[] { null, null,
                 null, null, null } );
 
         assertFalse( "web.xml should be missing", jarContent.containsKey( "WEB-INF/web.xml"
) );



Mime
View raw message