Jason van Zyl 137cbd8a97 Merge branch 'trunk' into eclipse-aether ... Conflicts: 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/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java maven-core/src/main/java/org/apache/maven/DefaultMaven.java maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java pom.xml src/site/site.xml		2013-02-14 22:08:26 -05:00
..
src	Merge branch 'trunk' into eclipse-aether	2013-02-14 22:08:26 -05:00
pom.xml	Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether	2013-02-14 20:21:50 -05:00