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 2008/05/23 21:45:29 UTC

svn commit: r659640 - in /maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata: ./ conflict/ resolver/ transform/

Author: jvanzyl
Date: Fri May 23 12:45:27 2008
New Revision: 659640

URL: http://svn.apache.org/viewvc?rev=659640&view=rev
Log:
o there's only going to be one flavour of conflict resolver for versioning

Added:
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionPolicy.java
      - copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolutionPolicy.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolver.java
      - copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolver.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolutionPolicy.java
      - copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolutionPolicy.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolver.java
      - copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolver.java
Removed:
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolutionPolicy.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolver.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolutionPolicy.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolver.java
Modified:
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionException.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionRequest.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/CyclicDependencyException.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionException.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionException.java?rev=659640&r1=659639&r2=659640&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionException.java Fri May 23 12:45:27 2008
@@ -4,4 +4,22 @@
     extends Exception
 {
 
+    public ArtifactResolutionException( String message, Throwable cause )
+    {
+        super( message, cause );
+        // TODO Auto-generated constructor stub
+    }
+
+    public ArtifactResolutionException( String message )
+    {
+        super( message );
+        // TODO Auto-generated constructor stub
+    }
+
+    public ArtifactResolutionException( Throwable cause )
+    {
+        super( cause );
+        // TODO Auto-generated constructor stub
+    }
+    
 }

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionRequest.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionRequest.java?rev=659640&r1=659639&r2=659640&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionRequest.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionRequest.java Fri May 23 12:45:27 2008
@@ -1,6 +1,6 @@
 package org.apache.maven.artifact.resolver.metadata;
 
-import org.apache.maven.artifact.resolver.metadata.conflict.GraphConflictResolver;
+import org.apache.maven.artifact.resolver.metadata.conflict.ConflictResolver;
 import org.apache.maven.artifact.resolver.metadata.resolver.MetadataSource;
 
 import java.util.List;
@@ -34,7 +34,7 @@
 
     private Map managedVersionMap;
 
-    private List<GraphConflictResolver> conflictResolvers;
+    private List<ConflictResolver> conflictResolvers;
 
     public Artifact getArtifact()
     {
@@ -168,12 +168,12 @@
         return this;
     }
 
-    public List<GraphConflictResolver> getConflictResolvers()
+    public List<ConflictResolver> getConflictResolvers()
     {
         return conflictResolvers;
     }
 
-    public ArtifactResolutionRequest setConflictResolvers( List<GraphConflictResolver> conflictResolvers )
+    public ArtifactResolutionRequest setConflictResolvers( List<ConflictResolver> conflictResolvers )
     {
         this.conflictResolvers = conflictResolvers;
 

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/CyclicDependencyException.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/CyclicDependencyException.java?rev=659640&r1=659639&r2=659640&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/CyclicDependencyException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/CyclicDependencyException.java Fri May 23 12:45:27 2008
@@ -31,14 +31,13 @@
     extends ArtifactResolutionException
 {
     private Artifact artifact;
-
-    public CyclicDependencyException( String message,
-                                      Artifact artifact )
+       
+    public CyclicDependencyException( String message, Throwable cause )
     {
-        //super( message, artifact );
+        super( message, cause );
         this.artifact = artifact;
     }
-
+    
     public Artifact getArtifact()
     {
         return artifact;

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionPolicy.java (from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolutionPolicy.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionPolicy.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionPolicy.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolutionPolicy.java&r1=659622&r2=659640&rev=659640&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolutionPolicy.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionPolicy.java Fri May 23 12:45:27 2008
@@ -11,9 +11,9 @@
  * @version $Id$
  */
 
-public interface GraphConflictResolutionPolicy
+public interface ConflictResolutionPolicy
 {
-    static String ROLE = GraphConflictResolutionPolicy.class.getName();
+    static String ROLE = ConflictResolutionPolicy.class.getName();
 
     public MetadataGraphEdge apply( 
 			  MetadataGraphEdge e1

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolver.java (from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolver.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolver.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolver.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolver.java&r1=659622&r2=659640&rev=659640&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolver.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolver.java Fri May 23 12:45:27 2008
@@ -1,37 +1,34 @@
 package org.apache.maven.artifact.resolver.metadata.conflict;
 
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
  */
 
 import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum;
 import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraph;
 
-/**
- * Resolves conflicts in the supplied dependency graph. 
- * Different implementations will implement different conflict resolution policies.
- *
+/*
+ * Resolves conflicts in the supplied dependency graph. Different implementations will implement
+ * different conflict resolution policies.
+ * 
  * @author <a href="mailto:oleg@codehaus.org">Oleg Gusakov</a>
+ * 
  * @version $Id$
  */
-public interface GraphConflictResolver
+public interface ConflictResolver
 {
-    static String ROLE = GraphConflictResolver.class.getName();
+    static String ROLE = ConflictResolver.class.getName();
 
     /**
      * Cleanses the supplied graph by leaving only one directed versioned edge\
@@ -46,5 +43,5 @@
      * @since 3.0
      */
     MetadataGraph resolveConflicts( MetadataGraph graph, ArtifactScopeEnum scope )
-    throws GraphConflictResolutionException;
+        throws GraphConflictResolutionException;
 }

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolutionPolicy.java (from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolutionPolicy.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolutionPolicy.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolutionPolicy.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolutionPolicy.java&r1=659622&r2=659640&rev=659640&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolutionPolicy.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolutionPolicy.java Fri May 23 12:45:27 2008
@@ -12,8 +12,8 @@
  * 
  * @version $Id$
  */
-public class DefaultGraphConflictResolutionPolicy
-implements GraphConflictResolutionPolicy
+public class DefaultConflictResolutionPolicy
+implements ConflictResolutionPolicy
 {
 	
 	/**

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolver.java (from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolver.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolver.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolver.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolver.java&r1=659622&r2=659640&rev=659640&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolver.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolver.java Fri May 23 12:45:27 2008
@@ -41,15 +41,15 @@
  * @version $Id$
  */
 
-public class DefaultGraphConflictResolver
-implements GraphConflictResolver
+public class DefaultConflictResolver
+implements ConflictResolver
 {
 	/**
      * artifact, closer to the entry point, is selected
      * 
      * @plexus.requirement role="org.apache.maven.artifact.resolver.conflict.GraphConflictResolutionPolicy"
      */
-	protected GraphConflictResolutionPolicy policy;
+	protected ConflictResolutionPolicy policy;
 	//-------------------------------------------------------------------------------------
 	//-------------------------------------------------------------------------------------
 	public MetadataGraph resolveConflicts( MetadataGraph graph, ArtifactScopeEnum scope )

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java?rev=659640&r1=659639&r2=659640&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java Fri May 23 12:45:27 2008
@@ -10,7 +10,7 @@
 import org.apache.maven.artifact.resolver.metadata.Artifact;
 import org.apache.maven.artifact.resolver.metadata.ArtifactRepository;
 import org.apache.maven.artifact.resolver.metadata.DefaultArtifact;
-import org.apache.maven.artifact.resolver.metadata.conflict.GraphConflictResolver;
+import org.apache.maven.artifact.resolver.metadata.conflict.ConflictResolver;
 import org.apache.maven.artifact.resolver.metadata.transform.ClasspathTransformation;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 
@@ -34,7 +34,7 @@
     MetadataSource metadataSource;
 
     /** @plexus.requirement */
-    GraphConflictResolver conflictResolver;
+    ConflictResolver conflictResolver;
 
     /** @plexus.requirement */
     ClasspathTransformation classpathTransformation;
@@ -77,32 +77,26 @@
 
             String error = null;
 
-            try
-            {
-                ArtifactResolutionRequest arr = new ArtifactResolutionRequest();
-                arr.setArtifact( pomArtifact );
-                arr.setLocalRepository( localRepository );
-                arr.setRemoteRepostories( remoteRepositories );
+            ArtifactResolutionRequest arr = new ArtifactResolutionRequest();
+            arr.setArtifact( pomArtifact );
+            arr.setLocalRepository( localRepository );
+            arr.setRemoteRepostories( remoteRepositories );
 
-                artifactResolver.resolve( pomArtifact, remoteRepositories, localRepository );
-                //System.out.println("Resolved "+query+" : "+pomArtifact.isResolved() );
+            ResolutionRequest request = new ResolutionRequest().setArtifact( pomArtifact ).setLocalRepository( localRepository ).setRemoteRepostories( remoteRepositories );
 
-                if ( !pomArtifact.isResolved() )
-                {
-                    getLogger().info(
-                                      "*************> Did not resolve " + pomArtifact.toString() + "\nURL: " + pomArtifact.getDownloadUrl() + "\nRepos: " + remoteRepositories + "\nLocal: "
-                                          + localRepository );
-                }
-            }
-            catch ( ArtifactResolutionException are )
+            ResolutionResult result = artifactResolver.resolve( request );
+
+            // Here we just need to deal with basic retrieval problems.
+            if ( result.hasMetadataResolutionExceptions() )
             {
                 pomArtifact.setResolved( false );
-                error = are.getMessage();
             }
-            catch ( ArtifactNotFoundException anfe )
+
+            if ( !pomArtifact.isResolved() )
             {
-                pomArtifact.setResolved( false );
-                error = anfe.getMessage();
+                getLogger().info(
+                                  "*************> Did not resolve " + pomArtifact.toString() + "\nURL: " + pomArtifact.getDownloadUrl() + "\nRepos: " + remoteRepositories + "\nLocal: "
+                                      + localRepository );
             }
 
             if ( error != null )
@@ -154,26 +148,19 @@
 
         ArrayList<Artifact> res = new ArrayList<Artifact>( mdCollection.size() );
         Artifact artifact = null;
-        try
+
+        // TODO: optimize retrieval by zipping returns from repo managers (nexus)
+        for ( ArtifactMetadata md : mdCollection )
         {
-            // TODO: optimize retrieval by zipping returns from repo managers (nexus)
-            for ( ArtifactMetadata md : mdCollection )
-            {
+            artifact = new DefaultArtifact( md.getGroupId(), md.getArtifactId(), md.getVersion(), md.getType() == null ? "jar" : md.getType(), null, false, md.getScope(), null );
 
-                artifact = new DefaultArtifact( md.getGroupId(), md.getArtifactId(), md.getVersion(), md.getType() == null ? "jar" : md.getType(), null, false, md.getScope(), null );
+            ResolutionRequest request = new ResolutionRequest().setArtifact( artifact ).setLocalRepository( localRepository ).setRemoteRepostories( remoteRepositories );
 
-                artifactResolver.resolve( artifact, remoteRepositories, localRepository );
+            ResolutionResult result = artifactResolver.resolve( request );
 
-                res.add( artifact );
-            }
-            return res;
-        }
-        catch ( ArtifactNotFoundException e )
-        {
-            e.printStackTrace();
-            throw new ArtifactResolutionException( e.getMessage(), artifact, remoteRepositories );
+            res.add( artifact );
         }
+        return res;
     }
-    //------------------------------------------------------------------------
-    //------------------------------------------------------------------------
 }
+

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java?rev=659640&r1=659639&r2=659640&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java Fri May 23 12:45:27 2008
@@ -2,7 +2,7 @@
 
 import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum;
 import org.apache.maven.artifact.resolver.metadata.conflict.GraphConflictResolutionException;
-import org.apache.maven.artifact.resolver.metadata.conflict.GraphConflictResolver;
+import org.apache.maven.artifact.resolver.metadata.conflict.ConflictResolver;
 import org.apache.maven.artifact.resolver.metadata.transform.ClasspathContainer;
 import org.apache.maven.artifact.resolver.metadata.transform.ClasspathTransformation;
 import org.apache.maven.artifact.resolver.metadata.transform.MetadataGraphTransformationException;
@@ -24,7 +24,7 @@
      * explicit call of the initTreeProcessing() 
      */ 
     ClasspathTransformation classpathTransformation;
-    GraphConflictResolver conflictResolver;
+    ConflictResolver conflictResolver;
 
     //----------------------------------------------------------------------------
     public MetadataResolutionResult( )
@@ -50,7 +50,7 @@
     throws ComponentLookupException
     {
         classpathTransformation = (ClasspathTransformation)plexus.lookup(ClasspathTransformation.class);
-        conflictResolver = (GraphConflictResolver)plexus.lookup(GraphConflictResolver.class);
+        conflictResolver = (ConflictResolver)plexus.lookup(ConflictResolver.class);
     }
     //----------------------------------------------------------------------------
     public MetadataGraph getGraph()

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java?rev=659640&r1=659639&r2=659640&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java Fri May 23 12:45:27 2008
@@ -7,7 +7,7 @@
 
 import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum;
 import org.apache.maven.artifact.resolver.metadata.conflict.GraphConflictResolutionException;
-import org.apache.maven.artifact.resolver.metadata.conflict.GraphConflictResolver;
+import org.apache.maven.artifact.resolver.metadata.conflict.ConflictResolver;
 import org.apache.maven.artifact.resolver.metadata.resolver.ArtifactMetadata;
 import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraph;
 import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphEdge;
@@ -25,7 +25,7 @@
 implements ClasspathTransformation
 {
     /** @plexus.requirement */
-    GraphConflictResolver conflictResolver;
+    ConflictResolver conflictResolver;
     //----------------------------------------------------------------------------------------------------
 	public ClasspathContainer transform(
 						  MetadataGraph dirtyGraph