Commit Graph

2425 Commits

Author SHA1 Message Date
Benjamin Bentmann 3916201b98 Used improved conflict resolver 2012-12-29 22:25:25 +01: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
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 25a273f744 o Accounted for refactoring of aether-api/-util 2012-03-10 17:41:02 +01:00
Benjamin Bentmann 8cf8d36777 o Made Aether session read-only once setup 2012-01-08 20:02:32 +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
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 71c145a0e6 merge -r1222269:1222270 https://svn.apache.org/repos/asf/maven/maven-3/branches/maven-3.0.4-RCx
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1222272 13f79535-47bb-0310-9956-ffa450edef68
2011-12-22 15:13:10 +00:00
Olivier Lamy 18de090198 remove redundant cast
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212981 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 08:48:07 +00:00
Olivier Lamy 87884c7bc1 [MNG-5209] MavenProject.getTestClasspathElements can return null elements
Submitted by Jesse Glick.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212980 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 08:47:50 +00:00
Benson Margulies 4b637c5a2f MNG-5214: Dependency resolution substitutes g🅰️v:jar for j🅰️v:something-else when something-else isn't in the reactor
o allow ejb-client types artifacts to dance with jar artifacts to allow reactor resolution to target/classes, thus
unbreaking some integration tests.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212793 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 13:54:49 +00:00
Benson Margulies 04d269f1da MNG-5214: Dependency resolution substitutes g🅰️v:jar for j🅰️v:something-else when something-else isn't in the reactor
o rework to takine MNG-4065 back on board. We need to allow test-jar and jar to dosi-do even if we can't be having with
wsdl and jar changing places.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212720 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 02:22:55 +00:00
Benson Margulies 2b4e9a9ef7 MNG-5214: Dependency resolution substitutes g🅰️v:jar for j🅰️v:something-else when something-else isn't in the reacto
o When Aether asks the ReactorReader for a file for an artifact, remember to match type and classifier. And if all else
  fails, do not return target/classes if the desired artifact is not of type 'jar'. Arguably, if type or classifier
  are non-default, then we should never return those default paths at all.
o Add 'dir' format to make it quicker to run a quick test. If everyone hates this I'll revert it.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212564 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 18:30:26 +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
Igor Fedorenko 712c4fff72 MNG-5212 preserve PluginDescriptor dependencies in descriptor cache
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210924 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 14:13:48 +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 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
Benjamin Bentmann c9d2202549 o Revised fix from r1151426 which broke the appassembler-maven-plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210240 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 21:52:04 +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 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 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 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 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 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
Olivier Lamy 0cc2c9b227 [MNG-5201] upgrade aether to 1.13 and sisu to 2.3.0 .
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1203182 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 13:34:33 +00:00
Olivier Lamy f561a2b0e1 [MNG-5200] upgrade plugins version in super pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1202331 13f79535-47bb-0310-9956-ffa450edef68
2011-11-15 17:50:50 +00:00
Benjamin Bentmann c3bf134f57 [MNG-5073] ProjectBuilder.build(File,ProjectBuildingRequest) returns null project if dependency version info is missing
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1176414 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 14:55:56 +00:00
Olivier Lamy 64d86e9f82 [MNG-5175] replace wagon http lightweight with wagon http 2.0 (SNAPSHOT currently)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172517 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 08:37:25 +00:00
Herve Boutemy c7c79e1f1a [MNG-5151] updated constants to match the modification and added a unit-test
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172229 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 09:14:58 +00:00
Herve Boutemy a67cc71fbe code formatting
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172225 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 08:52:12 +00:00
Herve Boutemy 1b66b83732 fixed file snippet configuration to support DOXIA-373
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1171261 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 20:35:41 +00:00
Herve Boutemy 9815001f1f added lifecycles and bindings reference documentation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1169931 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 21:19:26 +00:00
Herve Boutemy 3f03a3097a added comment on default lifecycles
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1169513 13f79535-47bb-0310-9956-ffa450edef68
2011-09-11 19:47:56 +00:00
Herve Boutemy 38dc277f47 code firmatting and simplification
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1169507 13f79535-47bb-0310-9956-ffa450edef68
2011-09-11 19:34:37 +00:00
Benjamin Bentmann dbf98ae939 o Updated to buildnumber-maven-plugin:1.0
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1166637 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 11:46:46 +00:00
Benjamin Bentmann 8c24208875 [MNG-5163] MavenProject.getPluginRepositories misimplemented
Submitted by: Jesse Glick

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1164993 13f79535-47bb-0310-9956-ffa450edef68
2011-09-04 11:17:27 +00:00
Olivier Lamy 87d8d34d4a prevent ConcurrentModificationException
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1162348 13f79535-47bb-0310-9956-ffa450edef68
2011-08-27 13:33:19 +00:00
Jason van Zyl ef62188881 o make it possible to change:
- the overarching archive name
 - id of the product
 - long name of the product
 - short name of the product
 - have "mvn -v" output this information so that it's clear it's not Apache Maven

This allows people in the community creating builds of their own builds of Apache Maven to conform to the naming conventions put forth by the Apache Software Foundation.



git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1151924 13f79535-47bb-0310-9956-ffa450edef68
2011-07-28 16:46:23 +00:00
Igor Fedorenko 0ffb849a06 MNG-5141 Make MojoExecutor.ensureDependenciesAreResolved public
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1151851 13f79535-47bb-0310-9956-ffa450edef68
2011-07-28 13:53:23 +00:00
Benjamin Bentmann 8018e97eb0 o Avoided corruption of local repository when installing a snapshot artifact that was already deployed and as such has a timestamped version, this happens in the wild when using invoker:install during a build that deploys its output
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1151426 13f79535-47bb-0310-9956-ffa450edef68
2011-07-27 10:56:26 +00:00
Benjamin Bentmann e877a035d7 [MNG-5135] Regression: in some cases aggregator mojo is unable to resolve dependencies with custom packaging
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1151424 13f79535-47bb-0310-9956-ffa450edef68
2011-07-27 10:48:35 +00:00
Benjamin Bentmann 4be95217be [MNG-5096] <exclusion> on <dependency> with <type>test-jar</type> doesn't work in maven 3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1151423 13f79535-47bb-0310-9956-ffa450edef68
2011-07-27 10:45:43 +00:00
Benjamin Bentmann 5c79de69e7 [MNG-5137] Reactor resolution does not work for forked multi module builds
Submitted by: Stuart McCulloch

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1151421 13f79535-47bb-0310-9956-ffa450edef68
2011-07-27 10:39:37 +00:00
Benjamin Bentmann 9ec45b70e4 [MNG-5064] mvn -nsu (--no-snapshot-updates) should not download snapshots (and break local builds)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1151418 13f79535-47bb-0310-9956-ffa450edef68
2011-07-27 10:28:41 +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