Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating maven-javadoc-pugin to 3.2.0 #4559

Merged
merged 1 commit into from
Sep 7, 2020
Merged

Updating maven-javadoc-pugin to 3.2.0 #4559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions connectors/helidon-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>8</source>
<detectJavaApiLink>false</detectJavaApiLink>
</configuration>
</plugin>
</plugins>
Expand Down
37 changes: 36 additions & 1 deletion examples/extended-wadl-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,18 @@
version 2.5 of the javadoc plugin which will be used
by a maven version > 2.0.9 -->
<useStandardDocletOptions>false</useStandardDocletOptions>
<additionalparam>-output ${project.build.outputDirectory}/resourcedoc.xml</additionalparam>
<additionalOptions>
<additionalOption>-output</additionalOption>
<additionalOption>${project.build.outputDirectory}/resourcedoc.xml</additionalOption>
</additionalOptions>
<additionalDependencies>
<additionalDependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>${jaxb.ri.version}</version>
</additionalDependency>
</additionalDependencies>
<!-- <additionalparam>-output ${project.build.outputDirectory}/resourcedoc.xml</additionalparam>-->
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -246,6 +257,30 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>javadocAndTestsSkipJDK13</id>
<activation>
<jdk>[13,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>pre-release</id>
<build>
Expand Down
11 changes: 6 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,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>
Expand All @@ -457,7 +457,7 @@
</bottom>
<links>
<link>https://jax-rs.github.io/apidocs/2.1/</link>
<link>http://hk2.java.net/nonav/hk2-api/apidocs</link>
<link>https://javaee.github.io/hk2/apidocs/</link>
</links>
<excludePackageNames>
*.internal.*:*.tests.*
Expand All @@ -467,8 +467,9 @@
<fileExclude>module-info.java</fileExclude>
</sourceFileExcludes>
<verbose>true</verbose>
<additionalparam>-Xdoclint:none</additionalparam>
<doclint>none</doclint>
<maxmemory>256m</maxmemory>
<source>8</source>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -1386,7 +1387,7 @@
<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>
Expand All @@ -1405,7 +1406,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>
Expand Down