This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to branch master in repository maven-javadoc-plugin.
commit 56cb804fc0be5596c22bfa69ce9d6cc13a906e1c Merge: e45a690 52f0157 Author: Miguel Landaeta <[email protected]> Date: Tue Aug 22 20:38:53 2017 +0100 Merge tag 'upstream/3.0.0_M1' Upstream version 3.0.0~M1 # gpg: Signature made Tue 22 Aug 2017 08:38:43 PM IST # gpg: using RSA key 0xAFB8E0FC9231CC6D # gpg: Good signature from "Miguel Landaeta <[email protected]>" [full] # gpg: aka "Miguel Landaeta <[email protected]>" [full] # gpg: aka "Miguel Landaeta (LDC) <[email protected]>" [full] # gpg: aka "Miguel Landaeta (Debian) <[email protected]>" [full] # Primary key fingerprint: 4CB7 FE1E 280E CC90 F29A 597E 6E60 8B63 7D89 67E9 # Subkey fingerprint: 1247 379C 15BC F26C 0EC4 6B61 AFB8 E0FC 9231 CC6D pom.xml | 192 +- src/it/MJAVADOC-126/pom.xml | 14 - src/it/MJAVADOC-137/pom.xml | 13 - src/it/MJAVADOC-172/pom.xml | 18 +- src/it/MJAVADOC-180/invoker.properties | 2 +- src/it/MJAVADOC-180/pom.xml | 9 +- .../application/src/main/java/app/App.java | 6 +- .../library/module-a/src/main/java/aaa/App.java | 6 +- .../library/module-b/src/main/java/bbb/App.java | 6 +- src/it/MJAVADOC-181/pom.xml | 4 +- src/it/MJAVADOC-194/module1/pom.xml | 2 +- src/it/MJAVADOC-194/module2/pom.xml | 2 +- src/it/MJAVADOC-262/pom.xml | 2 +- .../src/main/java/com/mycompany/myapp/App.java | 2 +- src/it/MJAVADOC-365/pom.xml | 2 +- .../dependencySource-3/MJAVADOC-280-3-modA/pom.xml | 4 +- .../apache/maven/plugins/mjavadoc/it/moda/App.java | 4 +- .../dependencySource-3/MJAVADOC-280-3-modB/pom.xml | 4 +- .../apache/maven/plugins/mjavadoc/it/modb/App.java | 4 +- .../apache/maven/plugins/mjavadoc/it/moda/App.java | 4 +- .../apache/maven/plugins/mjavadoc/it/modb/App.java | 4 +- .../MJAVADOC-280-4-projects/pom.xml | 4 +- src/it/detectLinks/pom.xml | 6 +- src/it/site-failOnError/pom.xml | 12 + .../javadoc/resolver/ProjectArtifactFilter.java | 66 - .../javadoc/AbstractFixJavadocMojo.java | 7503 ++++++------ .../javadoc/AbstractJavadocMojo.java | 12046 +++++++++---------- .../javadoc/AdditionalDependency.java | 64 +- .../javadoc/AggregatorJavadocJar.java | 88 +- .../javadoc/AggregatorJavadocReport.java | 87 +- .../javadoc/AggregatorTestJavadocJar.java | 88 +- .../javadoc/AggregatorTestJavadocReport.java | 87 +- .../javadoc/FixJavadocMojo.java | 84 +- .../javadoc/JavadocArchiveConfiguration.java | 2 +- .../{plugin => plugins}/javadoc/JavadocJar.java | 622 +- .../javadoc/JavadocNoForkReport.java | 2 +- .../{plugin => plugins}/javadoc/JavadocReport.java | 687 +- .../{plugin => plugins}/javadoc/JavadocUtil.java | 3692 +++--- .../maven/plugins/javadoc/JavadocVersion.java | 87 + .../javadoc/ResourcesBundleMojo.java | 290 +- .../javadoc/TestFixJavadocMojo.java | 158 +- .../javadoc/TestJavadocJar.java | 453 +- .../javadoc/TestJavadocNoForkReport.java | 2 +- .../javadoc/TestJavadocReport.java | 720 +- .../javadoc/TestResourcesBundleMojo.java | 134 +- .../javadoc/resolver/JavadocBundle.java | 124 +- .../javadoc/resolver/ResourceResolver.java | 942 +- .../javadoc/resolver/SourceResolverConfig.java | 414 +- .../maven/{plugin => plugins}/javadoc/package.html | 1744 +-- src/main/mdo/javadocOptions.mdo | 2 +- src/main/resources/javadoc-report.properties | 4 +- src/main/resources/javadoc-report_de.properties | 4 +- src/main/resources/javadoc-report_fr.properties | 4 +- src/main/resources/javadoc-report_nl.properties | 4 +- src/main/resources/javadoc-report_sv.properties | 4 +- .../{plugin => plugins}/javadoc/css/stylesheet.css | 128 +- .../javadoc/frame-injection-fix.txt | 72 +- .../javadoc/java-api-package-list-1.3 | 0 .../javadoc/java-api-package-list-1.4 | 0 .../javadoc/java-api-package-list-1.5 | 0 .../javadoc/java-api-package-list-1.6 | 0 .../javadoc/java-api-package-list-1.7 | 0 .../javadoc/java-api-package-list-1.8 | 0 src/main/resources/test-javadoc-report.properties | 4 +- .../resources/test-javadoc-report_de.properties | 4 +- .../resources/test-javadoc-report_fr.properties | 4 +- .../resources/test-javadoc-report_nl.properties | 4 +- .../resources/test-javadoc-report_sv.properties | 4 +- src/site/apt/index.apt.vm | 4 +- src/site/fml/faq.fml | 2 +- .../javadoc/AbstractFixJavadocMojoTest.java | 5 +- .../javadoc/AbstractJavadocMojoTest.java | 5 +- .../javadoc/AggregatorJavadocReportTest.java | 238 + .../javadoc/FixJavadocMojoTest.java | 1493 +-- .../javadoc/JavadocJarTest.java | 372 +- .../javadoc/JavadocReportTest.java | 2406 ++-- .../javadoc/JavadocUtilTest.java | 1247 +- .../maven/plugins/javadoc/JavadocVersionTest.java | 69 + .../{plugin => plugins}/javadoc/ProxyServer.java | 482 +- .../javadoc/TestJavadocReportTest.java | 111 +- .../AggregateProject1TestMavenProjectStub.java | 144 +- .../AggregateProject2TestMavenProjectStub.java | 144 +- ...egateResourcesProject1TestMavenProjectStub.java | 154 +- ...egateResourcesProject2TestMavenProjectStub.java | 154 +- .../AggregateResourcesTestMavenProjectStub.java | 142 +- .../stubs/AggregateTestMavenProjectStub.java | 166 +- .../stubs/CustomConfigurationMavenProjectStub.java | 206 +- .../javadoc/stubs/DefaultArtifactHandlerStub.java | 102 +- .../DefaultConfigurationMavenProjectStub.java | 162 +- .../stubs/DocfilesTestMavenProjectStub.java | 164 +- .../DocfilesWithJavaTestMavenProjectStub.java | 120 +- .../stubs/DocletPathTestMavenProjectStub.java | 162 +- .../javadoc/stubs/DocletTestMavenProjectStub.java | 164 +- .../javadoc/stubs/FixJdk5MavenProjectStub.java | 200 +- .../javadoc/stubs/FixJdk6MavenProjectStub.java | 200 +- .../javadoc/stubs/FixMavenProjectStub.java | 200 +- .../stubs/HeaderFooterTestMavenProjectStub.java | 124 +- .../javadoc/stubs/HelpFileMavenProjectStub.java | 164 +- .../stubs/JavadocJarArchiveConfigProjectStub.java | 2 +- .../stubs/JavadocJarDefaultMavenProjectStub.java | 176 +- .../JavadocJarFailOnErrorMavenProjectStub.java | 2 +- .../JavadocJarInvalidDestdirMavenProjectStub.java | 176 +- .../javadoc/stubs/JavadocPluginArtifactStub.java | 286 +- .../javadoc/stubs/Jdk5TestMavenProjectStub.java | 162 +- .../javadoc/stubs/Jdk6TestMavenProjectStub.java | 162 +- .../javadoc/stubs/NewlineTestMavenProjectStub.java | 124 +- .../javadoc/stubs/PomMavenProjectStub.java | 140 +- .../javadoc/stubs/ProxyTestMavenProjectStub.java | 175 +- .../javadoc/stubs/QuotedPathMavenProjectStub.java | 162 +- .../stubs/ResourcesTestMavenProjectStub.java | 124 +- .../ResourcesWithExcludesTestMavenProjectStub.java | 124 +- .../javadoc/stubs/SettingsStub.java | 108 +- ...dDocletConflictOptionsTestMavenProjectStub.java | 124 +- .../stubs/StylesheetFileMavenProjectStub.java | 164 +- .../stubs/SubpackagesTestMavenProjectStub.java | 162 +- .../javadoc/stubs/TagTestMavenProjectStub.java | 124 +- .../stubs/TagletArtifactsMavenProjectStub.java | 160 +- .../javadoc/stubs/TagletTestMavenProjectStub.java | 162 +- .../javadoc/stubs/TestJavadocMavenProjectStub.java | 176 +- .../WrongEncodingOptionsTestMavenProjectStub.java | 124 +- .../aggregate-resources-test-plugin-config.xml | 7 +- .../aggregate-test-plugin-config.xml | 7 +- .../custom-configuration-plugin-config.xml | 6 +- .../default-configuration-plugin-config.xml | 2 +- .../exception-test-plugin-config.xml | 2 +- .../docfiles-test/docfiles-test-plugin-config.xml | 2 +- .../docfiles-with-java-test-plugin-config.xml | 2 +- .../doclet-path-test-plugin-config.xml | 3 +- .../unit/doclet-test/doclet-test-plugin-config.xml | 3 +- .../file-include-exclude-plugin-config.xml | 2 +- src/test/resources/unit/fix-jdk5-test/pom.xml | 2 +- .../unit/fix-jdk5-test/1.0/fix-jdk5-test-1.0.pom | 2 +- src/test/resources/unit/fix-jdk6-test/pom.xml | 2 +- .../unit/fix-jdk6-test/1.0/fix-jdk6-test-1.0.pom | 2 +- src/test/resources/unit/fix-test/pom.xml | 2 +- .../unit/fix-test/1.0/fix-test-1.0.pom | 2 +- .../header-footer-test-plugin-config.xml | 2 +- .../1.0-SNAPSHOT/helpfile-test-1.0-SNAPSHOT.pom | 2 +- src/test/resources/unit/helpfile-test/pom.xml | 2 +- .../javaHome-test/javaHome-test-plugin-config.xml | 2 +- .../javadocjar-archive-config.xml | 2 +- .../javadocjar-default-plugin-config.xml | 2 +- .../javadocjar-failonerror-plugin-config.xml | 2 +- .../javadocjar-invalid-destdir-plugin-config.xml | 2 +- .../unit/jdk5-test/jdk5-test-plugin-config.xml | 2 +- .../unit/jdk6-test/jdk6-test-plugin-config.xml | 2 +- .../newline-test/newline-test-plugin-config.xml | 2 +- .../unit/pom-test/pom-test-plugin-config.xml | 2 +- .../unit/proxy-test/proxy-test-plugin-config.xml | 4 +- .../quotedpath-test-plugin-config.xml | 2 +- .../resources-test-plugin-config.xml | 2 +- .../resources-with-excludes-test-plugin-config.xml | 2 +- .../stylesheetfile-test-1.0-SNAPSHOT.pom | 2 +- .../resources/unit/stylesheetfile-test/pom.xml | 2 +- .../subpackages-test-plugin-config.xml | 2 +- .../unit/tag-test/tag-test-plugin-config.xml | 2 +- .../unit/taglet-test/taglet-test-plugin-config.xml | 3 +- .../tagletArtifacts-test-plugin-config.xml | 2 +- .../test-javadoc-test-plugin-config.xml | 2 +- .../conflict-options-test-plugin-config.xml | 2 +- .../wrong-charset-test-plugin-config.xml | 2 +- .../wrong-docencoding-test-plugin-config.xml | 2 +- .../wrong-encoding-test-plugin-config.xml | 2 +- .../wrong-locale-test-plugin-config.xml | 2 +- ...rong-locale-with-variant-test-plugin-config.xml | 2 +- 165 files changed, 21740 insertions(+), 21548 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
