Commit Graph

9145 Commits

Author SHA1 Message Date
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 50b6e3b621 [MNG-5206] plexus container never disposed
Submitted by Stuart McCulloch.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1211692 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 22:55:08 +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 85d2044250 use new fluido skin for core ref site
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1208992 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:20:57 +00:00
Olivier Lamy 858a7f8113 fix ciMngt url
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1208991 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:20:32 +00:00
Olivier Lamy 28f106faa3 add properties to ease site stage deploy
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1208990 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:20:16 +00:00
Olivier Lamy 01d6ddeada use aether 1.13.1 which prevent issues for http(s) deploy to http(s) server which doesn't support chuncked transfert (ie ngnix)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1208057 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 20:38:45 +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 4b9a53bdf7 exclude org.apache.httpcomponents:* as they are shaded in wagon-http-2.1-shaded.jar
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1205950 13f79535-47bb-0310-9956-ffa450edef68
2011-11-24 18:27:51 +00:00
Olivier Lamy 8800539f43 [MNG-5175] replace wagon http lightweight with wagon http 2.1 .
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1205928 13f79535-47bb-0310-9956-ffa450edef68
2011-11-24 16:56:55 +00:00
Olivier Lamy 8d186526ca use wagon 2.1-SNAPSHOT for http://jira.codehaus.org/browse/WAGON-353
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1203183 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 13:34:45 +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
Herve Boutemy 2f670115c5 fixed typo
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1190069 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 22:23:24 +00:00
Herve Boutemy aa23b383ed restored attribute removed in r1185847 since it is generated by maven-plugin-tools-java
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1187949 13f79535-47bb-0310-9956-ffa450edef68
2011-10-23 19:02:21 +00:00
Herve Boutemy 4e7aef6de8 added documentation to fields, copied from http://maven.apache.org/developers/mojo-api-specification.html
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1187814 13f79535-47bb-0310-9956-ffa450edef68
2011-10-22 21:32:02 +00:00
Herve Boutemy bf130b1bfa added forgotten "dependencies" element
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1187779 13f79535-47bb-0310-9956-ffa450edef68
2011-10-22 20:56:39 +00:00
Herve Boutemy cab9714c2c fixed elements order of parent: groupId, artifactId, version
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1187777 13f79535-47bb-0310-9956-ffa450edef68
2011-10-22 20:53:40 +00:00
Herve Boutemy 42aa645f96 updated jxr report plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1185901 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 22:06:36 +00:00
Herve Boutemy e022632f63 added dependency management import step
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1185882 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 21:39:15 +00:00
Herve Boutemy 003f6f0737 added plugin.xml plugin descriptor basic documentation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1185875 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 21:29:52 +00:00
Herve Boutemy b70a461fa4 fixed wrong UT for implementation configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1185847 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 20:45:35 +00:00
Herve Boutemy b448adb778 added an introduction with links to relevant existing documentation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1184902 13f79535-47bb-0310-9956-ffa450edef68
2011-10-16 19:17:36 +00:00
Benjamin Bentmann dd5dc0829a o Dispatched repository events via dedicated component
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1180679 13f79535-47bb-0310-9956-ffa450edef68
2011-10-09 18:22:20 +00:00
Olivier Lamy f57a97beac [MNG-5175] replace wagon http lightweight with wagon http 2.0 .
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1177416 13f79535-47bb-0310-9956-ffa450edef68
2011-09-29 20:10:32 +00:00
Olivier Lamy 81e8cc9b5c add .DS_Store in .gitignore
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1176750 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 06:46:02 +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
Benjamin Bentmann 870a3b3e80 [MNG-5157] NPE stemming from DefaultModelBuilder.containsCoordinates
o Revised original fix to prevent duplicate emission of error msg

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1176402 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 14:37:20 +00:00
Herve Boutemy 56f1540220 use java 6 API docs link
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1175592 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 21:52:34 +00:00
Herve Boutemy aab254c8a2 added "since" information for maven.version and maven.build.version values
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1175591 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 21:50:00 +00:00
Herve Boutemy fc6aac49ce added default local repository location in description
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1174363 13f79535-47bb-0310-9956-ffa450edef68
2011-09-22 20:10:22 +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 d935c0ff3f |MNG-5134] moved settings.* to the end of the list since it is not even evaluated during POM interpolation, but only written here for reference
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172331 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 19:48:52 +00:00
Herve Boutemy 46f194dc02 |MNG-5134] added maven.home property
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172328 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 19:39:21 +00:00
Herve Boutemy fbc7a8b9ed |MNG-5134] moved maven.version and maven.build.version just before Java system properties since they are defined (in MavenCli.java) as system property
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172327 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 19:38:45 +00:00
Paul Gier 7f056fa56e [MNG-5134] Improvements to model interpolation docs related to available properties.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172314 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 18:20:10 +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 40cdcb7563 point to Aether and Sisu projects at Eclipse
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172014 13f79535-47bb-0310-9956-ffa450edef68
2011-09-17 16:46:12 +00:00