Browse Source

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>
tags/V1_9_7_M2
Alexander Kriegisch 3 years ago
parent
commit
e6458de6e4
2 changed files with 20 additions and 10 deletions
  1. 10
    5
      aspectjtools/pom.xml
  2. 10
    5
      aspectjweaver/pom.xml

+ 10
- 5
aspectjtools/pom.xml View File

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

+ 10
- 5
aspectjweaver/pom.xml View File

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

Loading…
Cancel
Save