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/02/19 02:17:12 UTC
[maven-javadoc-plugin] branch master updated: [MJAVADOC-639]
include requires static from external dependencies for all modules (#38)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 405b16d [MJAVADOC-639] include requires static from external dependencies for all modules (#38)
405b16d is described below
commit 405b16dc1de312d31f8a4f31c1cf8a07db3220eb
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Wed Feb 19 12:17:06 2020 +1000
[MJAVADOC-639] include requires static from external dependencies for all modules (#38)
* [MJAVADOC-639] include requires static from external dependencies for all modules
Signed-off-by: olivier lamy <ol...@apache.org>
* [MJAVADOC-639] update plexus-java method name
Signed-off-by: olivier lamy <ol...@apache.org>
* add plexus snapshots repository
Signed-off-by: olivier lamy <ol...@apache.org>
* [MJAVADOC-639] plexus-java 1.0.5
Signed-off-by: olivier lamy <ol...@apache.org>
---
pom.xml | 2 +-
.../invoker.properties | 19 ++++++++
.../modulea/pom.xml | 32 +++++++++++++
.../com/javamodularity/modulea/HelloWorld.java | 37 ++++++++++++++
.../modulea/src/main/java/module-info.java | 25 ++++++++++
.../moduleb/pom.xml | 32 +++++++++++++
.../com/javamodularity/moduleb/HelloWorld.java | 37 ++++++++++++++
.../moduleb/src/main/java/module-info.java | 25 ++++++++++
.../modulec/pom.xml | 46 ++++++++++++++++++
.../com/javamodularity/modulec/WorldCollector.java | 50 +++++++++++++++++++
.../modulec/src/main/java/module-info.java | 28 +++++++++++
.../MJAVADOC-639_aggr_static_modulepath/pom.xml | 36 ++++++++++++++
.../invoker.properties | 19 ++++++++
.../MJAVADOC-639_requires_ignored/modulea/pom.xml | 32 +++++++++++++
.../com/javamodularity/modulea/HelloWorld.java | 37 ++++++++++++++
.../com/javamodularity/modulea/SimpleLogging.java | 48 +++++++++++++++++++
.../modulea/src/main/java/module-info.java | 28 +++++++++++
.../MJAVADOC-639_requires_ignored/moduleb/pom.xml | 25 ++++++++++
.../com/javamodularity/moduleb/HelloWorld.java | 37 ++++++++++++++
.../moduleb/src/main/java/module-info.java | 25 ++++++++++
.../projects/MJAVADOC-639_requires_ignored/pom.xml | 56 ++++++++++++++++++++++
.../MJAVADOC-639_requires_ignored/verify.groovy | 55 +++++++++++++++++++++
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 1 +
23 files changed, 731 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1c10418..c4c0886 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@ under the License.
<doxia-sitetoolsVersion>1.7.4</doxia-sitetoolsVersion>
<wagonVersion>2.4</wagonVersion>
<sonatypeAetherVersion>1.13.1</sonatypeAetherVersion>
- <plexus-java.version>1.0.4</plexus-java.version>
+ <plexus-java.version>1.0.5</plexus-java.version>
<!-- for ITs -->
<sitePluginVersion>3.3</sitePluginVersion>
<projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>
diff --git a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/invoker.properties b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/invoker.properties
new file mode 100644
index 0000000..f6c12c2
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/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.java.version = 9+
+invoker.goals=javadoc:aggregate
+
diff --git a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/pom.xml b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/pom.xml
new file mode 100644
index 0000000..cbb8ba4
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/pom.xml
@@ -0,0 +1,32 @@
+<!-- ~ 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>modulea</groupId>
+ <artifactId>modulea</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <release>9</release>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/src/main/java/com/javamodularity/modulea/HelloWorld.java b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/src/main/java/com/javamodularity/modulea/HelloWorld.java
new file mode 100644
index 0000000..e597b21
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/src/main/java/com/javamodularity/modulea/HelloWorld.java
@@ -0,0 +1,37 @@
+package com.javamodularity.modulea;
+
+/*
+ * 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.
+ */
+
+/**
+ * <p>Javadoc aggregation from module a.</p>
+ */
+public class HelloWorld {
+
+ /**
+ * <p>method f does something</p>
+ */
+ public void f() {
+ }
+
+ public static void main(String... args) {
+ System.out.println("Hello Modular World!");
+ }
+
+}
diff --git a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/src/main/java/module-info.java b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/src/main/java/module-info.java
new file mode 100644
index 0000000..6931f11
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/src/main/java/module-info.java
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+/**
+ * <p>modulea does something</p>
+ */
+module modulea {
+ exports com.javamodularity.modulea;
+}
diff --git a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/pom.xml b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/pom.xml
new file mode 100644
index 0000000..4d25a4e
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/pom.xml
@@ -0,0 +1,32 @@
+<!-- ~ 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>moduleb</groupId>
+ <artifactId>moduleb</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <release>9</release>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/src/main/java/com/javamodularity/moduleb/HelloWorld.java b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/src/main/java/com/javamodularity/moduleb/HelloWorld.java
new file mode 100644
index 0000000..1f93e00
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/src/main/java/com/javamodularity/moduleb/HelloWorld.java
@@ -0,0 +1,37 @@
+package com.javamodularity.moduleb;
+
+/*
+ * 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.
+ */
+
+/**
+ * <p>Javadoc aggregation from module a.</p>
+ */
+public class HelloWorld {
+
+ /**
+ * <p>method f does something</p>
+ */
+ public void f() {
+ }
+
+ public static void main(String... args) {
+ System.out.println("Hello Modular World!");
+ }
+
+}
diff --git a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/src/main/java/module-info.java b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/src/main/java/module-info.java
new file mode 100644
index 0000000..3f935b8
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/src/main/java/module-info.java
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+/**
+ * <p>moduleb does something</p>
+ */
+module moduleb {
+ exports com.javamodularity.moduleb;
+}
diff --git a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/pom.xml b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/pom.xml
new file mode 100644
index 0000000..f68bc4f
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/pom.xml
@@ -0,0 +1,46 @@
+<!-- ~ 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>modulec</groupId>
+ <artifactId>modulec</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <release>9</release>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>modulea</groupId>
+ <artifactId>modulea</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>moduleb</groupId>
+ <artifactId>moduleb</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/src/main/java/com/javamodularity/modulec/WorldCollector.java b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/src/main/java/com/javamodularity/modulec/WorldCollector.java
new file mode 100644
index 0000000..2dbd5ca
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/src/main/java/com/javamodularity/modulec/WorldCollector.java
@@ -0,0 +1,50 @@
+package com.javamodularity.modulec;
+
+/*
+ * 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.
+ */
+
+/**
+ * <strong>WorldCollector</strong>
+ */
+public class WorldCollector {
+
+ public void collect()
+ {
+ getA().main();
+
+ try
+ {
+ getB().main();
+ }
+ catch ( Exception e )
+ {
+ // noop
+ }
+ }
+
+ public com.javamodularity.modulea.HelloWorld getA()
+ {
+ return new com.javamodularity.modulea.HelloWorld();
+ }
+
+ public com.javamodularity.moduleb.HelloWorld getB()
+ {
+ return new com.javamodularity.moduleb.HelloWorld();
+ }
+}
diff --git a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/src/main/java/module-info.java b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/src/main/java/module-info.java
new file mode 100644
index 0000000..a0534b2
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/src/main/java/module-info.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+/**
+ * <p>modulec does something</p>
+ */
+module modulec {
+ requires modulea;
+ requires static moduleb;
+
+ exports com.javamodularity.modulec;
+}
diff --git a/src/it/projects/MJAVADOC-639_aggr_static_modulepath/pom.xml b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/pom.xml
new file mode 100644
index 0000000..4da452c
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_aggr_static_modulepath/pom.xml
@@ -0,0 +1,36 @@
+<?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>parent</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>modulea</module>
+ <module>moduleb</module>
+ <module>modulec</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/it/projects/MJAVADOC-639_requires_ignored/invoker.properties b/src/it/projects/MJAVADOC-639_requires_ignored/invoker.properties
new file mode 100644
index 0000000..db135df
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_requires_ignored/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.java.version = 9+
+invoker.goals=package source:jar javadoc:jar javadoc:aggregate-jar
+
diff --git a/src/it/projects/MJAVADOC-639_requires_ignored/modulea/pom.xml b/src/it/projects/MJAVADOC-639_requires_ignored/modulea/pom.xml
new file mode 100644
index 0000000..2061907
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_requires_ignored/modulea/pom.xml
@@ -0,0 +1,32 @@
+<!-- ~ 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.javadoc.its</groupId>
+ <artifactId>MJAVADOC-639</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>modulea</groupId>
+ <artifactId>modulea</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/it/projects/MJAVADOC-639_requires_ignored/modulea/src/main/java/com/javamodularity/modulea/HelloWorld.java b/src/it/projects/MJAVADOC-639_requires_ignored/modulea/src/main/java/com/javamodularity/modulea/HelloWorld.java
new file mode 100644
index 0000000..26447fc
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_requires_ignored/modulea/src/main/java/com/javamodularity/modulea/HelloWorld.java
@@ -0,0 +1,37 @@
+package com.javamodularity.modulea;
+
+/*
+ * 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.
+ */
+
+/**
+ * <p>Javadoc aggregation from module a.</p>
+ */
+public class HelloWorld {
+
+ /**
+ * <p>method f does something</p>
+ */
+ public void f() {
+ }
+
+ public static void main(String... args) {
+ System.out.println("Hello Modular World!");
+ }
+
+}
diff --git a/src/it/projects/MJAVADOC-639_requires_ignored/modulea/src/main/java/com/javamodularity/modulea/SimpleLogging.java b/src/it/projects/MJAVADOC-639_requires_ignored/modulea/src/main/java/com/javamodularity/modulea/SimpleLogging.java
new file mode 100644
index 0000000..04cf8c1
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_requires_ignored/modulea/src/main/java/com/javamodularity/modulea/SimpleLogging.java
@@ -0,0 +1,48 @@
+package com.javamodularity.modulea;
+
+/*
+ * 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.
+ */
+
+/**
+ * <p>Javadoc aggregation from module a.</p>
+ */
+public class SimpleLogging
+{
+
+ private final org.slf4j.Logger _logger;
+
+ public SimpleLogging( )
+ {
+ org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger("SimpleLogging");
+ _logger = logger;
+ }
+
+ /**
+ * <p>method f does something</p>
+ */
+ public void f()
+ {
+ }
+
+ public static void main( String... args )
+ {
+ System.out.println( "Hello Modular World!" );
+ }
+
+}
diff --git a/src/it/projects/MJAVADOC-639_requires_ignored/modulea/src/main/java/module-info.java b/src/it/projects/MJAVADOC-639_requires_ignored/modulea/src/main/java/module-info.java
new file mode 100644
index 0000000..59f800a
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_requires_ignored/modulea/src/main/java/module-info.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+/**
+ * <p>modulea does something</p>
+ */
+module modulea {
+ exports com.javamodularity.modulea;
+
+ // Only required if using Slf4jLog.
+ requires static org.slf4j;
+}
diff --git a/src/it/projects/MJAVADOC-639_requires_ignored/moduleb/pom.xml b/src/it/projects/MJAVADOC-639_requires_ignored/moduleb/pom.xml
new file mode 100644
index 0000000..4241e0d
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_requires_ignored/moduleb/pom.xml
@@ -0,0 +1,25 @@
+<!-- ~ 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.javadoc.its</groupId>
+ <artifactId>MJAVADOC-639</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>moduleb</groupId>
+ <artifactId>moduleb</artifactId>
+
+</project>
diff --git a/src/it/projects/MJAVADOC-639_requires_ignored/moduleb/src/main/java/com/javamodularity/moduleb/HelloWorld.java b/src/it/projects/MJAVADOC-639_requires_ignored/moduleb/src/main/java/com/javamodularity/moduleb/HelloWorld.java
new file mode 100644
index 0000000..4d9f4d2
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_requires_ignored/moduleb/src/main/java/com/javamodularity/moduleb/HelloWorld.java
@@ -0,0 +1,37 @@
+package com.javamodularity.moduleb;
+
+/*
+ * 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.
+ */
+
+/**
+ * <p>Javadoc aggregation from module a.</p>
+ */
+public class HelloWorld {
+
+ /**
+ * <p>method f does something</p>
+ */
+ public void f() {
+ }
+
+ public static void main(String... args) {
+ System.out.println("Hello Modular World!");
+ }
+
+}
diff --git a/src/it/projects/MJAVADOC-639_requires_ignored/moduleb/src/main/java/module-info.java b/src/it/projects/MJAVADOC-639_requires_ignored/moduleb/src/main/java/module-info.java
new file mode 100644
index 0000000..bcf2890
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_requires_ignored/moduleb/src/main/java/module-info.java
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+/**
+ * <p>moduleb does something</p>
+ */
+module moduleb {
+ exports com.javamodularity.moduleb;
+}
diff --git a/src/it/projects/MJAVADOC-639_requires_ignored/pom.xml b/src/it/projects/MJAVADOC-639_requires_ignored/pom.xml
new file mode 100644
index 0000000..57c30d4
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_requires_ignored/pom.xml
@@ -0,0 +1,56 @@
+<?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.javadoc.its</groupId>
+ <artifactId>MJAVADOC-639</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <properties>
+ <slf4j.version>1.8.0-beta4</slf4j.version>
+ </properties>
+ <modules>
+ <module>modulea</module>
+ <module>moduleb</module>
+ </modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ <configuration>
+ <release>9</release>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/src/it/projects/MJAVADOC-639_requires_ignored/verify.groovy b/src/it/projects/MJAVADOC-639_requires_ignored/verify.groovy
new file mode 100644
index 0000000..3cb9637
--- /dev/null
+++ b/src/it/projects/MJAVADOC-639_requires_ignored/verify.groovy
@@ -0,0 +1,55 @@
+import java.util.jar.JarEntry
+import java.util.jar.JarFile
+
+/*
+ * 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.
+ */
+
+int javaVersion = System.getProperty( "java.specification.version" ) as Integer
+if ( javaVersion >= 11 ) {
+ def index = new File( basedir, 'target/apidocs/index.html')
+
+ assert index.text =~ /<a href="modulea\/module-summary\.html">modulea<\/a>/
+ assert index.text =~ /<a href="moduleb\/module-summary\.html">moduleb<\/a>/
+
+ assert new File( basedir, 'target/apidocs/modulea/module-summary.html').exists()
+ assert new File( basedir, 'target/apidocs/moduleb/module-summary.html').exists()
+}
+else {
+ def overview = new File( basedir, 'target/site/apidocs/overview-summary.html')
+
+ assert overview.text =~ /<a href="modulea-summary.html">modulea<\/a>/
+ assert overview.text =~ /<a href="moduleb-summary.html">moduleb<\/a>/
+
+ assert new File( basedir, 'target/site/apidocs/modulea-summary.html').exists()
+ assert new File( basedir, 'target/site/apidocs/moduleb-summary.html').exists()
+}
+
+def aggregate = new File(basedir, 'target/MJAVADOC-639-1.0.0-SNAPSHOT-javadoc.jar')
+assert aggregate.exists()
+
+def jar = new JarFile( aggregate )
+def files = new ArrayList()
+
+for ( JarEntry file in jar.entries() ) {
+ files.add(file.getName())
+}
+
+assert files.contains("modulea/com/javamodularity/modulea/SimpleLogging.html")
+assert files.contains("modulea/com/javamodularity/modulea/HelloWorld.html")
+assert files.contains("moduleb/com/javamodularity/moduleb/HelloWorld.html")
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index ee29c6a..83c3bd0 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -5149,6 +5149,7 @@ public abstract class AbstractJavadocMojo
}
request.setAdditionalModules( additionalModules );
+ request.setIncludeStatic( isAggregator() );
try
{