Upgrade Maven Shade Plugin to 3.2.4.MSHADE-252-391

Unfortunately, the issues fixed in the aspectj.dev fork are still not
available upstream (MSHADE-252 is merged, but unreleased, MSHADE-391 is
in review).

Also use Maven Javadoc Plugin version from parent POM.

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

diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml
index 8d7a1573be67a09fda5763960ec2abdaaffb8943..ac52698ab2aef7cc41a83c64b925d09777970f78 100644 (file)
--- a/aspectjmatcher/pom.xml
+++ b/aspectjmatcher/pom.xml
@@ -187,7 +187,6 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>3.2.0</version>
                                <executions>
                                        <execution>
                                                <id>javadoc-jar</id>

diff --git a/aspectjrt/pom.xml b/aspectjrt/pom.xml
index 8dbd5a3f020093101d9c97d08c2315ea805d77a6..a63eb5171833dc72cbaace275c42608347b56858 100644 (file)
--- a/aspectjrt/pom.xml
+++ b/aspectjrt/pom.xml
@@ -180,7 +180,6 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>3.2.0</version>
                                <executions>
                                        <execution>
                                                <id>javadoc-jar</id>

diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml
index 1a68a6116709eae9f5635a1ab9ec7cbcc59d03db..7631228808c0f867764b24c1ff99db091f7676d9 100644 (file)
--- a/aspectjtools/pom.xml
+++ b/aspectjtools/pom.xml
@@ -249,7 +249,6 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>3.2.0</version>
                                <executions>
                                        <execution>
                                                <id>javadoc-jar</id>

diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml
index 3e41e36332be432d5a30ecf48bdcafaa4b337479..06bbf35d245ff34dd93f12d990de1b5b3b7b94fa 100644 (file)
--- a/aspectjweaver/pom.xml
+++ b/aspectjweaver/pom.xml
@@ -250,7 +250,6 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>3.2.0</version>
                                <executions>
                                        <execution>
                                                <id>javadoc-jar</id>

diff --git a/pom.xml b/pom.xml
index dbcc71bae6516f72221f37c38e15d9fbde052ad2..5781ac74b45092c1a8f54458738ca5a0a9f51e52 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -261,8 +261,13 @@
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-shade-plugin</artifactId>
-                                       <!-- TODO: upgrade after https://issues.apache.org/jira/browse/MSHADE-366 is fixed -->
-                                       <version>3.2.4</version>
+                                       <!--
+                                               TODO: Replace by release in which
+                                                 - https://issues.apache.org/jira/browse/MSHADE-252,
+                                                 - https://issues.apache.org/jira/browse/MSHADE-391,
+                                                 - https://issues.apache.org/jira/browse/MSHADE-366 are fixed.
+                                       -->
+                                       <version>3.2.4.MSHADE-252-391</version>
                                        <configuration>
                                                <createSourcesJar>true</createSourcesJar>
                                                <createDependencyReducedPom>false</createDependencyReducedPom>