Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,539 Commits 89 Branches 96 Tags 112 MiB
Commit Graph

130 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 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
Hervé Boutemy 853636d6aa code formatting 2013-02-02 16:46:43 +01:00
olivier lamy 6c3ec90f2c prevent possible NPE 2013-01-31 23:03:46 +01:00
Kristian Rosenvold 176a85f43c Fixed line feeds, added .gitattributes 2013-01-29 16:27:02 +01:00
Hervé Boutemy ff370850cd refactoring: extracted MavenSnapshotMetadata from 
(Local+Remote)SnapshotMetadata
 2013-01-19 13:36:20 +01:00
Hervé Boutemy 37d3166d00 removed unused annotation 2013-01-19 09:22:56 +01:00
Hervé Boutemy 1408254fb8 use MavenMetadata.read(File) API instead of duplicating code 2013-01-19 09:04:29 +01:00
Hervé Boutemy 9a1d22fa40 move MAVEN_METADATA_XML constant to MavenMetadata class 2013-01-19 08:56:12 +01:00
Hervé Boutemy 66dc8c6ec1 code simplification 2013-01-18 00:44:02 +01:00
Hervé Boutemy ff21286eee extracted readVersionInfoMap method 2013-01-17 23:22:58 +01:00
Hervé Boutemy d22d94903a code simplification 2013-01-17 22:56:18 +01:00
Hervé Boutemy 0824df85f3 little code simplification 2013-01-17 22:04:09 +01:00
Hervé Boutemy 5ad8e34e63 improved javadoc 2013-01-17 22:00:49 +01:00
Benjamin Bentmann 3916201b98 Used improved conflict resolver 2012-12-29 22:25:25 +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
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 d0ea1e767c implemented testResolveArtifacts() 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1408572 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-13 03:34:35 +00:00
Herve Boutemy d2fc288271 added readArtifactDescriptor() API test 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1408144 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-11 23:18:04 +00:00
Herve Boutemy fa27ad5434 prepared unit tests to write 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407933 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-11 09:58:41 +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 e32cf81b6c added resolveArtifact() API tests 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1403192 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-29 08:26:24 +00:00
Herve Boutemy 8b8279cc7e extracted common code into AbstractRepositoryTestCase 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1402969 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-28 10:57:40 +00:00
Herve Boutemy 127884c456 added comments 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1402814 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-27 15:56:50 +00:00
Herve Boutemy 57c8d8570f added dependency with classifier test 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1402786 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-27 12:20:37 +00:00
Robert Scholte 40d10ec9e4 [MNG-5365] Replace Aether's deprecated ConfigurationProperties with ConfigUtils 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1402701 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-26 22:14:17 +00:00
Robert Scholte 316bd0a055 [MNG-5324] Incorrect parsing of metadata by Maven: Cannot find snapshot artifact with older timestamp 
Added junit-test, can't reproduce it yet.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1402675 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-26 21:40:51 +00:00
Herve Boutemy 44458073ad check as much attributes as possible 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1401907 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-24 22:39:12 +00:00
Herve Boutemy 5f92449d5d first step at component unit-tests 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1400523 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-20 21:44:11 +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 42536ce88f Accounted for refactoring of aether-api 2012-09-30 17:37:09 +02:00
Herve Boutemy 4e0b4e0f22 added an introduction with links to the 2 main components 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1391846 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-29 17:30:48 +00:00
Herve Boutemy 16c178b743 formatting 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1391819 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-29 15:03:58 +00:00
Herve Boutemy 7f0def1f90 fixed wrong explanations: repository system is a Plexus component to use instead of MavenServiceLocator, repository system session can be injected as plugin parameter 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1391818 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-29 15:00:59 +00:00
Herve Boutemy 33c7132a8e added a link to Maven core's way of creating repository system session 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1391790 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-29 12:08:02 +00:00
Herve Boutemy e670e08ce1 Mojo don't get Plexus components injection but plugin parameter injection: added a link 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1391786 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-29 11:58:53 +00:00
Benjamin Bentmann 03b0269579 o Accounted for refactoring of aether-api 2012-03-18 16:52:54 +01:00
Benjamin Bentmann 02927ead50 o Accounted for refactoring of aether-api 2012-03-11 23:18:43 +01:00
Benjamin Bentmann 298403bed3 o Accounted for refactoring of aether-api 2012-01-15 18:36:21 +01:00
Benjamin Bentmann e02c8abdd1 Accounted for refactoring of aether-api 2012-01-08 20:01:59 +01:00
Benjamin Bentmann 2592e158ad o Accounted for API refactoring 2012-01-01 20:05:13 +01:00
Benjamin Bentmann a7613aad86 o Accounted for API refactoring 2011-12-31 21:46:14 +01:00