Commit Graph

9309 Commits

Author SHA1 Message Date
Herve Boutemy 567cd13787 fixed typos
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413425 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 21:23:34 +00:00
Herve Boutemy 614e7bd173 separate SLF4J export from JSR-330
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413416 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 21:02:47 +00:00
Jason van Zyl a284ef279c - keep git init script out of the source distribution
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413393 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 19:23:04 +00:00
Jason van Zyl d3756b95cc MNG-5381: Restore MavenSession.getRepositoryCache() for Tycho users so they are not forced to upgrade to 3.1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413391 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 19:09:44 +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
Jason van Zyl becf420bfa - export JAVA_HOME if it is not set or it commands, like javadoc, that expect it don't work very well
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413378 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 17:50:48 +00:00
Herve Boutemy 9009b8f858 fixed errors reported by Checkstyle
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413335 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 11:04:16 +00:00
Herve Boutemy 8a0d8ecb12 code format
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413323 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 10:48:50 +00:00
Jason van Zyl 451c43152b cleanup of the class realm purging
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413287 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 03:12:49 +00:00
Benson Margulies 1d4d1df865 MNG-5387: Add ability to replace an artifact in mid-build
o change MavenProject#addArtifact to use the *last* version of a given artifact passed to it instead of the first.
o add comments.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413286 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 02:26:42 +00:00
Olivier Lamy 8ca2e32a0c add init-git-svn.sh script: how to setup your clone to be able to use git svn
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413275 13f79535-47bb-0310-9956-ffa450edef68
2012-11-24 22:01:41 +00:00
Jason van Zyl 63fd9ed4d8 MNG-5376: Account for changes between the Apple and Oracle JDKs on OSX
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413208 13f79535-47bb-0310-9956-ffa450edef68
2012-11-24 17:22:54 +00:00
Jason van Zyl f45e5f1084 wagon 2.3 will be in central shortly, remove from the POM for the release
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413074 13f79535-47bb-0310-9956-ffa450edef68
2012-11-23 21:41:40 +00:00
Herve Boutemy a71baa4579 added notes about logger name, with Plexus Logger API that cannot follow logger name as class name convention :(
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412766 13f79535-47bb-0310-9956-ffa450edef68
2012-11-23 07:45:43 +00:00
Herve Boutemy c4703d2437 added info about direct SLF4J use
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412765 13f79535-47bb-0310-9956-ffa450edef68
2012-11-23 07:17:37 +00:00
Jason van Zyl 325972aed0 MNG-5376: Account for changes between the Apple and Oracle JDKs on OSX
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412409 13f79535-47bb-0310-9956-ffa450edef68
2012-11-22 02:24:16 +00:00
Herve Boutemy 4e52800a1b [MNG-5380] check that whitespace can be preserved in Maven plugin configuration when building MavenProject (still need to check if content is not trimmed when injected into plugin)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412310 13f79535-47bb-0310-9956-ffa450edef68
2012-11-21 21:36:19 +00:00
Herve Boutemy ca584199a5 removed stdout output
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412263 13f79535-47bb-0310-9956-ffa450edef68
2012-11-21 20:00:50 +00:00
Herve Boutemy 6417401054 [MNG-5380] check that whitespace can be preserved in Maven plugin configuration when reading pom (still need to check if content is not trimmed when injected into plugin)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412261 13f79535-47bb-0310-9956-ffa450edef68
2012-11-21 19:59:14 +00:00
Jason van Zyl 0098ceb9fc use staging repository in the POM to test Wagon 2.3, this is wrong but until the Jenkins/Nexus setup is figured out this will keep the build working
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411752 13f79535-47bb-0310-9956-ffa450edef68
2012-11-20 17:20:20 +00:00
Jason van Zyl 1e41eff172 update to Wagon 2.3 through the staging repo so we can validate 2.3 is good with master
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411743 13f79535-47bb-0310-9956-ffa450edef68
2012-11-20 16:58:42 +00:00
Herve Boutemy 731fa826e5 [MNG-5380] [MNG-5336] use Modello 1.6, which adds xml:space="preserve" support for DOM and fixes xdoc propoerties output
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411559 13f79535-47bb-0310-9956-ffa450edef68
2012-11-20 06:30:12 +00:00
Herve Boutemy 21c2429519 added link to plexus-container-default javadoc
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411369 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 19:50:04 +00:00
Herve Boutemy d707fa5b81 plexus-utils 3.0.9 released
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411083 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 06:58:42 +00:00
Herve Boutemy 7def319030 [MNG-5380] preserve whitespace in Maven plugin configuration when elemnt has xml:space="preserve"
partial fix, Modello 1.6 is required but I can't deploy it

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410886 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 13:29:18 +00:00
Herve Boutemy aac56f0f97 require Velocity filtering
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410883 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 12:59:14 +00:00
Herve Boutemy 7892b6d493 added Reference menu
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410816 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 02:29:00 +00:00
Herve Boutemy b1dbec59ab added developer documentation about logging APIs
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410815 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 02:23:48 +00:00
Herve Boutemy 5869fc1197 moved CLI Options Reference to a dedicated page
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410808 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 00:58:30 +00:00
Herve Boutemy b838131093 o code formatting
o added license header

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410724 13f79535-47bb-0310-9956-ffa450edef68
2012-11-17 12:27:48 +00:00
Kristian Rosenvold b766d34b70 [MNG-5245] Update maven plugin versions
- components.xml
  - maven-clean-plugin up to 2.5
  - maven-site-plugin up to 3.1
- default-bindings.xml
  - maven-install-plugin up to 2.4
  - maven-resources-plugin up to 2.6
  - maven-compiler-plugin up to 2.5.1
  - maven-surefire-plugin up to 2.12.4
  - maven-jar-plugin up to 2.4
  - maven-plugin-pugin up to 3.2
  - maven-war-plugin up to 2.3
  - maven-ear-plugin up to 2.8

Author:    Karl Heinz Marbaise <info@soebes.de>

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410570 13f79535-47bb-0310-9956-ffa450edef68
2012-11-16 21:09:49 +00:00
Olivier Lamy e1e683cbbb avoid logger with name ended with .null if no hint
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1409719 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 10:18:21 +00:00
Olivier Lamy 72df73f9e8 code format and add @since
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1409718 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 10:18:06 +00:00
Jason van Zyl 4c61954e7b MNG-5016: A mirror's layout setting should default to 'default' since thats' the only layout supported lay in maven 3
Submitted by: Hiram Chirino

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1409025 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 23:37:17 +00:00
Jason van Zyl 44f65114cc MNG-5053: Remove obsolete debugger arguments
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1409024 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 23:35:05 +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 1a6a6bd2e3 removed unused imports
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407920 13f79535-47bb-0310-9956-ffa450edef68
2012-11-11 05:33:06 +00:00
Jason van Zyl d698618204 MNG-5374: Fix transfer listener after the JSR330 merge
For the following cases I have done the following:

1) Logging to the console: I simply restored the class that was there such that when logging to the console it uses System.out as it did and the d
ownload progress appears as it did.

2) Logging in batch mode: the batch mode transfer listener uses an SLF4J logger and the batch mode transfer listener doesn't report download progr
ess so there is no issue. Download progress would just create a bunch of noise. The size and the speed at which it is downloaded are logged.

3) Logging to a file: same as 2) except it's all diverted to the specified file.

4) I created two protected methods in MavenCli so that integrators can supply their own console and batch transfer listeners if they wish.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407913 13f79535-47bb-0310-9956-ffa450edef68
2012-11-11 04:40:00 +00:00
Herve Boutemy ed3893b188 o upgraded MPIR to 2.6
o added Markdown support to m-site-p (waiting for next m-site-p version which will include it by default)

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407910 13f79535-47bb-0310-9956-ffa450edef68
2012-11-11 04:22:44 +00:00
Herve Boutemy 57976a8b1a added javadoc
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407894 13f79535-47bb-0310-9956-ffa450edef68
2012-11-10 22:16:09 +00:00
Herve Boutemy a8a59d6e13 fixed typo
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407893 13f79535-47bb-0310-9956-ffa450edef68
2012-11-10 22:15:18 +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 13bb4ba1be removed dead code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407835 13f79535-47bb-0310-9956-ffa450edef68
2012-11-10 15:26:34 +00:00
Herve Boutemy 09750f1a78 generics
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407834 13f79535-47bb-0310-9956-ffa450edef68
2012-11-10 15:25:30 +00:00
Herve Boutemy 3cbed6a1ca [MNG-5372] removed RepositoryCache, added in 3.0-alpha-3 and deprecated in 3.0-beta-3 with Aether integration (r988749)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407827 13f79535-47bb-0310-9956-ffa450edef68
2012-11-10 15:04:20 +00:00
Herve Boutemy 6c032edddb |MNG-5370] moved plugin bindings to default lifecycle configuration to default-bindings.xml to let only artifact handlers configuration in artifact-handlers.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407821 13f79535-47bb-0310-9956-ffa450edef68
2012-11-10 14:21:58 +00:00