Commit Graph

109 Commits

Author SHA1 Message Date
Jason van Zyl ebf2e4ddea Merge branch 'eclipse-aether' of github.com:tesla/tesla-build into eclipse-aether
Conflicts:
	.gitignore
	pom.xml
2013-03-14 13:03:31 -07:00
Stuart McCulloch 2c2bf6e6e5 Use Eclipse/Sisu 0.0.0.M2 milestone
Signed-off-by: Jason van Zyl <jason@tesla.io>
2013-03-13 08:49:00 -04:00
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
Jason van Zyl 73e1445987 [maven-release-plugin] prepare for next development iteration 2012-12-03 19:58:46 -08:00
Jason van Zyl 618d12906d [maven-release-plugin] prepare release maven-3.1.0 2012-12-03 19:58:40 -08:00
Jason van Zyl fcffe3c9d5 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413481 13f79535-47bb-0310-9956-ffa450edef68
2012-11-26 05:07:28 +00:00
Jason van Zyl 29c9b29f68 [maven-release-plugin] prepare release maven-3.1.0
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413479 13f79535-47bb-0310-9956-ffa450edef68
2012-11-26 05:07:15 +00:00
Jason van Zyl b5f1798f2d - revert the release as we're missing MNG-5381
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413389 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 19:07:27 +00:00
Jason van Zyl 84b15b971b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413381 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 17:59:53 +00:00
Jason van Zyl 7815ab87ad [maven-release-plugin] prepare release maven-3.1.0
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413379 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 17:59:36 +00:00
Herve Boutemy 49d8d172d9 next version will be 3.1 (Jira updated accordingly: 3.1 renamed to 3.2)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1395257 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 09:14:21 +00:00
Benjamin Bentmann 82b345e009 o Migrated to Eclipse Aether 2011-12-30 21:43:28 +01:00
Olivier Lamy 85ed3a1525 bump version to 3.0.5-SNAPSHOT 3.0.4 is on release branch: feel free to hack :-) here
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1211509 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 16:22:49 +00:00
Olivier Lamy 65507bcfde bump version to 3.0.5-SNAPSHOT 3.0.4 is on release branch: feel free to hack :-) here
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1211509 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 16:22:49 +00:00
Olivier Lamy 862ff21440 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210462 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:48:51 +00:00
Olivier Lamy 36abba0fa0 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210462 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:48:51 +00:00
Olivier Lamy 11c001ba01 [maven-release-plugin] prepare release maven-3.0.4-RC3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210460 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:47:24 +00:00
Olivier Lamy d8f872895e [maven-release-plugin] prepare release maven-3.0.4-RC3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210460 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:47:24 +00:00
Olivier Lamy 5259b7b623 back to 3.0.4-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210076 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 08:46:27 +00:00
Olivier Lamy b8e759de02 back to 3.0.4-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210076 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 08:46:27 +00:00
Olivier Lamy 8edd56b679 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1209001 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:44:24 +00:00
Olivier Lamy f154515a41 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1209001 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:44:24 +00:00
Olivier Lamy 790169b9a5 [maven-release-plugin] prepare release maven-3.0.4
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1208998 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:43:14 +00:00
Olivier Lamy 8abaddfd17 [maven-release-plugin] prepare release maven-3.0.4
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1208998 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:43:14 +00:00
Olivier Lamy 1fe4016cf1 vote cancelled back to 3.0.4-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1207843 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 12:09:14 +00:00
Olivier Lamy 13c114df16 vote cancelled back to 3.0.4-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1207843 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 12:09:14 +00:00
Olivier Lamy 272c17979b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1206076 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 08:15:06 +00:00
Olivier Lamy ae1e859263 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1206076 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 08:15:06 +00:00
Olivier Lamy 6d375983a4 [maven-release-plugin] prepare release maven-3.0.4
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1206073 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 08:14:04 +00:00
Olivier Lamy 878c4febd2 [maven-release-plugin] prepare release maven-3.0.4
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1206073 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 08:14:04 +00:00
Herve Boutemy 6443f93cb0 removed configuration already inherited from parents
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1169515 13f79535-47bb-0310-9956-ffa450edef68
2011-09-11 19:56:47 +00:00
Herve Boutemy ceac25c39b added description for every module
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1148953 13f79535-47bb-0310-9956-ffa450edef68
2011-07-20 22:10:09 +00:00
Benjamin Bentmann 5460ff9559 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1075438 13f79535-47bb-0310-9956-ffa450edef68
2011-02-28 17:26:44 +00:00
Benjamin Bentmann 98924fcc17 [maven-release-plugin] prepare release maven-3.0.3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1075436 13f79535-47bb-0310-9956-ffa450edef68
2011-02-28 17:25:08 +00:00
Benjamin Bentmann 2986a12cba [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1074306 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 21:31:36 +00:00
Benjamin Bentmann 435da1600e [maven-release-plugin] prepare release maven-3.0.3-RC1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1074303 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 21:29:33 +00:00
Benjamin Bentmann 8e60779cbb [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1056850 13f79535-47bb-0310-9956-ffa450edef68
2011-01-09 00:49:39 +00:00
Benjamin Bentmann 0023226958 [maven-release-plugin] prepare release maven-3.0.2
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1056847 13f79535-47bb-0310-9956-ffa450edef68
2011-01-09 00:48:15 +00:00
Benjamin Bentmann 499e2d7ee7 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1055634 13f79535-47bb-0310-9956-ffa450edef68
2011-01-05 20:42:41 +00:00
Benjamin Bentmann c4f1c5ca4d [maven-release-plugin] prepare release maven-3.0.2-RC1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1055631 13f79535-47bb-0310-9956-ffa450edef68
2011-01-05 20:40:50 +00:00
Benjamin Bentmann fb52cac08b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1038046 13f79535-47bb-0310-9956-ffa450edef68
2010-11-23 10:47:01 +00:00
Benjamin Bentmann 308d4d45e5 [maven-release-plugin] prepare release maven-3.0.1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1038043 13f79535-47bb-0310-9956-ffa450edef68
2010-11-23 10:44:18 +00:00
Benjamin Bentmann 7e57e9ea83 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1036683 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18 23:52:24 +00:00
Benjamin Bentmann 93af60e038 [maven-release-plugin] prepare release maven-3.0.1-RC1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1036681 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18 23:50:08 +00:00
Benjamin Bentmann 03789c3155 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1004207 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 11:45:32 +00:00
Benjamin Bentmann eaf528f2ce [maven-release-plugin] prepare release maven-3.0
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1004204 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 11:43:40 +00:00
Benjamin Bentmann 388e659a17 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1001464 13f79535-47bb-0310-9956-ffa450edef68
2010-09-26 16:09:27 +00:00
Benjamin Bentmann 8f839aef4c [maven-release-plugin] prepare release maven-3.0-RC3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1001462 13f79535-47bb-0310-9956-ffa450edef68
2010-09-26 16:07:40 +00:00
Benjamin Bentmann 0707794c27 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1000118 13f79535-47bb-0310-9956-ffa450edef68
2010-09-22 18:18:54 +00:00
Benjamin Bentmann eecf91a606 [maven-release-plugin] prepare release maven-3.0-RC2
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1000115 13f79535-47bb-0310-9956-ffa450edef68
2010-09-22 18:17:16 +00:00