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 7631228808c0f867764b24c1ff99db091f7676d9..dd16458aecd2b8f82853bc6d879c7959fb6dc9e1 100644 (file)
--- 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 06bbf35d245ff34dd93f12d990de1b5b3b7b94fa..d394a76d89df9cd6fb71cc8e5a1007152b8fcf90 100644 (file)
--- 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>