Skip to content

Commit 95d2950

Browse files
atoato
committed
maven: Configure docgen annotation processor on invidual submodules
It seems `combine.self="override"` doesn't work on the github runner's version of maven.
1 parent e49b0c9 commit 95d2950

File tree

6 files changed

+57
-20
lines changed

6 files changed

+57
-20
lines changed

‎commons/pom.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,21 @@
204204
<argLine>-Xmx1g</argLine>
205205
</configuration>
206206
</plugin>
207+
208+
<plugin>
209+
<groupId>org.apache.maven.plugins</groupId>
210+
<artifactId>maven-compiler-plugin</artifactId>
211+
<configuration>
212+
<!-- Generate heritrix-beans.json -->
213+
<annotationProcessorPaths>
214+
<path>
215+
<groupId>org.archive.heritrix</groupId>
216+
<artifactId>heritrix-docgen</artifactId>
217+
<version>${project.version}</version>
218+
</path>
219+
</annotationProcessorPaths>
220+
</configuration>
221+
</plugin>
207222
</plugins>
208223
</build>
209224
<properties>

‎contrib/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,20 @@
112112
</execution>
113113
</executions>
114114
</plugin>
115+
<plugin>
116+
<groupId>org.apache.maven.plugins</groupId>
117+
<artifactId>maven-compiler-plugin</artifactId>
118+
<configuration>
119+
<!-- Generate heritrix-beans.json -->
120+
<annotationProcessorPaths>
121+
<path>
122+
<groupId>org.archive.heritrix</groupId>
123+
<artifactId>heritrix-docgen</artifactId>
124+
<version>${project.version}</version>
125+
</path>
126+
</annotationProcessorPaths>
127+
</configuration>
128+
</plugin>
115129
</plugins>
116130
</build>
117131
</project>

‎docgen/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,4 @@
1717
<version>2.20.0</version>
1818
</dependency>
1919
</dependencies>
20-
<build>
21-
<plugins>
22-
<plugin>
23-
<groupId>org.apache.maven.plugins</groupId>
24-
<artifactId>maven-compiler-plugin</artifactId>
25-
<configuration>
26-
<!-- prevent attempting to run docgen on itself -->
27-
<annotationProcessorPaths combine.self="override"/>
28-
</configuration>
29-
</plugin>
30-
</plugins>
31-
</build>
3220
</project>

‎engine/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,20 @@
206206
<argLine>-server -Xmx512m -Djava.util.logging.config.file=${basedir}/src/test/resources/logging.properties</argLine>
207207
</configuration>
208208
</plugin>
209+
<plugin>
210+
<groupId>org.apache.maven.plugins</groupId>
211+
<artifactId>maven-compiler-plugin</artifactId>
212+
<configuration>
213+
<!-- Generate heritrix-beans.json -->
214+
<annotationProcessorPaths>
215+
<path>
216+
<groupId>org.archive.heritrix</groupId>
217+
<artifactId>heritrix-docgen</artifactId>
218+
<version>${project.version}</version>
219+
</path>
220+
</annotationProcessorPaths>
221+
</configuration>
222+
</plugin>
209223
</plugins>
210224
</build>
211225
<properties>

‎modules/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,20 @@
127127
</excludes>
128128
</configuration>
129129
</plugin>
130+
<plugin>
131+
<groupId>org.apache.maven.plugins</groupId>
132+
<artifactId>maven-compiler-plugin</artifactId>
133+
<configuration>
134+
<!-- Generate heritrix-beans.json -->
135+
<annotationProcessorPaths>
136+
<path>
137+
<groupId>org.archive.heritrix</groupId>
138+
<artifactId>heritrix-docgen</artifactId>
139+
<version>${project.version}</version>
140+
</path>
141+
</annotationProcessorPaths>
142+
</configuration>
143+
</plugin>
130144
</plugins>
131145
</build>
132146
<properties>

‎pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -355,14 +355,6 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html
355355
<!-- Retain method parameter names. This is required for some autowiring like AbstractFrontier.setScope()
356356
https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-6.1-Release-Notes#parameter-name-retention -->
357357
<parameters>true</parameters>
358-
<!-- Generate heritrix-beans.json -->
359-
<annotationProcessorPaths>
360-
<path>
361-
<groupId>org.archive.heritrix</groupId>
362-
<artifactId>heritrix-docgen</artifactId>
363-
<version>${project.version}</version>
364-
</path>
365-
</annotationProcessorPaths>
366358
</configuration>
367359
</plugin>
368360
<plugin>

0 commit comments

Comments
 (0)