This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository maven-javadoc-plugin.
from 7a78a71 Removed the unused dependency on libbcel-java
new 85803f1 Removed the explicit build dependency on libwagon-java
adds 5a9c4b4 Imported Upstream version 2.10.4
new 3f34ee5 Merge tag 'upstream/2.10.4'
new b0a8389 Refreshed the patches
new 87decf2 Upload to unstable
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
debian/changelog | 7 +-
debian/control | 3 +-
debian/copyright | 5 +-
.../missing-maven-plugin-plugin-declaration.patch | 4 +-
debian/patches/plexus-utils2-compatibility.patch | 2 +-
debian/patches/reproducible-footer.patch | 2 +-
pom.xml | 60 ++++-------
.../invoker.properties | 0
src/it/{MJAVADOC-325 => MJAVADOC-384}/pom.xml | 116 +++++++++++----------
.../src/main/java/com/foo/bar/Api.java} | 9 +-
.../src/main/java/com/foo/bar/impl/NotApi.java} | 7 +-
.../main/java/com/foo/bar/internal/NotApi.java} | 7 +-
.../java/com/foo/bar/internal/other/NotApi.java} | 7 +-
src/it/{MJAVADOC-407 => MJAVADOC-384}/verify.bsh | 18 +++-
.../invoker.properties | 1 +
.../module-a => MJAVADOC-437/module1}/pom.xml | 10 +-
.../src/main/java/com/example/foo/Foo.java} | 12 ++-
.../{detectLinks => MJAVADOC-437}/module2/pom.xml | 22 ++--
.../src/main/java/com/example/bar/Bar.java} | 39 ++++---
src/it/{MJAVADOC-250 => MJAVADOC-437}/pom.xml | 100 +++++++++---------
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} | 15 ++-
.../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 ++++-
...ava => JavadocJarArchiveConfigProjectStub.java} | 34 +++---
.../javadocjar-archive-config.xml} | 19 ++--
.../javadocjar/def/App.java | 12 +--
61 files changed, 672 insertions(+), 324 deletions(-)
copy src/it/{MJAVADOC-365 => MJAVADOC-384}/invoker.properties (100%)
copy src/it/{MJAVADOC-325 => MJAVADOC-384}/pom.xml (84%)
copy src/it/{MJAVADOC-126/test/src/main/java/test/TestClass.java =>
MJAVADOC-384/src/main/java/com/foo/bar/Api.java} (90%)
copy src/it/{MJAVADOC-275/mod-b/src/main/java/Main.java =>
MJAVADOC-384/src/main/java/com/foo/bar/impl/NotApi.java} (92%)
copy src/it/{MJAVADOC-275/mod-b/src/main/java/Main.java =>
MJAVADOC-384/src/main/java/com/foo/bar/internal/NotApi.java} (92%)
copy src/it/{MJAVADOC-275/mod-b/src/main/java/Main.java =>
MJAVADOC-384/src/main/java/com/foo/bar/internal/other/NotApi.java} (92%)
copy src/it/{MJAVADOC-407 => MJAVADOC-384}/verify.bsh (60%)
copy src/it/{MJAVADOC-194 => MJAVADOC-437}/invoker.properties (99%)
copy src/it/{MJAVADOC-181/library/module-a => MJAVADOC-437/module1}/pom.xml
(86%)
copy src/it/{site-failOnError/src/main/java/App.java =>
MJAVADOC-437/module1/src/main/java/com/example/foo/Foo.java} (86%)
copy src/it/{detectLinks => MJAVADOC-437}/module2/pom.xml (71%)
copy src/it/{MJAVADOC-181/application/src/main/java/app/App.java =>
MJAVADOC-437/module2/src/main/java/com/example/bar/Bar.java} (56%)
copy src/it/{MJAVADOC-250 => MJAVADOC-437}/pom.xml (89%)
create mode 100644 src/it/MJAVADOC-437/verify.bsh
rename src/it/{additionnal-dependencies-non-aggregate =>
additional-dependencies-non-aggregate}/invoker.properties (100%)
rename src/it/{additionnal-dependencies-non-aggregate =>
additional-dependencies-non-aggregate}/module1/pom.xml (96%)
rename src/it/{additionnal-dependencies-non-aggregate =>
additional-dependencies-non-aggregate}/module1/src/main/java/edu/jhu/library/HelloWorld.java
(100%)
rename src/it/{additionnal-dependencies-non-aggregate =>
additional-dependencies-non-aggregate}/module1/src/test/java/edu/jhu/library/Mjavadoc180Test.java
(100%)
rename src/it/{additionnal-dependencies-non-aggregate =>
additional-dependencies-non-aggregate}/pom.xml (98%)
rename src/it/{additionnal-dependencies-non-aggregate =>
additional-dependencies-non-aggregate}/verify.bsh (100%)
rename src/it/{additionnal-dependencies =>
additional-dependencies}/invoker.properties (100%)
rename src/it/{additionnal-dependencies =>
additional-dependencies}/module1/pom.xml (97%)
rename src/it/{additionnal-dependencies =>
additional-dependencies}/module1/src/main/java/edu/jhu/library/HelloWorld.java
(100%)
rename src/it/{additionnal-dependencies =>
additional-dependencies}/module1/src/test/java/edu/jhu/library/Mjavadoc180Test.java
(100%)
rename src/it/{additionnal-dependencies => additional-dependencies}/pom.xml
(98%)
rename src/it/{additionnal-dependencies => additional-dependencies}/verify.bsh
(100%)
copy src/{it/site-failOnError/src/main/java/App.java =>
main/java/org/apache/maven/plugin/javadoc/JavadocArchiveConfiguration.java}
(64%)
rename src/site/apt/examples/{additionnal-dependencies.apt.vm =>
additional-dependencies.apt.vm} (82%)
create mode 100644
src/test/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojoTest.java
copy
src/test/java/org/apache/maven/plugin/javadoc/stubs/{JavadocJarDefaultMavenProjectStub.java
=> JavadocJarArchiveConfigProjectStub.java} (75%)
copy
src/test/resources/unit/{javadocjar-default/javadocjar-default-plugin-config.xml
=> javadocjar-archive-config/javadocjar-archive-config.xml} (83%)
copy src/test/resources/unit/{javadocjar-default =>
javadocjar-archive-config}/javadocjar/def/App.java (82%)
--
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
