svn commit: r737595 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model: ./ src/main/java/org/apache/maven/doxia/site/decoration/inheritance/ src/main/mdo/ src/test

Author: dennisl Date: Sun Jan 25 22:32:15 2009 New Revision: 737595 URL: http://svn.apache.org/viewvc?rev=737595view=rev Log: [DOXIA-254] Merge revisions 629097, 736603, 736628 and 736630 from trunk. Modified:

svn commit: r737596 - /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/

Author: dennisl Date: Sun Jan 25 22:38:36 2009 New Revision: 737596 URL: http://svn.apache.org/viewvc?rev=737596view=rev Log: Commit the mergeinfo as well. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/ (props changed) Propchange:

svn commit: r737597 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer: pom.xml src/main/mdo/document.mdo

Author: dennisl Date: Sun Jan 25 22:42:32 2009 New Revision: 737597 URL: http://svn.apache.org/viewvc?rev=737597view=rev Log: [DOXIA-254] Using the last version of modello-maven-plugin Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml

svn commit: r737601 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x: ./ doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/ doxia-decoration-model

Author: dennisl Date: Sun Jan 25 23:14:52 2009 New Revision: 737601 URL: http://svn.apache.org/viewvc?rev=737601view=rev Log: Merge revisions 736602,736629 from trunk. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/ (props changed)

svn commit: r737611 - /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java

Author: dennisl Date: Sun Jan 25 23:43:24 2009 New Revision: 737611 URL: http://svn.apache.org/viewvc?rev=737611view=rev Log: Fix id svn keyword. Modified:

svn commit: r737612 - /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java

Author: dennisl Date: Sun Jan 25 23:44:18 2009 New Revision: 737612 URL: http://svn.apache.org/viewvc?rev=737612view=rev Log: o Fix id svn keyword. Modified:

svn commit: r737614 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x: ./ doxia-decoration-model/pom.xml doxia-decoration-model/src/main/mdo/decoration.mdo

Author: dennisl Date: Sun Jan 25 23:55:51 2009 New Revision: 737614 URL: http://svn.apache.org/viewvc?rev=737614view=rev Log: Merge r736929 from trunk. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/ (props changed)

svn commit: r737502 - /maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java

Author: bentmann Date: Sun Jan 25 11:16:22 2009 New Revision: 737502 URL: http://svn.apache.org/viewvc?rev=737502view=rev Log: [MNG-3975] getArtifact(Artifact artifact, List remoteRepositories) should include Exception in debug log messages. o Merged from r734502 This is a non-functional

svn commit: r737507 - /maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/post-build-script.apt.vm

Author: bentmann Date: Sun Jan 25 12:36:20 2009 New Revision: 737507 URL: http://svn.apache.org/viewvc?rev=737507view=rev Log: o Simplified example hook script (The Invoker Plugin automatically logs the exception stack trace. Besides, throwing an exception has the additional benefit of

svn commit: r737508 - in /maven/plugins/trunk/maven-ear-plugin: ./ src/it/basic/ src/it/descriptor-encoding/ src/it/descriptor-encoding/latin-1/ src/it/descriptor-encoding/utf-8/ src/main/java/org/apa

Author: bentmann Date: Sun Jan 25 13:30:18 2009 New Revision: 737508 URL: http://svn.apache.org/viewvc?rev=737508view=rev Log: [MEAR-99] Corrupted deployment descriptor if configured encoding does not match platform encoding Added:

svn commit: r737509 - in /maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it: AbstractEarPluginIT.java EarMojoIT.java

Author: bentmann Date: Sun Jan 25 13:40:41 2009 New Revision: 737509 URL: http://svn.apache.org/viewvc?rev=737509view=rev Log: o Stabilized tests Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java

svn commit: r737521 - in /maven/plugins/trunk/maven-invoker-plugin/src: it/script-errors/ it/script-errors/src/ it/script-errors/src/it/ it/script-errors/src/it/beanshell/ it/script-errors/src/it/groo

Author: bentmann Date: Sun Jan 25 15:22:26 2009 New Revision: 737521 URL: http://svn.apache.org/viewvc?rev=737521view=rev Log: [MINVOKER-78] Throwing subclasses of java.lang.Error from hook script aborts main build with FATAL ERROR Added:

svn commit: r737536 - in /maven/plugins/trunk/maven-invoker-plugin/src: it/script-context/ it/script-context/src/ it/script-context/src/it/ it/script-context/src/it/beanshell/ it/script-context/src/it

Author: bentmann Date: Sun Jan 25 16:41:57 2009 New Revision: 737536 URL: http://svn.apache.org/viewvc?rev=737536view=rev Log: [MINVOKER-79] Allow to easily pass data from the pre-build hook script to the post-build hook script Added:

svn commit: r737558 - in /maven/plugins/trunk/maven-invoker-plugin/src/it: invocation-offline/verify.bsh local-repo-path/verify.bsh local-repo-url/verify.bsh project-cloning-reactor/verify.bsh

Author: bentmann Date: Sun Jan 25 18:28:14 2009 New Revision: 737558 URL: http://svn.apache.org/viewvc?rev=737558view=rev Log: o Strengthened ITs Added: maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-offline/verify.bsh (with props)

svn commit: r737559 - in /maven/plugins/trunk/maven-invoker-plugin: ./ src/it/fail-build/ src/it/fail-ignore/ src/it/fail-postbuild/ src/it/fail-prebuild/ src/it/invocation-multiple/ src/it/invocation

Author: bentmann Date: Sun Jan 25 18:29:58 2009 New Revision: 737559 URL: http://svn.apache.org/viewvc?rev=737559view=rev Log: o Optimized ITs with regard to execution time Added: maven/plugins/trunk/maven-invoker-plugin/src/it/script-accessibility/invoker.properties (with props)

svn commit: r737619 - in /maven/components/trunk: maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java maven-project/src/test/java/org/apache/maven/project/builder/

Author: sisbell Date: Mon Jan 26 01:23:25 2009 New Revision: 737619 URL: http://svn.apache.org/viewvc?rev=737619view=rev Log: Updated unit tests with assertions. Modified: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java

svn commit: r737622 - in /maven/components/trunk: maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java maven-project/src/test/java/org/apache/maven/project/builder/

Author: sisbell Date: Mon Jan 26 01:40:40 2009 New Revision: 737622 URL: http://svn.apache.org/viewvc?rev=737622view=rev Log: Fixed regression on MNG-3821. Should not add any subcontainers to the Model Container Info list, which is the one that the ModelTransformerContext uses. This will match

svn commit: r737625 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv

Author: brianf Date: Mon Jan 26 01:52:07 2009 New Revision: 737625 URL: http://svn.apache.org/viewvc?rev=737625view=rev Log: remove bad sync Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Modified:

svn commit: r737633 - in /maven/components/trunk: maven-project-builder/src/main/java/org/apache/maven/project/builder/ maven-project/src/test/java/org/apache/maven/project/builder/ maven-project/src/

Author: sisbell Date: Mon Jan 26 03:29:07 2009 New Revision: 737633 URL: http://svn.apache.org/viewvc?rev=737633view=rev Log: MNG-3887: order of plugin executions, MNG-3864: plugin configs are collapsed, MNG-4000: Plugin executions without id are lost Modified: