diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2024-02-01 17:13:22 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2024-02-01 17:13:22 +0700 |
| commit | bce5e2d49bcf2ecf4d542c11dd84056e03ac87eb (patch) | |
| tree | 73d5da314bc939cdd91bac2c11ac56e25d8347c1 | |
| parent | ecbe1338108eba5756669ac1b67e691a0f695282 (diff) | |
| download | aspectj-bce5e2d49bcf2ecf4d542c11dd84056e03ac87eb.tar.gz aspectj-bce5e2d49bcf2ecf4d542c11dd84056e03ac87eb.zip | |
DRY: Centralise common Maven Javadoc configuration
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
| -rw-r--r-- | aspectjmatcher/pom.xml | 8 | ||||
| -rw-r--r-- | aspectjrt/pom.xml | 8 | ||||
| -rw-r--r-- | aspectjtools/pom.xml | 14 | ||||
| -rw-r--r-- | aspectjweaver/pom.xml | 14 | ||||
| -rw-r--r-- | pom.xml | 16 |
5 files changed, 16 insertions, 44 deletions
diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml index 7830f3f87..0d87b2673 100644 --- 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 2ef34a1f4..fc91a9226 100644 --- 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 25ffadb14..812642617 100644 --- 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 00d575fa3..bdd1e6848 100644 --- 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> @@ -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> |