Apache Maven core
Go to file
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
apache-maven Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether 2013-02-14 20:21:50 -05:00
maven-aether-provider Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether 2013-02-14 20:21:50 -05:00
maven-artifact added javadoc 2012-11-10 22:16:09 +00:00
maven-compat Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether 2013-02-14 20:21:50 -05:00
maven-core Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether 2013-02-14 20:21:50 -05:00
maven-embedder Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether 2013-02-14 20:21:50 -05:00
maven-model [MNG-5380] preserve whitespace in Maven plugin configuration when elemnt has xml:space="preserve" 2012-11-18 13:29:18 +00:00
maven-model-builder removed stdout output 2012-11-21 20:00:50 +00:00
maven-plugin-api Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether 2013-02-14 20:21:50 -05:00
maven-repository-metadata improved description for the 3 different use-cases: un-versioned artifact, snapshot artifact and group containing Maven plugins 2012-10-27 15:53:03 +00:00
maven-settings MNG-5016: A mirror's layout setting should default to 'default' since thats' the only layout supported lay in maven 3 2012-11-13 23:37:17 +00:00
maven-settings-builder next version will be 3.1 (Jira updated accordingly: 3.1 renamed to 3.2) 2012-10-07 09:14:21 +00:00
src/site Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether 2013-02-14 20:21:50 -05:00
.gitattributes [MNG-5046] Remove $Id$ from sources 2011-03-23 23:30:11 +00:00
.gitignore Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether 2013-02-14 20:21:50 -05:00
README.bootstrap.txt ant 1.8 required for bootstrap build 2012-04-02 19:36:36 +00:00
README.md o Added readme for github 2010-11-15 22:29:30 +00:00
README.txt separating READMEs so the bootstrap info doesn't get into the distro. 2008-01-22 21:53:20 +00:00
build.xml correctly set + for mvnDebug and mvnyjp in ant build 2011-09-01 15:01:43 +00:00
doap_Maven.rdf add 3.0.4 in doap file 2012-07-09 09:09:49 +00:00
maven-ant-tasks-2.1.1.jar o Updated bootstrap to use upcoming maven-ant-tasks:2.1.1 2010-07-20 10:00:22 +00:00
pom.xml Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether 2013-02-14 20:21:50 -05:00