Skip to content

Commit 797b435

Browse files
senivamjansupol
authored andcommitted
Updating maven-javadoc-pugin to 3.2.0
Signed-off-by: Maxim Nesen <[email protected]>
1 parent fb80651 commit 797b435

File tree

3 files changed

+43
-6
lines changed

3 files changed

+43
-6
lines changed

connectors/helidon-connector/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
<artifactId>maven-javadoc-plugin</artifactId>
7979
<configuration>
8080
<source>8</source>
81+
<detectJavaApiLink>false</detectJavaApiLink>
8182
</configuration>
8283
</plugin>
8384
</plugins>

examples/extended-wadl-webapp/pom.xml

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,18 @@
207207
version 2.5 of the javadoc plugin which will be used
208208
by a maven version > 2.0.9 -->
209209
<useStandardDocletOptions>false</useStandardDocletOptions>
210-
<additionalparam>-output ${project.build.outputDirectory}/resourcedoc.xml</additionalparam>
210+
<additionalOptions>
211+
<additionalOption>-output</additionalOption>
212+
<additionalOption>${project.build.outputDirectory}/resourcedoc.xml</additionalOption>
213+
</additionalOptions>
214+
<additionalDependencies>
215+
<additionalDependency>
216+
<groupId>com.sun.xml.bind</groupId>
217+
<artifactId>jaxb-osgi</artifactId>
218+
<version>${jaxb.ri.version}</version>
219+
</additionalDependency>
220+
</additionalDependencies>
221+
<!-- <additionalparam>-output ${project.build.outputDirectory}/resourcedoc.xml</additionalparam>-->
211222
</configuration>
212223
</plugin>
213224
<plugin>
@@ -246,6 +257,30 @@
246257
</dependency>
247258
</dependencies>
248259
</profile>
260+
<profile>
261+
<id>javadocAndTestsSkipJDK13</id>
262+
<activation>
263+
<jdk>[13,)</jdk>
264+
</activation>
265+
<build>
266+
<plugins>
267+
<plugin>
268+
<groupId>org.apache.maven.plugins</groupId>
269+
<artifactId>maven-javadoc-plugin</artifactId>
270+
<configuration>
271+
<skip>true</skip>
272+
</configuration>
273+
</plugin>
274+
<plugin>
275+
<groupId>org.apache.maven.plugins</groupId>
276+
<artifactId>maven-surefire-plugin</artifactId>
277+
<configuration>
278+
<skip>true</skip>
279+
</configuration>
280+
</plugin>
281+
</plugins>
282+
</build>
283+
</profile>
249284
<profile>
250285
<id>pre-release</id>
251286
<build>

pom.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@
445445
<plugin>
446446
<groupId>org.apache.maven.plugins</groupId>
447447
<artifactId>maven-javadoc-plugin</artifactId>
448-
<version>2.10.4</version>
448+
<version>3.2.0</version>
449449
<configuration>
450450
<doctitle>Jersey ${jersey.version} API Documentation</doctitle>
451451
<windowtitle>Jersey ${jersey.version} API</windowtitle>
@@ -457,7 +457,7 @@
457457
</bottom>
458458
<links>
459459
<link>https://jax-rs.github.io/apidocs/2.1/</link>
460-
<link>http://hk2.java.net/nonav/hk2-api/apidocs</link>
460+
<link>https://javaee.github.io/hk2/apidocs/</link>
461461
</links>
462462
<excludePackageNames>
463463
*.internal.*:*.tests.*
@@ -467,8 +467,9 @@
467467
<fileExclude>module-info.java</fileExclude>
468468
</sourceFileExcludes>
469469
<verbose>true</verbose>
470-
<additionalparam>-Xdoclint:none</additionalparam>
470+
<doclint>none</doclint>
471471
<maxmemory>256m</maxmemory>
472+
<source>8</source>
472473
</configuration>
473474
<executions>
474475
<execution>
@@ -1386,7 +1387,7 @@
13861387
<plugin>
13871388
<groupId>org.apache.maven.plugins</groupId>
13881389
<artifactId>maven-javadoc-plugin</artifactId>
1389-
<version>2.10.4</version>
1390+
<version>3.2.0</version>
13901391
<!-- Run this plugin report sets only in the main Jersey pom -->
13911392
<inherited>false</inherited>
13921393
<configuration>
@@ -1405,7 +1406,7 @@
14051406
<link>https://jax-rs.github.io/apidocs/2.1</link>
14061407
<link>https://javaee.github.io/hk2/apidocs/</link>
14071408
</links>
1408-
<additionalparam>-Xdoclint:none</additionalparam>
1409+
<doclint>none</doclint>
14091410
<sourceFileExcludes>
14101411
<fileExclude>module-info.java</fileExclude>
14111412
</sourceFileExcludes>

0 commit comments

Comments
 (0)