Branch: refs/heads/FORGE-988 Home: https://github.com/forge/core Commit: 5be9c4283e2cadeb26118f2a52a64b169dc6eab9 https://github.com/forge/core/commit/5be9c4283e2cadeb26118f2a52a64b169dc6... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com&gt; Date: 2013-07-08 (Mon, 08 Jul 2013) Changed paths: M addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/AddonManagerTest.java M addons/tests/src/test/java/org/jboss/forge/addon/addons/AddonProjectConfiguratorTest.java M addons/tests/src/test/java/org/jboss/forge/addon/addons/NewAddonProjectAeshTest.java M arquillian/classpath/src/main/java/org/jboss/forge/arquillian/ForgeDeployableContainer.java R arquillian/core/src/main/java/org/jboss/forge/arquillian/Addon.java A arquillian/core/src/main/java/org/jboss/forge/arquillian/AddonDependency.java M arquillian/core/src/main/java/org/jboss/forge/arquillian/Dependencies.java M arquillian/core/src/main/java/org/jboss/forge/arquillian/ForgeDeploymentScenarioGenerator.java M arquillian/core/src/main/java/org/jboss/forge/arquillian/archive/ForgeArchive.java M arquillian/core/src/main/java/org/jboss/forge/arquillian/archive/ForgeRemoteAddon.java M convert/tests/src/test/java/org/jboss/forge/addon/convert/CDIConverterTest.java M convert/tests/src/test/java/org/jboss/forge/addon/convert/exported/StringToExportedConverterTest.java M environment/tests/src/test/java/org/jboss/forge/addon/environment/CDIEnvironmentTest.java M facets/tests/src/test/java/org/jboss/forge/addon/facets/FacetFactoryTest.java M facets/tests/src/test/java/org/jboss/forge/addon/facets/requirements/FacetConstraintsTest.java M javaee/tests/src/test/java/org/jboss/forge/addon/javaee/JavaEETestHelper.java M javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/CDIFacetTest.java M javaee/tests/src/test/java/org/jboss/forge/addon/javaee/jpa/NewEntityCommandShellTest.java M javaee/tests/src/test/java/org/jboss/forge/addon/javaee/jpa/PersistenceFacetTest.java M javaee/tests/src/test/java/org/jboss/forge/addon/javaee/jpa/ui/setup/PersistenceSetupWizardTest.java M javaee/tests/src/test/java/org/jboss/forge/addon/javaee/servlet/ServletFacetTest.java M maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenMultiModuleProviderTest.java M maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenProjectLocatorTest.java M maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenWebResourceFacetTest.java M maven/tests/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenPackagingFacetTest.java M parser-java/tests/src/test/java/org/jboss/forge/addon/parser/java/JavaParserResourcesTest.java M parser-java/tests/src/test/java/org/jboss/forge/addon/parser/java/JavaSourceFactoryTest.java M parser-java/tests/src/test/java/org/jboss/forge/addon/parser/java/hints/ParserHintsTest.java M projects/tests/src/test/java/org/jboss/forge/addon/projects/impl/DependencyInstallerImplTest.java M projects/tests/src/test/java/org/jboss/forge/addon/projects/impl/NewProjectWizardTest.java M projects/tests/src/test/java/org/jboss/forge/addon/projects/impl/ProjectFactoryImplTest.java M projects/tests/src/test/java/org/jboss/forge/addon/projects/impl/facets/ProjectFacetConstraintsTest.java M projects/tests/src/test/java/org/jboss/forge/addon/projects/shell/NewProjectShellTest.java M resources/tests/src/test/java/org/jboss/forge/addon/resource/FileResourceGeneratorTest.java M resources/tests/src/test/java/org/jboss/forge/addon/resource/ResourceGeneratorAddonTest.java M resources/tests/src/test/java/org/jboss/forge/addon/resource/URLResourceGeneratorTest.java M resources/tests/src/test/java/org/jboss/forge/addon/resource/convert/ResourceConverterTest.java M resources/tests/src/test/java/org/jboss/forge/addon/resource/hints/ResourceHintsTest.java M resources/tests/src/test/java/org/jboss/forge/addon/resource/transaction/TransactionalFileResourceGeneratorTest.java M shell/tests/src/test/java/org/jboss/forge/addon/shell/ShellAddonTest.java M shell/tests/src/test/java/org/jboss/forge/addon/shell/ShellCommandListenerTest.java M shell/tests/src/test/java/org/jboss/forge/addon/shell/ShellTestHarnessTest.java M shell/tests/src/test/java/org/jboss/forge/addon/shell/parser/RunnningCommandParserTest.java M ui/tests/src/test/java/org/jboss/forge/addon/ui/UIWizardDiscoveryTest.java M ui/tests/src/test/java/org/jboss/forge/addon/ui/impl/ManyValuesInjectionTest.java M ui/tests/src/test/java/org/jboss/forge/addon/ui/impl/UIInputInjectionDispirateTypesTest.java M ui/tests/src/test/java/org/jboss/forge/addon/ui/impl/UIInputInjectionTest.java M ui/tests/src/test/java/org/jboss/forge/addon/ui/impl/UIInputResourceInjectionTest.java Log Message: ----------- Test annotation @Addon -> @AddonDependency Commit: 802ecd02150c90af14609e21825e7a25ec17a88e https://github.com/forge/core/commit/802ecd02150c90af14609e21825e7a25ec17... Author: George Gastaldi <gegastaldi(a)gmail.com&gt; Date: 2013-07-08 (Mon, 08 Jul 2013) Changed paths: M addons/tests/src/test/java/org/jboss/forge/addon/addons/AddonProjectConfiguratorTest.java M addons/tests/src/test/java/org/jboss/forge/addon/addons/NewAddonProjectAeshTest.java M arquillian/classpath/src/main/java/org/jboss/forge/arquillian/ForgeDeployableContainer.java R arquillian/core/src/main/java/org/jboss/forge/arquillian/Addon.java A arquillian/core/src/main/java/org/jboss/forge/arquillian/AddonDependency.java M arquillian/core/src/main/java/org/jboss/forge/arquillian/Dependencies.java M arquillian/core/src/main/java/org/jboss/forge/arquillian/ForgeDeploymentScenarioGenerator.java M arquillian/core/src/main/java/org/jboss/forge/arquillian/archive/ForgeArchive.java M arquillian/core/src/main/java/org/jboss/forge/arquillian/archive/ForgeRemoteAddon.java M convert/tests/src/test/java/org/jboss/forge/addon/convert/CDIConverterTest.java M convert/tests/src/test/java/org/jboss/forge/addon/convert/exported/StringToExportedConverterTest.java M environment/tests/src/test/java/org/jboss/forge/addon/environment/CDIEnvironmentTest.java M facets/tests/src/test/java/org/jboss/forge/addon/facets/FacetFactoryTest.java M facets/tests/src/test/java/org/jboss/forge/addon/facets/requirements/FacetConstraintsTest.java M javaee/tests/src/test/java/org/jboss/forge/addon/javaee/JavaEETestHelper.java M javaee/tests/src/test/java/org/jboss/forge/addon/javaee/cdi/CDIFacetTest.java M javaee/tests/src/test/java/org/jboss/forge/addon/javaee/jpa/NewEntityCommandShellTest.java M javaee/tests/src/test/java/org/jboss/forge/addon/javaee/jpa/PersistenceFacetTest.java M javaee/tests/src/test/java/org/jboss/forge/addon/javaee/jpa/ui/setup/PersistenceSetupWizardTest.java M javaee/tests/src/test/java/org/jboss/forge/addon/javaee/servlet/ServletFacetTest.java M maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenMultiModuleProviderTest.java M maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenProjectLocatorTest.java M maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenWebResourceFacetTest.java M maven/tests/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenPackagingFacetTest.java M parser-java/tests/src/test/java/org/jboss/forge/addon/parser/java/JavaParserResourcesTest.java M parser-java/tests/src/test/java/org/jboss/forge/addon/parser/java/JavaSourceFactoryTest.java M parser-java/tests/src/test/java/org/jboss/forge/addon/parser/java/hints/ParserHintsTest.java M projects/tests/src/test/java/org/jboss/forge/addon/projects/impl/DependencyInstallerImplTest.java M projects/tests/src/test/java/org/jboss/forge/addon/projects/impl/NewProjectWizardTest.java M projects/tests/src/test/java/org/jboss/forge/addon/projects/impl/ProjectFactoryImplTest.java M projects/tests/src/test/java/org/jboss/forge/addon/projects/impl/facets/ProjectFacetConstraintsTest.java M projects/tests/src/test/java/org/jboss/forge/addon/projects/shell/NewProjectShellTest.java M resources/tests/src/test/java/org/jboss/forge/addon/resource/FileResourceGeneratorTest.java M resources/tests/src/test/java/org/jboss/forge/addon/resource/ResourceGeneratorAddonTest.java M resources/tests/src/test/java/org/jboss/forge/addon/resource/URLResourceGeneratorTest.java M resources/tests/src/test/java/org/jboss/forge/addon/resource/convert/ResourceConverterTest.java M resources/tests/src/test/java/org/jboss/forge/addon/resource/hints/ResourceHintsTest.java M resources/tests/src/test/java/org/jboss/forge/addon/resource/transaction/TransactionalFileResourceGeneratorTest.java M shell/tests/src/test/java/org/jboss/forge/addon/shell/ShellAddonTest.java M shell/tests/src/test/java/org/jboss/forge/addon/shell/ShellCommandListenerTest.java M shell/tests/src/test/java/org/jboss/forge/addon/shell/ShellTestHarnessTest.java M shell/tests/src/test/java/org/jboss/forge/addon/shell/parser/RunnningCommandParserTest.java M ui/tests/src/test/java/org/jboss/forge/addon/ui/UIWizardDiscoveryTest.java M ui/tests/src/test/java/org/jboss/forge/addon/ui/impl/ManyValuesInjectionTest.java M ui/tests/src/test/java/org/jboss/forge/addon/ui/impl/UIInputInjectionDispirateTypesTest.java M ui/tests/src/test/java/org/jboss/forge/addon/ui/impl/UIInputInjectionTest.java M ui/tests/src/test/java/org/jboss/forge/addon/ui/impl/UIInputResourceInjectionTest.java Log Message: ----------- Merge branch '2.0' into FORGE-988 Conflicts: addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/AddonManagerTest.java Compare: https://github.com/forge/core/compare/f6a58c09771b...802ecd02150c