From f55ca2d0cfa186930628b3b822766961500dda70 Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Sat, 17 Feb 2024 11:55:26 +0700
Subject: [PATCH] Run Antrun post-javadoc task depending on Javadoc execution

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---
 aspectjmatcher/pom.xml | 5 +++--
 aspectjrt/pom.xml      | 5 +++--
 aspectjtools/pom.xml   | 5 +++--
 aspectjweaver/pom.xml  | 5 +++--
 pom.xml                | 5 +++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml
index 1c56f1210..4283f7a7f 100644
--- a/aspectjmatcher/pom.xml
+++ b/aspectjmatcher/pom.xml
@@ -206,8 +206,9 @@
 					<!-- 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>
+						<configuration>
+							<skip>${maven.javadoc.skip}</skip>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
diff --git a/aspectjrt/pom.xml b/aspectjrt/pom.xml
index be1bc7059..835f762cd 100644
--- a/aspectjrt/pom.xml
+++ b/aspectjrt/pom.xml
@@ -204,8 +204,9 @@
 					<!-- 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>
+						<configuration>
+							<skip>${maven.javadoc.skip}</skip>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml
index a872b1ea7..45a3a8c4f 100644
--- a/aspectjtools/pom.xml
+++ b/aspectjtools/pom.xml
@@ -278,8 +278,9 @@
 					<!-- 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>
+						<configuration>
+							<skip>${maven.javadoc.skip}</skip>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml
index 964821255..22a6a5006 100644
--- a/aspectjweaver/pom.xml
+++ b/aspectjweaver/pom.xml
@@ -279,8 +279,9 @@
 					<!-- 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>
+						<configuration>
+							<skip>${maven.javadoc.skip}</skip>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
diff --git a/pom.xml b/pom.xml
index b8ed29db2..e5fb0180c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -484,12 +484,13 @@
 						-->
 						<execution>
 							<id>filter-javadocs</id>
-							<!-- Override phase to 'package' in modules which need to filter javadocs -->
-							<phase>none</phase>
+							<phase>package</phase>
 							<goals>
 								<goal>run</goal>
 							</goals>
 							<configuration>
+								<!-- Override in modules which need to filter javadocs -->
+								<skip>$true</skip>
 								<target>
 									<!-- See https://ant.apache.org/manual/Tasks/replaceregexp.html -->
 									<replaceregexp byline="true">
-- 
2.39.5