Skip to content

Commit 1f2caee

Browse files
committed
merge javadocs
1 parent ca0e964 commit 1f2caee

1 file changed

Lines changed: 25 additions & 33 deletions

File tree

‎pom.xml‎

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
</executions>
206206
</plugin>
207207

208-
<!-- Javadoc JAR -->
208+
<!-- Javadoc JAR and custom doclet execution (merged into one plugin declaration) -->
209209
<plugin>
210210
<groupId>org.apache.maven.plugins</groupId>
211211
<artifactId>maven-javadoc-plugin</artifactId>
@@ -216,6 +216,30 @@
216216
<goal>jar</goal>
217217
</goals>
218218
</execution>
219+
<!-- Disable default javadoc execution -->
220+
<execution>
221+
<id>default-cli</id>
222+
<phase>none</phase>
223+
</execution>
224+
<execution>
225+
<id>generate-json-docs</id>
226+
<phase>prepare-package</phase>
227+
<goals>
228+
<goal>javadoc-no-fork</goal>
229+
</goals>
230+
<configuration>
231+
<doclet>doclets.Scratch4JDoclet</doclet>
232+
<!-- Use the compiled classes from target/classes -->
233+
<docletPath>${project.build.outputDirectory}</docletPath>
234+
<outputDirectory>${project.build.directory}/../docs/book/reference</outputDirectory>
235+
<useStandardDocletOptions>false</useStandardDocletOptions>
236+
<additionalOptions>
237+
<additionalOption>-d</additionalOption>
238+
<additionalOption>${project.build.directory}/../docs/book/reference</additionalOption>
239+
</additionalOptions>
240+
<show>public</show>
241+
</configuration>
242+
</execution>
219243
</executions>
220244
<configuration>
221245
<tags>
@@ -282,38 +306,6 @@
282306
</execution>
283307
</executions>
284308
</plugin>
285-
286-
<plugin>
287-
<groupId>org.apache.maven.plugins</groupId>
288-
<artifactId>maven-javadoc-plugin</artifactId>
289-
<version>3.6.3</version>
290-
<executions>
291-
<!-- Disable default javadoc execution -->
292-
<execution>
293-
<id>default-cli</id>
294-
<phase>none</phase>
295-
</execution>
296-
<execution>
297-
<id>generate-json-docs</id>
298-
<phase>prepare-package</phase>
299-
<goals>
300-
<goal>javadoc-no-fork</goal>
301-
</goals>
302-
<configuration>
303-
<doclet>doclets.Scratch4JDoclet</doclet>
304-
<!-- Use the compiled classes from target/classes -->
305-
<docletPath>${project.build.outputDirectory}</docletPath>
306-
<outputDirectory>${project.build.directory}/../docs/book/reference</outputDirectory>
307-
<useStandardDocletOptions>false</useStandardDocletOptions>
308-
<additionalOptions>
309-
<additionalOption>-d</additionalOption>
310-
<additionalOption>${project.build.directory}/../docs/book/reference</additionalOption>
311-
</additionalOptions>
312-
<show>public</show>
313-
</configuration>
314-
</execution>
315-
</executions>
316-
</plugin>
317309
</plugins>
318310

319311
<resources>

0 commit comments

Comments
 (0)