Migrate to new DependencyEntry API

forge · Jul 6, 2013 · 13b8b22 · 13b8b22
1 parent c1c593c
commit 13b8b22
Show file tree

Hide file tree

Showing 43 changed files with 129 additions and 104 deletions.
diff --git a/addon-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/InstallRequestImpl.java b/addon-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/InstallRequestImpl.java
@@ -35,9 +35,9 @@
 /**
  * When an addon is installed, another addons could be required. This object returns the necessary information for the
  * installation of an addon to succeed, like required addons and dependencies
- *
+ * 
  * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
- *
+ * 
  */
 public class InstallRequestImpl implements InstallRequest
 {
@@ -52,7 +52,7 @@ public class InstallRequestImpl implements InstallRequest
 
    /**
     * Package-access constructor. Only AddonManager should be allowed to call this constructor.
-    *
+    * 
     * @param addonManager
     */
    InstallRequestImpl(AddonManager addonManager, Furnace forge, DependencyNode requestedAddonNode)
@@ -247,7 +247,8 @@ private List<AddonDependencyEntry> toAddonDependencies(List<DependencyNode> depe
             else if ("provided".equalsIgnoreCase(scopeType))
                export = false;
          }
-         AddonDependencyEntry addonDep = AddonDependencyEntry.create(toAddonId(dep), export, optional);
+         AddonDependencyEntry addonDep = AddonDependencyEntry.create(toAddonId(dep).getName(), toAddonId(dep)
+                  .getVersion().toString(), export, optional);
          addonDependencies.add(addonDep);
       }
       return addonDependencies;

diff --git a/addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/AddonManagerTest.java b/addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/AddonManagerTest.java
@@ -26,6 +26,8 @@
 import org.jboss.forge.furnace.repositories.AddonRepository;
 import org.jboss.forge.furnace.util.Addons;
 import org.jboss.forge.furnace.versions.SingleVersion;
+import org.jboss.forge.furnace.versions.SingleVersionRange;
+import org.jboss.forge.furnace.versions.Versions;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
 import org.junit.Test;
@@ -50,7 +52,7 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:addon-manager", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create("org.jboss.forge.addon:addon-manager", "2.0.0-SNAPSHOT")
                );
 
       return archive;
@@ -87,18 +89,16 @@ public void testInstallingAddonWithSingleOptionalAddonDependency() throws Interr
       Set<AddonDependencyEntry> dependencies = repository.getAddonDependencies(example);
       Assert.assertEquals(1, dependencies.size());
       AddonDependencyEntry dependency = dependencies.toArray(new AddonDependencyEntry[dependencies.size()])[0];
-      Assert.assertEquals("org.jboss.forge.addon:example2", dependency
-               .getId().getName());
-      Assert.assertEquals(new SingleVersion("2.0.0-SNAPSHOT"), dependency
-               .getId().getVersion());
+      Assert.assertEquals("org.jboss.forge.addon:example2", dependency.getName());
+      Assert.assertEquals(new SingleVersionRange(new SingleVersion("2.0.0-SNAPSHOT")), dependency.getVersionRange());
       Assert.assertTrue(dependency.isOptional());
       Assert.assertFalse(dependency.isExported());
 
       Assert.assertTrue(registry.getAddon(AddonId.from("org.jboss.forge.addon:example2", "2.0.0-SNAPSHOT"))
                .getStatus().isMissing());
 
       Addons.waitUntilStarted(registry.getAddon(example), 10, TimeUnit.SECONDS);
-      Assert.assertEquals(addonCount + 2, registry.getAddons().size());
+      Assert.assertEquals(addonCount + 1, registry.getAddons().size());
    }
 
    @Test
@@ -128,9 +128,9 @@ public void testInstallingAlreadyInstalledAddonWithTwoRequiredAddonDependency()
 
       for (AddonDependencyEntry dependency : dependencies)
       {
-         Assert.assertTrue("Not a valid addon dependency: " + dependency.getId().getName(),
-                  addonDependenciesIds.remove(dependency.getId().getName()));
-         Assert.assertEquals(new SingleVersion("2.0.0-SNAPSHOT"), dependency.getId().getVersion());
+         Assert.assertTrue("Not a valid addon dependency: " + dependency.getName(),
+                  addonDependenciesIds.remove(dependency.getName()));
+         Assert.assertEquals(Versions.parseMultipleVersionRange("2.0.0-SNAPSHOT"), dependency.getVersionRange());
       }
       Assert.assertTrue("Addons not detected as dependency: " + addonDependenciesIds, addonDependenciesIds.isEmpty());
 

diff --git a/addons/impl/src/main/java/org/jboss/forge/addon/addons/AddonProjectConfigurator.java b/addons/impl/src/main/java/org/jboss/forge/addon/addons/AddonProjectConfigurator.java
@@ -81,7 +81,7 @@ public void setupAddonProject(Project project, Version forgeVersion, Iterable<Ad
       }
 
       dependencyInstaller.installManaged(project, DependencyBuilder.create(ForgeContainerAPIFacet.FORGE_API_DEPENDENCY)
-               .setVersion(forgeVersion.getVersionString()));
+               .setVersion(forgeVersion.toString()));
 
       Project addonProject =
                createSubmoduleProject(project, "addon", projectName, ForgeAddonFacet.class, CDIFacet.class);
@@ -139,7 +139,7 @@ private void installSelectedAddons(final Project project, Iterable<AddonId> addo
             String[] mavenCoords = addon.getName().split(":");
             DependencyBuilder dependency = DependencyBuilder.create().setGroupId(mavenCoords[0])
                      .setArtifactId(mavenCoords[1])
-                     .setVersion(addon.getVersion().getVersionString()).setClassifier(FORGE_ADDON_CLASSIFIER);
+                     .setVersion(addon.getVersion().toString()).setClassifier(FORGE_ADDON_CLASSIFIER);
             if (managed)
             {
                dependencyInstaller.installManaged(project, dependency);

diff --git a/addons/tests/src/test/java/org/jboss/forge/addon/addons/AddonProjectConfiguratorTest.java b/addons/tests/src/test/java/org/jboss/forge/addon/addons/AddonProjectConfiguratorTest.java
@@ -50,8 +50,8 @@ public static ForgeArchive getDeployment()
                addBeansXML().
                addPackages(true, AddonProjectConfigurator.class.getPackage()).
                addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:addons", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:javaee", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create("org.jboss.forge.addon:addons", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:javaee", "2.0.0-SNAPSHOT")
                );
    }
 

diff --git a/addons/tests/src/test/java/org/jboss/forge/addon/addons/NewAddonProjectAeshTest.java b/addons/tests/src/test/java/org/jboss/forge/addon/addons/NewAddonProjectAeshTest.java
@@ -46,12 +46,12 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:dependencies", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:ui", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:shell", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:shell-test-harness", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create("org.jboss.forge.addon:dependencies", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:ui", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:shell", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:shell-test-harness", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT")
                );
 
       return archive;

diff --git a/bootstrap/src/main/java/org/jboss/forge/bootstrap/listener/GreetingListener.java b/bootstrap/src/main/java/org/jboss/forge/bootstrap/listener/GreetingListener.java
@@ -52,4 +52,16 @@ public void afterStop(Furnace forge) throws ContainerException
       // Do nothing
    }
 
+   @Override
+   public void beforeConfigurationScan(Furnace forge) throws ContainerException
+   {
+      // Do nothing
+   }
+
+   @Override
+   public void afterConfigurationScan(Furnace forge) throws ContainerException
+   {
+      // Do nothing
+   }
+
 }
diff --git a/...strap/src/main/java/org/jboss/forge/bootstrap/listener/InstallRequiredAddonsListener.java b/...strap/src/main/java/org/jboss/forge/bootstrap/listener/InstallRequiredAddonsListener.java
@@ -138,4 +138,16 @@ private AddonId toAddonId(String addonCoordinate)
       return addon;
    }
 
+   @Override
+   public void beforeConfigurationScan(Furnace forge) throws ContainerException
+   {
+      // Do nothing
+   }
+
+   @Override
+   public void afterConfigurationScan(Furnace forge) throws ContainerException
+   {
+      // Do nothing
+   }
+
 }
diff --git a/configuration/tests/src/test/java/org/jboss/forge/addon/configuration/ConfigurationTest.java b/configuration/tests/src/test/java/org/jboss/forge/addon/configuration/ConfigurationTest.java
@@ -43,12 +43,12 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:maven",
-                                 "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects",
-                                 "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:configuration",
-                                 "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create("org.jboss.forge.addon:maven",
+                                 "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:projects",
+                                 "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:configuration",
+                                 "2.0.0-SNAPSHOT")
                );
       return archive;
    }

diff --git a/convert/tests/src/test/java/org/jboss/forge/addon/convert/CDIConverterTest.java b/convert/tests/src/test/java/org/jboss/forge/addon/convert/CDIConverterTest.java
@@ -34,7 +34,7 @@ public static ForgeArchive getDeployment()
                .addBeansXML()
                .addClass(CDIConverterTest.class)
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:convert", "2.0.0-SNAPSHOT")));
+                        AddonDependencyEntry.create("org.jboss.forge.addon:convert", "2.0.0-SNAPSHOT"));
 
       return archive;
    }

diff --git a/...s/src/test/java/org/jboss/forge/addon/convert/exported/StringToExportedConverterTest.java b/...s/src/test/java/org/jboss/forge/addon/convert/exported/StringToExportedConverterTest.java
@@ -37,7 +37,7 @@ public static ForgeArchive getDeployment()
                .addBeansXML()
                .addPackage(StringToExportedConverterTest.class.getPackage())
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:convert", "2.0.0-SNAPSHOT")));
+                        AddonDependencyEntry.create("org.jboss.forge.addon:convert", "2.0.0-SNAPSHOT"));
 
       return archive;
    }

diff --git a/environment/tests/src/test/java/org/jboss/forge/addon/environment/CDIEnvironmentTest.java b/environment/tests/src/test/java/org/jboss/forge/addon/environment/CDIEnvironmentTest.java
@@ -36,7 +36,7 @@ public static ForgeArchive getDeployment()
                .addPackages(true, CDIEnvironmentTest.class.getPackage())
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:environment", "2.0.0-SNAPSHOT")));
+                        AddonDependencyEntry.create("org.jboss.forge.addon:environment", "2.0.0-SNAPSHOT"));
       return archive;
    }
 

diff --git a/facets/tests/src/test/java/org/jboss/forge/addon/facets/FacetFactoryTest.java b/facets/tests/src/test/java/org/jboss/forge/addon/facets/FacetFactoryTest.java
@@ -43,7 +43,7 @@ public static ForgeArchive getDeployment()
                         NotFoundMockFacet.class,
                         TestQualifier.class)
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:facets", "2.0.0-SNAPSHOT")));
+                        AddonDependencyEntry.create("org.jboss.forge.addon:facets", "2.0.0-SNAPSHOT"));
       return archive;
    }
 

diff --git a/...s/tests/src/test/java/org/jboss/forge/addon/facets/requirements/FacetConstraintsTest.java b/...s/tests/src/test/java/org/jboss/forge/addon/facets/requirements/FacetConstraintsTest.java
@@ -38,7 +38,7 @@ public static ForgeArchive getDeployment()
                .addClasses(FacetA.class, FacetB.class, FacetC.class, MockFaceted.class, MockFacet.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:facets", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create("org.jboss.forge.addon:facets", "2.0.0-SNAPSHOT")
                );
 
       return archive;

diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/JavaEETestHelper.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/JavaEETestHelper.java
@@ -37,9 +37,9 @@ public static ForgeArchive getDeployment()
                .addPackages(true, WizardTester.class.getPackage())
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:javaee", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:javaee", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT")
                );
       return archive;
    }

diff --git a/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/jpa/NewEntityCommandShellTest.java b/javaee/tests/src/test/java/org/jboss/forge/addon/javaee/jpa/NewEntityCommandShellTest.java
@@ -46,10 +46,10 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:javaee", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:shell-test-harness",
-                                 "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create("org.jboss.forge.addon:javaee", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:shell-test-harness",
+                                 "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT")
                );
 
       return archive;

diff --git a/...s/src/test/java/org/jboss/forge/addon/javaee/jpa/ui/setup/PersistenceSetupWizardTest.java b/...s/src/test/java/org/jboss/forge/addon/javaee/jpa/ui/setup/PersistenceSetupWizardTest.java
@@ -48,7 +48,7 @@ public class PersistenceSetupWizardTest
    public static ForgeArchive getDeployment()
    {
       return JavaEETestHelper.getDeployment().addAsAddonDependencies(
-               AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:ui", "2.0.0-SNAPSHOT")));
+               AddonDependencyEntry.create("org.jboss.forge.addon:ui", "2.0.0-SNAPSHOT"));
    }
 
    @Inject

diff --git a/maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenMultiModuleProviderTest.java b/maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenMultiModuleProviderTest.java
@@ -46,8 +46,8 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT")
                );
 
       return archive;

diff --git a/maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenProjectLocatorTest.java b/maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenProjectLocatorTest.java
@@ -53,8 +53,8 @@ public static ForgeArchive getDeployment()
                         "org/jboss/forge/addon/maven/pom-template.xml")
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT")
                );
 
       return archive;

diff --git a/maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenWebResourceFacetTest.java b/maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenWebResourceFacetTest.java
@@ -44,8 +44,8 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT")
                );
 
       return archive;

diff --git a/...ts/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenPackagingFacetTest.java b/...ts/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenPackagingFacetTest.java
@@ -42,8 +42,8 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT")
                );
 
       return archive;

diff --git a/...r-java/tests/src/test/java/org/jboss/forge/addon/parser/java/JavaParserResourcesTest.java b/...r-java/tests/src/test/java/org/jboss/forge/addon/parser/java/JavaParserResourcesTest.java
@@ -46,8 +46,8 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:parser-java", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create("org.jboss.forge.addon:parser-java", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT")
                );
 
       return archive;

diff --git a/parser-java/tests/src/test/java/org/jboss/forge/addon/parser/java/JavaSourceFactoryTest.java b/parser-java/tests/src/test/java/org/jboss/forge/addon/parser/java/JavaSourceFactoryTest.java
@@ -35,7 +35,7 @@ public static ForgeArchive getDeployment()
       ForgeArchive archive = ShrinkWrap.create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:parser-java", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create("org.jboss.forge.addon:parser-java", "2.0.0-SNAPSHOT")
                );
 
       return archive;

diff --git a/parser-java/tests/src/test/java/org/jboss/forge/addon/parser/java/hints/ParserHintsTest.java b/parser-java/tests/src/test/java/org/jboss/forge/addon/parser/java/hints/ParserHintsTest.java
@@ -40,10 +40,10 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:ui-spi", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:parser-java", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:environment", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:ui-spi", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:parser-java", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:environment", "2.0.0-SNAPSHOT")
                );
 
       return archive;

diff --git a/.../tests/src/test/java/org/jboss/forge/addon/projects/impl/DependencyInstallerImplTest.java b/.../tests/src/test/java/org/jboss/forge/addon/projects/impl/DependencyInstallerImplTest.java
@@ -48,8 +48,8 @@ public static ForgeArchive getDeployment()
                .create(ForgeArchive.class)
                .addBeansXML()
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT")),
-                        AddonDependencyEntry.create(AddonId.from("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT"))
+                        AddonDependencyEntry.create("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT")
                );
 
       return archive;