This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MJAVADOC-792-alternative
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
discard b2008a71 Try
discard e7f4f633 [MJAVADOC-807] Simplify IT for MJAVADOC-498
add 0a850a16 [MJAVADOC-807] Simplify IT for MJAVADOC-498
add d02bb88d Bump org.apache.commons:commons-lang3 from 3.15.0 to 3.16.0
add dbca15ac Bump org.hamcrest:hamcrest-core from 2.2 to 3.0
add 636442b3 Improve ITs
add 7c4b467e Bump org.apache.maven.plugins:maven-plugins from 42 to 43
add a11b9214 [MJAVADOC-809] Align Mojo class names
add 9d339255 [MJAVADOC-784] Upgrade to Doxia 2.0.0 Milestone Stack
add 9638a6a7 [MJAVADOC-785] Align plugin implementation with
AbstractMavenReport (maven-reporting-impl)
add 487e4799 [maven-release-plugin] prepare release
maven-javadoc-plugin-3.10.0
add d9c0002b [maven-release-plugin] prepare for next development iteration
add a424c6b6 [MJAVADOC-810] [REGRESSION] MJAVADOC-791 causes forked Maven
execution fail if any toolchains or settings file isn't present
add 54a76516 Add goal prefix
add ff52cff8 Bump org.apache.commons:commons-lang3 from 3.16.0 to 3.17.0
add 577c2043 Bump org.codehaus.plexus:plexus-io from 3.5.0 to 3.5.1
add a737e166 Bump commons-io:commons-io from 2.16.1 to 2.17.0
add db6d7f6e [MJAVADOC-811] javadoc.bat fails to execute on Windows when
project is not on drive C and AutoRun is configured
add cde7c56b [MJAVADOC-812] [REGRESSION] maven-javadoc-plugin 3.10.0
creates empty JARs
add 091785be [maven-release-plugin] prepare release
maven-javadoc-plugin-3.10.1
add 6e3b1e45 [maven-release-plugin] prepare for next development iteration
add effd6648 [MJAVADOC-816] Bump org.codehaus.plexus:plexus-java from
1.2.0 to 1.3.0 (#322)
add 1b6ec4ac Bump commons-io:commons-io in
/src/it/projects/MJAVADOC-437/module2
add 5775ce13 Fix typo
add ba266c0f Fix SCM tag
add 373172d8 [MJAVADOC-817] Upgrade to Doxia 2.0.0 GA Stack
add 3a90de59 [MJAVADOC-787] Automatic detection of release option for JDK
< 9
add 6c5fdc06 [MJAVADOC-819] Align archive generation code with Maven
Source Plugin
add d37a6d48 Try
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b2008a71)
\
N -- N -- N refs/heads/MJAVADOC-792-alternative (d37a6d48)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
pom.xml | 74 +++---
.../checkstyle-suppressions.xml} | 18 +-
src/it/projects/MJAVADOC-110/verify.bsh | 108 ++++----
src/it/projects/MJAVADOC-126/verify.bsh | 116 ++++-----
src/it/projects/MJAVADOC-172/verify.bsh | 126 +++++-----
src/it/projects/MJAVADOC-180/verify.bsh | 122 ++++-----
src/it/projects/MJAVADOC-181/verify.bsh | 134 +++++-----
src/it/projects/MJAVADOC-194/verify.bsh | 164 ++++++------
src/it/projects/MJAVADOC-257/mymojo/pom.xml | 14 +-
src/it/projects/MJAVADOC-257/pom.xml | 25 +-
src/it/projects/MJAVADOC-262/verify.bsh | 82 +++---
src/it/projects/MJAVADOC-278/verify.bsh | 62 ++---
src/it/projects/MJAVADOC-320/verify.groovy | 96 +++----
src/it/projects/MJAVADOC-365/verify.bsh | 4 +-
src/it/projects/MJAVADOC-384/verify.bsh | 108 ++++----
src/it/projects/MJAVADOC-407/verify.bsh | 62 ++---
src/it/projects/MJAVADOC-414/verify.bsh | 94 +++----
src/it/projects/MJAVADOC-427/verify.groovy | 2 +-
src/it/projects/MJAVADOC-437/module2/pom.xml | 2 +-
src/it/projects/MJAVADOC-437/verify.bsh | 2 +-
.../MJAVADOC-449_aggr_modulepath/verify.groovy | 12 +-
.../projects/MJAVADOC-450_classifier/verify.groovy | 2 +-
.../MJAVADOC-495_offline-filescheme/verify.groovy | 2 +-
src/it/projects/MJAVADOC-497/verify.bsh | 114 ++++-----
.../invoker.properties | 2 +-
.../MJAVADOC-498_mm_modulepath/invoker.properties | 2 +-
.../MJAVADOC-498_modulepath/invoker.properties | 2 +-
.../projects/MJAVADOC-498_modulepath/verify.groovy | 2 +-
.../MJAVADOC-506_excl-module-info/verify.groovy | 8 +-
.../projects/MJAVADOC-555_aggr_mixed/verify.groovy | 12 +-
.../verify.groovy | 4 +-
.../mojo/pom.xml | 8 +-
.../MJAVADOC-569_aggr-mixed/module2/pom.xml | 3 +
src/it/projects/MJAVADOC-569_aggr-mixed/pom.xml | 4 +-
.../MJAVADOC-575_source8-module-info/verify.groovy | 4 +-
.../MJAVADOC-580_detectLinks/verify.groovy | 2 +-
.../projects/MJAVADOC-590_nooverview/verify.groovy | 4 +-
src/it/projects/MJAVADOC-591_release8/pom.xml | 5 -
.../MJAVADOC-592_detectApiLink/verify.groovy | 2 +-
src/it/projects/MJAVADOC-610_mrjar/verify.groovy | 4 +-
.../MJAVADOC-611_dependencyLinks/verify.groovy | 2 +-
.../MJAVADOC-618_modular-war/verify.groovy | 6 +-
.../MJAVADOC-619_copyright-year/verify.groovy | 2 +-
.../MJAVADOC-620_no-dot-in-version/verify.bsh | 6 +-
.../MJAVADOC-620_top-level-package/verify.bsh | 6 +-
.../MJAVADOC-625_addstylesheet/verify.groovy | 2 +-
.../MJAVADOC-639_requires_ignored/verify.groovy | 20 +-
src/it/projects/MJAVADOC-661_mrjar/verify.groovy | 2 +-
src/it/projects/MJAVADOC-770/verify.groovy | 2 +-
.../invoker.properties | 2 +-
.../pom.xml | 12 +-
.../src/main/java/com/foo/MyClass.java | 0
.../invoker.properties | 3 +-
.../{MJAVADOC-767 => MJAVADOC-812}/pom.xml | 21 +-
.../OtherClass.java => MJAVADOC-812/verify.groovy} | 47 ++--
src/it/projects/dependencySource-1/verify.bsh | 102 ++++----
src/it/projects/dependencySource-2/verify.bsh | 102 ++++----
src/it/projects/dependencySource-3/verify.bsh | 102 ++++----
.../MJAVADOC-280-4-projects/pom.xml | 5 -
src/it/projects/dependencySource-4/verify.bsh | 102 ++++----
src/it/projects/detectLinks/verify.bsh | 278 ++++++++++-----------
.../examples/alternate-doclet/verify.groovy | 2 +-
.../examples/exclude-package-names/verify.groovy | 2 +-
src/it/projects/output-encoding/verify.bsh | 126 +++++-----
src/it/projects/reproducible/verify.groovy | 2 +-
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 122 +++------
...vadocJar.java => AggregatorJavadocJarMojo.java} | 2 +-
...cJar.java => AggregatorTestJavadocJarMojo.java} | 2 +-
.../{JavadocJar.java => JavadocJarMojo.java} | 58 ++---
.../maven/plugins/javadoc/JavadocReport.java | 115 ++++-----
.../apache/maven/plugins/javadoc/JavadocUtil.java | 16 +-
.../maven/plugins/javadoc/ResourcesBundleMojo.java | 7 +-
...TestJavadocJar.java => TestJavadocJarMojo.java} | 14 +-
.../maven/plugins/javadoc/TestJavadocReport.java | 59 +----
.../plugins/javadoc/TestResourcesBundleMojo.java | 2 +-
src/site/apt/examples/alternate-doclet.apt.vm | 3 -
src/site/apt/examples/output-configuration.apt.vm | 11 +-
...JavadocJarTest.java => JavadocJarMojoTest.java} | 33 +--
.../maven/plugins/javadoc/JavadocReportTest.java | 17 +-
.../JavadocJarInvalidDestdirMavenProjectStub.java | 81 ------
.../all/pom.xml | 2 +-
.../aggregate-resources-test-plugin-config.xml | 2 +-
.../aggregate-test-plugin-config.xml | 2 +-
.../custom-configuration-plugin-config.xml | 2 +-
.../default-configuration-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 | 2 +-
.../unit/doclet-test/doclet-test-plugin-config.xml | 2 +-
.../file-include-exclude-plugin-config.xml | 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 | 77 ------
.../javadocjar/invalid/destdir/App.java | 50 ----
.../javadocjar/invalid/destdir/AppSample.java | 45 ----
.../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 +-
.../optionsumlautencoding-test-plugin-config.xml | 2 +-
.../unit/pom-test/pom-test-plugin-config.xml | 2 +-
.../unit/proxy-test/proxy-test-plugin-config.xml | 2 +-
.../quotedpath-test-plugin-config.xml | 2 +-
.../resources-test-plugin-config.xml | 2 +-
.../resources-with-excludes-test-plugin-config.xml | 2 +-
.../unit/stale-test/stale-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 | 2 +-
.../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 | 51 ----
...rong-locale-with-variant-test-plugin-config.xml | 2 +-
123 files changed, 1473 insertions(+), 1939 deletions(-)
copy
src/{test/resources/unit/doclet-path-test/artifact-doclet/umlgraph/UMLGraph-bis/2.1/UMLGraph-bis-2.1.pom
=> config/checkstyle-suppressions.xml} (65%)
copy src/it/projects/{MJAVADOC-444 => MJAVADOC-787}/invoker.properties (95%)
copy src/it/projects/{MJAVADOC-704_toolchains => MJAVADOC-787}/pom.xml (90%)
copy src/it/projects/{MJAVADOC-506_excl-module-info =>
MJAVADOC-787}/src/main/java/com/foo/MyClass.java (100%)
copy src/it/projects/{MJAVADOC-642 => MJAVADOC-812}/invoker.properties (96%)
copy src/it/projects/{MJAVADOC-767 => MJAVADOC-812}/pom.xml (74%)
copy
src/it/projects/{MJAVADOC-498_aggr_modulepath/bar/src/main/java/com/bar/OtherClass.java
=> MJAVADOC-812/verify.groovy} (89%)
rename
src/main/java/org/apache/maven/plugins/javadoc/{AggregatorJavadocJar.java =>
AggregatorJavadocJarMojo.java} (96%)
rename
src/main/java/org/apache/maven/plugins/javadoc/{AggregatorTestJavadocJar.java
=> AggregatorTestJavadocJarMojo.java} (96%)
rename src/main/java/org/apache/maven/plugins/javadoc/{JavadocJar.java =>
JavadocJarMojo.java} (86%)
rename src/main/java/org/apache/maven/plugins/javadoc/{TestJavadocJar.java =>
TestJavadocJarMojo.java} (92%)
rename src/test/java/org/apache/maven/plugins/javadoc/{JavadocJarTest.java =>
JavadocJarMojoTest.java} (90%)
delete mode 100644
src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java
delete mode 100644
src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml
delete mode 100644
src/test/resources/unit/javadocjar-invalid-destdir/javadocjar/invalid/destdir/App.java
delete mode 100644
src/test/resources/unit/javadocjar-invalid-destdir/javadocjar/invalid/destdir/AppSample.java
delete mode 100644
src/test/resources/unit/validate-options-test/wrong-locale-test-plugin-config.xml
