From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Mon, 24 May 2021 01:57:06 +0000 (+0700)
Subject: Fix Javadoc generation by also unpacking relocated ASM sources
X-Git-Tag: V1_9_7_M2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e6458de6e48a7add4843a4df5467fb3084a3f526;p=aspectj.git

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>
---

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>