This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MSHARED-1327
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
discard 730e1df0 PoC: Change outputDirectory default
discard 99d4d646 Align plugin with AbstractMavenReport
discard 97187938 Prepare for Doxia 2.0.0
add 867dc73c [MJAVADOC-781] Upgrade plugins and components (in ITs)
add 488624f0 [MJAVADOC-782] Align read-only parameters naming with other
plugins
add b47b280e directory, not folder
add b69af902 [MJAVADOC-682] Reactor builds fail when multiple modules with
same groupId:artifactId, but different versions
add 8205008d [maven-release-plugin] prepare release
maven-javadoc-plugin-3.6.3
add 30add45c [maven-release-plugin] prepare for next development iteration
add 1417c622 Prepare for Doxia 2.0.0
add c79769af Align plugin with AbstractMavenReport
new eaa33085 MSHARED-1327
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 (730e1df0)
\
N -- N -- N refs/heads/MSHARED-1327 (eaa33085)
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.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 43 ++--
src/it/projects/MJAVADOC-110/pom.xml | 150 ++++++-------
src/it/projects/MJAVADOC-126/pom.xml | 102 ++++-----
src/it/projects/MJAVADOC-137_jar/pom.xml | 124 +++++------
src/it/projects/MJAVADOC-172/pom.xml | 144 ++++++-------
src/it/projects/MJAVADOC-180/pom.xml | 186 ++++++++--------
src/it/projects/MJAVADOC-181/application/pom.xml | 104 ++++-----
src/it/projects/MJAVADOC-181/library/pom.xml | 124 +++++------
src/it/projects/MJAVADOC-181/pom.xml | 166 +++++++--------
src/it/projects/MJAVADOC-194/pom.xml | 190 ++++++++---------
src/it/projects/MJAVADOC-250/pom.xml | 100 ++++-----
src/it/projects/MJAVADOC-257/pom.xml | 218 +++++++++----------
src/it/projects/MJAVADOC-259/pom.xml | 160 +++++++-------
src/it/projects/MJAVADOC-262/pom.xml | 190 ++++++++---------
src/it/projects/MJAVADOC-275/pom.xml | 137 ++++++------
src/it/projects/MJAVADOC-278/pom.xml | 170 +++++++--------
src/it/projects/MJAVADOC-320/pom.xml | 112 +++++-----
src/it/projects/MJAVADOC-369/pom.xml | 6 +-
src/it/projects/MJAVADOC-384/pom.xml | 2 +-
src/it/projects/MJAVADOC-407/pom.xml | 142 ++++++-------
src/it/projects/MJAVADOC-414/pom.xml | 2 +-
src/it/projects/MJAVADOC-427/pom.xml | 2 +-
src/it/projects/MJAVADOC-437/pom.xml | 2 +-
src/it/projects/MJAVADOC-444/pom.xml | 6 +-
.../MJAVADOC-449_aggr_modulepath/modulea/pom.xml | 22 +-
.../MJAVADOC-449_aggr_modulepath/moduleb/pom.xml | 24 +--
src/it/projects/MJAVADOC-497/pom.xml | 4 +-
.../projects/MJAVADOC-498_aggr_modulepath/pom.xml | 2 +-
src/it/projects/MJAVADOC-498_mm_modulepath/pom.xml | 2 +-
src/it/projects/MJAVADOC-498_modulepath/pom.xml | 144 ++++++-------
.../projects/MJAVADOC-506_excl-module-info/pom.xml | 6 +-
src/it/projects/MJAVADOC-508/pom.xml | 98 ++++-----
.../javadoc-child/pom.xml | 36 ++--
.../projects/MJAVADOC-526_aggr-managedDeps/pom.xml | 22 +-
src/it/projects/MJAVADOC-528/pom.xml | 110 +++++-----
.../MJAVADOC-555_aggr_mixed/module1/pom.xml | 14 +-
.../MJAVADOC-555_aggr_mixed/module2/pom.xml | 6 +-
src/it/projects/MJAVADOC-555_aggr_mixed/pom.xml | 6 +-
.../MJAVADOC-555_link-automatic-modules/pom.xml | 4 +-
.../module/pom.xml | 4 +-
src/it/projects/MJAVADOC-562_release/pom.xml | 2 +-
.../MJAVADOC-567_aggr-mixed/module1/pom.xml | 14 +-
src/it/projects/MJAVADOC-567_aggr-mixed/pom.xml | 6 +-
.../projects/MJAVADOC-567_aggr-mixed/verify.groovy | 2 +-
.../module1/pom.xml | 16 +-
.../module2/pom.xml | 130 ++++++------
.../MJAVADOC-568_export-to-testcase/pom.xml | 4 +-
.../MJAVADOC-568_jar-mixed/module2/pom.xml | 4 +-
.../MJAVADOC-568_manifest-splitpackage/pom.xml | 12 +-
.../MJAVADOC-569_aggr-mixed/module2/pom.xml | 8 +-
src/it/projects/MJAVADOC-569_aggr-mixed/pom.xml | 4 +-
.../module1/pom.xml | 16 +-
.../module2/pom.xml | 30 +--
.../MJAVADOC-571_aggr-empty-sourcepaths/pom.xml | 60 +++---
.../MJAVADOC-575_source8-module-info/pom.xml | 4 +-
src/it/projects/MJAVADOC-580_detectLinks/pom.xml | 4 +-
src/it/projects/MJAVADOC-591_release8/pom.xml | 6 +-
src/it/projects/MJAVADOC-592_detectApiLink/pom.xml | 2 +-
src/it/projects/MJAVADOC-610_mrjar/pom.xml | 4 +-
src/it/projects/MJAVADOC-618_modular-war/pom.xml | 2 +-
.../MJAVADOC-620_top-level-package/pom.xml | 4 +-
src/it/projects/MJAVADOC-625_addstylesheet/pom.xml | 20 +-
.../MJAVADOC-634-module-testreports/pom.xml | 2 +-
.../modulea/pom.xml | 64 +++---
.../moduleb/pom.xml | 64 +++---
.../modulec/pom.xml | 92 ++++----
.../projects/MJAVADOC-639_requires_ignored/pom.xml | 24 +--
.../MJAVADOC-639_requires_ignored/verify.groovy | 4 +-
src/it/projects/MJAVADOC-661_mrjar/pom.xml | 4 +-
.../MJAVADOC-677_require-static-transitive/pom.xml | 4 +-
src/it/projects/MJAVADOC-679_encoding/pom.xml | 2 +-
.../invoker.properties | 1 +
.../b/c/d2 => MJAVADOC-682/module-1}/pom.xml | 7 +-
.../module-1/src/main/java/com}/foo/Bar.java | 6 +-
.../module-1}/src/main/java/module-info.java | 10 +-
.../b/c/d1 => MJAVADOC-682/module-2}/pom.xml | 7 +-
.../module-2/src/main/java/com}/foo/Bar.java | 6 +-
.../module-2}/src/main/java/module-info.java | 10 +-
.../pom.xml | 31 ++-
src/it/projects/MJAVADOC-704_toolchains/pom.xml | 2 +-
src/it/projects/MJAVADOC-769/pom.xml | 2 +-
src/it/projects/MJAVADOC-770/pom.xml | 2 +-
.../additional-dependencies-non-aggregate/pom.xml | 4 +-
src/it/projects/additional-dependencies/pom.xml | 4 +-
.../MJAVADOC-280-1-distro/pom.xml | 144 ++++++-------
src/it/projects/dependencySource-1/pom.xml | 140 ++++++------
.../MJAVADOC-280-2-distro/pom.xml | 162 +++++++-------
.../MJAVADOC-280-2-projects/pom.xml | 150 ++++++-------
src/it/projects/dependencySource-3/pom.xml | 146 ++++++-------
.../MJAVADOC-280-4-distro/pom.xml | 156 +++++++-------
.../MJAVADOC-280-4-projects/pom.xml | 202 +++++++++---------
src/it/projects/dependencySource-4/pom.xml | 234 ++++++++++-----------
src/it/projects/detectLinks/pom.xml | 180 ++++++++--------
src/it/projects/javadoc-fix/pom.xml | 120 +++++------
src/it/projects/output-encoding/pom.xml | 112 +++++-----
src/it/projects/site-failOnError/pom.xml | 170 +++++++--------
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 25 +--
.../maven/plugins/javadoc/JavadocModule.java | 14 +-
.../apache/maven/plugins/javadoc/JavadocUtil.java | 4 +-
.../maven/plugins/javadoc/ResourcesBundleMojo.java | 2 +-
.../plugins/javadoc/resolver/ResourceResolver.java | 16 +-
src/site/apt/examples/aggregate.apt.vm | 12 +-
.../javadoc/AggregatorJavadocReportTest.java | 8 +-
...nSubDirectoryProject1TestMavenProjectStub.java} | 8 +-
...nSubDirectoryProject2TestMavenProjectStub.java} | 8 +-
...gateNotInSubDirectoryTestMavenProjectStub.java} | 8 +-
.../all/pom.xml | 19 +-
.../project1/pom.xml | 62 +++---
.../project1/src/main/java/test1/Hello.java | 0
.../project2/pom.xml | 64 +++---
.../project2/src/main/java/test2/World.java | 0
.../unit/stale-test/stale-test-plugin-config.xml | 2 +-
112 files changed, 2999 insertions(+), 2961 deletions(-)
copy src/it/projects/{MJAVADOC-591_release8 =>
MJAVADOC-682}/invoker.properties (97%)
copy src/it/projects/{MJAVADOC-134_multiaggregate/b/c/d2 =>
MJAVADOC-682/module-1}/pom.xml (86%)
copy src/it/projects/{MJAVADOC-634-module-testreports/src/main/java =>
MJAVADOC-682/module-1/src/main/java/com}/foo/Bar.java (92%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath/foo =>
MJAVADOC-682/module-1}/src/main/java/module-info.java (96%)
copy src/it/projects/{MJAVADOC-134_multiaggregate/b/c/d1 =>
MJAVADOC-682/module-2}/pom.xml (86%)
copy src/it/projects/{MJAVADOC-634-module-testreports/src/main/java =>
MJAVADOC-682/module-2/src/main/java/com}/foo/Bar.java (92%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath/foo =>
MJAVADOC-682/module-2}/src/main/java/module-info.java (96%)
copy src/it/projects/{MJAVADOC-679_encoding => MJAVADOC-682}/pom.xml (70%)
rename
src/test/java/org/apache/maven/plugins/javadoc/stubs/{AggregateNotInSubFolderProject1TestMavenProjectStub.java
=> AggregateNotInSubDirectoryProject1TestMavenProjectStub.java} (76%)
rename
src/test/java/org/apache/maven/plugins/javadoc/stubs/{AggregateNotInSubFolderProject2TestMavenProjectStub.java
=> AggregateNotInSubDirectoryProject2TestMavenProjectStub.java} (76%)
rename
src/test/java/org/apache/maven/plugins/javadoc/stubs/{AggregateNotInSubFolderTestMavenProjectStub.java
=> AggregateNotInSubDirectoryTestMavenProjectStub.java} (79%)
rename src/test/resources/unit/{aggregate-modules-not-in-subfolders-test =>
aggregate-modules-not-in-subdirectories-test}/all/pom.xml (79%)
rename src/test/resources/unit/{aggregate-modules-not-in-subfolders-test =>
aggregate-modules-not-in-subdirectories-test}/project1/pom.xml (86%)
rename src/test/resources/unit/{aggregate-modules-not-in-subfolders-test =>
aggregate-modules-not-in-subdirectories-test}/project1/src/main/java/test1/Hello.java
(100%)
rename src/test/resources/unit/{aggregate-modules-not-in-subfolders-test =>
aggregate-modules-not-in-subdirectories-test}/project2/pom.xml (86%)
rename src/test/resources/unit/{aggregate-modules-not-in-subfolders-test =>
aggregate-modules-not-in-subdirectories-test}/project2/src/main/java/test2/World.java
(100%)
