aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kriegisch <Alexander@Kriegisch.name>2024-01-03 13:52:35 +0700
committerAlexander Kriegisch <Alexander@Kriegisch.name>2024-01-06 10:09:11 +0100
commit217df7e0bfef4aea30453ad2595702abecca57d7 (patch)
treeadf16f132ea3feadc006b45aeeea575e07a9df79
parent451cd62eac71a02f653521c6a40bdd7fb530df5f (diff)
downloadaspectj-217df7e0bfef4aea30453ad2595702abecca57d7.tar.gz
aspectj-217df7e0bfef4aea30453ad2595702abecca57d7.zip
Remove 'imagesdir' from Asciidoctor Maven config
User relative paths for images instead. In one case, we need to copy images from a subdirectory one level up, because otherwise the images are only found in the included document, but not in the single-page one including it from the subdirectory. In all other cases, included ADOCs are located in the same directory as the including document. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
-rw-r--r--docs/pom.xml24
-rw-r--r--pom.xml7
2 files changed, 30 insertions, 1 deletions
diff --git a/docs/pom.xml b/docs/pom.xml
index e6c256dd9..d0726a217 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -23,6 +23,30 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-images-compiler-weaver</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/html/developer</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/developer/compiler-weaver</directory>
+ <includes>
+ <include>*.gif</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<executions>
diff --git a/pom.xml b/pom.xml
index 3b10e3bd1..3fd4a5ff8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,6 +304,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
</plugin>
@@ -419,7 +424,7 @@
<configuration>
<attributes>
<source-highlighter>coderay</source-highlighter>
- <imagesdir>./images</imagesdir>
+ <!--<imagesdir>./images</imagesdir>-->
<toc>left</toc>
<icons>font</icons>
</attributes>