From 1b459022dd4dda53ac2ce7709fda9be69189a864 Mon Sep 17 00:00:00 2001 From: John Casey Date: Wed, 18 Jun 2008 15:59:48 +0000 Subject: [PATCH] Fixing primary artifact resolution, so we don't have to depend on comparison artifacts being in the local repository. git-svn-id: file:///home/tiste/MOJOHAUS-TO-GIT/SVN-MOJO-WIP/trunk/mojo/clirr-maven-plugin@7157 52ab4f32-60fc-0310-b215-8acea882cd1b --- .../org/codehaus/mojo/clirr/AbstractClirrMojo.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/codehaus/mojo/clirr/AbstractClirrMojo.java b/src/main/java/org/codehaus/mojo/clirr/AbstractClirrMojo.java index dd4887f..9e66e0b 100644 --- a/src/main/java/org/codehaus/mojo/clirr/AbstractClirrMojo.java +++ b/src/main/java/org/codehaus/mojo/clirr/AbstractClirrMojo.java @@ -25,6 +25,7 @@ import net.sf.clirr.core.XmlDiffListener; import net.sf.clirr.core.internal.bcel.BcelJavaType; import net.sf.clirr.core.internal.bcel.BcelTypeArrayBuilder; import net.sf.clirr.core.spi.JavaType; + import org.apache.bcel.classfile.ClassParser; import org.apache.bcel.classfile.JavaClass; import org.apache.bcel.util.ClassLoaderRepository; @@ -111,7 +112,7 @@ public abstract class AbstractClirrMojo * @component */ private MavenProjectBuilder mavenProjectBuilder; - + /** * The classes of this project to compare the last release against. * @@ -286,8 +287,14 @@ public abstract class AbstractClirrMojo try { + for ( Iterator iter = previousArtifacts.iterator(); iter.hasNext(); ) + { + Artifact artifact = (Artifact) iter.next(); + resolver.resolve( artifact, project.getRemoteArtifactRepositories(), localRepository ); + } + final List dependencies = getTransitiveDependencies( previousArtifacts ); - + ClassLoader origDepCL = createClassLoader( dependencies, previousArtifacts ); final File[] files = new File[ previousArtifacts.size() ]; int i = 0; @@ -385,7 +392,7 @@ public abstract class AbstractClirrMojo Set artifactSet = new HashSet(); Artifact[] result = new Artifact[artifacts.length]; for ( int i = 0; i < result.length; i++ ) - { + { artifactSet.add( resolveArtifact( artifacts[i] ) ); } return artifactSet; -- GitLab