Return-Path: Delivered-To: apmail-maven-surefire-commits-archive@www.apache.org Received: (qmail 75355 invoked from network); 9 Dec 2007 03:19:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Dec 2007 03:19:24 -0000 Received: (qmail 49153 invoked by uid 500); 9 Dec 2007 03:19:13 -0000 Delivered-To: apmail-maven-surefire-commits-archive@maven.apache.org Received: (qmail 49131 invoked by uid 500); 9 Dec 2007 03:19:13 -0000 Mailing-List: contact surefire-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: surefire-dev@maven.apache.org Delivered-To: mailing list surefire-commits@maven.apache.org Received: (qmail 49120 invoked by uid 99); 9 Dec 2007 03:19:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Dec 2007 19:19:13 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Dec 2007 03:19:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A7DFF1A9832; Sat, 8 Dec 2007 19:18:51 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r602619 - in /maven/surefire/trunk: ./ surefire-api/ surefire-booter/ surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ surefire-integration-tests/src/test/resources/plexus-conflict/ surefire-integration-tests/src/test... Date: Sun, 09 Dec 2007 03:18:47 -0000 To: surefire-commits@maven.apache.org From: dfabulich@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071209031851.A7DFF1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dfabulich Date: Sat Dec 8 19:18:44 2007 New Revision: 602619 URL: http://svn.apache.org/viewvc?rev=602619&view=rev Log: [SUREFIRE-347] [SUREFIRE-334] Made a plexus conflict integration test to confirm these bugs. SUREFIRE-334 reproduced, SUREFIRE-347 didn't (though it is filed against 2.3). Resolved by shading surefire-booter and surefire-api deps (just commons-lang and plexus-utils, now that we no longer depend on plexus-archiver). Will also need to port this to 2.3 branch. Added: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java - copied, changed from r602310, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationTest.java maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/main/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/main/java/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/main/java/plexusConflict/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/main/java/plexusConflict/CommandlineExtender.java maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/test/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/test/java/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/test/java/plexusConflict/ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/test/java/plexusConflict/BasicTest.java Modified: maven/surefire/trunk/pom.xml maven/surefire/trunk/surefire-api/pom.xml maven/surefire/trunk/surefire-booter/pom.xml Modified: maven/surefire/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=602619&r1=602618&r2=602619&view=diff ============================================================================== --- maven/surefire/trunk/pom.xml (original) +++ maven/surefire/trunk/pom.xml Sat Dec 8 19:18:44 2007 @@ -175,14 +175,13 @@ - - + + false - codehaus.snapshots - Codehaus Snapshot Development Repository - http://snapshots.repository.codehaus.org - - + apache.snapshots + http://people.apache.org/repo/m2-snapshot-repository/ + + Modified: maven/surefire/trunk/surefire-api/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/pom.xml?rev=602619&r1=602618&r2=602619&view=diff ============================================================================== --- maven/surefire/trunk/surefire-api/pom.xml (original) +++ maven/surefire/trunk/surefire-api/pom.xml Sat Dec 8 19:18:44 2007 @@ -26,6 +26,41 @@ 4.0.0 surefire-api SureFire API + + + + org.apache.maven.plugins + maven-shade-plugin + 1.0-alpha-14-SNAPSHOT + + + package + + shade + + + + + org.codehaus.plexus:plexus-utils + commons-lang:commons-lang + + + + + org.codehaus.plexus.util + org.apache.maven.surefire.shade.org.codehaus.plexus.util + + + org.apache.commons.lang + org.apache.maven.surefire.shade.org.apache.commons.lang + + + + + + + + org.codehaus.plexus Modified: maven/surefire/trunk/surefire-booter/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/pom.xml?rev=602619&r1=602618&r2=602619&view=diff ============================================================================== --- maven/surefire/trunk/surefire-booter/pom.xml (original) +++ maven/surefire/trunk/surefire-booter/pom.xml Sat Dec 8 19:18:44 2007 @@ -7,6 +7,36 @@ 4.0.0 surefire-booter SureFire Booter + + + + org.apache.maven.plugins + maven-shade-plugin + 1.0-alpha-14-SNAPSHOT + + + package + + shade + + + + + org.codehaus.plexus:plexus-utils + + + + + org.codehaus.plexus.util + org.apache.maven.surefire.booter.shade.org.codehaus.plexus.util + + + + + + + + org.apache.maven.surefire Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java (from r602310, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationTest.java) URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationTest.java&r1=602310&r2=602619&rev=602619&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java Sat Dec 8 19:18:44 2007 @@ -1,30 +1,47 @@ package org.apache.maven.surefire.its; -import java.io.File; - import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; +import java.util.ArrayList; + /** - * Test basic default configuration, runs the JUnit 3 test in the src/test directory. - * + * Test library using a conflicting version of plexus-utils + * * @author Dan Fabulich - * + * */ -public class DefaultConfigurationTest +public class PlexusConflictTest extends AbstractMavenIntegrationTestCase { - public void testDefaultConfiguration () + public void testPlexusConflict () throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/default-configuration" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/plexus-conflict" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "test" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - - HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir ); + + HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir ); + } + + public void testPlexusConflictSystemClassLoader () + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/plexus-conflict" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + ArrayList goals = new ArrayList(); + goals.add( "test" ); + goals.add( "-Dsurefire.useSystemClassLoader=true" ); + verifier.executeGoals( goals ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir ); } -} +} \ No newline at end of file Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml?rev=602619&view=auto ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml (added) +++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml Sat Dec 8 19:18:44 2007 @@ -0,0 +1,45 @@ + + + + + 4.0.0 + + org.apache.maven.plugins.surefire + plexus-conflict + 1.0-SNAPSHOT + Test for plexus conflict + + + + org.codehaus.plexus + plexus-utils + 1.0.4 + + + junit + junit + 3.8.1 + test + + + + Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/main/java/plexusConflict/CommandlineExtender.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/main/java/plexusConflict/CommandlineExtender.java?rev=602619&view=auto ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/main/java/plexusConflict/CommandlineExtender.java (added) +++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/main/java/plexusConflict/CommandlineExtender.java Sat Dec 8 19:18:44 2007 @@ -0,0 +1,14 @@ +package plexusConflict; + +import org.codehaus.plexus.util.cli.Commandline; + +/** + * Conflict with latest version of plexus by using modified protected class. + */ +public class CommandlineExtender extends Commandline +{ + public CommandlineExtender() { + // In 1.0.4, Commandline.envVars was a Vector; in 1.4.x, it's a Map. + super.envVars.add(""); + } +} Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/test/java/plexusConflict/BasicTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/test/java/plexusConflict/BasicTest.java?rev=602619&view=auto ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/test/java/plexusConflict/BasicTest.java (added) +++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plexus-conflict/src/test/java/plexusConflict/BasicTest.java Sat Dec 8 19:18:44 2007 @@ -0,0 +1,17 @@ +package plexusConflict; + +import junit.extensions.TestSetup; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +public class BasicTest + extends TestCase +{ + + public void testPlexusConflict() + { + CommandlineExtender ce = new CommandlineExtender(); + } + +}