You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by pg...@apache.org on 2012/10/22 07:31:27 UTC
svn commit: r1400764 - in /maven/plugins/trunk/maven-dependency-plugin:
pom.xml src/it/purge-local-repository-bad-pom/invoker.properties
src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
Author: pgier
Date: Mon Oct 22 05:31:26 2012
New Revision: 1400764
URL: http://svn.apache.org/viewvc?rev=1400764&view=rev
Log:
Fix purge-local-repository bad pom test for Maven 3.
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository-bad-pom/invoker.properties
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1400764&r1=1400763&r2=1400764&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Mon Oct 22 05:31:26 2012
@@ -311,10 +311,6 @@ under the License.
<postBuildHookScript>verify</postBuildHookScript>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
- <pomExcludes>
- <!-- Exclude this IT until it can be fixed -->
- <pomExclude>purge-local-repository-bad-pom/pom.xml</pomExclude>
- </pomExcludes>
<goals>
<goal>clean</goal>
<goal>process-sources</goal>
Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository-bad-pom/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository-bad-pom/invoker.properties?rev=1400764&r1=1400763&r2=1400764&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository-bad-pom/invoker.properties (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/it/purge-local-repository-bad-pom/invoker.properties Mon Oct 22 05:31:26 2012
@@ -1 +1,3 @@
invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:purge-local-repository
+# The bad pom test fails using Maven 2.x
+invoker.maven.version = 3.0.0+
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java?rev=1400764&r1=1400763&r2=1400764&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java Mon Oct 22 05:31:26 2012
@@ -457,9 +457,8 @@ public class PurgeLocalRepositoryMojo
try
{
ArtifactResolutionResult result =
- resolver.resolveTransitively( artifacts, project.getArtifact(), project.getManagedVersionMap(),
- localRepository, remoteRepos, metadataSource, artifactFilter,
- Collections.emptyList() );
+ resolver.resolveTransitively( artifacts, project.getArtifact(), localRepository, remoteRepos,
+ metadataSource, artifactFilter );
@SuppressWarnings( "unchecked" )
Set<Artifact> resolvedArtifacts = result.getArtifacts();
@@ -552,9 +551,8 @@ public class PurgeLocalRepositoryMojo
// If transitive we can just re-resolve the whole tree
if ( actTransitively )
{
- resolver.resolveTransitively( artifacts, project.getArtifact(), project.getManagedVersionMap(),
- localRepository, remoteRepos, metadataSource, filter,
- Collections.emptyList() );
+ resolver.resolveTransitively( artifacts, project.getArtifact(),
+ localRepository, remoteRepos, metadataSource, filter );
}
// If not doing transitive dependency resolution, then we need to resolve one by one.
else