Commit Graph

2422 Commits

Author SHA1 Message Date
Olivier Lamy 006075a349 make pluggable PasswordDecryptor working.
Submitted by Jason Dillon
see https://github.com/apache/maven-3/pull/4

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1310560 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 19:28:28 +00:00
Herve Boutemy 2f453c69b9 improved documentation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1244233 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 22:07:47 +00:00
Herve Boutemy 43518f56f4 generics and Java 5 constructs
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1244229 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 21:55:36 +00:00
Olivier Lamy 7bf2294941 [MNG-5245] upgrade default plugins versions surefire version 2.12
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1244153 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 18:36:58 +00:00
Olivier Lamy 4b2c7917e0 [MNG-5233] ArtifactMetadataRetrievalException from org.apache.maven.artifact.metadata is not anymore binary compatible.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1234715 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 09:28:47 +00:00
Herve Boutemy 0ab06d9cd6 removed unused configuration: version is defined in parents' managed versions
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1234623 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 21:42:49 +00:00
Olivier Lamy 76ad2345c1 [MNG-5225] The default version of the maven-site-plugin as defined in the site-lifecycle must be 3.x
merge -r1227324:1227325 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@1227327 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 21:15:03 +00:00
Stephen Connolly ffbdb44299 [MNG-5224] REGRESSION: Injected Settings in a Mojo are missing the profiles from settings.xml
o Some unit tests to cover some of the fix.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1226858 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 16:41:49 +00:00
Stephen Connolly d8000fa861 [MNG-5224] REGRESSION: Injected Settings in a Mojo are missing the profiles from settings.xml
o This is the fix, manually tested. Now I just have to figure out a good way to test the via a unit/integration test

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1226842 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 15:58:55 +00:00
Olivier Lamy 879d07b1d7 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 c07f369278 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 ed651a4d0e [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 a15a2646a3 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 acb711f32c 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 52beaf6221 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 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
Igor Fedorenko c53d95cee8 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 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 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
Benjamin Bentmann ab432a6dc6 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 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 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 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 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 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 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 c15263a465 [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 57741e53fd [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 86197aa24a [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 af7dffd4b6 [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
Herve Boutemy 799d63bf87 [MNG-5119] added Javadocs and JXR links in left menu for every module to give easy access to code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1137154 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 10:00:46 +00:00
Benjamin Bentmann e2ad36018b [MNG-5046] Remove $Id$ from sources
Submitted by: Jesse Glick

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1084807 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 23:30:11 +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