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 3f34ee57a23836207f8bf87b1edaea49e01927e0 Merge: 85803f1 5a9c4b4 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 22 09:14:07 2016 +0200 Merge tag 'upstream/2.10.4' Upstream version 2.10.4 pom.xml | 60 +++++------- .../invoker.properties | 7 +- .../module1 => MJAVADOC-384}/pom.xml | 71 +++++++------- .../src/main/java/com/foo/bar/Api.java} | 24 +---- .../src/main/java/com/foo/bar/impl/NotApi.java} | 24 +---- .../main/java/com/foo/bar/internal/NotApi.java} | 24 +---- .../java/com/foo/bar/internal/other/NotApi.java} | 24 +---- .../HelloWorld.java => MJAVADOC-384/verify.bsh} | 89 +++++++++--------- .../invoker.properties | 4 +- .../module1/pom.xml | 31 ++----- .../src/main/java/com/example/foo/Foo.java} | 28 ++---- .../module1 => MJAVADOC-437/module2}/pom.xml | 31 +++---- .../src/main/java/com/example/bar/Bar.java} | 40 ++++---- .../module1 => MJAVADOC-437}/pom.xml | 57 ++++++------ src/it/MJAVADOC-437/verify.bsh | 69 ++++++++++++++ .../invoker.properties | 0 .../module1/pom.xml | 2 +- .../src/main/java/edu/jhu/library/HelloWorld.java | 0 .../test/java/edu/jhu/library/Mjavadoc180Test.java | 0 .../pom.xml | 2 +- .../verify.bsh | 0 .../invoker.properties | 0 .../module1/pom.xml | 2 +- .../src/main/java/edu/jhu/library/HelloWorld.java | 0 .../test/java/edu/jhu/library/Mjavadoc180Test.java | 0 .../pom.xml | 2 +- .../verify.bsh | 0 .../plugin/javadoc/AbstractFixJavadocMojo.java | 28 +++--- .../maven/plugin/javadoc/AbstractJavadocMojo.java | 102 +++++++++++++++++---- .../javadoc/JavadocArchiveConfiguration.java} | 29 +++--- .../apache/maven/plugin/javadoc/JavadocJar.java | 6 +- .../apache/maven/plugin/javadoc/JavadocUtil.java | 55 ++++++----- .../maven/plugin/javadoc/ResourcesBundleMojo.java | 18 ++-- .../plugin/javadoc/resolver/ResourceResolver.java | 3 +- .../maven/plugin/javadoc/java-api-package-list-1.3 | 2 +- .../maven/plugin/javadoc/java-api-package-list-1.4 | 2 +- .../maven/plugin/javadoc/java-api-package-list-1.5 | 2 +- .../maven/plugin/javadoc/java-api-package-list-1.6 | 2 +- .../maven/plugin/javadoc/java-api-package-list-1.7 | 2 +- .../maven/plugin/javadoc/java-api-package-list-1.8 | 2 +- ...ncies.apt.vm => additional-dependencies.apt.vm} | 14 +-- src/site/apt/examples/fix-javadocs.apt.vm | 2 +- src/site/apt/examples/javadoc-nofork.apt.vm | 2 +- src/site/apt/index.apt.vm | 4 +- src/site/fml/faq.fml | 2 +- src/site/site.xml | 4 +- src/site/xdoc/download.xml.vm | 2 +- .../plugin/javadoc/AbstractJavadocMojoTest.java | 78 ++++++++++++++++ .../maven/plugin/javadoc/FixJavadocMojoTest.java | 7 +- .../maven/plugin/javadoc/JavadocJarTest.java | 41 ++++++++- .../maven/plugin/javadoc/JavadocReportTest.java | 2 + .../maven/plugin/javadoc/JavadocUtilTest.java | 26 +++++- .../stubs/JavadocJarArchiveConfigProjectStub.java | 96 +++++++++++++++++++ .../javadocjar-archive-config.xml | 83 +++++++++++++++++ .../javadocjar/def/App.java} | 43 +++++---- 55 files changed, 805 insertions(+), 445 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-javadoc-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
