Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 20325 invoked from network); 21 Feb 2006 11:38:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Feb 2006 11:38:35 -0000 Received: (qmail 23028 invoked by uid 500); 21 Feb 2006 11:38:33 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 22947 invoked by uid 500); 21 Feb 2006 11:38: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 22936 invoked by uid 99); 21 Feb 2006 11:38:33 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Feb 2006 03:38:33 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 21 Feb 2006 03:38:32 -0800 Received: (qmail 20114 invoked by uid 65534); 21 Feb 2006 11:38:11 -0000 Message-ID: <20060221113811.20113.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r379431 - in /maven/components/branches/maven-2.0.x: maven-core-it/ maven-core-it/it0094/ maven-core-it/it0094/mojo/ maven-core-it/it0094/mojo/src/ maven-core-it/it0094/mojo/src/main/java/org/codehaus/mojo/kodo/ maven-core-it/it0094/test/ m... Date: Tue, 21 Feb 2006 11:38:09 -0000 To: commits@maven.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: brett Date: Tue Feb 21 03:38:02 2006 New Revision: 379431 URL: http://svn.apache.org/viewcvs?rev=379431&view=rev Log: [MNG-1898] merge fixes from trunk related to this issue Added: maven/components/branches/maven-2.0.x/maven-core-it/it0094/ - copied from r379363, maven/components/trunk/maven-core-it/it0094/ maven/components/branches/maven-2.0.x/maven-core-it/it0094/goals.txt - copied unchanged from r379357, maven/components/trunk/maven-core-it/it0094/goals.txt maven/components/branches/maven-2.0.x/maven-core-it/it0094/mojo/pom.xml - copied unchanged from r379357, maven/components/trunk/maven-core-it/it0094/mojo/pom.xml maven/components/branches/maven-2.0.x/maven-core-it/it0094/mojo/src/ - copied from r379357, maven/components/trunk/maven-core-it/it0094/mojo/src/ maven/components/branches/maven-2.0.x/maven-core-it/it0094/mojo/src/main/java/org/codehaus/mojo/kodo/Enhance.java - copied unchanged from r379426, maven/components/trunk/maven-core-it/it0094/mojo/src/main/java/org/codehaus/mojo/kodo/Enhance.java maven/components/branches/maven-2.0.x/maven-core-it/it0094/pom.xml - copied unchanged from r379357, maven/components/trunk/maven-core-it/it0094/pom.xml maven/components/branches/maven-2.0.x/maven-core-it/it0094/test/ - copied from r379357, maven/components/trunk/maven-core-it/it0094/test/ Modified: maven/components/branches/maven-2.0.x/maven-core-it/integration-tests.txt maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Modified: maven/components/branches/maven-2.0.x/maven-core-it/integration-tests.txt URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-core-it/integration-tests.txt?rev=379431&r1=379430&r2=379431&view=diff ============================================================================== --- maven/components/branches/maven-2.0.x/maven-core-it/integration-tests.txt (original) +++ maven/components/branches/maven-2.0.x/maven-core-it/integration-tests.txt Tue Feb 21 03:38:02 2006 @@ -1,3 +1,4 @@ +it0094 # it0091 currrently fails. Not sure if there is an associated JIRA. it0090 it0089 Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=379431&r1=379430&r2=379431&view=diff ============================================================================== --- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original) +++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Tue Feb 21 03:38:02 2006 @@ -16,6 +16,7 @@ * limitations under the License. */ +import org.apache.maven.MavenArtifactFilterManager; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException; @@ -27,7 +28,6 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionResult; import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; -import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter; import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; @@ -55,7 +55,6 @@ import org.apache.maven.project.path.PathTranslator; import org.apache.maven.reporting.MavenReport; import org.apache.maven.settings.Settings; -import org.apache.maven.MavenArtifactFilterManager; import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.PlexusContainerException; @@ -73,7 +72,6 @@ import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; -import org.codehaus.classworlds.RealmDelegatingClassLoader; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.Xpp3Dom; @@ -241,8 +239,7 @@ * @todo would be better to store this in the plugin descriptor, but then it won't be available to the version * manager which executes before the plugin is instantiated */ - private void checkRequiredMavenVersion( Plugin plugin, ArtifactRepository localRepository, List - remoteRepositories ) + private void checkRequiredMavenVersion( Plugin plugin, ArtifactRepository localRepository, List remoteRepositories ) throws PluginVersionResolutionException, InvalidPluginException { try @@ -311,8 +308,8 @@ projectPlugin = plugin; } - Set artifacts = - MavenMetadataSource.createArtifacts( artifactFactory, projectPlugin.getDependencies(), null, null, project ); + Set artifacts = MavenMetadataSource.createArtifacts( artifactFactory, projectPlugin.getDependencies(), null, + null, project ); // Set artifacts = // MavenMetadataSource.createArtifacts( artifactFactory, plugin.getDependencies(), null, null, project ); @@ -410,7 +407,7 @@ try { Thread.currentThread().setContextClassLoader( - new RealmDelegatingClassLoader( mojoDescriptor.getPluginDescriptor().getClassRealm() ) ); + mojoDescriptor.getPluginDescriptor().getClassRealm().getClassLoader() ); plugin.execute(); @@ -607,14 +604,14 @@ Set dependencies = new HashSet( resolutionGroup.getArtifacts() ); dependencies.addAll( pluginDescriptor.getIntroducedDependencyArtifacts() ); - + ArtifactResolutionResult result = artifactResolver.resolveTransitively( dependencies, pluginArtifact, localRepository, resolutionGroup.getResolutionRepositories(), artifactMetadataSource, artifactFilter ); - Set resolved = result.getArtifacts(); + Set resolved = result.getArtifacts(); for ( Iterator it = resolved.iterator(); it.hasNext(); ) { @@ -1093,7 +1090,7 @@ public void initialize() { - artifactFilter = MavenArtifactFilterManager.createStandardFilter(); + artifactFilter = MavenArtifactFilterManager.createStandardFilter(); } // ----------------------------------------------------------------------