Fix JavaDoc for Java8 builds.

2 files changed, 45 insertions, 20 deletions

diff --git a/jacoco-maven-plugin/src/org/jacoco/maven/AbstractAgentMojo.java b/jacoco-maven-plugin/src/org/jacoco/maven/AbstractAgentMojo.java
index bcc1de73..b572a668 100644
--- a/jacoco-maven-plugin/src/org/jacoco/maven/AbstractAgentMojo.java
+++ b/jacoco-maven-plugin/src/org/jacoco/maven/AbstractAgentMojo.java
@@ -14,12 +14,13 @@ package org.jacoco.maven;
 import java.io.File;
 import java.util.Map;
 import java.util.Properties;
+
 import org.apache.maven.artifact.Artifact;
 import org.codehaus.plexus.util.StringUtils;
 import org.jacoco.core.runtime.AgentOptions;
 
 /**
- *
+ * 
  * @author Mirko Friedenhagen
  */
 public abstract class AbstractAgentMojo extends AbstractJacocoMojo {
@@ -38,7 +39,7 @@ public abstract class AbstractAgentMojo extends AbstractJacocoMojo {
 	protected static final String SUREFIRE_ARG_LINE = "argLine";
 	/**
 	 * Map of plugin artifacts.
-	 *
+	 * 
 	 * @parameter expression="${plugin.artifactMap}"
 	 * @required
 	 * @readonly
@@ -48,7 +49,7 @@ public abstract class AbstractAgentMojo extends AbstractJacocoMojo {
 	 * Allows to specify property which will contains settings for JaCoCo Agent.
 	 * If not specified, then "argLine" would be used for "jar" packaging and
 	 * "tycho.testArgLine" for "eclipse-test-plugin".
-	 *
+	 * 
 	 * @parameter expression="${jacoco.propertyName}"
 	 */
 	protected String propertyName;
@@ -56,7 +57,7 @@ public abstract class AbstractAgentMojo extends AbstractJacocoMojo {
 	 * If set to true and the execution data file already exists, coverage data
 	 * is appended to the existing file. If set to false, an existing execution
 	 * data file will be replaced.
-	 *
+	 * 
 	 * @parameter expression="${jacoco.append}"
 	 */
 	protected Boolean append;
@@ -67,28 +68,27 @@ public abstract class AbstractAgentMojo extends AbstractJacocoMojo {
 	 * special frameworks that conflict with JaCoCo code instrumentation, in
 	 * particular class loaders that do not have access to the Java runtime
 	 * classes.
-	 *
+	 * 
 	 * @parameter expression="${jacoco.exclClassLoaders}"
 	 */
 	protected String exclClassLoaders;
 	/**
 	 * A session identifier that is written with the execution data. Without
 	 * this parameter a random identifier is created by the agent.
-	 *
+	 * 
 	 * @parameter expression="${jacoco.sessionId}"
 	 */
 	protected String sessionId;
 	/**
 	 * If set to true coverage data will be written on VM shutdown.
-	 *
+	 * 
 	 * @parameter expression="${jacoco.dumpOnExit}"
 	 */
 	protected Boolean dumpOnExit;
 	/**
 	 * Output method to use for writing coverage data. Valid options are:
 	 * <ul>
-	 * <li>file: At VM termination execution data is written to the file
-	 * specified in the {@link #destfile}.</li>
+	 * <li>file: At VM termination execution data is written to a file.</li>
 	 * <li>tcpserver: The agent listens for incoming connections on the TCP port
 	 * specified by the {@link #address} and {@link #port}. Execution data is
 	 * written to this TCP connection.</li>
@@ -97,7 +97,7 @@ public abstract class AbstractAgentMojo extends AbstractJacocoMojo {
 	 * TCP connection.</li>
 	 * <li>none: Do not produce any output.</li>
 	 * </ul>
-	 *
+	 * 
 	 * @parameter expression="${jacoco.output}"
 	 */
 	protected String output;
@@ -105,7 +105,7 @@ public abstract class AbstractAgentMojo extends AbstractJacocoMojo {
 	 * IP address or hostname to bind to when the output method is tcpserver or
 	 * connect to when the output method is tcpclient. In tcpserver mode the
 	 * value "*" causes the agent to accept connections on any local address.
-	 *
+	 * 
 	 * @parameter expression="${jacoco.address}"
 	 */
 	protected String address;
@@ -114,7 +114,7 @@ public abstract class AbstractAgentMojo extends AbstractJacocoMojo {
 	 * the output method is tcpclient. In tcpserver mode the port must be
 	 * available, which means that if multiple JaCoCo agents should run on the
 	 * same machine, different ports have to be specified.
-	 *
+	 * 
 	 * @parameter expression="${jacoco.port}"
 	 */
 	protected Integer port;
@@ -123,13 +123,13 @@ public abstract class AbstractAgentMojo extends AbstractJacocoMojo {
 	 * class files it processes to the given location. This can be useful for
 	 * debugging purposes or in case of dynamically created classes for example
 	 * when scripting engines are used.
-	 *
+	 * 
 	 * @parameter expression="${jacoco.classDumpDir}"
 	 */
 	protected File classDumpDir;
 	/**
 	 * If set to true the agent exposes functionality via JMX.
-	 *
+	 * 
 	 * @parameter expression="${jacoco.jmx}"
 	 */
 	protected Boolean jmx;
@@ -146,8 +146,8 @@ public abstract class AbstractAgentMojo extends AbstractJacocoMojo {
 	}
 
 	protected File getAgentJarFile() {
-		final Artifact jacocoAgentArtifact = pluginArtifactMap.get(
-				AGENT_ARTIFACT_NAME);
+		final Artifact jacocoAgentArtifact = pluginArtifactMap
+				.get(AGENT_ARTIFACT_NAME);
 		return jacocoAgentArtifact.getFile();
 	}
 
@@ -158,13 +158,13 @@ public abstract class AbstractAgentMojo extends AbstractJacocoMojo {
 			agentOptions.setAppend(append.booleanValue());
 		}
 		if (getIncludes() != null && !getIncludes().isEmpty()) {
-			final String agentIncludes = StringUtils.join(
-					getIncludes().iterator(), ":");
+			final String agentIncludes = StringUtils.join(getIncludes()
+					.iterator(), ":");
 			agentOptions.setIncludes(agentIncludes);
 		}
 		if (getExcludes() != null && !getExcludes().isEmpty()) {
-			final String agentExcludes = StringUtils.join(
-					getExcludes().iterator(), ":");
+			final String agentExcludes = StringUtils.join(getExcludes()
+					.iterator(), ":");
 			agentOptions.setExcludes(agentExcludes);
 		}
 		if (exclClassLoaders != null) {
diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml
index 72df8181..a158b593 100644
--- a/org.jacoco.build/pom.xml
+++ b/org.jacoco.build/pom.xml
@@ -677,6 +677,31 @@
         <jvm.args>-XX:-FailOverToOldVerifier -Xverify:all</jvm.args>
       </properties>
     </profile>
+    
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <property>
+          <name>jdk.version</name>
+          <value>1.8</value>
+        </property>
+      </activation>
+      <properties>
+        <jvm.args>-XX:-FailOverToOldVerifier -Xverify:all</jvm.args>
+      </properties>
+      <build>
+        <plugins>
+          <!-- Temporary workaround for jira.codehaus.org/browse/MPLUGIN-244 -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+              <additionalparam>-Xdoclint:none</additionalparam>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
 
     <profile>
       <id>sign</id>