You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/12/29 14:26:38 UTC
[maven-javadoc-plugin] branch MJAVADOC-444 updated (daced8d ->
d3b3453)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MJAVADOC-444
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.
discard daced8d [MJAVADOC-444] - Add an 'aggregated-no-fork' goal o add aggregate-no-fork and aggregate-test-no-fork for non-forking versions of aggregate goals.
add b49d947 [MJAVADOC-571] Upgrade plexus-java to 0.9.7
add e637834 [MJAVADOC-515] - Upgrade parent to 31 o Fixed checkstyle issues related to upgrade.
add d955df5 [MJAVADOC-519] - IT detectLinks fails on Windows
add e4a55bb Upgrade maven-surefire-plugin
add 7c75ad5 [MJAVADOC-512] - Even when <javadocVersion>1.8.0</javadocVersion> matches there still is a warning.
add c611330 [MJAVADOC-512] - Even when <javadocVersion>1.8.0</javadocVersion> matches there still is a warning.
add 84a1e6b [MNGSITE-332] - Changed download templates of plugins not to reference .md5 anymore
add 86aa561 Skip Java 10 due to com.sun.tools.doclets removal in Java 10 which causes failing tests, must be fixed later
add 8e47dca [MJAVADOC-520] Upgrade dependencies
add 3df4a85 [MJAVADOC-521] - Added github information.
add 41a8475 Fix javadoc errors
add e00b87b [maven-release-plugin] prepare release maven-javadoc-plugin-3.0.1
add e7da1a4 [maven-release-plugin] prepare for next development iteration
add e2e0316 [INFRA-16467] move components documentation out of CMS space
add 976b8d2 [MJAVADOC-530] - Clean up additionalparam documentation
add 4e95ecf Merge pull request #6 from marschall/MJAVADOC-530
add 65bdf55 Switch to asfMavenTlp set https.protocols for Java 7
add 5410f11 Fix JenkinsFile
add dc510d2 Fix unittests which depend on connection with Central :(
add 3ccb3cc [MJAVADOC-532] <link> entries that do not redirect are ignored
add 407343b [MJAVADOC-533] <link> entries that point to a resource that requires an Accept header may be ignored
add 42225cc Fix IT failures on CI
add b651443 [MJAVADOC-528] Invalid 'expires' attribute
add 033ce3a [MJAVADOC-535] Upgrade to parent pom 32
add ea927bf [MNGSITE-341] use https for sigs, hashes and KEYS
add 49c6fbf [MPOM-205] use sha512 checksums instead of sha1
add 9f74de2 upgraded parent POM from 32 to 33
add b4d77c2 upgrade to plexus-java 0.9.11
add 972fbbc revert upgrade plexus-java because enforcer complains.
add c05e8dc [MJAVADOC-538] Filter out 'Picked up'
add 631a84e [MJAVADOC-538] Filter out 'Picked up'
add b78042e [MJAVADOC-542] Unsupported class file major version 55 [MJAVADOC-534] Support element-list links from java10 dependencies
add 1a213f3 [MJAVADOC-449] javadoc:aggregate fails with JDK 9
add 2138b05 [MJAVADOC-506] Javadoc plugin broken on Java 8 when module-info.java present
add e75d946 Cleanup code using java 7 features
add 9ada711 Fix checkstyle reported errors
add fa5dd05 [MJAVADOC-546] Allow to generate report in Spanish locale
add ffa9973 [MJAVADOC-546] Allow to generate report in Spanish locale
add 1062206 Explicitly the batchMode to true
add 3dcf135 [MJAVADOC-537] warning when javadoc is invoked for dependency
add 5d56087 fix mailing list url in README
add 8d4d7dc fix mailing list url in README
add dee1993 [MJAVADOC-514] Maven Javadoc Plugin can't get dependency from third party maven repository
add 85729d5 [MJAVADOC-445] JavadocOptionsXpp3Reader doesn't deserialize the placement element in Tag
add 5a6489a [MJAVADOC-544] - Changed behaviour of Javadoc for options file encoding
add b9ec67b [MJAVADOC-544] Changed behaviour of Javadoc for temporary files encoding (options, argfile, ...)
add 936cf7d [MJAVADOC-548] Directoryname mixed up with excludePackageNames
add aceadd7 [MJAVADOC-543] Archiving to jar is very slow Update plexus-io to 3.1.1
add 69ec690 [MJAVADOC-495] links option ignored in offline mode, even for local links
add 06407e3 [MJAVADOC-513] Aggregate: make order of classpath entries predictable
add 30daf28 [MJAVADOC-434] Running javadoc:fix corrupts files
add 28db4b0 [MJAVADOC-420] javadoc:fix duplicates lines
add a77f5e2 [MJAVADOC-134] Support aggregated reports at each level in the multi-module hierarchy
add 7f02059 [MJAVADOC-526] aggregate goal doesn't respect managed dependencies
add 45cfa34 Add plexus-utils-3.1.1 to maven-plugin-plugin to prevent a NoSuchElementException with JDK7
add bbecee4 [MJAVADOC-551] Error if path to project contains a spaces
add 5ed9837 Don't fail if module source path already exists. Improved error message if IOException is thrown (added chained exception).
add 07f7834 [MJAVADOC-554] Running javadoc:aggregate twice throws MavenReportException
add e6fa5ce [MJAVADOC-556] javadoc:aggregate fails with "No source files for package" for packages that are not exported
add b9d08e9 Refactor Strings to Paths
add 4cb073c Clarify handling of additionalOptions
add 5bb92b7 [MJAVADOC-452] Support duplicate @param entries
add 8e6622f Push version to 3.1.0
add 9e86675 [MJAVADOC-552] Author tag is removed
add a65044b Remove @version $Id:
add 1b7d362 [MJAVADOC-558] Change default value for removeUnknownThrows to true
add 0f0f9d4 [MJAVADOC-557] Deprecate parameter includeTransitiveDependencySources
new d3b3453 [MJAVADOC-444] - Add an 'aggregated-no-fork' goal o add aggregate-no-fork and aggregate-test-no-fork for non-forking versions of aggregate goals.
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 (daced8d)
\
N -- N -- N refs/heads/MJAVADOC-444 (d3b3453)
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:
.gitignore | 2 +
CONTRIBUTING.md | 91 +++
Jenkinsfile | 2 +-
README.md | 99 +++
pom.xml | 94 ++-
.../apache/maven/plugins/javadoc/its/Doclet.class | Bin 0 -> 673 bytes
.../mrm/3rdparty/{lib-1.0.pom => doclet-1.0.pom} | 54 +-
.../b/c/d1}/pom.xml | 15 +-
.../b/c/d1/src/main/java/a/b/c/d/D1.java | 9 +-
.../b/c/d2}/pom.xml | 15 +-
.../b/c/d2/src/main/java/a/b/c/d/D2.java | 9 +-
.../b/c}/pom.xml | 21 +-
.../b/e}/pom.xml | 15 +-
.../b/e/src/main/java/a/b/e/E.java | 9 +-
.../foo => MJAVADOC-134_multiaggregate/b}/pom.xml | 19 +-
.../foo => MJAVADOC-134_multiaggregate/f}/pom.xml | 15 +-
.../f/src/main/java/a/f/F.java | 8 +-
.../invoker.properties | 2 +-
.../pom.xml | 61 +-
.../MJAVADOC-134_multiaggregate/verify.groovy | 60 ++
src/it/projects/MJAVADOC-257/invoker.properties | 2 +
.../com/foo/bar/internal/{NotApi.java => Api.java} | 4 +-
src/it/projects/MJAVADOC-384/verify.bsh | 16 +-
.../invoker.properties | 2 +-
.../pom.xml | 51 +-
.../src/main/java/com/example/FirstBug.java} | 68 +-
.../verify.groovy | 5 +-
src/it/projects/MJAVADOC-427/verify.groovy | 2 +-
.../invoker.properties | 2 +-
.../pom.xml | 51 +-
.../src/main/java/test/A.java} | 60 +-
.../src/main/java/test/B.java | 98 +++
.../src/main/java/test/C.java | 88 +++
.../src/main/java/test/HttpRSSEState.java} | 57 +-
.../invoker.properties | 7 +-
.../modulea}/pom.xml | 78 +-
.../com/javamodularity/modulea/HelloWorld.java} | 24 +-
.../modulea/src/main/java/module-info.java} | 48 +-
.../moduleb}/pom.xml | 78 +-
.../com/javamodularity/moduleb/HelloWorld.java} | 24 +-
.../moduleb/src/main/java/module-info.java} | 48 +-
.../pom.xml | 81 +--
.../MJAVADOC-449_aggr_modulepath/verify.groovy | 38 +
.../invoker.properties | 36 +-
.../pom.xml | 53 +-
.../src/main/java/com/example/FirstBug.java} | 68 +-
.../verify.groovy} | 14 +-
.../invoker.properties | 37 +-
.../MJAVADOC-495_offline-filescheme/package-list | 1 +
.../pom.xml | 98 +--
.../src/main/java/foo/Bar.java} | 9 +-
.../verify.groovy} | 57 +-
src/it/projects/MJAVADOC-497/pom.xml | 2 +-
src/it/projects/MJAVADOC-497/verify.bsh | 17 +-
.../pom.xml | 147 ++--
.../src/main/java/com/foo/MyClass.java | 50 +-
.../src/main/java/module-info.java | 42 +-
.../verify.groovy} | 22 +-
.../invoker.properties | 0
.../pom.xml | 32 +-
.../src/main/java/foo/bar/ALotOfLinkTags.java} | 14 +-
.../invoker.properties | 2 +-
.../javadoc-child}/pom.xml | 97 +--
.../com/leokom/javadoc/JavadocMavenBugDemo.java} | 66 +-
.../pom.xml | 88 +--
.../invoker.properties | 0
.../{MJAVADOC-508 => MJAVADOC-528}/pom.xml | 12 +-
.../src/main/java/foo/bar}/MyClass.java | 3 +-
.../verify.groovy | 42 +-
.../invoker.properties | 0
.../{MJAVADOC-508 => MJAVADOC-538}/pom.xml | 28 +-
.../src/main/java/foo/bar}/MyClass.java | 3 +-
.../invoker.properties} | 34 +-
.../{MJAVADOC-250 => MJAVADOC-551 spaces}/pom.xml | 96 +--
.../src/main/java/fix/test/App.java | 92 +--
.../invoker.properties | 36 +-
.../pom.xml | 95 ++-
.../src/main/java/com/example/FirstBug.java} | 66 +-
.../verify.groovy} | 19 +-
.../invoker.properties | 37 +-
.../module}/pom.xml | 83 ++-
.../module/src/main/java/module-info.java | 9 +-
.../module/src/main/java/package1/Main1.java} | 46 +-
.../module/src/main/java/package2/Main2.java} | 46 +-
.../pom.xml | 103 ++-
.../invoker.properties | 36 +-
.../pom.xml | 53 +-
.../src/main/java/com/example/FirstBug.java} | 68 +-
.../verify.groovy | 8 +-
.../MJAVADOC-280-2-projects/pom.xml | 5 +
.../MJAVADOC-280-4-projects/pom.xml | 5 +
src/it/projects/detectLinks/pom.xml | 5 +-
src/it/projects/detectLinks/verify.bsh | 4 +-
.../plugins/javadoc/AbstractFixJavadocMojo.java | 165 ++---
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 799 +++++++++++++--------
.../plugins/javadoc/AggregatorJavadocJar.java | 7 +-
.../plugins/javadoc/AggregatorJavadocReport.java | 7 +-
.../plugins/javadoc/AggregatorTestJavadocJar.java | 9 +-
.../javadoc/AggregatorTestJavadocReport.java | 7 +-
.../maven/plugins/javadoc/FixJavadocMojo.java | 1 -
.../apache/maven/plugins/javadoc/JavadocJar.java | 8 +-
.../maven/plugins/javadoc/JavadocNoForkReport.java | 1 -
.../maven/plugins/javadoc/JavadocReport.java | 32 +-
.../apache/maven/plugins/javadoc/JavadocUtil.java | 677 ++++++++---------
.../maven/plugins/javadoc/ResourcesBundleMojo.java | 7 +-
.../maven/plugins/javadoc/TestFixJavadocMojo.java | 1 -
.../maven/plugins/javadoc/TestJavadocJar.java | 1 -
.../plugins/javadoc/TestJavadocNoForkReport.java | 1 -
.../maven/plugins/javadoc/TestJavadocReport.java | 1 -
.../plugins/javadoc/resolver/ResourceResolver.java | 57 +-
.../javadoc/resolver/SourceResolverConfig.java | 6 +-
src/main/mdo/javadocOptions.mdo | 22 +-
...ort.properties => javadoc-report_es.properties} | 2 +-
...api-package-list-9 => java-api-element-list-10} | 706 ++++++++++--------
...api-package-list-9 => java-api-element-list-11} | 597 ++++++++-------
.../resources/test-javadoc-report_es.properties} | 37 +-
src/site/apt/examples/aggregate.apt.vm | 46 +-
src/site/apt/examples/alternate-doclet.apt.vm | 14 +-
src/site/fml/faq.fml | 4 +-
src/site/xdoc/download.xml.vm | 6 +-
.../javadoc/AggregatorJavadocReportTest.java | 12 +-
.../maven/plugins/javadoc/FixJavadocMojoTest.java | 29 +-
.../maven/plugins/javadoc/JavadocJarTest.java | 6 +-
.../maven/plugins/javadoc/JavadocReportTest.java | 222 ++++--
.../maven/plugins/javadoc/JavadocUtilTest.java | 119 ++-
.../maven/plugins/javadoc/JavadocVersionTest.java | 9 +-
.../apache/maven/plugins/javadoc/ProxyServer.java | 1 -
.../io/xpp3/JavadocOptionsXpp3ReaderTest.java | 59 ++
.../AggregateProject1TestMavenProjectStub.java | 3 +-
.../AggregateProject2TestMavenProjectStub.java | 3 +-
...egateResourcesProject1TestMavenProjectStub.java | 1 -
...egateResourcesProject2TestMavenProjectStub.java | 1 -
.../AggregateResourcesTestMavenProjectStub.java | 11 +-
.../stubs/AggregateTestMavenProjectStub.java | 12 +-
.../stubs/CustomConfigurationMavenProjectStub.java | 1 -
.../javadoc/stubs/DefaultArtifactHandlerStub.java | 1 -
.../DefaultConfigurationMavenProjectStub.java | 3 +-
.../stubs/DocfilesTestMavenProjectStub.java | 3 +-
.../DocfilesWithJavaTestMavenProjectStub.java | 1 -
.../stubs/DocletPathTestMavenProjectStub.java | 1 -
.../javadoc/stubs/DocletTestMavenProjectStub.java | 1 -
.../javadoc/stubs/FixJdk5MavenProjectStub.java | 1 -
.../javadoc/stubs/FixJdk6MavenProjectStub.java | 1 -
.../plugins/javadoc/stubs/FixMavenProjectStub.java | 1 -
.../stubs/HeaderFooterTestMavenProjectStub.java | 1 -
.../javadoc/stubs/HelpFileMavenProjectStub.java | 1 -
.../stubs/JavadocJarArchiveConfigProjectStub.java | 2 +-
.../stubs/JavadocJarDefaultMavenProjectStub.java | 3 +-
.../JavadocJarFailOnErrorMavenProjectStub.java | 3 +-
.../JavadocJarInvalidDestdirMavenProjectStub.java | 4 +-
.../javadoc/stubs/JavadocPluginArtifactStub.java | 1 -
.../javadoc/stubs/Jdk5TestMavenProjectStub.java | 1 -
.../javadoc/stubs/Jdk6TestMavenProjectStub.java | 1 -
.../javadoc/stubs/NewlineTestMavenProjectStub.java | 1 -
... => OptionsUmlautEncodingMavenProjectStub.java} | 164 +++--
.../plugins/javadoc/stubs/PomMavenProjectStub.java | 1 -
.../javadoc/stubs/ProxyTestMavenProjectStub.java | 1 -
.../javadoc/stubs/QuotedPathMavenProjectStub.java | 3 +-
.../stubs/ResourcesTestMavenProjectStub.java | 1 -
.../ResourcesWithExcludesTestMavenProjectStub.java | 1 -
.../maven/plugins/javadoc/stubs/SettingsStub.java | 1 -
...dDocletConflictOptionsTestMavenProjectStub.java | 1 -
.../stubs/StylesheetFileMavenProjectStub.java | 1 -
.../stubs/SubpackagesTestMavenProjectStub.java | 3 +-
.../javadoc/stubs/TagTestMavenProjectStub.java | 1 -
.../stubs/TagletArtifactsMavenProjectStub.java | 1 -
.../javadoc/stubs/TagletTestMavenProjectStub.java | 3 +-
.../javadoc/stubs/TestJavadocMavenProjectStub.java | 1 -
.../WrongEncodingOptionsTestMavenProjectStub.java | 1 -
.../optionsumlautencoding-test-plugin-config.xml} | 13 +-
.../optionsumlautencoding/test}/App.java | 4 +-
.../optionsumlautencoding/test}/AppSample.java | 2 +-
172 files changed, 4241 insertions(+), 3221 deletions(-)
create mode 100644 CONTRIBUTING.md
create mode 100644 README.md
create mode 100644 src/it/mrm/3rdparty/doclet-1.0.jar/org/apache/maven/plugins/javadoc/its/Doclet.class
copy src/it/mrm/3rdparty/{lib-1.0.pom => doclet-1.0.pom} (95%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath/foo => MJAVADOC-134_multiaggregate/b/c/d1}/pom.xml (76%)
copy Jenkinsfile => src/it/projects/MJAVADOC-134_multiaggregate/b/c/d1/src/main/java/a/b/c/d/D1.java (95%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath/foo => MJAVADOC-134_multiaggregate/b/c/d2}/pom.xml (76%)
copy Jenkinsfile => src/it/projects/MJAVADOC-134_multiaggregate/b/c/d2/src/main/java/a/b/c/d/D2.java (95%)
copy src/it/projects/{MJAVADOC-498_aggr_modulepath/foo => MJAVADOC-134_multiaggregate/b/c}/pom.xml (71%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath/foo => MJAVADOC-134_multiaggregate/b/e}/pom.xml (76%)
copy Jenkinsfile => src/it/projects/MJAVADOC-134_multiaggregate/b/e/src/main/java/a/b/e/E.java (94%)
copy src/it/projects/{MJAVADOC-498_aggr_modulepath/foo => MJAVADOC-134_multiaggregate/b}/pom.xml (71%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath/foo => MJAVADOC-134_multiaggregate/f}/pom.xml (76%)
copy Jenkinsfile => src/it/projects/MJAVADOC-134_multiaggregate/f/src/main/java/a/f/F.java (95%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath => MJAVADOC-134_multiaggregate}/invoker.properties (96%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath => MJAVADOC-134_multiaggregate}/pom.xml (58%)
create mode 100644 src/it/projects/MJAVADOC-134_multiaggregate/verify.groovy
rename src/it/projects/MJAVADOC-384/src/main/java/com/foo/bar/internal/{NotApi.java => Api.java} (95%)
copy src/it/projects/{MJAVADOC-444 => MJAVADOC-420_fixparam}/invoker.properties (95%)
copy src/it/projects/{MJAVADOC-427 => MJAVADOC-420_fixparam}/pom.xml (68%)
copy src/it/projects/{MJAVADOC-137/test2/src/main/java/com/example/App.java => MJAVADOC-420_fixparam/src/main/java/com/example/FirstBug.java} (74%)
copy src/it/projects/{MJAVADOC-427 => MJAVADOC-420_fixparam}/verify.groovy (77%)
copy src/it/projects/{MJAVADOC-444 => MJAVADOC-434_fixcompile}/invoker.properties (95%)
copy src/it/projects/{MJAVADOC-427 => MJAVADOC-434_fixcompile}/pom.xml (68%)
copy src/it/projects/{MJAVADOC-194/module1/generated-src/main/java/test/GeneratedTest1.java => MJAVADOC-434_fixcompile/src/main/java/test/A.java} (81%)
create mode 100644 src/it/projects/MJAVADOC-434_fixcompile/src/main/java/test/B.java
create mode 100644 src/it/projects/MJAVADOC-434_fixcompile/src/main/java/test/C.java
copy src/it/projects/{MJAVADOC-444/moduleA/src/test/java/com/mycompany/myapp/AppATest.java => MJAVADOC-434_fixcompile/src/main/java/test/HttpRSSEState.java} (50%)
copy src/it/projects/{MJAVADOC-498_aggr_modulepath => MJAVADOC-449_aggr_modulepath}/invoker.properties (95%)
copy src/it/projects/{MJAVADOC-494_aggregate-repositories/module1 => MJAVADOC-449_aggr_modulepath/modulea}/pom.xml (50%)
copy src/it/projects/{MJAVADOC-427/src/main/java/mjavadoc427/App.java => MJAVADOC-449_aggr_modulepath/modulea/src/main/java/com/javamodularity/modulea/HelloWorld.java} (74%)
copy src/it/projects/{MJAVADOC-320/module1/src/main/java/org/apache/maven/plugin/javadoc/it/Module1Class.java => MJAVADOC-449_aggr_modulepath/modulea/src/main/java/module-info.java} (89%)
copy src/it/projects/{MJAVADOC-494_aggregate-repositories/module1 => MJAVADOC-449_aggr_modulepath/moduleb}/pom.xml (50%)
copy src/it/projects/{MJAVADOC-427/src/main/java/mjavadoc427/App.java => MJAVADOC-449_aggr_modulepath/moduleb/src/main/java/com/javamodularity/moduleb/HelloWorld.java} (74%)
copy src/it/projects/{MJAVADOC-320/module1/src/main/java/org/apache/maven/plugin/javadoc/it/Module1Class.java => MJAVADOC-449_aggr_modulepath/moduleb/src/main/java/module-info.java} (89%)
copy src/it/projects/{MJAVADOC-494_aggregate-repositories/module1 => MJAVADOC-449_aggr_modulepath}/pom.xml (52%)
create mode 100644 src/it/projects/MJAVADOC-449_aggr_modulepath/verify.groovy
copy src/it/projects/{MJAVADOC-181 => MJAVADOC-452_fix-duplicateparams}/invoker.properties (94%)
copy src/it/projects/{MJAVADOC-427 => MJAVADOC-452_fix-duplicateparams}/pom.xml (66%)
copy src/it/projects/{MJAVADOC-137/test2/src/main/java/com/example/App.java => MJAVADOC-452_fix-duplicateparams/src/main/java/com/example/FirstBug.java} (76%)
copy src/it/projects/{MJAVADOC-414/src/main/java/mjavadoc414/App.java => MJAVADOC-452_fix-duplicateparams/verify.groovy} (72%)
copy src/it/projects/{MJAVADOC-250 => MJAVADOC-495_offline-filescheme}/invoker.properties (90%)
create mode 100644 src/it/projects/MJAVADOC-495_offline-filescheme/package-list
copy src/it/projects/{MJAVADOC-250 => MJAVADOC-495_offline-filescheme}/pom.xml (90%)
copy src/it/projects/{MJAVADOC-498_aggr_modulepath/foo/src/main/java/module-info.java => MJAVADOC-495_offline-filescheme/src/main/java/foo/Bar.java} (95%)
copy src/it/projects/{MJAVADOC-278/verify.bsh => MJAVADOC-495_offline-filescheme/verify.groovy} (69%)
copy src/it/projects/{MJAVADOC-498_modulepath => MJAVADOC-506_excl-module-info}/pom.xml (80%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath/foo => MJAVADOC-506_excl-module-info}/src/main/java/com/foo/MyClass.java (97%)
copy src/it/projects/{MJAVADOC-498_modulepath => MJAVADOC-506_excl-module-info}/src/main/java/module-info.java (97%)
copy src/it/projects/{MJAVADOC-427/src/main/java/mjavadoc427/App.java => MJAVADOC-506_excl-module-info/verify.groovy} (74%)
copy src/it/projects/{MJAVADOC-384 => MJAVADOC-514_3rdparty-doclettags}/invoker.properties (100%)
copy src/it/projects/{MJAVADOC-365 => MJAVADOC-514_3rdparty-doclettags}/pom.xml (67%)
copy src/{test/resources/unit/jdk5-test/jdk5/test/package-info.java => it/projects/MJAVADOC-514_3rdparty-doclettags/src/main/java/foo/bar/ALotOfLinkTags.java} (89%)
copy src/it/projects/{MJAVADOC-498_aggr_modulepath => MJAVADOC-526_aggr-managedDeps}/invoker.properties (96%)
copy src/it/projects/{MJAVADOC-257/myj2ee/servlets/servlet => MJAVADOC-526_aggr-managedDeps/javadoc-child}/pom.xml (50%)
copy src/it/projects/{MJAVADOC-194/module1/src/main/java/test/Test1.java => MJAVADOC-526_aggr-managedDeps/javadoc-child/src/main/java/com/leokom/javadoc/JavadocMavenBugDemo.java} (75%)
copy src/it/projects/{MJAVADOC-257/myj2ee/projects => MJAVADOC-526_aggr-managedDeps}/pom.xml (56%)
copy src/it/projects/{MJAVADOC-407 => MJAVADOC-528}/invoker.properties (100%)
copy src/it/projects/{MJAVADOC-508 => MJAVADOC-528}/pom.xml (83%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath/foo/src/main/java/com/foo => MJAVADOC-528/src/main/java/foo/bar}/MyClass.java (95%)
copy src/it/projects/{MJAVADOC-498_modulepath => MJAVADOC-528}/verify.groovy (83%)
copy src/it/projects/{MJAVADOC-407 => MJAVADOC-538}/invoker.properties (100%)
copy src/it/projects/{MJAVADOC-508 => MJAVADOC-538}/pom.xml (67%)
copy src/it/projects/{MJAVADOC-498_mm_modulepath/foo/src/main/java/com/foo => MJAVADOC-538/src/main/java/foo/bar}/MyClass.java (95%)
copy src/it/projects/{MJAVADOC-126/res1/src/main/resources/file1.txt => MJAVADOC-551 spaces/invoker.properties} (96%)
copy src/it/projects/{MJAVADOC-250 => MJAVADOC-551 spaces}/pom.xml (86%)
copy src/it/projects/{javadoc-fix => MJAVADOC-551 spaces}/src/main/java/fix/test/App.java (96%)
copy src/it/projects/{MJAVADOC-181 => MJAVADOC-552_fix-author}/invoker.properties (94%)
copy src/it/projects/{MJAVADOC-250 => MJAVADOC-552_fix-author}/pom.xml (76%)
copy src/it/projects/{MJAVADOC-137/test2/src/main/java/com/example/App.java => MJAVADOC-552_fix-author/src/main/java/com/example/FirstBug.java} (81%)
copy src/it/projects/{MJAVADOC-427/src/main/java/mjavadoc427/App.java => MJAVADOC-552_fix-author/verify.groovy} (75%)
copy src/it/projects/{MJAVADOC-181 => MJAVADOC-556_hide-non-exported-packages}/invoker.properties (93%)
copy src/it/projects/{MJAVADOC-320/module1 => MJAVADOC-556_hide-non-exported-packages/module}/pom.xml (62%)
copy Jenkinsfile => src/it/projects/MJAVADOC-556_hide-non-exported-packages/module/src/main/java/module-info.java (89%)
copy src/it/projects/{MJAVADOC-275/mod-a/src/main/java/Main.java => MJAVADOC-556_hide-non-exported-packages/module/src/main/java/package1/Main1.java} (88%)
copy src/it/projects/{MJAVADOC-275/mod-a/src/main/java/Main.java => MJAVADOC-556_hide-non-exported-packages/module/src/main/java/package2/Main2.java} (88%)
copy src/it/projects/{MJAVADOC-320 => MJAVADOC-556_hide-non-exported-packages}/pom.xml (84%)
copy src/it/projects/{MJAVADOC-181 => MJAVADOC-558_fix-unknownthrows}/invoker.properties (94%)
copy src/it/projects/{MJAVADOC-427 => MJAVADOC-558_fix-unknownthrows}/pom.xml (66%)
copy src/it/projects/{MJAVADOC-137/test2/src/main/java/com/example/App.java => MJAVADOC-558_fix-unknownthrows/src/main/java/com/example/FirstBug.java} (73%)
copy src/it/projects/{MJAVADOC-427 => MJAVADOC-558_fix-unknownthrows}/verify.groovy (70%)
copy src/main/resources/{javadoc-report.properties => javadoc-report_es.properties} (92%)
copy src/main/resources/org/apache/maven/plugins/javadoc/{java-api-package-list-9 => java-api-element-list-10} (79%)
copy src/main/resources/org/apache/maven/plugins/javadoc/{java-api-package-list-9 => java-api-element-list-11} (64%)
copy src/{it/projects/MJAVADOC-180/invoker.properties => main/resources/test-javadoc-report_es.properties} (86%)
create mode 100644 src/test/java/org/apache/maven/plugins/javadoc/options/io/xpp3/JavadocOptionsXpp3ReaderTest.java
copy src/test/java/org/apache/maven/plugins/javadoc/stubs/{QuotedPathMavenProjectStub.java => OptionsUmlautEncodingMavenProjectStub.java} (74%)
copy src/test/resources/unit/{default-configuration/default-configuration-plugin-config.xml => optionsumlautencoding-test/optionsumlautencoding-test-plugin-config.xml} (80%)
copy src/test/resources/unit/{default-configuration/def/configuration => optionsumlautencoding-test/optionsumlautencoding/test}/App.java (96%)
copy src/test/resources/unit/{javaHome-test/def/configuration => optionsumlautencoding-test/optionsumlautencoding/test}/AppSample.java (96%)
[maven-javadoc-plugin] 01/01: [MJAVADOC-444] - Add an
'aggregated-no-fork' goal o add aggregate-no-fork and
aggregate-test-no-fork for non-forking versions of aggregate goals.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MJAVADOC-444
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit d3b3453e6fb491e4404ec773b7d81bcfd5e3a5df
Author: Sean Busbey <bu...@apache.org>
AuthorDate: Mon Mar 5 17:11:41 2018 -0600
[MJAVADOC-444] - Add an 'aggregated-no-fork' goal
o add aggregate-no-fork and aggregate-test-no-fork for non-forking versions of aggregate goals.
Signed-off-by: Karl Heinz Marbaise <kh...@apache.org>
---
src/it/projects/MJAVADOC-444/invoker.properties | 18 ++++
src/it/projects/MJAVADOC-444/moduleA/pom.xml | 41 +++++++++
.../src/main/java/com/mycompany/myapp/AppA.java | 31 +++++++
.../test/java/com/mycompany/myapp/AppATest.java | 57 +++++++++++++
src/it/projects/MJAVADOC-444/moduleB/pom.xml | 41 +++++++++
.../src/main/java/com/mycompany/myapp/AppB.java | 31 +++++++
.../test/java/com/mycompany/myapp/AppBTest.java | 57 +++++++++++++
src/it/projects/MJAVADOC-444/pom.xml | 98 ++++++++++++++++++++++
src/it/projects/MJAVADOC-444/verify.bsh | 40 +++++++++
.../javadoc/AggregatorJavadocNoForkReport.java | 39 +++++++++
.../javadoc/AggregatorTestJavadocNoForkReport.java | 39 +++++++++
...vadoc-nofork.apt.vm => aggregate-nofork.apt.vm} | 26 ++----
src/site/apt/examples/javadoc-nofork.apt.vm | 3 +-
src/site/apt/index.apt.vm | 20 ++++-
src/site/site.xml | 1 +
15 files changed, 520 insertions(+), 22 deletions(-)
diff --git a/src/it/projects/MJAVADOC-444/invoker.properties b/src/it/projects/MJAVADOC-444/invoker.properties
new file mode 100644
index 0000000..3d5509a
--- /dev/null
+++ b/src/it/projects/MJAVADOC-444/invoker.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals=clean verify site
diff --git a/src/it/projects/MJAVADOC-444/moduleA/pom.xml b/src/it/projects/MJAVADOC-444/moduleA/pom.xml
new file mode 100644
index 0000000..b2b4670
--- /dev/null
+++ b/src/it/projects/MJAVADOC-444/moduleA/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>mjavadoc-444</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>mjavadoc-444-moduleA</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/src/it/projects/MJAVADOC-444/moduleA/src/main/java/com/mycompany/myapp/AppA.java b/src/it/projects/MJAVADOC-444/moduleA/src/main/java/com/mycompany/myapp/AppA.java
new file mode 100644
index 0000000..6646f69
--- /dev/null
+++ b/src/it/projects/MJAVADOC-444/moduleA/src/main/java/com/mycompany/myapp/AppA.java
@@ -0,0 +1,31 @@
+package com.mycompany.myapp;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Hello world!
+ */
+public class AppA
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
diff --git a/src/it/projects/MJAVADOC-444/moduleA/src/test/java/com/mycompany/myapp/AppATest.java b/src/it/projects/MJAVADOC-444/moduleA/src/test/java/com/mycompany/myapp/AppATest.java
new file mode 100644
index 0000000..f54bad8
--- /dev/null
+++ b/src/it/projects/MJAVADOC-444/moduleA/src/test/java/com/mycompany/myapp/AppATest.java
@@ -0,0 +1,57 @@
+package com.mycompany.myapp;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppATest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppATest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppATest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
diff --git a/src/it/projects/MJAVADOC-444/moduleB/pom.xml b/src/it/projects/MJAVADOC-444/moduleB/pom.xml
new file mode 100644
index 0000000..c053830
--- /dev/null
+++ b/src/it/projects/MJAVADOC-444/moduleB/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>mjavadoc-444</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>mjavadoc-444-moduleB</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/src/it/projects/MJAVADOC-444/moduleB/src/main/java/com/mycompany/myapp/AppB.java b/src/it/projects/MJAVADOC-444/moduleB/src/main/java/com/mycompany/myapp/AppB.java
new file mode 100644
index 0000000..bf38d7b
--- /dev/null
+++ b/src/it/projects/MJAVADOC-444/moduleB/src/main/java/com/mycompany/myapp/AppB.java
@@ -0,0 +1,31 @@
+package com.mycompany.myapp;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Hello world!
+ */
+public class AppB
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
diff --git a/src/it/projects/MJAVADOC-444/moduleB/src/test/java/com/mycompany/myapp/AppBTest.java b/src/it/projects/MJAVADOC-444/moduleB/src/test/java/com/mycompany/myapp/AppBTest.java
new file mode 100644
index 0000000..e7c57f5
--- /dev/null
+++ b/src/it/projects/MJAVADOC-444/moduleB/src/test/java/com/mycompany/myapp/AppBTest.java
@@ -0,0 +1,57 @@
+package com.mycompany.myapp;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppBTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppBTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppBTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
diff --git a/src/it/projects/MJAVADOC-444/pom.xml b/src/it/projects/MJAVADOC-444/pom.xml
new file mode 100644
index 0000000..d4178e1
--- /dev/null
+++ b/src/it/projects/MJAVADOC-444/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>mjavadoc-444</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>myapp</name>
+ <url>http://maven.apache.org</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <modules>
+ <module>moduleA</module>
+ <module>moduleB</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.3.1</version>
+ <executions>
+ <execution>
+ <id>default-enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <alwaysPass/>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@pom.version@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>@sitePluginVersion@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <excludeDefaults>true</excludeDefaults>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@pom.version@</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>aggregate-no-fork</report>
+ <report>test-aggregate-no-fork</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
diff --git a/src/it/projects/MJAVADOC-444/verify.bsh b/src/it/projects/MJAVADOC-444/verify.bsh
new file mode 100644
index 0000000..828d834
--- /dev/null
+++ b/src/it/projects/MJAVADOC-444/verify.bsh
@@ -0,0 +1,40 @@
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.*;
+import org.codehaus.plexus.util.*;
+
+File indexFile = new File( basedir, "target/site/apidocs/index.html" );
+
+if ( !indexFile.exists() )
+{
+ System.err.println( indexFile.getAbsolutePath() + " is missing." );
+ return false;
+}
+
+File buildLog = new File( basedir, "build.log" );
+String content = IOUtil.toString( new FileInputStream( buildLog ) );
+String needle = ">>> maven-javadoc-plugin";
+if ( content.contains( needle ) )
+{
+ System.err.println( "build.log contains '" + needle + "'" );
+ return false;
+}
+return true;
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AggregatorJavadocNoForkReport.java b/src/main/java/org/apache/maven/plugins/javadoc/AggregatorJavadocNoForkReport.java
new file mode 100644
index 0000000..0e27b05
--- /dev/null
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AggregatorJavadocNoForkReport.java
@@ -0,0 +1,39 @@
+package org.apache.maven.plugins.javadoc;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
+/**
+ * Generates documentation for the <code>Java code</code> in an <b>aggregator</b> project using the standard
+ * <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/">Javadoc Tool</a>.
+ *
+ * @version $Id$
+ * @since 3.0.1
+ */
+@Mojo( name = "aggregate-no-fork", requiresDependencyResolution = ResolutionScope.COMPILE )
+@Execute( phase = LifecyclePhase.NONE )
+public class AggregatorJavadocNoForkReport
+ extends AggregatorJavadocReport
+{
+}
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AggregatorTestJavadocNoForkReport.java b/src/main/java/org/apache/maven/plugins/javadoc/AggregatorTestJavadocNoForkReport.java
new file mode 100644
index 0000000..6e06167
--- /dev/null
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AggregatorTestJavadocNoForkReport.java
@@ -0,0 +1,39 @@
+package org.apache.maven.plugins.javadoc;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
+/**
+ * Generates documentation for the <code>Java Test code</code> in an <b>aggregator</b> project using the standard
+ * <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/">Javadoc Tool</a>.
+ *
+ * @version $Id$
+ * @since 3.0.1
+ */
+@Mojo( name = "test-aggregate-no-fork", requiresDependencyResolution = ResolutionScope.TEST )
+@Execute( phase = LifecyclePhase.NONE )
+public class AggregatorTestJavadocNoForkReport
+ extends AggregatorTestJavadocReport
+{
+}
diff --git a/src/site/apt/examples/javadoc-nofork.apt.vm b/src/site/apt/examples/aggregate-nofork.apt.vm
similarity index 69%
copy from src/site/apt/examples/javadoc-nofork.apt.vm
copy to src/site/apt/examples/aggregate-nofork.apt.vm
index 15b8373..6669f42 100644
--- a/src/site/apt/examples/javadoc-nofork.apt.vm
+++ b/src/site/apt/examples/aggregate-nofork.apt.vm
@@ -1,9 +1,5 @@
------
- Generate Javadoc without duplicate execution of phase generate-sources.
- ------
- Mirko Friedenhagen
- ------
- 2014-03-19
+ Generate aggregate Javadoc without duplicate execution of phase compile.
------
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -26,21 +22,19 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Generate Javadoc without duplicate execution of phase generate-sources.
+Generate aggregate Javadoc without duplicate execution of phase compile.
- * The standard goals <<<javadoc>>> and <<<test-javadoc>>> invoke separate lifecyles
- <<<generate-sources>>> and <<<generate-test-sources>>>.
+ * The standard goals <<<aggregate>>> and <<<test-aggregate>>> invoke separate lifecyles
+ <<<compile>>> and <<<test-compile>>>.
* In a CI environment you now might execute something like <<<mvn clean deploy site site-deploy>>>.
- * During <<<site>>> build the standard reports will trigger <<<generate-sources>>> or
- <<<generate-test-sources>>> again, depending on your build this may take some time, because
+ * During <<<site>>> build the standard reports will trigger <<<compile>>> or
+ <<<test-compile>>> again, depending on your build this may take some time, because
stuff like <<<enforcer>>> or generating stubs from a WDSL will be invoked again, which may lead
to longer build times.
- * See {{{https://issues.apache.org/jira/browse/MJAVADOC-369}MJAVADOC-369}} as well.
-
- * As of version 2.10 two new reports are defined, <<<javadoc-no-fork>>> and <<<test-javadoc-no-fork>>>
+ * As of version 3.0.1 two new reports are defined, <<<aggregate-no-fork>>> and <<<test-aggregate-no-fork>>>
which will not trigger above phases a second time.
* Configure this in your <<<reporting>>> section as follows:
@@ -58,8 +52,8 @@ Generate Javadoc without duplicate execution of phase generate-sources.
<reportSets>
<reportSet>
<reports>
- <report>javadoc-no-fork</report>
- <report>test-javadoc-no-fork</report>
+ <report>aggregate-no-fork</report>
+ <report>test-aggregate-no-fork</report>
</reports>
</reportSet>
</reportSets>
@@ -69,5 +63,3 @@ Generate Javadoc without duplicate execution of phase generate-sources.
...
</project>
+-----+
-
- <<Note>>: These reports may not be used for aggregate reports.
diff --git a/src/site/apt/examples/javadoc-nofork.apt.vm b/src/site/apt/examples/javadoc-nofork.apt.vm
index 15b8373..4c8d218 100644
--- a/src/site/apt/examples/javadoc-nofork.apt.vm
+++ b/src/site/apt/examples/javadoc-nofork.apt.vm
@@ -70,4 +70,5 @@ Generate Javadoc without duplicate execution of phase generate-sources.
</project>
+-----+
- <<Note>>: These reports may not be used for aggregate reports.
+ <<Note>>: These reports may not be used for aggregate reports. For those, see the example of
+ {{{./aggregate-nofork.html}generating aggregate Javadocs without execution of phase compile}}.
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index 580fe15..0c217f1 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -49,7 +49,7 @@ javadoc.exe(or .sh) @options @packages | @argfile
* Goals Overview
- The Javadoc Plugin has 14 goals:
+ The Javadoc Plugin has 16 goals:
* {{{./javadoc-mojo.html}javadoc:javadoc}} generates the Javadoc files for the project. It executes the standard
Javadoc tool and supports the parameters used by the tool.
@@ -58,12 +58,12 @@ javadoc.exe(or .sh) @options @packages | @argfile
the standard Javadoc tool and supports the parameters used by the tool.
* {{{./javadoc-no-fork-mojo.html}javadoc:javadoc-no-fork}} generates the Javadoc files for the project.
- It executes the standard Javadoc tool and supports the parameters used by the tool without forking the
+ It executes the standard Javadoc tool and supports the parameters used by the tool without forking the
<<<generate-sources>>> phase again. Note that this goal does require generation of test sources before site generation, e.g.
by invoking <<<mvn clean deploy site>>>.
- * {{{./test-javadoc-no-fork-mojo.html}javadoc:test-javadoc-no-fork}} generates the test Javadoc files for the project.
- It executes the standard Javadoc tool and supports the parameters used by the tool without forking the
+ * {{{./test-javadoc-no-fork-mojo.html}javadoc:test-javadoc-no-fork}} generates the test Javadoc files for the project.
+ It executes the standard Javadoc tool and supports the parameters used by the tool without forking the
<<<generate-test-sources>>> phase again. Note that this goal does require generation of test sources before site generation,
e.g. by invoking <<<mvn clean deploy site>>>.
@@ -73,6 +73,16 @@ javadoc.exe(or .sh) @options @packages | @argfile
* {{{./test-aggregate-mojo.html}javadoc:test-aggregate}} generates the test Javadoc files for an aggregator project.
It executes the standard Javadoc tool and supports the parameters used by the tool.
+ * {{{./aggregate-no-fork-mojo.html}javadoc:aggregate-no-fork}} generates the Javadoc files for an aggregator project.
+ It executes the standard Javadoc tool and supports the parameters used by the tool without forking the <<compile>>>
+ phase again. Note that this goal does require generation of class files before site generation, e.g. by invoking
+ <<<mvn compile>>> or <<<mvn install>>>.
+
+ * {{{./test-aggregate-no-fork-mojo.html}javadoc:test-aggregate}} generates the test Javadoc files for an aggregator
+ project. It executes the standard Javadoc tool and supports the parameters used by the tool without forking the
+ <<<compile>>> phase again. Note that this goal does require generation of test class files before site generation,
+ e.g. by invoking <<<mvn test-compile>>> or <<<mvn install>>>.
+
* {{{./jar-mojo.html}javadoc:jar}} creates an archive file of the generated Javadocs. It is used during
the release process to create the Javadoc artifact for the project's release. This artifact is uploaded
to the remote repository along with the project's compiled binary and source archive.
@@ -155,4 +165,6 @@ javadoc.exe(or .sh) @options @packages | @argfile
* {{{./examples/javadoc-nofork.html}Generate Javadoc without duplicate execution of phase generate-sources}}
+ * {{{./examples/aggregate-nofork.html}Generate aggregate Javadocs without execution of phase compile}}
+
[]
diff --git a/src/site/site.xml b/src/site/site.xml
index 727da9a..947580a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -55,6 +55,7 @@ under the License.
<item name="Fixing Javadoc Comments" href="/examples/fix-javadocs.html"/>
<item name="Adding additional dependencies" href="/examples/additional-dependencies.html"/>
<item name="Generate Javadoc without duplicate execution of phase generate-sources" href="/examples/javadoc-nofork.html"/>
+ <item name="Generate aggregate Javadoc without duplicate execution of phase compile" href="/examples/aggregate-nofork.html"/>
</menu>
</body>
</project>