Using ShrinkWrap Resolver WorkspaceReader

forge · Mar 6, 2013 · ad56f84 · ad56f84
1 parent f9f3a5b
commit ad56f84
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/maven/impl/src/main/java/org/jboss/forge/maven/dependencies/AddonDependencySelector.java b/maven/impl/src/main/java/org/jboss/forge/maven/dependencies/AddonDependencySelector.java
@@ -7,7 +7,7 @@
 
 /**
  * A dependency selector that filters based on their scope and classifier "forge-addon"
- * 
+ *
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
 public class AddonDependencySelector
@@ -26,6 +26,7 @@ public AddonDependencySelector(int depth)
       this.depth = depth;
    }
 
+   @Override
    public boolean selectDependency(Dependency dependency)
    {
       if (depth < 1)
@@ -42,6 +43,7 @@ public boolean selectDependency(Dependency dependency)
       return result;
    }
 
+   @Override
    public DependencySelector deriveChildSelector(DependencyCollectionContext context)
    {
       if ((depth > 0) && FORGE_ADDON.equals(context.getDependency().getArtifact().getClassifier()))

diff --git a/maven/impl/src/main/java/org/jboss/forge/maven/dependencies/MavenDependencyResolver.java b/maven/impl/src/main/java/org/jboss/forge/maven/dependencies/MavenDependencyResolver.java
@@ -33,6 +33,7 @@
 import org.jboss.forge.dependencies.builder.DependencyNodeBuilder;
 import org.jboss.forge.resource.FileResource;
 import org.jboss.forge.resource.ResourceFactory;
+import org.jboss.shrinkwrap.resolver.impl.maven.aether.ClasspathWorkspaceReader;
 import org.jboss.shrinkwrap.resolver.impl.maven.logging.LogTransferListener;
 import org.sonatype.aether.RepositorySystem;
 import org.sonatype.aether.artifact.Artifact;
@@ -142,7 +143,7 @@ public List<Coordinate> resolveVersions(DependencyQuery query)
 
    /**
     * Returns the versions of a specific artifact
-    * 
+    *
     * @param query
     * @return
     */
@@ -191,7 +192,7 @@ private MavenRepositorySystemSession setupRepoSession(final RepositorySystem rep
       session.setLocalRepositoryManager(repoSystem.newLocalRepositoryManager(localRepo));
       session.setTransferErrorCachingEnabled(false);
       session.setNotFoundCachingEnabled(false);
-
+      session.setWorkspaceReader(new ClasspathWorkspaceReader());
       return session;
    }
 
@@ -230,6 +231,7 @@ public Dependency resolveArtifact(DependencyQuery query)
       }
    }
 
+   @Override
    public org.jboss.forge.dependencies.DependencyNode resolveAddonDependencyHierarchy(final DependencyQuery query)
    {
       try