From e6458de6e48a7add4843a4df5467fb3084a3f526 Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Mon, 24 May 2021 08:57:06 +0700
Subject: [PATCH] Fix Javadoc generation by also unpacking relocated ASM
 sources

Suddenly, for AspectJ Weaver + Tools Javadoc generation started to fail.
This might be due to switching from ASM-renamed to dynamically shaded
ASM. Either way, the Javadoc tool complains about the missing source
files. Therefore, we also unpack them from the source uber JAR now via
TrueZIP before generating Javadoc.

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

diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml
index 763122880..dd16458ae 100644
--- a/aspectjtools/pom.xml
+++ b/aspectjtools/pom.xml
@@ -236,11 +236,16 @@
 							-->
 							<skip>${maven.javadoc.skip}</skip>
 							<verbose>true</verbose>
-							<!-- TODO: Include 'aj' package for ASM-renamed contained in aspectjtools? -->
-							<fileset>
-								<directory>${project.build.directory}/${project.build.finalName}-sources.jar/org/aspectj</directory>
-								<outputDirectory>${project.build.directory}/unpacked-sources/org/aspectj</outputDirectory>
-							</fileset>
+							<filesets>
+								<fileset>
+									<directory>${project.build.directory}/${project.build.finalName}-sources.jar/org/aspectj</directory>
+									<outputDirectory>${project.build.directory}/unpacked-sources/org/aspectj</outputDirectory>
+								</fileset>
+								<fileset>
+									<directory>${project.build.directory}/${project.build.finalName}-sources.jar/aj</directory>
+									<outputDirectory>${project.build.directory}/unpacked-sources/aj</outputDirectory>
+								</fileset>
+							</filesets>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/aspectjweaver/pom.xml b/aspectjweaver/pom.xml
index 06bbf35d2..d394a76d8 100644
--- a/aspectjweaver/pom.xml
+++ b/aspectjweaver/pom.xml
@@ -237,11 +237,16 @@
 							-->
 							<skip>${maven.javadoc.skip}</skip>
 							<verbose>true</verbose>
-							<!-- TODO: Include 'aj' package for ASM-renamed contained in aspectjweaver? -->
-							<fileset>
-								<directory>${project.build.directory}/${project.build.finalName}-sources.jar/org/aspectj</directory>
-								<outputDirectory>${project.build.directory}/unpacked-sources/org/aspectj</outputDirectory>
-							</fileset>
+							<filesets>
+								<fileset>
+									<directory>${project.build.directory}/${project.build.finalName}-sources.jar/org/aspectj</directory>
+									<outputDirectory>${project.build.directory}/unpacked-sources/org/aspectj</outputDirectory>
+								</fileset>
+								<fileset>
+									<directory>${project.build.directory}/${project.build.finalName}-sources.jar/aj</directory>
+									<outputDirectory>${project.build.directory}/unpacked-sources/aj</outputDirectory>
+								</fileset>
+							</filesets>
 						</configuration>
 					</execution>
 				</executions>
-- 
2.39.5