Jason van Zyl 27ad9858d2 Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether ... Conflicts: .gitignore apache-maven/pom.xml maven-aether-provider/pom.xml maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSession.java maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenServiceLocator.java maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java maven-artifact/pom.xml maven-compat/pom.xml maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java maven-core/pom.xml maven-core/src/main/java/org/apache/maven/DefaultMaven.java maven-core/src/main/java/org/apache/maven/ReactorReader.java maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java maven-embedder/pom.xml maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java maven-model-builder/pom.xml maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java maven-model/pom.xml maven-plugin-api/pom.xml maven-plugin-api/src/main/mdo/plugin.mdo maven-plugin-api/src/site/apt/index.apt maven-repository-metadata/pom.xml maven-settings-builder/pom.xml maven-settings/pom.xml pom.xml src/site/site.xml		2013-02-14 20:21:50 -05:00
..
src	Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether	2013-02-14 20:21:50 -05:00
lifecycle-executor.txt	o taking into account the common case where configuration is specified for many goal in a single configuration element which needs to be accounted for.	2009-05-04 13:09:06 +00:00
plugin-manager.txt	o separated the sorter out of the reactor manager in preparation for making the reactor just an implementation of a local repository. shouldn't be tangled with sorting, that should be done before anything starts	2009-03-28 18:24:05 +00:00
pom.xml	Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether	2013-02-14 20:21:50 -05:00
project-builder.txt	o disable the tests in the bootstrap so ben and i can go all the way through to the embedder	2009-05-04 15:32:10 +00:00