Run Antrun post-javadoc task depending on Javadoc execution

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

diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml
index 1c56f1210cc02348450664cd0107c89ab69a6a84..4283f7a7fc8a9ebbd73ff426ac221b8b4f4dddc3 100644 (file)
--- 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 be1bc70597f4798acdc81fabf7c7a954645bfdaf..835f762cd744e2d01dd9baca8c9afc2437b8584f 100644 (file)
--- 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 a872b1ea7afc68acade24df4e7d08c84cdaa488c..45a3a8c4f21eb31c4012167dcb78a73d6b34b989 100644 (file)
--- 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 9648212550b5628505d8dd8650b9616e4b41edde..22a6a5006bec988c0dd4c19ddaf5661bcc9de1cc 100644 (file)
--- 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 b8ed29db218f6508cf7c5738896235dfb20d3443..e5fb0180cd9528fcddddcd25a75e13b5d30e9a3e 100644 (file)
--- 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">