maven git commit: [MNG-6105] properties.internal.SystemProperties.addSystemProperties() is not really thread-safe

2016-10-15 Thread gboue 
Repository: maven
Updated Branches:
  refs/heads/master f7c1359cf -> ace448158


[MNG-6105] properties.internal.SystemProperties.addSystemProperties() is
not really thread-safe

Refactoring the current code setting system properties to synchronize
correctly on the given ones: avoids ConcurrentModificationException and
NullPointerException if the properties is modified by another thread.

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ace44815
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ace44815
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ace44815

Branch: refs/heads/master
Commit: ace448158131285e5ef8fb54b96dfb3d8d05f37e
Parents: f7c1359
Author: Guillaume Boué 
Authored: Sun Oct 16 01:40:46 2016 +0200
Committer: Guillaume Boué 
Committed: Sun Oct 16 01:40:46 2016 +0200

--
 .../internal/MavenRepositorySystemUtils.java| 21 +++-
 .../execution/DefaultMavenExecutionRequest.java |  4 +--
 .../project/DefaultProjectBuildingRequest.java  |  7 ++--
 .../properties/internal/SystemProperties.java   | 35 
 .../building/DefaultModelBuildingRequest.java   |  5 ++-
 .../DefaultSettingsBuildingRequest.java | 12 ++-
 6 files changed, 38 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ace44815/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
--
diff --git 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index 877c277..645fd1c 100644
--- 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++ 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -19,9 +19,6 @@ package org.apache.maven.repository.internal;
  * under the License.
  */
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.util.Properties;
 
 import org.eclipse.aether.DefaultRepositorySystemSession;
@@ -130,22 +127,14 @@ public final class MavenRepositorySystemUtils
 
 session.setArtifactDescriptorPolicy( new 
SimpleArtifactDescriptorPolicy( true, true ) );
 
+final Properties systemProperties = new Properties();
+
 // MNG-5670 guard against ConcurrentModificationException
 // MNG-6053 guard against key without value
-final Properties systemProperties = new Properties();
-// This relies on the fact that load/store are synchronized internally.
-try ( final ByteArrayOutputStream out = new ByteArrayOutputStream() )
-{
-System.getProperties().store( out, null );
-
-try ( final ByteArrayInputStream in = new ByteArrayInputStream( 
out.toByteArray() ) )
-{
-systemProperties.load( in );
-}
-}
-catch ( final IOException e )
+Properties sysProp = System.getProperties();
+synchronized ( sysProp )
 {
-throw new AssertionError( "Unexpected IO error copying system 
properties.", e );
+systemProperties.putAll( sysProp );
 }
 
 session.setSystemProperties( systemProperties );

http://git-wip-us.apache.org/repos/asf/maven/blob/ace44815/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
 
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index 71a6894..d67061f 100644
--- 
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++ 
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -33,6 +33,7 @@ import org.apache.maven.eventspy.internal.EventSpyDispatcher;
 import org.apache.maven.model.Profile;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.properties.internal.SystemProperties;
 import org.apache.maven.settings.Mirror;
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Server;
@@ -535,8 +536,7 @@ public class DefaultMavenExecutionRequest
 {
 if ( properties != null )
 {
-this.systemProperties = new Properties();
-this.systemProperties.putAll( properties );
+

maven git commit: [MNG-6106] Remove maven.home setter from m2.conf

2016-10-15 Thread michaelo 
Repository: maven
Updated Branches:
  refs/heads/master d99f9ef8c -> f7c1359cf


[MNG-6106] Remove maven.home setter from m2.conf

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f7c1359c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f7c1359c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f7c1359c

Branch: refs/heads/master
Commit: f7c1359cf4e3ed82b91b78688076ff684a4eb9a8
Parents: d99f9ef
Author: Michael Osipov 
Authored: Sun Oct 16 01:22:00 2016 +0200
Committer: Michael Osipov 
Committed: Sun Oct 16 01:22:00 2016 +0200

--
 apache-maven/src/bin/m2.conf | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f7c1359c/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 5eaa760..2235f82 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,6 +1,5 @@
 main is org.apache.maven.cli.MavenCli from plexus.core
 
-set maven.home default ${user.home}/m2
 set maven.conf default ${maven.home}/conf
 
 [plexus.core]

maven git commit: Fix checkstyle error

2016-10-15 Thread michaelo 
Repository: maven
Updated Branches:
  refs/heads/master 1c9362be4 -> d99f9ef8c


Fix checkstyle error

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d99f9ef8
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d99f9ef8
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d99f9ef8

Branch: refs/heads/master
Commit: d99f9ef8c7ffe56966945d6f1b66f0280866ded5
Parents: 1c9362b
Author: Michael Osipov 
Authored: Sun Oct 16 00:37:53 2016 +0200
Committer: Michael Osipov 
Committed: Sun Oct 16 00:37:53 2016 +0200

--
 .../aether/DefaultRepositorySystemSessionFactory.java| 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/d99f9ef8/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
 
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
index af2562d..248a3b6 100644
--- 
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
+++ 
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
@@ -121,10 +121,10 @@ public class DefaultRepositorySystemSessionFactory
 }
 
 int errorPolicy = 0;
-errorPolicy |= request.isCacheNotFound() ? 
ResolutionErrorPolicy.CACHE_NOT_FOUND :
-ResolutionErrorPolicy.CACHE_DISABLED;
-errorPolicy |= request.isCacheTransferError() ? 
ResolutionErrorPolicy.CACHE_TRANSFER_ERROR :
-ResolutionErrorPolicy.CACHE_DISABLED;
+errorPolicy |= request.isCacheNotFound() ? 
ResolutionErrorPolicy.CACHE_NOT_FOUND
+: ResolutionErrorPolicy.CACHE_DISABLED;
+errorPolicy |= request.isCacheTransferError() ? 
ResolutionErrorPolicy.CACHE_TRANSFER_ERROR
+: ResolutionErrorPolicy.CACHE_DISABLED;
 session.setResolutionErrorPolicy(
 new SimpleResolutionErrorPolicy( errorPolicy, errorPolicy | 
ResolutionErrorPolicy.CACHE_NOT_FOUND ) );

maven git commit: Use static final values instead of literals

2016-10-15 Thread michaelo 
Repository: maven
Updated Branches:
  refs/heads/master d8e3585e0 -> 1c9362be4


Use static final values instead of literals

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/1c9362be
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/1c9362be
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/1c9362be

Branch: refs/heads/master
Commit: 1c9362be4328713386bd23b01f9e2c87674cb952
Parents: d8e3585
Author: Michael Osipov 
Authored: Sun Oct 16 00:10:57 2016 +0200
Committer: Michael Osipov 
Committed: Sun Oct 16 00:10:57 2016 +0200

--
 .../internal/aether/DefaultRepositorySystemSessionFactory.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/1c9362be/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
 
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
index a0c5444..af2562d 100644
--- 
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
+++ 
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
@@ -121,8 +121,10 @@ public class DefaultRepositorySystemSessionFactory
 }
 
 int errorPolicy = 0;
-errorPolicy |= request.isCacheNotFound() ? 
ResolutionErrorPolicy.CACHE_NOT_FOUND : 0;
-errorPolicy |= request.isCacheTransferError() ? 
ResolutionErrorPolicy.CACHE_TRANSFER_ERROR : 0;
+errorPolicy |= request.isCacheNotFound() ? 
ResolutionErrorPolicy.CACHE_NOT_FOUND :
+ResolutionErrorPolicy.CACHE_DISABLED;
+errorPolicy |= request.isCacheTransferError() ? 
ResolutionErrorPolicy.CACHE_TRANSFER_ERROR :
+ResolutionErrorPolicy.CACHE_DISABLED;
 session.setResolutionErrorPolicy(
 new SimpleResolutionErrorPolicy( errorPolicy, errorPolicy | 
ResolutionErrorPolicy.CACHE_NOT_FOUND ) );

svn commit: r1765098 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

2016-10-15 Thread michaelo 
Author: michaelo
Date: Sat Oct 15 18:46:43 2016
New Revision: 1765098

URL: http://svn.apache.org/viewvc?rev=1765098=rev
Log:
[MJAVADOC-474] Deprecate parameter additionalparam

Modified:

maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1765098=1765097=1765098=diff
==
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 Sat Oct 15 18:46:43 2016
@@ -394,8 +394,11 @@ public abstract class AbstractJavadocMoj
 /**
  * Set an additional parameter(s) on the command line. This value should 
include quotes as necessary for
  * parameters that include spaces. Useful for a custom doclet.
+ *
+ * @deprecated Does not properly support multiple options at once and has 
a bad name
  */
 @Parameter( property = "additionalparam" )
+@Deprecated
 private String additionalparam;
 
 /**

svn commit: r1765097 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

2016-10-15 Thread michaelo 
Author: michaelo
Date: Sat Oct 15 17:37:33 2016
New Revision: 1765097

URL: http://svn.apache.org/viewvc?rev=1765097=rev
Log:
[MJAVADOC-387] Handle JDK8 -Xdoclint

Add proper handling of -Xdoclint. Option is only evaluated if Java 1.8+ is used 
otherwise a warning is issued.
Due to a limitation in Modello, it cannot simply enabled by  because 
it is umarshaled to null instead of "". One has to use all 
explicitly.

Modified:

maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1765097=1765096=1765097=diff
==
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 Sat Oct 15 17:37:33 2016
@@ -279,6 +279,15 @@ public abstract class AbstractJavadocMoj
  */
 private static final float SINCE_JAVADOC_1_6 = 1.6f;
 
+/**
+ * For Javadoc options appears since Java 8.0.
+ * See http://docs.oracle.com/javase/8/docs/technotes/guides/javadoc/index.html;>
+ * Javadoc Technology
+ *
+ * @since 3.0.0
+ */
+private static final float SINCE_JAVADOC_1_8 = 1.8f;
+
 // --
 // Mojo components
 // --
@@ -310,16 +319,16 @@ public abstract class AbstractJavadocMoj
  */
 @Component
 private ArtifactResolver resolver;
-
+
 @Component
 private ResourceResolver resourceResolver;
-
+
 @Component
 private org.apache.maven.shared.artifact.resolve.ArtifactResolver 
artifactResolver;
-
+
 @Component
 private ArtifactHandlerManager artifactHandlerManager;
-
+
 @Component
 private DependencyResolver dependencyResolver;
 
@@ -359,7 +368,7 @@ public abstract class AbstractJavadocMoj
  */
 @Parameter( defaultValue = "${project}", readonly = true, required = true )
 protected MavenProject project;
-
+
 @Parameter( defaultValue = "${plugin}", readonly = true )
 private PluginDescriptor plugin;
 
@@ -966,6 +975,16 @@ public abstract class AbstractJavadocMoj
 private boolean docfilessubdirs;
 
 /**
+ * Specifies specific checks to be performed on Javadoc comments.
+ * 
+ * See http://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#BEJEFABE;>doclint.
+ *
+ * @since 3.0.0
+ */
+@Parameter( property = "doclint" )
+private String doclint;
+
+/**
  * Specifies the title to be placed near the top of the overview summary 
file.
  * 
  * See http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#doctitle;>doctitle.
@@ -1827,6 +1846,14 @@ public abstract class AbstractJavadocMoj
 }
 
 /**
+ * @return the doclint specific checks configuration
+ */
+protected String getDoclint()
+{
+return doclint;
+}
+
+/**
  * @return the title to be placed near the top of the overview summary file
  */
 protected String getDoctitle()
@@ -1881,19 +1908,19 @@ public abstract class AbstractJavadocMoj
 verifyRemovedParameter( "aggregator" );
 verifyRemovedParameter( "proxyHost" );
 verifyRemovedParameter( "proxyPort" );
-
+
 doExecute();
 }
-
+
 abstract void doExecute() throws MojoExecutionException, 
MojoFailureException;
-
+
 private void verifyRemovedParameter( String paramName )
 {
 Object pluginConfiguration = plugin.getPlugin().getConfiguration();
 if ( pluginConfiguration instanceof Xpp3Dom )
 {
 Xpp3Dom configDom = (Xpp3Dom) pluginConfiguration;
-
+
 if ( configDom.getChild( paramName ) != null )
 {
 throw new IllegalArgumentException( "parameter '" + paramName
@@ -1901,7 +1928,7 @@ public abstract class AbstractJavadocMoj
 }
 }
 }
-
+
 /**
  * The package documentation details the
  * Javadoc Options used by this Plugin.
@@ -2046,7 +2073,7 @@ public abstract class AbstractJavadocMoj
 // 
--
 
 // MJAVADOC-365 if includes/excludes are specified, these take 
precedence over the default
-// package-based mode and force javadoc into file-based mode unless 
subpackages are 
+// package-based mode and force javadoc into file-based mode unless 
subpackages are
 // specified.

svn commit: r1765073 - in /maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats: ./ src/main/resources/ src/main/resources/META-INF/ src/main/resources/META-INF/maven/ src/site/apt/

2016-10-15 Thread hboutemy 
Author: hboutemy
Date: Sat Oct 15 14:25:13 2016
New Revision: 1765073

URL: http://svn.apache.org/viewvc?rev=1765073=rev
Log:
[MSITE-782] check that Velocity tools declared in 
/META-INF/maven/site-tools.xml are discovered after DOXIASITETOOLS-168 r1765053

Added:

maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/resources/META-INF/

maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/resources/META-INF/maven/

maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/resources/META-INF/maven/site-tools.xml
  - copied unchanged from r1765072, 
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/resources/tools.xml
Removed:

maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/resources/tools.xml

maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy.edited
Modified:

maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm

Modified: 
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm?rev=1765073=1765072=1765073=diff
==
--- 
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm
 Sat Oct 15 14:25:13 2016
@@ -145,6 +145,8 @@ Doxia Site Renderer Velocity Context
 | <<>> | = <<<$xml>>>
 
*---+---+
 
- <<< $custom>>> TODO: remove space once MSITE-782 is fixed
+* Velocity custom tool declared in <<>>
 
- <<< $custom.test()>>>
+ <<>> = <<<$custom>>>
+
+ <<>> = <<<$custom.test()>>>

svn propchange: r1765053 - svn:log

2016-10-15 Thread michaelo 
Author: michaelo
Revision: 1765053
Modified property: svn:log

Modified: svn:log at Sat Oct 15 13:04:33 2016
--
--- svn:log (original)
+++ svn:log Sat Oct 15 13:04:33 2016
@@ -1,3 +1,3 @@
-[MSITE-782] Support for custom Velocity tools has disappeared
+[DOXIASITETOOLS-168] Add ability to explicitly load custom Velocity tools
 
 Instruct Velocity to load possible custom tools from 
/META-INF/maven/site-tools.xml found in the classpath of the Maven Site Plugin.

svn commit: r1765053 - in /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src: main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java site/apt/index.apt.vm

2016-10-15 Thread michaelo 
Author: michaelo
Date: Sat Oct 15 12:58:28 2016
New Revision: 1765053

URL: http://svn.apache.org/viewvc?rev=1765053=rev
Log:
[MSITE-782] Support for custom Velocity tools has disappeared

Instruct Velocity to load possible custom tools from 
/META-INF/maven/site-tools.xml found in the classpath of the Maven Site Plugin.

Modified:

maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt.vm

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1765053=1765052=1765053=diff
==
--- 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 Sat Oct 15 12:58:28 2016
@@ -78,7 +78,9 @@ import org.apache.velocity.Template;
 import org.apache.velocity.context.Context;
 import org.apache.velocity.tools.Scope;
 import org.apache.velocity.tools.ToolManager;
+import org.apache.velocity.tools.config.ConfigurationUtils;
 import org.apache.velocity.tools.config.EasyFactoryConfiguration;
+import org.apache.velocity.tools.config.FactoryConfiguration;
 import org.apache.velocity.tools.generic.AlternatorTool;
 import org.apache.velocity.tools.generic.ClassTool;
 import org.apache.velocity.tools.generic.ComparisonDateTool;
@@ -150,6 +152,8 @@ public class DefaultSiteRenderer
 
 private static final String SKIN_TEMPLATE_LOCATION = 
"META-INF/maven/site.vm";
 
+private static final String TOOLS_LOCATION = 
"META-INF/maven/site-tools.xml";
+
 // --
 // Renderer implementation
 // --
@@ -497,6 +501,13 @@ public class DefaultSiteRenderer
 .tool( SortTool.class )
 .tool( XmlTool.class );
 
+FactoryConfiguration customConfig = 
ConfigurationUtils.findInClasspath( TOOLS_LOCATION );
+
+if ( customConfig != null )
+{
+config.addConfiguration( customConfig );
+}
+
 ToolManager manager = new ToolManager( false, false );
 manager.configure( config );
 

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt.vm?rev=1765053=1765052=1765053=diff
==
--- 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt.vm 
(original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/site/apt/index.apt.vm 
Sat Oct 15 12:58:28 2016
@@ -137,6 +137,9 @@ Doxia Sitetools - Site Renderer
 | <<>>| {{{$generic/XmlTool.html}XmlTool}}   
| For reading/navigating XML files. This uses dom4j under the covers and 
provides complete XPath support.
 
*--+--+---+
 
+  If you intend to use custom Velocity tools, add them to the Maven Site 
Plugin's dependency list and make sure
+  that they have a bundled configuration file in 
<<>>.
+
   See 
<<<{{{./xref/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.html\#L470}DefaultSiteRenderer.createToolManagedVelocityContext(...)}}>>>
   source for more details and the 
{{{http://velocity.apache.org/tools/devel/summary.html}tools usage summary}}.

maven git commit: fixed typo (excessive search "cause"/replace "t")

2016-10-15 Thread hboutemy 
Repository: maven
Updated Branches:
  refs/heads/MNG-6093 bf44e8a05 -> 8485d3f84


fixed typo (excessive search "cause"/replace "t")

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8485d3f8
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8485d3f8
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8485d3f8

Branch: refs/heads/MNG-6093
Commit: 8485d3f84213a8c536d4ab34d39a602dacf1893a
Parents: bf44e8a
Author: Hervé Boutemy 
Authored: Sat Oct 15 11:52:43 2016 +0200
Committer: Hervé Boutemy 
Committed: Sat Oct 15 11:52:43 2016 +0200

--
 .../src/main/java/org/slf4j/impl/MavenSimpleLogger.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8485d3f8/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
--
diff --git 
a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java 
b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
index 0c3ad47..0715ed0 100644
--- a/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
+++ b/maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
@@ -82,7 +82,7 @@ public class MavenSimpleLogger
 t = t.getCause();
 if ( t != null )
 {
-stream.append( buffer().strong( "td by" ).a( ": " ).a( 
t.getClass().getName() ).toString() );
+stream.append( buffer().strong( "Caused by" ).a( ": " ).a( 
t.getClass().getName() ).toString() );
 if ( t.getMessage() != null )
 {
 stream.append( ": " );