Branch: refs/heads/2.0 Home: https://github.com/forge/core Commit: 38c4bb99c9539eb738cd1206fb288a1a8043316d https://github.com/forge/core/commit/38c4bb99c9539eb738cd1206fb288a1a8043... Author: George Gastaldi <gegastaldi(a)gmail.com&gt; Date: 2013-07-15 (Mon, 15 Jul 2013) Changed paths: M maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/MavenFacetImpl.java M maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/util/RepositoryUtils.java M maven/impl-projects/src/test/java/org/jboss/forge/maven/addon/projects/util/RepositoryUtilsTest.java M maven/impl/pom.xml M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/AddonDependencySelector.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/ClasspathWorkspaceReader.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/DependencyMetadataImpl.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/ManualWagonProvider.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/MavenContainer.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/MavenConvertUtils.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/MavenDependencyAdapter.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/MavenDependencyResolver.java M maven/impl/src/test/java/org/jboss/forge/addon/maven/dependencies/MavenDependencyResolverTest.java M maven/pom.xml Log Message: ----------- Upgraded to Maven 3.1.0 API and Eclipse Aether Commit: 3f278d1ce4b59c62c4a668c2619afc0cc2708e6b https://github.com/forge/core/commit/3f278d1ce4b59c62c4a668c2619afc0cc270... Author: George Gastaldi <gegastaldi(a)gmail.com&gt; Date: 2013-07-16 (Tue, 16 Jul 2013) Changed paths: M maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/MavenFacetImpl.java M maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/util/RepositoryUtils.java M maven/impl-projects/src/test/java/org/jboss/forge/maven/addon/projects/util/RepositoryUtilsTest.java M maven/impl/pom.xml M maven/impl/src/main/java/org/jboss/forge/addon/maven/addon/MavenAddonDependencyResolver.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/AddonDependencySelector.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/ClasspathWorkspaceReader.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/DependencyMetadataImpl.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/ManualWagonProvider.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/MavenContainer.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/MavenConvertUtils.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/MavenDependencyAdapter.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/MavenDependencyResolver.java M maven/impl/src/test/java/org/jboss/forge/addon/maven/dependencies/MavenDependencyResolverTest.java M maven/pom.xml Log Message: ----------- Merge branch 'features/eclipse_aether_maven_3_1_0' into 2.0 Conflicts: maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/MavenContainer.java maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/MavenDependencyResolver.java Commit: 8c899ced8a4ed7a10d4f146b6bc6bc9b28b11297 https://github.com/forge/core/commit/8c899ced8a4ed7a10d4f146b6bc6bc9b28b1... Author: George Gastaldi <gegastaldi(a)gmail.com&gt; Date: 2013-07-16 (Tue, 16 Jul 2013) Changed paths: M maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/MavenFacetImpl.java M maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/util/RepositoryUtils.java M maven/impl-projects/src/test/java/org/jboss/forge/maven/addon/projects/util/RepositoryUtilsTest.java M maven/impl/pom.xml M maven/impl/src/main/java/org/jboss/forge/addon/maven/ManualWagonProvider.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/MavenContainer.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/addon/AddonDependencySelector.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/addon/MavenAddonDependencyResolver.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/ClasspathWorkspaceReader.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/DependencyMetadataImpl.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/MavenDependencyAdapter.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/MavenDependencyResolver.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/util/MavenConvertUtils.java M maven/impl/src/main/java/org/jboss/forge/addon/maven/util/MavenRepositories.java M maven/impl/src/test/java/org/jboss/forge/addon/maven/dependencies/MavenDependencyResolverTest.java M maven/pom.xml Log Message: ----------- Merge branch 'features/eclipse_aether_maven_3_1_0' into 2.0 Conflicts: maven/impl/src/main/java/org/jboss/forge/addon/maven/MavenContainer.java maven/impl/src/main/java/org/jboss/forge/addon/maven/dependencies/MavenDependencyResolver.java maven/impl/src/test/java/org/jboss/forge/addon/maven/dependencies/MavenDependencyResolverTest.java Commit: df33847578c60c4a16be018c8d0eb15bb28a63bf https://github.com/forge/core/commit/df33847578c60c4a16be018c8d0eb15bb28a... Author: George Gastaldi <gegastaldi(a)gmail.com&gt; Date: 2013-07-17 (Wed, 17 Jul 2013) Changed paths: M maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/PlexusContainer.java Log Message: ----------- Fix for the PlexusContainer Commit: 2f850e5987e7b2baef89d7dea1635594c994aea2 https://github.com/forge/core/commit/2f850e5987e7b2baef89d7dea1635594c994... Author: George Gastaldi <gegastaldi(a)gmail.com&gt; Date: 2013-07-17 (Wed, 17 Jul 2013) Changed paths: M addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/AddonManagerDependencyResolutionTest.java M addon-manager/tests/src/test/java/org/jboss/forge/addon/manager/AddonManagerInstallTest.java R test-harness/src/main/java/org/jboss/forge/test/Tests.java Log Message: ----------- Using MavenContainer instead of ShrinkWrap classes Commit: 06d2196f75cf6c7922cb9dc3ea58f15ad32e2952 https://github.com/forge/core/commit/06d2196f75cf6c7922cb9dc3ea58f15ad32e... Author: George Gastaldi <gegastaldi(a)gmail.com&gt; Date: 2013-07-17 (Wed, 17 Jul 2013) Changed paths: M arquillian/pom.xml M maven/impl/pom.xml M pom.xml M test-harness/pom.xml Log Message: ----------- Removed Shrinkwrap Resolver from poms due to incompatibility with Maven 3.1.0. All tests passing Compare: https://github.com/forge/core/compare/2807f463a005...06d2196f75cf