[maven-javadoc-plugin] 01/05: Merge tag 'upstream/2.10.3'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-javadoc-plugin.

commit 94be96b448a140f3a9b6700d7cdad8936a1b3851
Merge: a561e44 937b782
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 4 17:00:25 2015 +0200

    Merge tag 'upstream/2.10.3'
    
    Upstream version 2.10.3

 pom.xml                                            |  19 ++--
 src/it/MJAVADOC-414/invoker.properties             |  18 ++++
 src/it/MJAVADOC-414/pom.xml                        |  55 +++++++++++
 .../src/main/java/mjavadoc414/App.java}            |  30 +-----
 .../src/test/java/mjavadoc414/test/AppTest.java}   |  35 +++----
 src/it/MJAVADOC-414/verify.bsh                     |  47 +++++++++
 .../plugin/javadoc/AbstractFixJavadocMojo.java     |  10 +-
 .../maven/plugin/javadoc/AbstractJavadocMojo.java  | 110 ++++++++++++++-------
 .../apache/maven/plugin/javadoc/JavadocJar.java    |  47 +++++----
 .../apache/maven/plugin/javadoc/JavadocReport.java |  23 +++--
 .../apache/maven/plugin/javadoc/JavadocUtil.java   |   7 +-
 .../maven/plugin/javadoc/ResourcesBundleMojo.java  |   6 ++
 .../maven/plugin/javadoc/TestJavadocJar.java       |   8 +-
 .../maven/plugin/javadoc/TestJavadocReport.java    |   8 +-
 .../plugin/javadoc/TestResourcesBundleMojo.java    |   5 +
 .../plugin/javadoc/resolver/JavadocBundle.java     |  10 ++
 .../plugin/javadoc/resolver/ResourceResolver.java  |  17 ++++
 .../javadoc/resolver/SourceResolverConfig.java     |  66 +++++++++++++
 .../maven/plugin/javadoc/JavadocJarTest.java       |  13 +++
 .../JavadocJarFailOnErrorMavenProjectStub.java     |  88 +++++++++++++++++
 .../javadocjar-failonerror-plugin-config.xml       |  79 +++++++++++++++
 .../javadocjar/def/App.java}                       |  44 ++++-----
 .../javadocjar/def/package.html                    |  20 ++++
 23 files changed, 613 insertions(+), 152 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-javadoc-plugin.git