From 86a026c81399be570d96a4ceb901dcd5c649c60e Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Sun, 23 May 2021 14:37:33 +0700
Subject: [PATCH] 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>
---
 aspectjmatcher/pom.xml | 1 -
 aspectjrt/pom.xml      | 1 -
 aspectjtools/pom.xml   | 1 -
 aspectjweaver/pom.xml  | 1 -
 pom.xml                | 9 +++++++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/aspectjmatcher/pom.xml b/aspectjmatcher/pom.xml
index 8d7a1573b..ac52698ab 100644
--- 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 8dbd5a3f0..a63eb5171 100644
--- 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 1a68a6116..763122880 100644
--- 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 3e41e3633..06bbf35d2 100644
--- 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 dbcc71bae..5781ac74b 100644
--- 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>
-- 
2.39.5