Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,558 Commits 83 Branches 94 Tags 109 MiB
Commit Graph

464 Commits

Author SHA1 Message Date
Jason van Zyl 95fbf6f445 [maven-release-plugin] prepare for next development iteration 2013-03-30 10:52:15 -04:00
Jason van Zyl 262b9bb1ef [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-03-30 10:52:10 -04:00
Jason van Zyl 08eab1953d o revert release plugin commits 2013-03-30 10:50:39 -04:00
Jason van Zyl 01c969e1eb [maven-release-plugin] prepare for next development iteration 2013-03-30 10:21:32 -04:00
Jason van Zyl 2decac4869 [maven-release-plugin] prepare release maven-3.1.0 2013-03-30 10:19:45 -04:00
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
olivier lamy 57954042c5 [MNG-5445] Missing PathTranslator @Requirement in org.apache.maven.project.interpolation.StringSearchModelInterpolator 
Submitted by Stuart McCulloch.
 2013-03-05 22:11:26 +01:00
Kristian Rosenvold 80e01fea5b Reverted 1a1fe6d508 to make things workproperly on java5/windows 2013-02-27 07:27:43 +01:00
Jason van Zyl de40fe19a8 o update for changes in Aether APIs 2013-02-16 22:48:55 -05:00
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
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
Benjamin Bentmann b5e0532310 Updated for latest ConflictResolver 2013-02-03 20:44:44 +01:00
Benjamin Bentmann 3916201b98 Used improved conflict resolver 2012-12-29 22:25:25 +01:00
Hervé Boutemy 3849bbd46a fixed errors reported by Checkstyle 2012-12-16 21:49:18 +01: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
Hervé Boutemy b63904c9db fixed errors reported by Checkstyle (once again...) 2012-12-03 02:21:58 +01:00
Hervé Boutemy 543870467f fixed errors reported by Checkstyle 2012-12-02 20:22:52 +01:00
Kristian Rosenvold 1a1fe6d508 o Made lower bound of executor threads 0 for artifact resolver 
Ideally I think we should just get rid of the whole executor and use new Thread() instead,
which would mean we'd need some way of constraining thread counts.

Freeing the threads mean they also release the classloader
 2012-12-01 10:56:53 +01:00
Kristian Rosenvold e8df4ca993 o Restored old context classloader so the threads dont go running around with classloaders that should unload 2012-11-30 07:33:28 +01: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 994a27d004 removed code duplication: maven-core can use base MavenRepositorySystemSession provided by maven-aether-provider as a basis before adding environment configuration 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407851 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-10 17:14:21 +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 3df76ee227 Fixed auth retrieval 2012-09-30 21:09:51 +02:00
Benjamin Bentmann 42536ce88f Accounted for refactoring of aether-api 2012-09-30 17:37:09 +02:00
Benjamin Bentmann 2838745156 o Accounted for refactoring of aether-api 2012-09-17 00:05:23 +02:00
Milos Kleint 4fcfcb8f73 MNG-5306 : introduce ModelProblemCollectorRequest and a new ModelProblem property - version which denotes on which validation level the error/warning applies. Additionally move the logic on failing the ModelBuilding from ModelProblemCollector to ModelBuilder's protected method to allow overriding. Default maven behaviour should stay the same. 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1357589 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-05 13:11:15 +00:00
Benjamin Bentmann 02927ead50 o Accounted for refactoring of aether-api 2012-03-11 23:18:43 +01:00
Herve Boutemy a2b01be028 generics 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1243037 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-11 11:55:03 +00:00
Herve Boutemy a7ef4d4da0 improved javadoc: added pointer to equivalent Maven 3 API 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1243031 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-11 11:41:08 +00:00
Benjamin Bentmann 298403bed3 o Accounted for refactoring of aether-api 2012-01-15 18:36:21 +01:00
Benjamin Bentmann 2592e158ad o Accounted for API refactoring 2012-01-01 20:05:13 +01:00
Benjamin Bentmann 18b81002cd o Accounted for API refactoring 2011-12-30 22:16:02 +01: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