diff --git a/0001-Port-to-current-plexus-utils.patch b/0001-Port-to-current-plexus-utils.patch
deleted file mode 100644
index b455c9c..0000000
--- a/0001-Port-to-current-plexus-utils.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2da6ad1c0a941423490a74119966ea403f3ca246 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Fri, 29 Jun 2018 12:35:54 +0200
-Subject: [PATCH] Port to current plexus-utils
-
----
- .../maven/plugins/javadoc/JavadocUtil.java    | 20 +++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
-index a740c6e..0fbf00c 100644
---- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
-+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
-@@ -1178,14 +1178,18 @@ public class JavadocUtil
-         InvocationOutputHandler outputHandler = new PrintStreamHandler( ps, false );
-         request.setOutputHandler( outputHandler );
- 
--        outputHandler.consumeLine( "Invoking Maven for the goals: " + goals + " with "
--            + ( properties == null ? "no properties" : "properties=" + properties ) );
--        outputHandler.consumeLine( "" );
--        outputHandler.consumeLine( "M2_HOME=" + getMavenHome( log ) );
--        outputHandler.consumeLine( "MAVEN_OPTS=" + getMavenOpts( log ) );
--        outputHandler.consumeLine( "JAVA_HOME=" + getJavaHome( log ) );
--        outputHandler.consumeLine( "JAVA_OPTS=" + getJavaOpts( log ) );
--        outputHandler.consumeLine( "" );
-+        try {
-+            outputHandler.consumeLine( "Invoking Maven for the goals: " + goals + " with "
-+                + ( properties == null ? "no properties" : "properties=" + properties ) );
-+            outputHandler.consumeLine( "" );
-+            outputHandler.consumeLine( "M2_HOME=" + getMavenHome( log ) );
-+            outputHandler.consumeLine( "MAVEN_OPTS=" + getMavenOpts( log ) );
-+            outputHandler.consumeLine( "JAVA_HOME=" + getJavaHome( log ) );
-+            outputHandler.consumeLine( "JAVA_OPTS=" + getJavaOpts( log ) );
-+            outputHandler.consumeLine( "" );
-+        } catch (IOException e) {
-+            throw new MavenInvocationException("Failed to output lines", e);
-+        }
- 
-         try
-         {
--- 
-2.17.1
-
diff --git a/maven-javadoc-plugin-3.1.1-source-release.zip b/maven-javadoc-plugin-3.1.1-source-release.zip
deleted file mode 100644
index f0323ad..0000000
--- a/maven-javadoc-plugin-3.1.1-source-release.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4d77714fee454bad1921c4cec87d3aa067d2e949557a0458ea1762fc269d5de2
-size 3382572
diff --git a/maven-javadoc-plugin-3.3.1-source-release.zip b/maven-javadoc-plugin-3.3.1-source-release.zip
new file mode 100644
index 0000000..605f7df
--- /dev/null
+++ b/maven-javadoc-plugin-3.3.1-source-release.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:40fe86b3e26837d133874431078186c1765f570cb011f1848d811a001edf2939
+size 3586385
diff --git a/maven-javadoc-plugin-bootstrap-resources.patch b/maven-javadoc-plugin-bootstrap-resources.patch
index 6a2c602..5acdeee 100644
--- a/maven-javadoc-plugin-bootstrap-resources.patch
+++ b/maven-javadoc-plugin-bootstrap-resources.patch
@@ -1,13 +1,16 @@
---- maven-javadoc-plugin-3.1.1/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-javadoc-plugin/plugin-help.xml	1970-01-01 01:00:00.000000000 +0100
-+++ maven-javadoc-plugin-3.1.1/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-javadoc-plugin/plugin-help.xml	2019-11-25 18:40:31.873923655 +0100
-@@ -0,0 +1,12570 @@
+--- maven-javadoc-plugin-3.3.1/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-javadoc-plugin/plugin-help.xml	1970-01-01 01:00:00.000000000 +0100
++++ maven-javadoc-plugin-3.3.1/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-javadoc-plugin/plugin-help.xml	2019-11-25 18:40:31.873923655 +0100
+@@ -0,0 +1,13175 @@
 +<?xml version="1.0" encoding="UTF-8"?>
++
++<!-- Generated by maven-plugin-tools 3.6 -->
++
 +<plugin>
-+  <name>${project.name}</name>
-+  <description>${project.description}</description>
-+  <groupId>${project.groupId}</groupId>
-+  <artifactId>${project.artifactId}</artifactId>
-+  <version>${project.version}</version>
++  <name>Apache Maven Javadoc Plugin</name>
++  <description>The Apache Maven Javadoc Plugin is a plugin that uses the javadoc tool for generating javadocs for the specified project.</description>
++  <groupId>org.apache.maven.plugins</groupId>
++  <artifactId>maven-javadoc-plugin</artifactId>
++  <version>3.3.1</version>
 +  <goalPrefix>javadoc</goalPrefix>
 +  <mojos>
 +    <mojo>
@@ -64,6 +67,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>applyJavadocSecurityFix</name>
 +          <type>boolean</type>
 +          <since>2.9.1</since>
@@ -124,6 +135,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -527,6 +546,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -594,6 +621,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -648,6 +683,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -826,6 +869,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <quiet implementation="boolean" default-value="false">${quiet}</quiet>
@@ -835,11 +879,13 @@
 +        <serialwarn implementation="boolean" default-value="false">${serialwarn}</serialwarn>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -913,6 +959,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>applyJavadocSecurityFix</name>
 +          <type>boolean</type>
 +          <since>2.9.1</since>
@@ -996,6 +1050,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -1397,6 +1459,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -1457,6 +1527,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -1511,6 +1589,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -1699,6 +1785,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <quiet implementation="boolean" default-value="false">${quiet}</quiet>
@@ -1707,11 +1794,13 @@
 +        <serialwarn implementation="boolean" default-value="false">${serialwarn}</serialwarn>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -1781,6 +1870,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>applyJavadocSecurityFix</name>
 +          <type>boolean</type>
 +          <since>2.9.1</since>
@@ -1841,6 +1938,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -2244,6 +2349,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -2311,6 +2424,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -2365,6 +2486,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -2543,6 +2672,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <quiet implementation="boolean" default-value="false">${quiet}</quiet>
@@ -2552,11 +2682,13 @@
 +        <serialwarn implementation="boolean" default-value="false">${serialwarn}</serialwarn>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -2784,6 +2916,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>applyJavadocSecurityFix</name>
 +          <type>boolean</type>
 +          <since>2.9.1</since>
@@ -2867,6 +3007,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -3268,6 +3416,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -3328,6 +3484,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -3382,6 +3546,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -3570,6 +3742,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <quiet implementation="boolean" default-value="false">${quiet}</quiet>
@@ -3578,11 +3751,13 @@
 +        <serialwarn implementation="boolean" default-value="false">${serialwarn}</serialwarn>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -3653,6 +3828,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>applyJavadocSecurityFix</name>
 +          <type>boolean</type>
 +          <since>2.9.1</since>
@@ -3713,6 +3896,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -4116,6 +4307,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -4183,6 +4382,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -4237,6 +4444,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -4415,6 +4630,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <quiet implementation="boolean" default-value="false">${quiet}</quiet>
@@ -4424,11 +4640,13 @@
 +        <serialwarn implementation="boolean" default-value="false">${serialwarn}</serialwarn>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -4497,6 +4715,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>applyJavadocSecurityFix</name>
 +          <type>boolean</type>
 +          <since>2.9.1</since>
@@ -4557,6 +4783,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -4960,6 +5194,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -5027,6 +5269,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -5081,6 +5331,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -5259,6 +5517,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <quiet implementation="boolean" default-value="false">${quiet}</quiet>
@@ -5268,11 +5527,13 @@
 +        <serialwarn implementation="boolean" default-value="false">${serialwarn}</serialwarn>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -5342,6 +5603,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>applyJavadocSecurityFix</name>
 +          <type>boolean</type>
 +          <since>2.9.1</since>
@@ -5402,6 +5671,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -5781,6 +6058,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -5841,6 +6126,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -5895,6 +6188,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -6070,6 +6371,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <quiet implementation="boolean" default-value="false">${quiet}</quiet>
@@ -6078,11 +6380,13 @@
 +        <serialwarn implementation="boolean" default-value="false">${serialwarn}</serialwarn>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -6155,6 +6459,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>applyJavadocSecurityFix</name>
 +          <type>boolean</type>
 +          <since>2.9.1</since>
@@ -6215,6 +6527,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -6617,6 +6937,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -6684,6 +7012,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -6738,6 +7074,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -6970,6 +7314,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <quiet implementation="boolean" default-value="false">${quiet}</quiet>
@@ -6979,11 +7324,13 @@
 +        <serialwarn implementation="boolean" default-value="false">${serialwarn}</serialwarn>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -7063,6 +7410,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>applyJavadocSecurityFix</name>
 +          <type>boolean</type>
 +          <since>2.9.1</since>
@@ -7146,6 +7501,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -7549,6 +7912,14 @@
 +</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -7609,6 +7980,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -7663,6 +8042,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -7910,6 +8297,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/testapidocs"/>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <quiet implementation="boolean" default-value="false">${quiet}</quiet>
@@ -7918,11 +8306,13 @@
 +        <serialwarn implementation="boolean" default-value="false">${serialwarn}</serialwarn>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -7997,6 +8387,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>applyJavadocSecurityFix</name>
 +          <type>boolean</type>
 +          <since>2.9.1</since>
@@ -8057,6 +8455,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -8459,6 +8865,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -8526,6 +8940,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -8580,6 +9002,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -8812,6 +9242,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <quiet implementation="boolean" default-value="false">${quiet}</quiet>
@@ -8821,11 +9252,13 @@
 +        <serialwarn implementation="boolean" default-value="false">${serialwarn}</serialwarn>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -9059,6 +9492,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>applyJavadocSecurityFix</name>
 +          <type>boolean</type>
 +          <since>2.9.1</since>
@@ -9142,6 +9583,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -9545,6 +9994,14 @@
 +</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -9605,6 +10062,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -9659,6 +10124,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -9906,6 +10379,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/testapidocs"/>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <quiet implementation="boolean" default-value="false">${quiet}</quiet>
@@ -9914,11 +10388,13 @@
 +        <serialwarn implementation="boolean" default-value="false">${serialwarn}</serialwarn>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -9994,6 +10470,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>applyJavadocSecurityFix</name>
 +          <type>boolean</type>
 +          <since>2.9.1</since>
@@ -10054,6 +10538,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -10456,6 +10948,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -10523,6 +11023,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -10577,6 +11085,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -10809,6 +11325,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <quiet implementation="boolean" default-value="false">${quiet}</quiet>
@@ -10818,11 +11335,13 @@
 +        <serialwarn implementation="boolean" default-value="false">${serialwarn}</serialwarn>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -10897,6 +11416,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>applyJavadocSecurityFix</name>
 +          <type>boolean</type>
 +          <since>2.9.1</since>
@@ -10957,6 +11484,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -11359,6 +11894,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -11426,6 +11969,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -11480,6 +12031,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -11712,6 +12271,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <quiet implementation="boolean" default-value="false">${quiet}</quiet>
@@ -11721,11 +12281,13 @@
 +        <serialwarn implementation="boolean" default-value="false">${serialwarn}</serialwarn>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -11801,6 +12363,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>applyJavadocSecurityFix</name>
 +          <type>boolean</type>
 +          <since>2.9.1</since>
@@ -11861,6 +12431,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -12240,6 +12818,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -12300,6 +12886,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -12354,6 +12948,14 @@
 +          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the Java code in an aggregator project using the standard Javadoc Tool.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -12537,6 +13139,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <quiet implementation="boolean" default-value="false">${quiet}</quiet>
@@ -12545,11 +13148,13 @@
 +        <serialwarn implementation="boolean" default-value="false">${serialwarn}</serialwarn>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -12571,16 +13176,21 @@
 +    </mojo>
 +  </mojos>
 +</plugin>
---- maven-javadoc-plugin-3.1.1/src/main/filtered-resources/META-INF/maven/plugin.xml	1970-01-01 01:00:00.000000000 +0100
-+++ maven-javadoc-plugin-3.1.1/src/main/filtered-resources/META-INF/maven/plugin.xml	2019-11-25 18:39:36.449612339 +0100
-@@ -0,0 +1,15988 @@
+\ No newline at end of file
+--- maven-javadoc-plugin-3.3.1/src/main/filtered-resources/META-INF/maven/plugin.xml	1970-01-01 01:00:00.000000000 +0100
++++ maven-javadoc-plugin-3.3.1/src/main/filtered-resources/META-INF/maven/plugin.xml	2019-11-25 18:39:36.449612339 +0100
+@@ -0,0 +1,16702 @@
 +<?xml version="1.0" encoding="UTF-8"?>
++
++<!-- Generated by maven-plugin-tools 3.6 -->
++
 +<plugin>
-+  <name>${project.name}</name>
-+  <description>${project.description}</description>
-+  <groupId>${project.groupId}</groupId>
-+  <artifactId>${project.artifactId}</artifactId>
-+  <version>${project.version}</version>
++  <name>Apache Maven Javadoc Plugin</name>
++  <description>The Apache Maven Javadoc Plugin is a plugin that uses the javadoc tool for
++    generating javadocs for the specified project.</description>
++  <groupId>org.apache.maven.plugins</groupId>
++  <artifactId>maven-javadoc-plugin</artifactId>
++  <version>3.3.1</version>
 +  <goalPrefix>javadoc</goalPrefix>
 +  <isolatedRealm>false</isolatedRealm>
 +  <inheritedByDefault>true</inheritedByDefault>
@@ -12607,6 +13217,15 @@
 +      <threadSafe>false</threadSafe>
 +      <parameters>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>additionalDependencies</name>
 +          <type>java.util.List</type>
 +          <since>2.8.1</since>
@@ -12711,6 +13330,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -13193,6 +13821,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -13302,6 +13939,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -13363,6 +14009,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -13560,6 +14215,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
@@ -13573,11 +14229,13 @@
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -13649,6 +14307,15 @@
 +      <threadSafe>false</threadSafe>
 +      <parameters>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>additionalDependencies</name>
 +          <type>java.util.List</type>
 +          <since>2.8.1</since>
@@ -13788,6 +14455,15 @@
 +a jar using the standard &lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -14268,6 +14944,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -14369,6 +15054,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -14430,6 +15124,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -14639,6 +15342,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
@@ -14651,11 +15355,13 @@
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -14733,6 +15439,15 @@
 +      <threadSafe>false</threadSafe>
 +      <parameters>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>additionalDependencies</name>
 +          <type>java.util.List</type>
 +          <since>2.8.1</since>
@@ -14837,6 +15552,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -15319,6 +16043,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -15428,6 +16161,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -15489,6 +16231,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -15686,6 +16437,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
@@ -15699,11 +16451,13 @@
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -15935,6 +16689,15 @@
 +Be Used&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>session</name>
++          <type>org.apache.maven.execution.MavenSession</type>
++          <required>true</required>
++          <editable>false</editable>
++          <description>Fix Javadoc documentation and tags for the &lt;code&gt;Test Java code&lt;/code&gt; for the project.
++See &lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#wheretags&quot;&gt;Where Tags Can
++Be Used&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>settings</name>
 +          <type>org.apache.maven.settings.Settings</type>
 +          <required>true</required>
@@ -15963,6 +16726,7 @@
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.sourceDirectory}">${outputDirectory}</outputDirectory>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
 +        <removeUnknownThrows implementation="boolean" default-value="true">${removeUnknownThrows}</removeUnknownThrows>
++        <session implementation="org.apache.maven.execution.MavenSession" default-value="${session}"/>
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +      </configuration>
 +      <requirements>
@@ -15992,6 +16756,15 @@
 +      <threadSafe>true</threadSafe>
 +      <parameters>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>additionalDependencies</name>
 +          <type>java.util.List</type>
 +          <since>2.8.1</since>
@@ -16131,6 +16904,15 @@
 +a jar using the standard &lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -16611,6 +17393,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -16712,6 +17503,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -16773,6 +17573,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -16982,6 +17791,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
@@ -16994,11 +17804,13 @@
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -17077,6 +17889,15 @@
 +      <threadSafe>true</threadSafe>
 +      <parameters>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>additionalDependencies</name>
 +          <type>java.util.List</type>
 +          <since>2.8.1</since>
@@ -17181,6 +18002,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -17663,6 +18493,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -17772,6 +18611,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -17833,6 +18681,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -18030,6 +18887,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
@@ -18043,11 +18901,13 @@
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -18116,6 +18976,15 @@
 +      <threadSafe>true</threadSafe>
 +      <parameters>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>additionalDependencies</name>
 +          <type>java.util.List</type>
 +          <since>2.8.1</since>
@@ -18220,6 +19089,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -18702,6 +19580,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -18811,6 +19698,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -18872,6 +19768,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -19069,6 +19974,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
@@ -19082,11 +19988,13 @@
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -19157,6 +20065,15 @@
 +      <threadSafe>true</threadSafe>
 +      <parameters>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>additionalDependencies</name>
 +          <type>java.util.List</type>
 +          <since>2.8.1</since>
@@ -19261,6 +20178,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -19727,6 +20653,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -19828,6 +20763,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -19889,6 +20833,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -20084,6 +21037,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
@@ -20096,11 +21050,13 @@
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -20175,6 +21131,15 @@
 +      <threadSafe>false</threadSafe>
 +      <parameters>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>additionalDependencies</name>
 +          <type>java.util.List</type>
 +          <since>2.8.1</since>
@@ -20279,6 +21244,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -20760,6 +21734,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -20869,6 +21852,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -20930,6 +21922,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -21187,6 +22188,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
@@ -21200,11 +22202,13 @@
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -21282,6 +22286,15 @@
 +      <threadSafe>false</threadSafe>
 +      <parameters>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>additionalDependencies</name>
 +          <type>java.util.List</type>
 +          <since>2.8.1</since>
@@ -21421,6 +22434,15 @@
 +a jar using the standard &lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -21902,6 +22924,15 @@
 +&lt;p&gt;Since version 3.1.0 an aggregated jar is created for every module of a Maven multimodule project.&lt;/p&gt;</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -22003,6 +23034,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -22064,6 +23104,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -22332,6 +23381,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/testapidocs"/>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
@@ -22344,11 +23394,13 @@
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -22431,6 +23483,15 @@
 +      <threadSafe>false</threadSafe>
 +      <parameters>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>additionalDependencies</name>
 +          <type>java.util.List</type>
 +          <since>2.8.1</since>
@@ -22535,6 +23596,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -23016,6 +24086,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -23125,6 +24204,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -23186,6 +24274,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -23443,6 +24540,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
@@ -23456,11 +24554,13 @@
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -23698,6 +24798,15 @@
 +Be Used&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>session</name>
++          <type>org.apache.maven.execution.MavenSession</type>
++          <required>true</required>
++          <editable>false</editable>
++          <description>Fix Javadoc documentation and tags for the &lt;code&gt;Test Java code&lt;/code&gt; for the project.
++See &lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#wheretags&quot;&gt;Where Tags Can
++Be Used&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>settings</name>
 +          <type>org.apache.maven.settings.Settings</type>
 +          <required>true</required>
@@ -23726,6 +24835,7 @@
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.sourceDirectory}">${outputDirectory}</outputDirectory>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
 +        <removeUnknownThrows implementation="boolean" default-value="true">${removeUnknownThrows}</removeUnknownThrows>
++        <session implementation="org.apache.maven.execution.MavenSession" default-value="${session}"/>
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +      </configuration>
 +      <requirements>
@@ -23755,6 +24865,15 @@
 +      <threadSafe>true</threadSafe>
 +      <parameters>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>additionalDependencies</name>
 +          <type>java.util.List</type>
 +          <since>2.8.1</since>
@@ -23894,6 +25013,15 @@
 +a jar using the standard &lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -24375,6 +25503,15 @@
 +&lt;p&gt;Since version 3.1.0 an aggregated jar is created for every module of a Maven multimodule project.&lt;/p&gt;</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -24476,6 +25613,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -24537,6 +25683,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -24805,6 +25960,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/testapidocs"/>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
@@ -24817,11 +25973,13 @@
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -24905,6 +26063,15 @@
 +      <threadSafe>true</threadSafe>
 +      <parameters>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>additionalDependencies</name>
 +          <type>java.util.List</type>
 +          <since>2.8.1</since>
@@ -25009,6 +26176,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -25490,6 +26666,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -25599,6 +26784,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -25660,6 +26854,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -25917,6 +27120,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
@@ -25930,11 +27134,13 @@
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -26010,6 +27216,15 @@
 +      <threadSafe>true</threadSafe>
 +      <parameters>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>additionalDependencies</name>
 +          <type>java.util.List</type>
 +          <since>2.8.1</since>
@@ -26114,6 +27329,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -26595,6 +27819,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -26704,6 +27937,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -26765,6 +28007,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -27022,6 +28273,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
@@ -27035,11 +28287,13 @@
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -27117,6 +28371,15 @@
 +      <threadSafe>true</threadSafe>
 +      <parameters>
 +        <parameter>
++          <name>addStylesheets</name>
++          <type>java.lang.String[]</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>additionalDependencies</name>
 +          <type>java.util.List</type>
 +          <since>2.8.1</since>
@@ -27221,6 +28484,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>dependencyLinks</name>
++          <type>java.util.List</type>
++          <since>3.3.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>dependencySourceExcludes</name>
 +          <type>java.util.List</type>
 +          <since>2.7</since>
@@ -27687,6 +28959,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>outputTimestamp</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>overview</name>
 +          <type>java.io.File</type>
 +          <required>false</required>
@@ -27788,6 +29069,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>skippedModules</name>
++          <type>java.lang.String</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>source</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -27849,6 +29139,15 @@
 +&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
 +        </parameter>
 +        <parameter>
++          <name>staleDataPath</name>
++          <type>java.io.File</type>
++          <since>3.2.0</since>
++          <required>false</required>
++          <editable>true</editable>
++          <description>Generates documentation for the &lt;code&gt;Java code&lt;/code&gt; in an &lt;b&gt;aggregator&lt;/b&gt; project using the standard
++&lt;a href=&quot;http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/&quot;&gt;Javadoc Tool&lt;/a&gt;.</description>
++        </parameter>
++        <parameter>
 +          <name>stylesheet</name>
 +          <type>java.lang.String</type>
 +          <required>false</required>
@@ -28056,6 +29355,7 @@
 +        <offlineLinks implementation="org.apache.maven.plugins.javadoc.options.OfflineLink[]">${offlineLinks}</offlineLinks>
 +        <old implementation="boolean" default-value="false">${old}</old>
 +        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/apidocs">${destDir}</outputDirectory>
++        <outputTimestamp implementation="java.lang.String" default-value="${project.build.outputTimestamp}"/>
 +        <overview implementation="java.io.File" default-value="${basedir}/src/main/javadoc/overview.html">${overview}</overview>
 +        <packagesheader implementation="java.lang.String">${packagesheader}</packagesheader>
 +        <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
@@ -28068,11 +29368,13 @@
 +        <settings implementation="org.apache.maven.settings.Settings" default-value="${settings}"/>
 +        <show implementation="java.lang.String" default-value="protected">${show}</show>
 +        <skip implementation="boolean" default-value="false">${maven.javadoc.skip}</skip>
-+        <source implementation="java.lang.String">${source}</source>
++        <skippedModules implementation="java.lang.String">${maven.javadoc.skippedModules}</skippedModules>
++        <source implementation="java.lang.String" default-value="${maven.compiler.source}">${source}</source>
 +        <sourceDependencyCacheDir implementation="java.io.File" default-value="${project.build.directory}/distro-javadoc-sources"/>
 +        <sourcepath implementation="java.lang.String">${sourcepath}</sourcepath>
 +        <sourcetab implementation="int">${sourcetab}</sourcetab>
 +        <splitindex implementation="boolean" default-value="false">${splitindex}</splitindex>
++        <staleDataPath implementation="java.io.File" default-value="${project.build.directory}/maven-javadoc-plugin-stale-data.txt">${staleDataPath}</staleDataPath>
 +        <stylesheet implementation="java.lang.String" default-value="java">${stylesheet}</stylesheet>
 +        <stylesheetfile implementation="java.lang.String">${stylesheetfile}</stylesheetfile>
 +        <subpackages implementation="java.lang.String">${subpackages}</subpackages>
@@ -28132,19 +29434,31 @@
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-core</artifactId>
 +      <type>jar</type>
-+      <version>3.5.0</version>
++      <version>3.0</version>
++    </dependency>
++    <dependency>
++      <groupId>org.codehaus.plexus</groupId>
++      <artifactId>plexus-interpolation</artifactId>
++      <type>jar</type>
++      <version>1.26</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.resolver</groupId>
 +      <artifactId>maven-resolver-util</artifactId>
 +      <type>jar</type>
-+      <version>1.4.1</version>
++      <version>1.6.3</version>
++    </dependency>
++    <dependency>
++      <groupId>org.slf4j</groupId>
++      <artifactId>slf4j-api</artifactId>
++      <type>jar</type>
++      <version>1.7.32</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.eclipse.sisu</groupId>
 +      <artifactId>org.eclipse.sisu.inject</artifactId>
 +      <type>jar</type>
-+      <version>0.3.3</version>
++      <version>0.3.5</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>javax.enterprise</groupId>
@@ -28168,13 +29482,7 @@
 +      <groupId>com.google.inject</groupId>
 +      <artifactId>guice</artifactId>
 +      <type>jar</type>
-+      <version>4.2.1</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>aopalliance</groupId>
-+      <artifactId>aopalliance</artifactId>
-+      <type>jar</type>
-+      <version>1.0</version>
++      <version>4.2.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>cglib</groupId>
@@ -28183,22 +29491,34 @@
 +      <version>3.2.0</version>
 +    </dependency>
 +    <dependency>
++      <groupId>aopalliance</groupId>
++      <artifactId>aopalliance</artifactId>
++      <type>jar</type>
++      <version>1.0</version>
++    </dependency>
++    <dependency>
 +      <groupId>com.google.guava</groupId>
 +      <artifactId>guava</artifactId>
 +      <type>jar</type>
 +      <version>19.0</version>
 +    </dependency>
 +    <dependency>
++      <groupId>com.google.code.findbugs</groupId>
++      <artifactId>jsr305</artifactId>
++      <type>jar</type>
++      <version>any</version>
++    </dependency>
++    <dependency>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-resolver-provider</artifactId>
 +      <type>jar</type>
-+      <version>3.6.2</version>
++      <version>3.8.4</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.resolver</groupId>
 +      <artifactId>maven-resolver-api</artifactId>
 +      <type>jar</type>
-+      <version>1.4.1</version>
++      <version>1.6.3</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>javax.inject</groupId>
@@ -28210,43 +29530,43 @@
 +      <groupId>org.apache.maven.resolver</groupId>
 +      <artifactId>maven-resolver-impl</artifactId>
 +      <type>jar</type>
-+      <version>1.4.1</version>
++      <version>1.6.3</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-repository-metadata</artifactId>
 +      <type>jar</type>
-+      <version>3.6.2</version>
++      <version>3.8.4</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.resolver</groupId>
 +      <artifactId>maven-resolver-spi</artifactId>
 +      <type>jar</type>
-+      <version>1.4.1</version>
++      <version>1.6.3</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.eclipse.sisu</groupId>
 +      <artifactId>org.eclipse.sisu.plexus</artifactId>
 +      <type>jar</type>
-+      <version>0.3.3</version>
++      <version>0.3.5</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-model-builder</artifactId>
 +      <type>jar</type>
-+      <version>3.6.2</version>
++      <version>3.8.4</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-builder-support</artifactId>
 +      <type>jar</type>
-+      <version>3.6.2</version>
++      <version>3.8.4</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.shared</groupId>
 +      <artifactId>maven-shared-utils</artifactId>
 +      <type>jar</type>
-+      <version>3.2.1</version>
++      <version>3.3.4</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.codehaus.plexus</groupId>
@@ -28258,43 +29578,43 @@
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-settings-builder</artifactId>
 +      <type>jar</type>
-+      <version>3.6.2</version>
++      <version>3.8.4</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>org.sonatype.plexus</groupId>
++      <groupId>org.codehaus.plexus</groupId>
 +      <artifactId>plexus-sec-dispatcher</artifactId>
 +      <type>jar</type>
-+      <version>1.4</version>
++      <version>2.0</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>org.sonatype.plexus</groupId>
++      <groupId>org.codehaus.plexus</groupId>
 +      <artifactId>plexus-cipher</artifactId>
 +      <type>jar</type>
-+      <version>1.4</version>
++      <version>2.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-model</artifactId>
 +      <type>jar</type>
-+      <version>3.5.0</version>
++      <version>3.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-settings</artifactId>
 +      <type>jar</type>
-+      <version>3.5.0</version>
++      <version>3.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-plugin-api</artifactId>
 +      <type>jar</type>
-+      <version>3.5.0</version>
++      <version>3.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-artifact</artifactId>
 +      <type>jar</type>
-+      <version>3.5.0</version>
++      <version>3.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.reporting</groupId>
@@ -28306,37 +29626,25 @@
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-archiver</artifactId>
 +      <type>jar</type>
-+      <version>3.2.0</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.codehaus.plexus</groupId>
-+      <artifactId>plexus-interpolation</artifactId>
-+      <type>jar</type>
-+      <version>1.25</version>
++      <version>3.5.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.shared</groupId>
 +      <artifactId>maven-invoker</artifactId>
 +      <type>jar</type>
-+      <version>3.0.0</version>
++      <version>3.1.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.shared</groupId>
 +      <artifactId>maven-common-artifact-filters</artifactId>
 +      <type>jar</type>
-+      <version>3.0.0</version>
++      <version>3.1.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.shared</groupId>
 +      <artifactId>maven-artifact-transfer</artifactId>
 +      <type>jar</type>
-+      <version>0.10.1</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>commons-codec</groupId>
-+      <artifactId>commons-codec</artifactId>
-+      <type>jar</type>
-+      <version>1.11</version>
++      <version>0.13.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.eclipse.aether</groupId>
@@ -28345,40 +29653,46 @@
 +      <version>0.9.0.M2</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>org.slf4j</groupId>
-+      <artifactId>slf4j-api</artifactId>
++      <groupId>commons-codec</groupId>
++      <artifactId>commons-codec</artifactId>
 +      <type>jar</type>
-+      <version>1.7.5</version>
++      <version>1.11</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.doxia</groupId>
 +      <artifactId>doxia-sink-api</artifactId>
 +      <type>jar</type>
-+      <version>1.7</version>
++      <version>1.9.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.doxia</groupId>
 +      <artifactId>doxia-logging-api</artifactId>
 +      <type>jar</type>
-+      <version>1.7</version>
++      <version>1.9.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.doxia</groupId>
 +      <artifactId>doxia-site-renderer</artifactId>
 +      <type>jar</type>
-+      <version>1.7.4</version>
++      <version>1.9.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.doxia</groupId>
 +      <artifactId>doxia-decoration-model</artifactId>
 +      <type>jar</type>
-+      <version>1.7.5</version>
++      <version>1.9.2</version>
++    </dependency>
++    <dependency>
++      <groupId>org.apache.maven.doxia</groupId>
++      <artifactId>doxia-core</artifactId>
++      <type>jar</type>
++      <version>1.9.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-collections</groupId>
 +      <artifactId>commons-collections</artifactId>
 +      <type>jar</type>
-+      <version>3.2.1</version>
++      <version>3.2.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.codehaus.plexus</groupId>
@@ -28387,34 +29701,16 @@
 +      <version>1.2</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>org.apache.maven.doxia</groupId>
-+      <artifactId>doxia-core</artifactId>
++      <groupId>org.codehaus.plexus</groupId>
++      <artifactId>plexus-i18n</artifactId>
 +      <type>jar</type>
-+      <version>1.7</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>commons-lang</groupId>
-+      <artifactId>commons-lang</artifactId>
-+      <type>jar</type>
-+      <version>2.4</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>xmlunit</groupId>
-+      <artifactId>xmlunit</artifactId>
-+      <type>jar</type>
-+      <version>1.5</version>
++      <version>1.0-beta-10</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.doxia</groupId>
 +      <artifactId>doxia-module-xhtml</artifactId>
 +      <type>jar</type>
-+      <version>1.7</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.codehaus.plexus</groupId>
-+      <artifactId>plexus-i18n</artifactId>
-+      <type>jar</type>
-+      <version>1.0-beta-7</version>
++      <version>1.9.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.codehaus.plexus</groupId>
@@ -28432,13 +29728,13 @@
 +      <groupId>org.ow2.asm</groupId>
 +      <artifactId>asm-tree</artifactId>
 +      <type>jar</type>
-+      <version>7.2</version>
++      <version>9.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.ow2.asm</groupId>
 +      <artifactId>asm-analysis</artifactId>
 +      <type>jar</type>
-+      <version>7.2</version>
++      <version>9.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.xbean</groupId>
@@ -28459,46 +29755,52 @@
 +      <version>1.3</version>
 +    </dependency>
 +    <dependency>
++      <groupId>org.apache.maven.doxia</groupId>
++      <artifactId>doxia-module-xhtml5</artifactId>
++      <type>jar</type>
++      <version>1.9.1</version>
++    </dependency>
++    <dependency>
 +      <groupId>org.apache.velocity</groupId>
 +      <artifactId>velocity</artifactId>
 +      <type>jar</type>
 +      <version>1.7</version>
 +    </dependency>
 +    <dependency>
++      <groupId>commons-lang</groupId>
++      <artifactId>commons-lang</artifactId>
++      <type>jar</type>
++      <version>2.4</version>
++    </dependency>
++    <dependency>
 +      <groupId>org.apache.maven.doxia</groupId>
 +      <artifactId>doxia-skin-model</artifactId>
 +      <type>jar</type>
-+      <version>1.7.5</version>
++      <version>1.9.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.wagon</groupId>
 +      <artifactId>wagon-provider-api</artifactId>
 +      <type>jar</type>
-+      <version>1.0-beta-6</version>
++      <version>2.4</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.commons</groupId>
 +      <artifactId>commons-lang3</artifactId>
 +      <type>jar</type>
-+      <version>3.5</version>
++      <version>3.12.0</version>
 +    </dependency>
 +    <dependency>
-+      <groupId>commons-io</groupId>
-+      <artifactId>commons-io</artifactId>
++      <groupId>org.apache.commons</groupId>
++      <artifactId>commons-text</artifactId>
 +      <type>jar</type>
-+      <version>2.5</version>
++      <version>1.9</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.httpcomponents</groupId>
 +      <artifactId>httpclient</artifactId>
 +      <type>jar</type>
-+      <version>4.5.8</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.httpcomponents</groupId>
-+      <artifactId>httpcore</artifactId>
-+      <type>jar</type>
-+      <version>any</version>
++      <version>4.5.13</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-logging</groupId>
@@ -28507,28 +29809,34 @@
 +      <version>any</version>
 +    </dependency>
 +    <dependency>
++      <groupId>org.apache.httpcomponents</groupId>
++      <artifactId>httpcore</artifactId>
++      <type>jar</type>
++      <version>4.4.14</version>
++    </dependency>
++    <dependency>
 +      <groupId>com.thoughtworks.qdox</groupId>
 +      <artifactId>qdox</artifactId>
 +      <type>jar</type>
-+      <version>2.0-M10</version>
++      <version>2.0.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.codehaus.plexus</groupId>
 +      <artifactId>plexus-java</artifactId>
 +      <type>jar</type>
-+      <version>1.0.3</version>
++      <version>1.1.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.ow2.asm</groupId>
 +      <artifactId>asm</artifactId>
 +      <type>jar</type>
-+      <version>7.0</version>
++      <version>9.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.codehaus.plexus</groupId>
 +      <artifactId>plexus-archiver</artifactId>
 +      <type>jar</type>
-+      <version>3.6.0</version>
++      <version>4.2.5</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.commons</groupId>
@@ -28546,19 +29854,32 @@
 +      <groupId>org.codehaus.plexus</groupId>
 +      <artifactId>plexus-io</artifactId>
 +      <type>jar</type>
-+      <version>3.1.1</version>
++      <version>3.2.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.codehaus.plexus</groupId>
 +      <artifactId>plexus-utils</artifactId>
 +      <type>jar</type>
-+      <version>3.0.24</version>
++      <version>3.3.0</version>
++    </dependency>
++    <dependency>
++      <groupId>commons-io</groupId>
++      <artifactId>commons-io</artifactId>
++      <type>jar</type>
++      <version>2.8.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.codehaus.plexus</groupId>
 +      <artifactId>plexus-interactivity-api</artifactId>
 +      <type>jar</type>
-+      <version>1.0-alpha-6</version>
++      <version>1.0</version>
++    </dependency>
++    <dependency>
++      <groupId>org.codehaus.plexus</groupId>
++      <artifactId>plexus-component-api</artifactId>
++      <type>jar</type>
++      <version>1.0-alpha-15</version>
 +    </dependency>
 +  </dependencies>
 +</plugin>
+\ No newline at end of file
diff --git a/maven-javadoc-plugin-build.xml b/maven-javadoc-plugin-build.xml
index 99562d6..a4983ae 100644
--- a/maven-javadoc-plugin-build.xml
+++ b/maven-javadoc-plugin-build.xml
@@ -14,12 +14,12 @@
             value="The Apache Maven Javadoc Plugin is a plugin that uses the javadoc tool for generating javadocs for the specified project."/>
   <property name="project.groupId" value="org.apache.maven.plugins"/>
   <property name="project.artifactId" value="maven-javadoc-plugin"/>
-  <property name="project.version" value="3.1.1"/>
+  <property name="project.version" value="3.3.1"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
-  <property name="spec.version" value="3.1"/>
+  <property name="spec.version" value="3.3"/>
 
-  <property name="compiler.source" value="1.7"/>
+  <property name="compiler.source" value="1.8"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -83,7 +83,7 @@
     </macrodef>
     <macrodef name="modello">
       <attribute name="file"/>
-      <attribute name="version" default="1.1.0"/>
+      <attribute name="version" default="1.1.1"/>
       <sequential>
         <echo taskname="modello" message="Generating sources for @{file}"/>
         <modello-single-mode file="@{file}" version="@{version}" mode="java"/>
diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec
index 239605b..6b5d507 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package maven-javadoc-plugin-bootstrap
+# spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
 %bcond_with bootstrap
 %endif
 %global base_name maven-javadoc-plugin
-Version:        3.1.1
+Version:        3.3.1
 Release:        0
 Summary:        Maven plugin for creating javadocs
 License:        Apache-2.0
@@ -32,12 +32,10 @@ URL:            http://maven.apache.org/plugins/maven-javadoc-plugin
 Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugins/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
 Source1:        %{base_name}-build.xml
 Patch0:         %{base_name}-bootstrap-resources.patch
-Patch1:         0001-Port-to-current-plexus-utils.patch
-# PATCH-FIX-OPENSUSE bmwiedemann -- https://issues.apache.org/jira/browse/MJAVADOC-619
-Patch2:         reproducible-footer.patch
 BuildRequires:  apache-commons-cli
 BuildRequires:  apache-commons-io
 BuildRequires:  apache-commons-lang3
+BuildRequires:  apache-commons-text
 BuildRequires:  atinject
 BuildRequires:  fdupes
 BuildRequires:  google-guice
@@ -123,9 +121,6 @@ cp %{SOURCE1} build.xml
 %patch0 -p1
 %endif
 
-%patch1 -p1
-%patch2 -p1
-
 %pom_xpath_remove pom:project/pom:parent/pom:relativePath
 %pom_remove_dep :::test:
 
@@ -134,6 +129,7 @@ cp %{SOURCE1} build.xml
 mkdir -p lib
 build-jar-repository -s lib \
 	apache-commons-lang3 \
+	apache-commons-text \
 	atinject \
 	commons-cli \
 	commons-io \
@@ -181,7 +177,7 @@ build-jar-repository -s lib \
 xmvn --batch-mode --offline \
 	-Dmaven.test.skip=true -DmavenVersion=3.5.0 \
 %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-	-Dmaven.compiler.release=7 \
+	-Dmaven.compiler.release=8 \
 %endif
 	package org.apache.maven.plugins:maven-javadoc-plugin:aggregate
 %endif
diff --git a/reproducible-footer.patch b/reproducible-footer.patch
deleted file mode 100644
index d08c6ef..0000000
--- a/reproducible-footer.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://salsa.debian.org/java-team/maven-javadoc-plugin/blob/master/debian/patches/reproducible-footer.patch
-for https://issues.apache.org/jira/browse/MJAVADOC-619
-
-Description: Use the SOURCE_DATE_EPOCH variable to set the current year displayed in the javadoc footer
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: no
---- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
-+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
-@@ -2821,6 +2821,20 @@
-     private String getBottomText()
-     {
-         int currentYear = Calendar.getInstance().get( Calendar.YEAR );
-+        if ( System.getenv("SOURCE_DATE_EPOCH") != null )
-+        {
-+            try
-+            {
-+                Calendar calendar = Calendar.getInstance( java.util.TimeZone.getTimeZone("UTC") );
-+                calendar.setTimeInMillis(Long.parseLong( System.getenv("SOURCE_DATE_EPOCH") ) * 1000);
-+                currentYear = calendar.get( Calendar.YEAR );
-+            }
-+            catch (Exception e)
-+            {
-+                e.printStackTrace();
-+            }
-+        }
-+
-         String year = String.valueOf( currentYear );
- 
-         String inceptionYear = project.getInceptionYear();