Jason van Zyl
38d132b64d
Merge branch 'trunk' of github.com:apache/maven-3 into trunk
...
Conflicts:
apache-maven/src/bin/mvn
maven-embedder/src/site/apt/logging.apt
2013-02-14 18:02:32 -05:00
Jason van Zyl
fcffe3c9d5
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413481 13f79535-47bb-0310-9956-ffa450edef68
2012-11-26 05:07:28 +00:00
Jason van Zyl
29c9b29f68
[maven-release-plugin] prepare release maven-3.1.0
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413479 13f79535-47bb-0310-9956-ffa450edef68
2012-11-26 05:07:15 +00:00
Jason van Zyl
527cee25ef
- Look for older setups as well, thanks to @mcculls for spotting this
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413474 13f79535-47bb-0310-9956-ffa450edef68
2012-11-26 03:50:32 +00:00
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
fdf808d012
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
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
eff45b31ba
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
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
d36522363f
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
0cb6c4a1c5
wagon 2.3 will be in central shortly, remove from the POM for the release
2012-11-23 13:41:16 -08: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
074667f20f
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
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
b5eee08e3f
[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
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
784e8c3a90
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
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
cbcda629dc
[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
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
c401d36101
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
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
603fe408ca
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
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
143354e5f9
[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
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
f750ec8970
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
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
17eec87d33
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
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
9bfdb4fe49
[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
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
db109865ab
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
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
fb0cd240f3
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
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
b1a90588d2
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