DRY: Centralise common Maven Javadoc configuration

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml
index 7830f3f874eb83d998054c868832d0ffc1bf06a8..0d87b2673e55a03a1891ed0cf417685b070d6fd8 100644 (file)
--- a/aspectjmatcher/pom.xml
+++ b/aspectjmatcher/pom.xml
@@ -194,14 +194,6 @@
                                                </goals>
                                                <configuration>
                                                        <sourcepath>${project.build.directory}/unpacked-sources</sourcepath>
-                                                       <!-- TODO: Include 'aj' package for ASM-renamed contained in aspectjtools? -->
-                                                       <subpackages>org.aspectj</subpackages>
-                                                       <!-- Deactivate doclint checks in order to suppress errors -->
-                                                       <doclint>none</doclint>
-                                                       <!-- Generate class use xref, making javadocs considerably bigger, but also more informative -->
-                                                       <use>true</use>
-                                                       <!-- FIXME: Why does it fail without this parameter? -->
-                                                       <javadocVersion>8</javadocVersion>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/aspectjrt/pom.xml b/aspectjrt/pom.xml
index 2ef34a1f4457d399ec36f3291de72169b18583a0..fc91a9226d8e461ddd9dd2b5d2d8ddc1484f7289 100644 (file)
--- a/aspectjrt/pom.xml
+++ b/aspectjrt/pom.xml
@@ -192,14 +192,6 @@
                                                </goals>
                                                <configuration>
                                                        <sourcepath>${project.build.directory}/unpacked-sources</sourcepath>
-                                                       <!-- TODO: Include 'aj' package for ASM-renamed contained in aspectjtools? -->
-                                                       <subpackages>org.aspectj</subpackages>
-                                                       <!-- Deactivate doclint checks in order to suppress errors -->
-                                                       <doclint>none</doclint>
-                                                       <!-- Generate class use xref, making javadocs considerably bigger, but also more informative -->
-                                                       <use>true</use>
-                                                       <!-- FIXME: Why does it fail without this parameter? -->
-                                                       <javadocVersion>8</javadocVersion>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml
index 25ffadb146ecadaf199f10d3e38d195a5363e969..812642617b940d083d2f89d72bdea90f33602bbd 100644 (file)
--- a/aspectjtools/pom.xml
+++ b/aspectjtools/pom.xml
@@ -264,22 +264,8 @@
                                                <goals>
                                                        <goal>jar</goal>
                                                </goals>
-                                               <!--
-                                                 FIXME: This configuration works with JDK 16, but throws errors on other JDK versions, e.g. 14. It looks as
-                                                  if the Maven Javadoc plugin does not do a particularly good job applying the plugin settings in a way
-                                                  making it work with different JDK javadoc tool versions. I am saying that, because when using the tool
-                                                  directly on the console, it works with basic settings and the correct classpath.
-                                               -->
                                                <configuration>
                                                        <sourcepath>${project.build.directory}/unpacked-sources</sourcepath>
-                                                       <!-- TODO: Include 'aj' package for ASM-renamed contained in aspectjtools? -->
-                                                       <subpackages>org.aspectj</subpackages>
-                                                       <!-- Deactivate doclint checks in order to suppress errors -->
-                                                       <doclint>none</doclint>
-                                                       <!-- Generate class use xref, making javadocs considerably bigger, but also more informative -->
-                                                       <use>true</use>
-                                                       <!-- FIXME: Why does it fail without this parameter? -->
-                                                       <javadocVersion>8</javadocVersion>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml
index 00d575fa3cf2b48685099f9769f487f42fd07526..bdd1e6848fea7f5f4e1620e51e7159ffe75a269c 100644 (file)
--- a/aspectjweaver/pom.xml
+++ b/aspectjweaver/pom.xml
@@ -265,22 +265,8 @@
                                                <goals>
                                                        <goal>jar</goal>
                                                </goals>
-                                               <!--
-                                                 FIXME: This configuration works with JDK 16, but throws errors on other JDK versions, e.g. 14. It looks as
-                                                  if the Maven Javadoc plugin does not do a particularly good job applying the plugin settings in a way
-                                                  making it work with different JDK javadoc tool versions. I am saying that, because when using the tool
-                                                  directly on the console, it works with basic settings and the correct classpath.
-                                               -->
                                                <configuration>
                                                        <sourcepath>${project.build.directory}/unpacked-sources</sourcepath>
-                                                       <!-- TODO: Include 'aj' package for ASM-renamed contained in aspectjtools? -->
-                                                       <subpackages>org.aspectj</subpackages>
-                                                       <!-- Deactivate doclint checks in order to suppress errors -->
-                                                       <doclint>none</doclint>
-                                                       <!-- Generate class use xref, making javadocs considerably bigger, but also more informative -->
-                                                       <use>true</use>
-                                                       <!-- FIXME: Why does it fail without this parameter? -->
-                                                       <javadocVersion>8</javadocVersion>
                                                </configuration>
                                        </execution>
                                </executions>

diff --git a/pom.xml b/pom.xml
index d06933fa0f3d47f4315888674c7fe05843f699fb..34f3ae69bf29e644245f73c5e977b7adb022ce1a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -421,6 +421,22 @@
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-javadoc-plugin</artifactId>
                                        <version>3.2.0</version>
+                                       <!--
+                                               FIXME: This configuration works with JDK 16, but throws errors on other JDK versions, e.g. 14. It looks as
+                                                if the Maven Javadoc plugin does not do a particularly good job applying the plugin settings in a way
+                                                making it work with different JDK javadoc tool versions. I am saying that, because when using the tool
+                                                directly on the console, it works with basic settings and the correct classpath.
+                                       -->
+                                       <configuration>
+                                               <!-- TODO: Include 'aj' package for ASM-renamed contained in aspectjtools? -->
+                                               <subpackages>org.aspectj</subpackages>
+                                               <!-- Deactivate doclint checks in order to suppress errors -->
+                                               <doclint>none</doclint>
+                                               <!-- Generate class use xref, making javadocs considerably bigger, but also more informative -->
+                                               <use>true</use>
+                                               <!-- FIXME: Why does it fail without this parameter? -->
+                                               <javadocVersion>8</javadocVersion>
+                                       </configuration>
                                </plugin>
                                <plugin>
                                        <groupId>org.asciidoctor</groupId>