FORGE-1324: Added tests and fix for indirect furnace dependency

manager/resolver/maven/src/main/java/org/jboss/forge/furnace/manager/maven/addon/MavenAddonDependencyResolver.java

@@ -156,27 +156,29 @@ public String resolveAPIVersion(AddonId addonId)
       Settings settings = container.getSettings();
       DefaultRepositorySystemSession session = container.setupRepoSession(system, settings);
       List<RemoteRepository> repositories = MavenRepositories.getRemoteRepositories(container, settings);
-      // Furnace API is in provided scope.
-      session.setDependencySelector(new ScopeDependencySelector(Arrays.asList("provided", "compile"), null));
       String mavenCoords = toMavenCoords(addonId);
       Artifact queryArtifact = new DefaultArtifact(mavenCoords);
-      CollectRequest collectRequest = new CollectRequest(new Dependency(queryArtifact, null), repositories);
+
+      session.setDependencySelector(new ScopeDependencySelector(Arrays.asList("provided", "compile"), Arrays
+               .asList("test")));
+
+      CollectRequest request = new CollectRequest(new Dependency(queryArtifact, null), repositories);
       CollectResult result;
       try
       {
-         result = system.collectDependencies(session, collectRequest);
+         result = system.collectDependencies(session, request);
       }
       catch (DependencyCollectionException e)
       {
          throw new RuntimeException(e);
       }
-      String apiVersion = findVersion(result.getRoot(), FURNACE_API_GROUP_ID, FURNACE_API_ARTIFACT_ID);
+      String apiVersion = findVersion(result.getRoot().getChildren(), FURNACE_API_GROUP_ID, FURNACE_API_ARTIFACT_ID);
       return apiVersion;
    }
 
-   private String findVersion(DependencyNode node, String groupId, String artifactId)
+   private String findVersion(List<DependencyNode> dependencies, String groupId, String artifactId)
    {
-      for (DependencyNode child : node.getChildren())
+      for (DependencyNode child : dependencies)
       {
          Artifact childArtifact = child.getArtifact();
 
@@ -185,6 +187,14 @@ private String findVersion(DependencyNode node, String groupId, String artifactI
          {
             return childArtifact.getBaseVersion();
          }
+         else
+         {
+            String version = findVersion(child.getChildren(), groupId, artifactId);
+            if (version != null)
+            {
+               return version;
+            }
+         }
       }
       return null;
    }

manager/resolver/maven/src/test/java/org/jboss/forge/furnace/manager/AddonManagerDependencyResolutionTest.java

@@ -143,4 +143,12 @@ public void testResolveAPIVersion() throws Exception
       Assert.assertEquals("2.0.0.Beta3", apiVersion);
    }
 
+   @Test
+   public void testResolveIndirectAPIVersion() throws Exception
+   {
+      AddonId sut = AddonId.from("test:furnace_api_indirect_dep", "1.0.0.Final");
+      String apiVersion = resolver.resolveAPIVersion(sut);
+      Assert.assertEquals("2.0.0.Beta3", apiVersion);
+   }
+
 }

manager/resolver/maven/src/test/resources/repository/test/furnace_api_indirect_dep/1.0.0.Final/furnace_api_indirect_dep-1.0.0.Final.pom

@@ -0,0 +1,43 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>test</groupId>
+   <artifactId>furnace_api_indirect_dep</artifactId>
+   <version>1.0.0.Final</version>
+   <name>Forge - Example Addon</name>
+   <dependencies>
+      <dependency>
+         <groupId>test</groupId>
+         <artifactId>no_dep</artifactId>
+         <version>1.0.0.Final</version>
+         <classifier>forge-addon</classifier>
+      </dependency>
+      <dependency>
+         <groupId>test</groupId>
+         <artifactId>furnace_api_dep</artifactId>
+         <version>1.0.0.Final</version>
+         <classifier>forge-addon</classifier>
+         <scope>provided</scope>
+      </dependency>
+   </dependencies>
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>create-forge-addon</id>
+                  <phase>package</phase>
+                  <goals>
+                     <goal>jar</goal>
+                  </goals>
+                  <inherited>false</inherited>
+                  <configuration>
+                     <classifier>forge-addon</classifier>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+</project>

manager/resolver/maven/src/test/resources/repository/test/furnace_api_indirect_dep/maven-metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+   <groupId>test</groupId>
+   <artifactId>furnace_api_indirect_dep</artifactId>
+   <versioning>
+      <latest>1.0.0.Final</latest>
+      <release>1.0.0.Final</release>
+      <versions>
+         <version>1.0.0.Final</version>
+      </versions>
+      <lastUpdated>20130310152137</lastUpdated>
+   </versioning>
+</metadata>