Run Antrun post-javadoc task depending on Javadoc execution

Signed-off-by: Alexander Kriegisch <[email protected]>
eclipse-aspectj · Feb 17, 2024 · f55ca2d · f55ca2d
1 parent c267c75
commit f55ca2d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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">