aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--aspectjmatcher/pom.xml13
-rw-r--r--aspectjrt/pom.xml13
-rw-r--r--aspectjtools/pom.xml13
-rw-r--r--aspectjweaver/pom.xml13
-rw-r--r--pom.xml39
5 files changed, 91 insertions, 0 deletions
diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml
index ee20f307c..1c56f1210 100644
--- a/aspectjmatcher/pom.xml
+++ b/aspectjmatcher/pom.xml
@@ -199,6 +199,19 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <!-- Remove javadoc version number from HTML comment to keep website diffs small -->
+ <execution>
+ <id>filter-javadocs</id>
+ <!-- Override default phase 'none' from parent -->
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- Caveat: Attaching the flattened POM needs packaging=jar, so do not use packaging=pom for this module -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/aspectjrt/pom.xml b/aspectjrt/pom.xml
index 4377c3e76..be1bc7059 100644
--- a/aspectjrt/pom.xml
+++ b/aspectjrt/pom.xml
@@ -199,6 +199,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <!-- Remove javadoc version number from HTML comment to keep website diffs small -->
+ <execution>
+ <id>filter-javadocs</id>
+ <!-- Override default phase 'none' from parent -->
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml
index 5df90da85..a872b1ea7 100644
--- a/aspectjtools/pom.xml
+++ b/aspectjtools/pom.xml
@@ -271,6 +271,19 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <!-- Remove javadoc version number from HTML comment to keep website diffs small -->
+ <execution>
+ <id>filter-javadocs</id>
+ <!-- Override default phase 'none' from parent -->
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- Caveat: Attaching the flattened POM needs packaging=jar, so do not use packaging=pom for this module -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml
index b8ad8cd24..964821255 100644
--- a/aspectjweaver/pom.xml
+++ b/aspectjweaver/pom.xml
@@ -274,6 +274,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <!-- Remove javadoc version number from HTML comment to keep website diffs small -->
+ <execution>
+ <id>filter-javadocs</id>
+ <!-- Override default phase 'none' from parent -->
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
diff --git a/pom.xml b/pom.xml
index 8855eee7a..8e0afc598 100644
--- a/pom.xml
+++ b/pom.xml
@@ -466,6 +466,45 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <!--
+ Remove javadoc version number from HTML comment to keep website diffs small.
+
+ Attention: This has no effect on javadocs generated by the 'jar' goal, because they are archived while
+ Maven Javadoc runs, i.e. before this plugin execution kicks in. However, it cleans the javadocs before
+ Maven Resources copies them to aj-build/dist/docs/doc. I.e., they will be clean on the website, if copied
+ from that folder, and also in the installer.
+
+ TODO: In the future, maybe this execution or the whole Antrun plugin can go away, after a JDK feature
+ request I just created (internal review ID 9076583) has been implemented and back-ported into all JDK
+ versions we support for javadoc generation. But if that ever happens, it might take a while.
+ -->
+ <execution>
+ <id>filter-javadocs</id>
+ <!-- Override phase to 'package' in modules which need to filter javadocs -->
+ <phase>none</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- See https://ant.apache.org/manual/Tasks/replaceregexp.html -->
+ <replaceregexp byline="true">
+ <regexp pattern="^(&lt;!-- Generated by javadoc ).* (--&gt;)$"/>
+ <substitution expression="\1\2"/>
+ <fileset dir="${project.build.directory}/apidocs">
+ <include name="**/*.html"/>
+ </fileset>
+ </replaceregexp>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>2.2.5</version>