javadoc plugin migrated to 3.2.0 Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/bundles/apidocs/pom.xml b/bundles/apidocs/pom.xml index 76ad95e..40ebdd9 100644 --- a/bundles/apidocs/pom.xml +++ b/bundles/apidocs/pom.xml
@@ -210,6 +210,27 @@ </dependencies> <profiles> <profile> + <id>JettyExclude</id> + <activation> + <jdk>1.8</jdk> + </activation> + <properties> + <jetty.version>9.4.28.v20200408</jetty.version> + </properties> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-client</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty.version}</version> + </dependency> + </dependencies> + </profile> + <profile> <id>jetty2x</id> <activation> <activeByDefault>false</activeByDefault>
diff --git a/ext/cdi/jersey-cdi-rs-inject/pom.xml b/ext/cdi/jersey-cdi-rs-inject/pom.xml index 7990855..43072b2 100644 --- a/ext/cdi/jersey-cdi-rs-inject/pom.xml +++ b/ext/cdi/jersey-cdi-rs-inject/pom.xml
@@ -54,6 +54,7 @@ <artifactId>maven-javadoc-plugin</artifactId> <configuration> <show>package</show> + <detectJavaApiLink>false</detectJavaApiLink> </configuration> </plugin> </plugins>
diff --git a/pom.xml b/pom.xml index 34faa7b..52388a6 100644 --- a/pom.xml +++ b/pom.xml
@@ -451,7 +451,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> + <version>3.2.0</version> <configuration> <doctitle>Jersey ${jersey.version} API Documentation</doctitle> <windowtitle>Jersey ${jersey.version} API</windowtitle> @@ -473,7 +473,7 @@ <fileExclude>module-info.java</fileExclude> </sourceFileExcludes> <verbose>true</verbose> - <additionalparam>-Xdoclint:none</additionalparam> + <doclint>none</doclint> <maxmemory>256m</maxmemory> </configuration> <executions> @@ -1392,14 +1392,14 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> + <version>3.2.0</version> <!-- Run this plugin report sets only in the main Jersey pom --> <inherited>false</inherited> <configuration> <doctitle>Jersey ${jersey.version} API Documentation</doctitle> <windowtitle>Jersey ${jersey.version} API</windowtitle> <bottom> - <![CDATA[Copyright © 2007-2017, + <![CDATA[Copyright © 2007-2021, <a href="http://www.oracle.com">Oracle</a> and/or its affiliates. All Rights Reserved. Use is subject to license terms.]]> @@ -1411,7 +1411,7 @@ <link>https://jax-rs.github.io/apidocs/2.1</link> <link>https://javaee.github.io/hk2/apidocs/</link> </links> - <additionalparam>-Xdoclint:none</additionalparam> + <doclint>none</doclint> <sourceFileExcludes> <fileExclude>module-info.java</fileExclude> </sourceFileExcludes>