You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/06/05 18:41:07 UTC
svn commit: r782059 - in /maven/components/trunk: ./
maven-compat/src/main/java/org/apache/maven/artifact/
maven-core/src/main/java/org/apache/maven/lifecycle/
maven-core/src/main/java/org/apache/maven/project/artifact/
maven-core/src/test/java/org/apa...
Author: jvanzyl
Date: Fri Jun 5 16:41:07 2009
New Revision: 782059
URL: http://svn.apache.org/viewvc?rev=782059&view=rev
Log:
o missing bits of Igor's patch
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
maven/components/trunk/pom.xml
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java?rev=782059&r1=782058&r2=782059&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java Fri Jun 5 16:41:07 2009
@@ -146,6 +146,16 @@
return clone;
}
+ /** Returns <code>to</code> collection */
+ public static <T extends Collection<Artifact>> T copyArtifacts( Collection<Artifact> from, T to )
+ {
+ for ( Artifact artifact : from )
+ {
+ to.add( ArtifactUtils.copyArtifact( artifact ) );
+ }
+ return to;
+ }
+
private static <T> List<T> copyList( List<T> original )
{
List<T> copy = null;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=782059&r1=782058&r2=782059&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Fri Jun 5 16:41:07 2009
@@ -397,12 +397,6 @@
MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor(
mojoExecution.getGroupId(), mojoExecution.getArtifactId(), mojoExecution.getVersion(), mojoExecution.getGoal(), session.getLocalRepository(), project.getPluginArtifactRepositories() );
- PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
- if ( pluginDescriptor.getPlugin().isExtensions() )
- {
- pluginDescriptor.setClassRealm( pluginManager.getPluginRealm( session, pluginDescriptor ) );
- }
-
requiredDependencyResolutionScope = calculateRequiredDependencyResolutionScope( requiredDependencyResolutionScope, mojoDescriptor.isDependencyResolutionRequired() );
mojoExecution.setMojoDescriptor( mojoDescriptor );
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java?rev=782059&r1=782058&r2=782059&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java Fri Jun 5 16:41:07 2009
@@ -18,7 +18,6 @@
import java.io.File;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
@@ -130,7 +129,7 @@
CacheRecord(Artifact pomArtifact, Set<Artifact> artifacts, List<ArtifactRepository> remoteRepositories)
{
this.pomArtifact = ArtifactUtils.copyArtifact( pomArtifact );
- this.artifacts = copyArtifacts( artifacts );
+ this.artifacts = ArtifactUtils.copyArtifacts( artifacts, new ArrayList<Artifact>() );
this.remoteRepositories = new ArrayList<ArtifactRepository>( remoteRepositories );
@@ -186,7 +185,7 @@
if ( cacheRecord != null && !cacheRecord.isStale() )
{
Artifact pomArtifact = ArtifactUtils.copyArtifact( cacheRecord.getArtifact() );
- Set<Artifact> artifacts = new LinkedHashSet<Artifact>( copyArtifacts( cacheRecord.getArtifacts() ) );
+ Set<Artifact> artifacts = ArtifactUtils.copyArtifacts( cacheRecord.getArtifacts(), new LinkedHashSet<Artifact>() );
return new ResolutionGroup( pomArtifact, artifacts , cacheRecord.getRemoteRepositories() );
}
@@ -204,16 +203,6 @@
cache.put( cacheKey, cacheRecord );
}
- public static List<Artifact> copyArtifacts( Collection<Artifact> artifacts )
- {
- ArrayList<Artifact> result = new ArrayList<Artifact>();
- for ( Artifact artifact : artifacts )
- {
- result.add( ArtifactUtils.copyArtifact( artifact ) );
- }
- return result;
- }
-
public void flush()
{
cache.clear();
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java?rev=782059&r1=782058&r2=782059&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java Fri Jun 5 16:41:07 2009
@@ -154,22 +154,6 @@
{
return repositorySystem.createDefaultLocalRepository();
}
-
- protected ArtifactRepository getReactorRepository( MavenProject... projects )
- throws InvalidRepositoryException
- {
- Map<String, MavenProject> projectsMap = new LinkedHashMap<String, MavenProject>();
-
- for ( MavenProject project : projects )
- {
- projectsMap.put( ArtifactUtils.key( project.getGroupId(), project.getArtifactId(), project.getVersion() ), project );
- }
-
- DelegatingLocalArtifactRepository delegatingLocalArtifactRepository = new DelegatingLocalArtifactRepository( getLocalRepository() );
- delegatingLocalArtifactRepository.setBuildReactor( new ReactorArtifactRepository( projectsMap ) );
-
- return delegatingLocalArtifactRepository;
- }
protected class ProjectBuilder
{
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=782059&r1=782058&r2=782059&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Fri Jun 5 16:41:07 2009
@@ -52,7 +52,7 @@
<easyMockVersion>1.2_Java1.3</easyMockVersion>
<junitVersion>3.8.2</junitVersion>
<plexusVersion>1.0-beta-3.0.8-SNAPSHOT</plexusVersion>
- <plexusInterpolationVersion>1.8.1</plexusInterpolationVersion>
+ <plexusInterpolationVersion>1.9-SNAPSHOT</plexusInterpolationVersion>
<plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
<plexusUtilsVersion>1.5.13-SNAPSHOT</plexusUtilsVersion>
<plexusJetty6Version>1.6</plexusJetty6Version>