This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.
from a0ee027 must run its before pushing new b4285c6 [MJAVADOC-613] exclude skipped javadoc modules from aggregated javadoc new 4f569ca [MJAVADOC-635] upgrade plexus-java 1.0.4 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: pom.xml | 6 +- src/it/projects/MJAVADOC-320/verify.bsh | 80 -------------- src/it/projects/MJAVADOC-320/verify.groovy | 48 ++++++++ .../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 ++++++++ .../maven/plugins/javadoc/AbstractJavadocMojo.java | 99 +++++++++++------ .../maven/plugins/javadoc/FixJavadocMojoTest.java | 50 --------- .../maven/plugins/javadoc/JavadocReportTest.java | 2 +- .../javadoc/stubs/FixJdk5MavenProjectStub.java | 105 ------------------ .../javadoc/stubs/FixJdk6MavenProjectStub.java | 105 ------------------ .../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 ----------- .../unit/fix-jdk6-test/maven-metadata-local.xml | 31 ------ .../src/main/java/fix/test/ClassWithJavadoc.java | 70 ------------ .../main/java/fix/test/InterfaceWithJavadoc.java | 47 -------- src/test/resources/unit/fix-test/pom.xml | 2 +- .../tagletArtifacts-test-plugin-config.xml | 2 +- 45 files changed, 223 insertions(+), 1676 deletions(-) delete mode 100644 src/it/projects/MJAVADOC-320/verify.bsh create mode 100644 src/it/projects/MJAVADOC-320/verify.groovy 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 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/repo/org/apache/maven/plugins/maven-javadoc-plugin/unit/fix-jdk6-test/maven-metadata-local.xml 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