You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2020/03/11 08:16:46 UTC
[maven-javadoc-plugin] branch MJAVADOC-610 updated (a4f1947 ->
2f21ee6)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a change to branch MJAVADOC-610
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.
discard a4f1947 add more tests
discard 9b65d3a [MJAVADOC-610] Support multirelease jar
add b8e7768 it looks guava has moved his javadoc...
add e100fb7 Use jdks default
add c3c3838 [maven-release-plugin] prepare release maven-javadoc-plugin-3.1.1
add 1bf1f43 [maven-release-plugin] prepare for next development iteration
add 6f72d47 As of JDK 13, the com.sun.javadoc API is no longer supported.
add e664eb3 As of JDK 13, the com.sun.javadoc API is no longer supported.
add a33b95f [maven-release-plugin] prepare release maven-javadoc-plugin-3.1.1
add c929ada [maven-release-plugin] prepare for next development iteration
add 571d433 bundle-lifecycle bindings doesn't have explicit versions for plugins
add f908c18 Merge branch 'stabilize'
add 12eaec4 Fix for MJAVADOC-616
add 1969cea [MJAVADOC-616] Adjust test to please generate-test-metadata goal
add b1c029f [MJAVADOC-607] followLinks fix to get redirect target breaks for certain sites
add f23d61d Remove space typo in markdown
add 2440a51 Remove space typo in markdown
add 448b822 Remove IT, https://docs.oracle.com/javase/1,5,0/docs/api/ (with commas) doesn't exist anymore
add f801ec7 [MJAVADOC-555] Sometimes fails on JDK11 + Linux with 'index is out of range 0..-1 (index = 0)', even though hasGroup() returns true
add 112f5a5 Disable IT MJAVADOC-555 for Linux + JDK11, javadoc tool exits with -1, but pages are generated... Adjust JavadocReportTest.testJavadocResources: unlikely JDK-8032205 will be fix unless some user discovers this changed behavior Add offline elementlist for Java 13
add b1b28fe MJAVADOC-627 make output jars reproducible like m-source-p
add e4efc0f [MJAVADOC-620] Do not ignore JARs w/o module info when building classpath
add 769b73f [MJAVADOC-620] Integration test for class in top-level package
add efd0e47 [MJAVADOC-620] Integration test for JAR with version without dots
add 2649d40 Merge pull request #35 from CoreMedia/MJAVADOC-620
add f92b508 [MJAVADOC-626] Add a stale javadoc detection mechanism (#33)
add dd110f5 http to central not supported anymore, switch to https
add 82d1f94 http to central not supported anymore, switch to https
add a0ee027 must run its before pushing
add b4285c6 [MJAVADOC-613] exclude skipped javadoc modules from aggregated javadoc
add 4f569ca [MJAVADOC-635] upgrade plexus-java 1.0.4
add 0cec2c7 plexus-java version as a property to ease testing
add 0a7c819 remove duplicate property
add 7bfa76d [MJAVADOC-636] exclude some modules from aggregated javadoc
add aaa2007 [MJAVADOC-637] make build Reproducible
add 405b16d [MJAVADOC-639] include requires static from external dependencies for all modules (#38)
add 528ce30 [MJAVADOC-639] Switch to Oracle OpenJDK 11 compatible jar, see MJAVADOC-610
add 37d0ef5 [MJAVADOC-638] upgrade Doxia Sitetools to 1.9.2 to remove dependency on Struts (#39)
new 3c400b5 [MJAVADOC-610] Support multirelease jar
new 2f21ee6 add more tests
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 (a4f1947)
\
N -- N -- N refs/heads/MJAVADOC-610 (2f21ee6)
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 2 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:
.github/pull_request_template.md | 2 +-
Jenkinsfile | 2 +-
pom.xml | 67 ++++--
src/it/projects/MJAVADOC-137/verify.bsh | 47 ----
.../invoker.properties | 0
.../{MJAVADOC-137 => MJAVADOC-137_jar}/pom.xml | 1 +
.../test1/pom.xml | 0
.../test1}/src/main/java/com/example/App.java | 0
.../test2/pom.xml | 0
.../test2}/src/main/java/com/example/App.java | 0
src/it/projects/MJAVADOC-137_jar/verify.bsh | 76 +++++++
src/it/projects/MJAVADOC-320/verify.bsh | 80 -------
src/it/projects/MJAVADOC-320/verify.groovy | 48 ++++
src/it/projects/MJAVADOC-325/invoker.properties | 22 --
src/it/projects/MJAVADOC-325/pom.xml | 55 -----
.../MJAVADOC-325/src/main/java/foo/Bar.java | 22 --
src/it/projects/MJAVADOC-325/verify.bsh | 42 ----
src/it/projects/MJAVADOC-427/verify.groovy | 2 +-
.../invoker.properties | 4 +-
.../invoker.properties | 8 +-
.../MJAVADOC-555_link-automatic-modules/pom.xml | 4 +-
.../verify.groovy | 10 +-
src/it/projects/MJAVADOC-591_release8/pom.xml | 14 ++
.../b/c/d1}/pom.xml | 4 +-
.../b/c/d1/src/main/java/a/b/c/d/D1.java | 0
.../b/c/d2/pom.xml | 4 +-
.../b/c/d2/src/main/java/a/b/c/d/D2.java | 0
.../b/c/pom.xml | 18 +-
.../b/e}/pom.xml | 4 +-
.../b/e/src/main/java/a/b/e/E.java | 0
.../b/pom.xml | 4 +-
.../b => MJAVADOC-613-aggregate-exclude/f}/pom.xml | 20 +-
.../f/src/main/java/a/f/F.java | 0
.../invoker.properties | 37 ++--
.../pom.xml | 2 +-
.../MJAVADOC-613-aggregate-exclude/verify.groovy | 45 ++++
.../invoker.properties | 4 +-
.../maven-MJAVADOC620-jar/pom.xml} | 10 +-
.../src/main/java/somepackage/Test.java} | 9 +-
.../pom.xml | 38 ++--
.../src/main/java/TestUsage.java} | 68 +++---
.../verify.bsh | 126 +++++------
.../invoker.properties | 4 +-
.../maven-MJAVADOC620-jar/pom.xml} | 10 +-
.../maven-MJAVADOC620-jar/src/main/java/Test.java} | 7 +-
.../pom.xml | 94 ++++----
.../src/main/java/TestUsage.java} | 66 +++---
.../verify.bsh | 126 +++++------
.../b/c/d1}/pom.xml | 4 +-
.../b/c/d1/src/main/java/a/b/c/d/D1.java | 0
.../b/c/d2/pom.xml | 4 +-
.../b/c/d2/src/main/java/a/b/c/d/D2.java | 0
.../b/c/pom.xml | 4 +-
.../b/e}/pom.xml | 4 +-
.../b/e/src/main/java/a/b/e/E.java | 0
.../b/pom.xml | 4 +-
.../f/pom.xml | 4 +-
.../f/src/main/java/a/f/F.java | 0
.../invoker.properties | 37 ++--
.../pom.xml | 5 +-
.../verify.groovy} | 33 ++-
.../invoker.properties | 38 ++--
.../modulea/pom.xml | 64 +++---
.../com/javamodularity/modulea/HelloWorld.java | 74 +++----
.../modulea/src/main/java/module-info.java | 50 ++---
.../moduleb/pom.xml | 64 +++---
.../com/javamodularity/moduleb/HelloWorld.java | 74 +++----
.../moduleb/src/main/java/module-info.java | 50 ++---
.../modulec}/pom.xml | 78 ++++---
.../javamodularity/modulec/WorldCollector.java} | 87 ++++----
.../modulec/src/main/java/module-info.java} | 60 +++--
.../pom.xml | 71 +++---
.../invoker.properties | 2 +-
.../modulea/pom.xml | 26 +--
.../com/javamodularity/modulea/HelloWorld.java | 0
.../com/javamodularity/modulea/SimpleLogging.java} | 33 ++-
.../modulea/src/main/java/module-info.java | 3 +
.../moduleb/pom.xml | 17 +-
.../com/javamodularity/moduleb/HelloWorld.java | 0
.../moduleb/src/main/java/module-info.java | 0
.../pom.xml | 114 +++++-----
.../verify.groovy | 25 ++-
.../invoker.properties | 3 +-
.../additional-dependencies/invoker.properties | 3 +-
.../plugins/javadoc/AbstractFixJavadocMojo.java | 13 +-
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 242 +++++++++++++++++----
.../apache/maven/plugins/javadoc/JavadocJar.java | 14 ++
.../apache/maven/plugins/javadoc/JavadocUtil.java | 27 ++-
.../apache/maven/plugins/javadoc/StaleHelper.java | 181 +++++++++++++++
...pi-element-list-12 => java-api-element-list-13} | 2 -
src/site/apt/examples/aggregate.apt.vm | 2 +-
.../maven/plugins/javadoc/FixJavadocMojoTest.java | 63 +-----
.../maven/plugins/javadoc/JavadocReportTest.java | 33 ++-
.../javadoc/stubs/FixJdk5MavenProjectStub.java | 105 ---------
.../javadoc/stubs/FixJdk6MavenProjectStub.java | 105 ---------
.../stubs/TagletArtifactsMavenProjectStub.java | 2 +-
.../src/main/java/fix/test/ClassWithJavadoc.java | 122 -----------
.../src/main/java/fix/test/ClassWithNoJavadoc.java | 112 ----------
.../main/java/fix/test/InterfaceWithJavadoc.java | 58 -----
.../main/java/fix/test/InterfaceWithNoJavadoc.java | 63 ------
.../main/java/fix/test/SubClassWithJavadoc.java | 43 ----
src/test/resources/unit/fix-jdk5-test/pom.xml | 63 ------
.../unit/fix-jdk5-test/1.0/fix-jdk5-test-1.0.jar | Bin 5912 -> 0 bytes
.../unit/fix-jdk5-test/1.0/fix-jdk5-test-1.0.pom | 61 ------
.../unit/fix-jdk5-test/maven-metadata-local.xml | 31 ---
.../src/main/java/fix/test/ClassWithJavadoc.java | 106 ---------
.../src/main/java/fix/test/ClassWithNoJavadoc.java | 69 ------
.../main/java/fix/test/InterfaceWithJavadoc.java | 47 ----
.../main/java/fix/test/InterfaceWithNoJavadoc.java | 39 ----
.../main/java/fix/test/SubClassWithJavadoc.java | 39 ----
.../src/main/java/fix/test/ClassWithJavadoc.java | 79 -------
.../main/java/fix/test/InterfaceWithJavadoc.java | 58 -----
src/test/resources/unit/fix-jdk6-test/pom.xml | 63 ------
.../unit/fix-jdk6-test/1.0/fix-jdk6-test-1.0.jar | Bin 3670 -> 0 bytes
.../unit/fix-jdk6-test/1.0/fix-jdk6-test-1.0.pom | 61 ------
.../src/main/java/fix/test/ClassWithJavadoc.java | 70 ------
.../main/java/fix/test/InterfaceWithJavadoc.java | 47 ----
src/test/resources/unit/fix-test/pom.xml | 2 +-
.../maven-metadata-local.xml => settings.xml} | 21 +-
.../tagletArtifacts-test-plugin-config.xml | 2 +-
120 files changed, 1622 insertions(+), 2664 deletions(-)
delete mode 100644 src/it/projects/MJAVADOC-137/verify.bsh
rename src/it/projects/{MJAVADOC-137 => MJAVADOC-137_jar}/invoker.properties (100%)
rename src/it/projects/{MJAVADOC-137 => MJAVADOC-137_jar}/pom.xml (93%)
rename src/it/projects/{MJAVADOC-137 => MJAVADOC-137_jar}/test1/pom.xml (100%)
rename src/it/projects/{MJAVADOC-137/test2 => MJAVADOC-137_jar/test1}/src/main/java/com/example/App.java (100%)
rename src/it/projects/{MJAVADOC-137 => MJAVADOC-137_jar}/test2/pom.xml (100%)
rename src/it/projects/{MJAVADOC-137/test1 => MJAVADOC-137_jar/test2}/src/main/java/com/example/App.java (100%)
create mode 100644 src/it/projects/MJAVADOC-137_jar/verify.bsh
delete mode 100644 src/it/projects/MJAVADOC-320/verify.bsh
create mode 100644 src/it/projects/MJAVADOC-320/verify.groovy
delete mode 100644 src/it/projects/MJAVADOC-325/invoker.properties
delete mode 100644 src/it/projects/MJAVADOC-325/pom.xml
delete mode 100644 src/it/projects/MJAVADOC-325/src/main/java/foo/Bar.java
delete mode 100644 src/it/projects/MJAVADOC-325/verify.bsh
copy src/it/projects/{MJAVADOC-134_multiaggregate/b/c/d2 => MJAVADOC-613-aggregate-exclude/b/c/d1}/pom.xml (93%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-613-aggregate-exclude}/b/c/d1/src/main/java/a/b/c/d/D1.java (100%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-613-aggregate-exclude}/b/c/d2/pom.xml (93%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-613-aggregate-exclude}/b/c/d2/src/main/java/a/b/c/d/D2.java (100%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-613-aggregate-exclude}/b/c/pom.xml (76%)
copy src/it/projects/{MJAVADOC-134_multiaggregate/b/c/d2 => MJAVADOC-613-aggregate-exclude/b/e}/pom.xml (93%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-613-aggregate-exclude}/b/e/src/main/java/a/b/e/E.java (100%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-613-aggregate-exclude}/b/pom.xml (94%)
copy src/it/projects/{MJAVADOC-134_multiaggregate/b => MJAVADOC-613-aggregate-exclude/f}/pom.xml (78%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-613-aggregate-exclude}/f/src/main/java/a/f/F.java (100%)
copy src/it/projects/{MJAVADOC-250 => MJAVADOC-613-aggregate-exclude}/invoker.properties (86%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-613-aggregate-exclude}/pom.xml (98%)
create mode 100644 src/it/projects/MJAVADOC-613-aggregate-exclude/verify.groovy
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-620_no-dot-in-version}/invoker.properties (89%)
copy src/it/{mrm/repository/mjavadoc338-transitive.pom => projects/MJAVADOC-620_no-dot-in-version/maven-MJAVADOC620-jar/pom.xml} (85%)
copy src/it/projects/{MJAVADOC-556_hide-non-exported-packages/module/src/main/java/package2/Main2.java => MJAVADOC-620_no-dot-in-version/maven-MJAVADOC620-jar/src/main/java/somepackage/Test.java} (87%)
copy src/it/projects/{MJAVADOC-437 => MJAVADOC-620_no-dot-in-version}/pom.xml (68%)
copy src/it/projects/{javadoc-fix/src/main/java/fix/test/InterfaceWithJavadoc.java => MJAVADOC-620_no-dot-in-version/src/main/java/TestUsage.java} (75%)
copy src/it/projects/{MJAVADOC-172 => MJAVADOC-620_no-dot-in-version}/verify.bsh (85%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-620_top-level-package}/invoker.properties (89%)
copy src/it/{mrm/repository/mjavadoc338-transitive.pom => projects/MJAVADOC-620_top-level-package/maven-MJAVADOC620-jar/pom.xml} (85%)
copy src/it/projects/{MJAVADOC-556_hide-non-exported-packages/module/src/main/java/package2/Main2.java => MJAVADOC-620_top-level-package/maven-MJAVADOC620-jar/src/main/java/Test.java} (89%)
copy src/it/projects/{detectLinks/module2 => MJAVADOC-620_top-level-package}/pom.xml (69%)
copy src/it/projects/{javadoc-fix/src/main/java/fix/test/InterfaceWithJavadoc.java => MJAVADOC-620_top-level-package/src/main/java/TestUsage.java} (77%)
copy src/it/projects/{MJAVADOC-172 => MJAVADOC-620_top-level-package}/verify.bsh (85%)
copy src/it/projects/{MJAVADOC-134_multiaggregate/b/c/d2 => MJAVADOC-636-aggregate_module_skipped/b/c/d1}/pom.xml (93%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-636-aggregate_module_skipped}/b/c/d1/src/main/java/a/b/c/d/D1.java (100%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-636-aggregate_module_skipped}/b/c/d2/pom.xml (93%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-636-aggregate_module_skipped}/b/c/d2/src/main/java/a/b/c/d/D2.java (100%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-636-aggregate_module_skipped}/b/c/pom.xml (94%)
copy src/it/projects/{MJAVADOC-134_multiaggregate/b/c/d2 => MJAVADOC-636-aggregate_module_skipped/b/e}/pom.xml (93%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-636-aggregate_module_skipped}/b/e/src/main/java/a/b/e/E.java (100%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-636-aggregate_module_skipped}/b/pom.xml (94%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-636-aggregate_module_skipped}/f/pom.xml (93%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-636-aggregate_module_skipped}/f/src/main/java/a/f/F.java (100%)
copy src/it/projects/{MJAVADOC-250 => MJAVADOC-636-aggregate_module_skipped}/invoker.properties (86%)
copy src/it/projects/{MJAVADOC-134_multiaggregate => MJAVADOC-636-aggregate_module_skipped}/pom.xml (94%)
copy src/it/projects/{MJAVADOC-414/src/test/java/mjavadoc414/test/AppTest.java => MJAVADOC-636-aggregate_module_skipped/verify.groovy} (64%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_aggr_static_modulepath}/invoker.properties (97%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_aggr_static_modulepath}/modulea/pom.xml (97%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_aggr_static_modulepath}/modulea/src/main/java/com/javamodularity/modulea/HelloWorld.java (96%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_aggr_static_modulepath}/modulea/src/main/java/module-info.java (97%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_aggr_static_modulepath}/moduleb/pom.xml (97%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_aggr_static_modulepath}/moduleb/src/main/java/com/javamodularity/moduleb/HelloWorld.java (96%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_aggr_static_modulepath}/moduleb/src/main/java/module-info.java (97%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath/moduleb => MJAVADOC-639_aggr_static_modulepath/modulec}/pom.xml (74%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath/modulea/src/main/java/com/javamodularity/modulea/HelloWorld.java => MJAVADOC-639_aggr_static_modulepath/modulec/src/main/java/com/javamodularity/modulec/WorldCollector.java} (58%)
copy src/it/projects/{MJAVADOC-599/subproject1/src/main/java/com/example/A.java => MJAVADOC-639_aggr_static_modulepath/modulec/src/main/java/module-info.java} (84%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_aggr_static_modulepath}/pom.xml (95%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_requires_ignored}/invoker.properties (92%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_requires_ignored}/modulea/pom.xml (75%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_requires_ignored}/modulea/src/main/java/com/javamodularity/modulea/HelloWorld.java (100%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath/modulea/src/main/java/com/javamodularity/modulea/HelloWorld.java => MJAVADOC-639_requires_ignored/modulea/src/main/java/com/javamodularity/modulea/SimpleLogging.java} (67%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_requires_ignored}/modulea/src/main/java/module-info.java (93%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_requires_ignored}/moduleb/pom.xml (80%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_requires_ignored}/moduleb/src/main/java/com/javamodularity/moduleb/HelloWorld.java (100%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_requires_ignored}/moduleb/src/main/java/module-info.java (100%)
copy src/it/projects/{MJAVADOC-494_aggregate-repositories => MJAVADOC-639_requires_ignored}/pom.xml (61%)
copy src/it/projects/{MJAVADOC-449_aggr_modulepath => MJAVADOC-639_requires_ignored}/verify.groovy (65%)
create mode 100644 src/main/java/org/apache/maven/plugins/javadoc/StaleHelper.java
copy src/main/resources/org/apache/maven/plugins/javadoc/{java-api-element-list-12 => java-api-element-list-13} (99%)
delete mode 100644 src/test/java/org/apache/maven/plugins/javadoc/stubs/FixJdk5MavenProjectStub.java
delete mode 100644 src/test/java/org/apache/maven/plugins/javadoc/stubs/FixJdk6MavenProjectStub.java
delete mode 100644 src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/ClassWithJavadoc.java
delete mode 100644 src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/ClassWithNoJavadoc.java
delete mode 100644 src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/InterfaceWithJavadoc.java
delete mode 100644 src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/InterfaceWithNoJavadoc.java
delete mode 100644 src/test/resources/unit/fix-jdk5-test/expected/src/main/java/fix/test/SubClassWithJavadoc.java
delete mode 100644 src/test/resources/unit/fix-jdk5-test/pom.xml
delete mode 100644 src/test/resources/unit/fix-jdk5-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-jdk5-test/1.0/fix-jdk5-test-1.0.jar
delete mode 100644 src/test/resources/unit/fix-jdk5-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-jdk5-test/1.0/fix-jdk5-test-1.0.pom
delete mode 100644 src/test/resources/unit/fix-jdk5-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-jdk5-test/maven-metadata-local.xml
delete mode 100644 src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/ClassWithJavadoc.java
delete mode 100644 src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/ClassWithNoJavadoc.java
delete mode 100644 src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/InterfaceWithJavadoc.java
delete mode 100644 src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/InterfaceWithNoJavadoc.java
delete mode 100644 src/test/resources/unit/fix-jdk5-test/src/main/java/fix/test/SubClassWithJavadoc.java
delete mode 100644 src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/test/ClassWithJavadoc.java
delete mode 100644 src/test/resources/unit/fix-jdk6-test/expected/src/main/java/fix/test/InterfaceWithJavadoc.java
delete mode 100644 src/test/resources/unit/fix-jdk6-test/pom.xml
delete mode 100644 src/test/resources/unit/fix-jdk6-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-jdk6-test/1.0/fix-jdk6-test-1.0.jar
delete mode 100644 src/test/resources/unit/fix-jdk6-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-jdk6-test/1.0/fix-jdk6-test-1.0.pom
delete mode 100644 src/test/resources/unit/fix-jdk6-test/src/main/java/fix/test/ClassWithJavadoc.java
delete mode 100644 src/test/resources/unit/fix-jdk6-test/src/main/java/fix/test/InterfaceWithJavadoc.java
rename src/test/resources/unit/{fix-jdk6-test/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-jdk6-test/maven-metadata-local.xml => settings.xml} (63%)
[maven-javadoc-plugin] 01/02: [MJAVADOC-610] Support multirelease
jar
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch MJAVADOC-610
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 3c400b5a43f58a3e625854db0c5af18b08b0f9f2
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon Mar 9 08:27:51 2020 +0100
[MJAVADOC-610] Support multirelease jar
---
.../projects/MJAVADOC-610_mrjar/invoker.properties | 19 +++++
src/it/projects/MJAVADOC-610_mrjar/pom.xml | 93 ++++++++++++++++++++++
.../src/main/java/com/foo/MyClass.java | 25 ++++++
.../src/main/java9/com/foo/MyClass.java | 25 ++++++
.../src/main/java9/module-info.java | 22 +++++
5 files changed, 184 insertions(+)
diff --git a/src/it/projects/MJAVADOC-610_mrjar/invoker.properties b/src/it/projects/MJAVADOC-610_mrjar/invoker.properties
new file mode 100644
index 0000000..f04b53a
--- /dev/null
+++ b/src/it/projects/MJAVADOC-610_mrjar/invoker.properties
@@ -0,0 +1,19 @@
+# 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 = package
+invoker.java.version = 1.9+
diff --git a/src/it/projects/MJAVADOC-610_mrjar/pom.xml b/src/it/projects/MJAVADOC-610_mrjar/pom.xml
new file mode 100644
index 0000000..70adfa3
--- /dev/null
+++ b/src/it/projects/MJAVADOC-610_mrjar/pom.xml
@@ -0,0 +1,93 @@
+<?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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.javadoc.it</groupId>
+ <artifactId>mjavadoc610</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <url>https://issues.apache.org/jira/browse/MJAVADOC-610</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ <executions>
+ <execution>
+ <id>jdk9</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <release>9</release>
+ <multiReleaseOutput>true</multiReleaseOutput>
+ <compileSourceRoots>
+ <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
+ </compileSourceRoots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Multi-Release>true</Multi-Release>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>jar</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <sourcepath>src/main/java9;src/main/java</sourcepath>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java b/src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java
new file mode 100644
index 0000000..7370ac0
--- /dev/null
+++ b/src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java
@@ -0,0 +1,25 @@
+package com.foo;
+
+/*
+ * 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.
+ */
+
+public class MyClass
+{
+
+}
diff --git a/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/MyClass.java b/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/MyClass.java
new file mode 100644
index 0000000..7370ac0
--- /dev/null
+++ b/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/MyClass.java
@@ -0,0 +1,25 @@
+package com.foo;
+
+/*
+ * 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.
+ */
+
+public class MyClass
+{
+
+}
diff --git a/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/module-info.java b/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/module-info.java
new file mode 100644
index 0000000..78ba6a6
--- /dev/null
+++ b/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/module-info.java
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+module com.foo
+{
+ exports com.foo;
+}
\ No newline at end of file
[maven-javadoc-plugin] 02/02: add more tests
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch MJAVADOC-610
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 2f21ee6cd228de660b1a7380426bbe66af45942c
Author: olivier lamy <ol...@apache.org>
AuthorDate: Wed Mar 11 10:07:08 2020 +1000
add more tests
Signed-off-by: olivier lamy <ol...@apache.org>
---
.../MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java | 5 +++++
.../MJAVADOC-610_mrjar/src/main/java9/com/foo/MyClass.java | 14 ++++++++++++++
.../com/foo/MyClass.java => java9/com/foo/OtherClass.java} | 2 +-
.../{src/main/java/com/foo/MyClass.java => verify.groovy} | 13 ++++++-------
4 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java b/src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java
index 7370ac0..a698ec9 100644
--- a/src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java
+++ b/src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java
@@ -21,5 +21,10 @@ package com.foo;
public class MyClass
{
+ /**
+ * foo method
+ */
+ public void foo(){
+ }
}
diff --git a/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/MyClass.java b/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/MyClass.java
index 7370ac0..5859585 100644
--- a/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/MyClass.java
+++ b/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/MyClass.java
@@ -22,4 +22,18 @@ package com.foo;
public class MyClass
{
+ /**
+ * bar method
+ */
+ public void foo(){
+
+ }
+
+ /**
+ * bar method
+ */
+ public void bar(){
+
+ }
+
}
diff --git a/src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java b/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/OtherClass.java
similarity index 97%
copy from src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java
copy to src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/OtherClass.java
index 7370ac0..2b07d89 100644
--- a/src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java
+++ b/src/it/projects/MJAVADOC-610_mrjar/src/main/java9/com/foo/OtherClass.java
@@ -19,7 +19,7 @@ package com.foo;
* under the License.
*/
-public class MyClass
+public class OtherClass
{
}
diff --git a/src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java b/src/it/projects/MJAVADOC-610_mrjar/verify.groovy
similarity index 74%
copy from src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java
copy to src/it/projects/MJAVADOC-610_mrjar/verify.groovy
index 7370ac0..bbed8f9 100644
--- a/src/it/projects/MJAVADOC-610_mrjar/src/main/java/com/foo/MyClass.java
+++ b/src/it/projects/MJAVADOC-610_mrjar/verify.groovy
@@ -1,5 +1,3 @@
-package com.foo;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -8,9 +6,9 @@ package com.foo;
* 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
@@ -19,7 +17,8 @@ package com.foo;
* under the License.
*/
-public class MyClass
-{
+def file = new File( basedir, 'target/mjavadoc610-1.0-SNAPSHOT-javadoc.jar' )
+assert file.exists()
-}
+assert new File( basedir, 'target/apidocs/com.foo/com/foo/MyClass.html').exists()
+assert new File( basedir, 'target/apidocs/com.foo/com/foo/OtherClass.html').exists()