Commit Graph

9370 Commits

Author SHA1 Message Date
Herve Boutemy efbbaf668e removed unused import
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1333235 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 22:45:49 +00:00
Herve Boutemy 3289f39cb9 [MNG-5279] added anchors for each option
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1332308 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 17:30:04 +00:00
Herve Boutemy b7cd7e8bc8 renamed generated file: it's .html, not .apt (even if I initially wanted apt, but snippet macro could not do it)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1332305 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 17:27:29 +00:00
Herve Boutemy 8904ba6889 [MNG-5279] added CLI options to the code documentation site
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1332011 13f79535-47bb-0310-9956-ffa450edef68
2012-04-29 22:33:19 +00:00
Herve Boutemy 32357134cd formatting
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1331989 13f79535-47bb-0310-9956-ffa450edef68
2012-04-29 20:29:06 +00:00
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
Olivier Lamy bcf07917a0 ant 1.8 required for bootstrap build
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1308501 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 19:36:36 +00:00
Robert Scholte ecb64a623a Adjust default value of localRepository in xml-comment
Issue id: MNG-5258


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1300694 13f79535-47bb-0310-9956-ffa450edef68
2012-03-14 19:30:17 +00:00
Olivier Lamy 003853ae35 [MNG-5261] upgrade wagon version to 2.3 to fix issues with redirect
use 2.3-SNAPSHOT

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1300653 13f79535-47bb-0310-9956-ffa450edef68
2012-03-14 17:27: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
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
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
Olivier Lamy 4dce88a170 ignore .idea
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1234714 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 09:28:22 +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 79b40d219a upgrade to wagon 2.2
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1221248 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 13:23:02 +00:00
Benson Margulies 9b7613b81c Take the dir format away.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1212997 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 12:30:30 +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 e6ef3dd660 [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 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 fe39398f74 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 277d085f4b 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 cf4b48d603 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 92f77d696b 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 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 3aa1fdc077 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 4c12417114 [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 f360758345 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 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
Herve Boutemy 0ea246a7cd 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