Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 34C731747D for ; Mon, 3 Nov 2014 21:41:33 +0000 (UTC) Received: (qmail 42008 invoked by uid 500); 3 Nov 2014 21:41:33 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 41945 invoked by uid 500); 3 Nov 2014 21:41:33 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 41936 invoked by uid 99); 3 Nov 2014 21:41:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2014 21:41:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2014 21:41:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CD02323888A6; Mon, 3 Nov 2014 21:40:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@maven.apache.org From: andham@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141103214010.CD02323888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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. - 2.5 + 2.6 1.3 2.2.1 3.2 @@ -120,7 +120,7 @@ under the License. org.codehaus.plexus plexus-io - 2.2 + 2.3.2 commons-io @@ -130,16 +130,12 @@ under the License. org.codehaus.plexus plexus-archiver - 2.7.1 + 2.8.1 org.codehaus.plexus plexus-container-default - - org.codehaus.plexus - plexus-component-api - 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 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" ) );