Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restoring badly merged maven-javadoc-plugin configuration

This commit is contained in:
Joakim Erdfelt 2018-05-31 09:56:44 -05:00
parent d065f1e068
commit 519d36ae40
1 changed files with 57 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
pom.xml
View File

@ -546,15 +546,19 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<configuration> <configuration>
<charset>UTF-8</charset>
<docencoding>UTF-8</docencoding>
<encoding>UTF-8</encoding>
<docfilessubdirs>true</docfilessubdirs> <docfilessubdirs>true</docfilessubdirs>
<detectLinks>false</detectLinks> <detectLinks>false</detectLinks>
<detectJavaApiLink>true</detectJavaApiLink> <detectJavaApiLink>false</detectJavaApiLink>
<show>protected</show>
<excludePackageNames>com.acme.*;org.slf4j.*;org.mortbay.*</excludePackageNames> <excludePackageNames>com.acme.*;org.slf4j.*;org.mortbay.*</excludePackageNames>
<links> <links>
<link>http://docs.oracle.com/javase/7/docs/api/</link> <link>http://docs.oracle.com/javase/8/docs/api/</link>
<link>http://docs.oracle.com/javaee/7/api/</link> <link>http://docs.oracle.com/javaee/7/api/</link>
<link>http://junit.org/junit4/javadoc/latest/</link>
<link>http://download.eclipse.org/jetty/stable-9/apidocs/</link> <link>http://download.eclipse.org/jetty/stable-9/apidocs/</link>
<link>http://junit.sourceforge.net/javadoc/</link>
</links> </links>
<tags> <tags>
<tag> <tag>
@ -562,6 +566,56 @@
<placement>X</placement> <placement>X</placement>
<head /> <head />
</tag> </tag>
<tag>
<name>phase</name>
<placement>t</placement>
<head>Phase:</head>
</tag>
<tag>
<name>goal</name>
<placement>t</placement>
<head>Goal:</head>
</tag>
<tag>
<name>description</name>
<placement>a</placement>
<head>Description:</head>
</tag>
<tag>
<name>parameter</name>
<placement>f</placement>
<head>Parameter:</head>
</tag>
<tag>
<name>required</name>
<placement>f</placement>
<head>Required:</head>
</tag>
<tag>
<name>readonly</name>
<placement>f</placement>
<head>Read-Only:</head>
</tag>
<tag>
<name>execute</name>
<placement>X</placement>
<head />
</tag>
<tag>
<name>requiresDependencyResolution</name>
<placement>X</placement>
<head />
</tag>
<tag>
<name>requiresProject</name>
<placement>X</placement>
<head />
</tag>
<tag>
<name>threadSafe</name>
<placement>X</placement>
<head />
</tag>
</tags> </tags>
</configuration> </configuration>
</plugin> </plugin>
@ -1262,18 +1316,6 @@
<properties> <properties>
<alpn.version>8.1.11.v20170118</alpn.version> <alpn.version>8.1.11.v20170118</alpn.version>
</properties> </properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- Required for Java 8u121 or later -->
<additionalparam>&#45;&#45;allow-script-in-comments</additionalparam>
</configuration>
</plugin>
</plugins>
</build>
</profile> </profile>
<profile> <profile>
<id>8u131</id> <id>8u131</id>