.gitignore

+target/
+.project
+.classpath
+.settings/
+.svn/
+bin/
+# Intellij
+*.ipr
+*.iml
+.idea
+out/
+.DS_Store
+/bootstrap
+/dependencies.xml
+.java-version
+/javadoc-options-javadoc-resources.xml
+.checkstyle

CONTRIBUTING.md

+<!---
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+Contributing to Apache Maven JavaDoc Plugin
+======================
+
+You have found a bug or you have an idea for a cool new feature? Contributing
+code is a great way to give something back to the open source community. Before
+you dig right into the code, there are a few guidelines that we need
+contributors to follow so that we can have a chance of keeping on top of
+things.
+
+Some of the ideas are documented in the [Maven Wiki][maven-wiki]
+which might be interesting to read and for further discussion.
+
+Getting Started
+---------------
+
++ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
++ Make sure you have a [GitHub account](https://github.com/signup/free).
++ If you're planning to implement a new feature, it makes sense to discuss your changes 
+  on the [dev list](https://maven.apache.org/mail-lists.html) first. 
+  This way you can make sure you're not wasting your time on something that isn't 
+  considered to be in Apache Maven's scope.
++ Submit a ticket for your issue, assuming one does not already exist.
+  + Clearly describe the issue, including steps to reproduce when it is a bug.
+  + Make sure you fill in the earliest version that you know has the issue.
++ Fork the repository on GitHub.
+
+Making and Submitting Changes
+--------------
+
+We accept Pull Requests via GitHub. The [developer mailing list][dev-ml-list] is the
+main channel of communication for contributors.  
+There are some guidelines which will make applying PRs easier for us:
++ Create a topic branch from where you want to base your work (this is usually the master branch).
+  Push your changes to a topic branch in your fork of the repository.
++ Make commits of logical units.
++ Respect the original code style: by using the same [codestyle][code-style],
+  patches should only highlight the actual difference, not being disturbed by any formatting issues:
+  + Only use spaces for indentation.
+  + Create minimal diffs - disable on save actions like reformat source code or organize imports. 
+    If you feel the source code should be reformatted, create a separate PR for this change.
+  + Check for unnecessary whitespace with `git diff --check` before committing.
++ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
+```
+[MJAVADOC-XXX] - Subject of the JIRA Ticket
+ Optional supplemental description.
+```
++ Make sure you have added the necessary tests (JUnit/IT) for your changes.
++ Run all the tests with `mvn -Prun-its verify` to assure nothing else was accidentally broken.
++ Submit a pull request to the repository in the Apache organization.
++ Update your JIRA ticket and include a link to the pull request in the ticket.
+
+If you plan to contribute on a regular basis, please consider filing a [contributor license agreement][cla].
+
+Making Trivial Changes
+----------------------
+
+For changes of a trivial nature to comments and documentation, it is not always
+necessary to create a new ticket in JIRA.  In this case, it is appropriate to
+start the first line of a commit with '(doc)' instead of a ticket number.
+
+Additional Resources
+--------------------
+
++ [Contributing patches](https://maven.apache.org/guides/development/guide-maven-development.html#Creating_and_submitting_a_patch)
++ [Apache Maven JavaDoc JIRA project page](https://issues.apache.org/jira/projects/MJAVADOC/)
++ [Contributor License Agreement][cla]
++ [General GitHub documentation](https://help.github.com/)
++ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
++ [Apache Maven Twitter Account](https://twitter.com/ASFMavenProject)
++ #Maven IRC channel on freenode.org
+
+[dev-ml-list]: https://maven.apache.org/mail-lists.html
+[code-style]: https://maven.apache.org/developers/conventions/code.html
+[cla]: https://www.apache.org/licenses/#clas
+[maven-wiki]: https://cwiki.apache.org/confluence/display/MAVEN/Index

Jenkinsfile

+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+asfMavenTlpStdBuild(jdk:[7,8,9])

README.md

+<!---
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+Contributing to Apache Maven JavaDoc Plugin
+======================
+
+[![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license]
+[![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.plugins/maven-javadoc-plugin.svg?label=Maven%20Central)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.apache.maven.plugins%22%20AND%20a%3A%22maven-javadoc-plugin%22)
+[![Jenkins Status](https://img.shields.io/jenkins/s/https/builds.apache.org/job/maven-box/job/maven-javadoc-plugin/job/master.svg?style=flat-square)][build]
+[![Jenkins tests](https://img.shields.io/jenkins/t/https/builds.apache.org/job/maven-box/job/maven-javadoc-plugin/job/master.svg?style=flat-square)][test-results]
+
+You have found a bug or you have an idea for a cool new feature? Contributing
+code is a great way to give something back to the open source community. Before
+you dig right into the code, there are a few guidelines that we need
+contributors to follow so that we can have a chance of keeping on top of
+things.
+
+Some of the ideas are documented in the [Maven Wiki][maven-wiki]
+which might be interesting to read and for further discussion.
+
+Getting Started
+---------------
+
++ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
++ Make sure you have a [GitHub account](https://github.com/signup/free).
++ If you're planning to implement a new feature, it makes sense to discuss your changes 
+  on the [dev list](https://maven.apache.org/mail-lists.html) first. 
+  This way you can make sure you're not wasting your time on something that isn't 
+  considered to be in Apache Maven's scope.
++ Submit a ticket for your issue, assuming one does not already exist.
+  + Clearly describe the issue, including steps to reproduce when it is a bug.
+  + Make sure you fill in the earliest version that you know has the issue.
++ Fork the repository on GitHub.
+
+Making and Submitting Changes
+--------------
+
+We accept Pull Requests via GitHub. The [developer mailing list][dev-ml-list] is the
+main channel of communication for contributors.  
+There are some guidelines which will make applying PRs easier for us:
++ Create a topic branch from where you want to base your work (this is usually the master branch).
+  Push your changes to a topic branch in your fork of the repository.
++ Make commits of logical units.
++ Respect the original code style: by using the same [codestyle][code-style],
+  patches should only highlight the actual difference, not being disturbed by any formatting issues:
+  + Only use spaces for indentation.
+  + Create minimal diffs - disable on save actions like reformat source code or organize imports. 
+    If you feel the source code should be reformatted, create a separate PR for this change.
+  + Check for unnecessary whitespace with `git diff --check` before committing.
++ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
+```
+[MJAVADOC-XXX] - Subject of the JIRA Ticket
+ Optional supplemental description.
+```
++ Make sure you have added the necessary tests (JUnit/IT) for your changes.
++ Run all the tests with `mvn -Prun-its verify` to assure nothing else was accidentally broken.
++ Submit a pull request to the repository in the Apache organization.
++ Update your JIRA ticket and include a link to the pull request in the ticket.
+
+If you plan to contribute on a regular basis, please consider filing a [contributor license agreement][cla].
+
+Making Trivial Changes
+----------------------
+
+For changes of a trivial nature to comments and documentation, it is not always
+necessary to create a new ticket in JIRA.  In this case, it is appropriate to
+start the first line of a commit with '(doc)' instead of a ticket number.
+
+Additional Resources
+--------------------
+
++ [Contributing patches](https://maven.apache.org/guides/development/guide-maven-development.html#Creating_and_submitting_a_patch)
++ [Apache Maven JavaDoc JIRA project page](https://issues.apache.org/jira/projects/MJAVADOC/)
++ [Contributor License Agreement][cla]
++ [General GitHub documentation](https://help.github.com/)
++ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
++ [Apache Maven Twitter Account](https://twitter.com/ASFMavenProject)
++ #Maven IRC channel on freenode.org
+
+[license]: https://www.apache.org/licenses/LICENSE-2.0
+[dev-ml-list]: https://maven.apache.org/mail-lists.html
+[code-style]: https://maven.apache.org/developers/conventions/code.html
+[cla]: https://www.apache.org/licenses/#clas
+[maven-wiki]: https://cwiki.apache.org/confluence/display/MAVEN/Index
+[test-results]: https://builds.apache.org/job/maven-box/job/maven-javadoc-plugin/job/master/lastCompletedBuild/testReport/
+[build]: https://builds.apache.org/job/maven-box/job/maven-javadoc-plugin/job/master/

debian/changelog

+maven-javadoc-plugin (3.0.1-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+  * Standards-Version updated to 4.1.5
+  * Use salsa.debian.org Vcs-* URLs
+  * Track and download the new releases from GitHub
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 30 Jul 2018 10:59:33 +0200
+
 maven-javadoc-plugin (3.0.0-4) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -24,9 +24,9 @@ Build-Depends:
  libplexus-languages-java,
  libqdox2-java,
  maven-debian-helper (>> 0.4)
-Standards-Version: 4.1.4
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-javadoc-plugin.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-javadoc-plugin.git
+Standards-Version: 4.1.5
+Vcs-Git: https://salsa.debian.org/java-team/maven-javadoc-plugin.git
+Vcs-Browser: https://salsa.debian.org/java-team/maven-javadoc-plugin
 Homepage: http://maven.apache.org/plugins/maven-javadoc-plugin/
 
 Package: libmaven-javadoc-plugin-java

debian/copyright

@@ -2,16 +2,17 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Maven Javadoc Plugin
 Upstream-Contact: Apache Maven team
 Source: http://maven.apache.org
+Files-Excluded: *.jar
 
 Files: *
-Copyright: 2001-2016, The Apache Software Foundation
+Copyright: 2001-2018, The Apache Software Foundation
 License: Apache-2.0
 
 Files: debian/*
 Copyright: 2009, Ludovic Claude <ludovic.claude@laposte.net>
            2010, Torsten Werner <twerner@debian.org>
            2011, Miguel Landaeta <nomadium@debian.org>
-           2013-2016, Emmanuel Bourg <ebourg@apache.org>
+           2013-2018, Emmanuel Bourg <ebourg@apache.org>
 License: GPL-3+
 
 License: GPL-3+

debian/orig-tar.sh

-#!/bin/sh -e
-
-VERSION=$2
-TAR=../maven-javadoc-plugin_$VERSION.orig.tar.xz
-DIR=maven-javadoc-plugin-$VERSION
-TAG=$(echo "maven-javadoc-plugin-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-
-svn export http://svn.apache.org/repos/asf/maven/plugins/tags/${TAG} $DIR
-XZ_OPT=--best tar -c -J -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR ../$TAG
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $TAR $origDir && echo "moved $TAR to $origDir"
-fi

debian/patches/MJAVADOC-504.patch

-Description: Fixes the NullPointerException in JavadocUtil.getJavaHome() when JAVA_HOME isn't set
-Origin: upstream, https://github.com/apache/maven-javadoc-plugin/commit/6c53ec5
-Bug: https://issues.apache.org/jira/browse/MJAVADOC-504
---- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
-+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
-@@ -1278,10 +1278,22 @@
-     private static File getJavaHome( Log log )
-     {
-         File javaHome = null;
-+        
-+        String javaHomeValue = null;
-+        try
-+        {
-+            javaHomeValue = CommandLineUtils.getSystemEnvVars().getProperty( "JAVA_HOME" );
-+        }
-+        catch ( IOException e )
-+        {
-+            if ( log != null && log.isDebugEnabled() )
-+            {
-+                log.debug( "IOException: " + e.getMessage() );
-+            }
-+        }
- 
-         // if maven.home is set, we can assume JAVA_HOME must be used for testing
--        
--        if ( System.getProperty( "maven.home" ) == null )
-+        if ( System.getProperty( "maven.home" ) == null || javaHomeValue == null )
-         {
-             // JEP220 (Java9) restructured the JRE/JDK runtime image
-             if ( ( SystemUtils.IS_OS_MAC_OSX
-@@ -1297,17 +1309,7 @@
- 
-         if ( javaHome == null || !javaHome.exists() )
-         {
--            try
--            {
--                javaHome = new File( CommandLineUtils.getSystemEnvVars().getProperty( "JAVA_HOME" ) );
--            }
--            catch ( IOException e )
--            {
--                if ( log != null && log.isDebugEnabled() )
--                {
--                    log.debug( "IOException: " + e.getMessage() );
--                }
--            }
-+            javaHome = new File( javaHomeValue );
-         }
- 
-         if ( javaHome == null || !javaHome.exists() )

debian/patches/fix-unmappable-characters.patch

@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: not-needed
 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
 +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
-@@ -573,7 +573,7 @@
+@@ -569,7 +569,7 @@
       * </tr>
       * <tr>
       * <td>IBM 1.5 (French JVM)</td>

debian/patches/ignore-source-errors.patch

@@ -3,13 +3,13 @@ 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
-@@ -4856,6 +4856,13 @@
+@@ -4859,6 +4859,13 @@
                  arguments.add( option );
              }
          }
 +
 +        // ignore source errors when using the default doclet with Java 9
-+        if ( doclet == null && SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9) && !arguments.contains( "--ignore-source-errors" ) )
++        if ( doclet == null && org.apache.commons.lang3.SystemUtils.isJavaVersionAtLeast( org.apache.commons.lang3.JavaVersion.JAVA_9 ) && !arguments.contains( "--ignore-source-errors" ) )
 +        {
 +            getLog().info("Adding the --ignore-source-errors option");
 +            arguments.add( "--ignore-source-errors" );

debian/patches/openjdk-9-javadoc-path.patch

 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
 +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
-@@ -3699,6 +3699,12 @@
+@@ -3702,6 +3702,12 @@
          {
              javadocExe = new File( SystemUtils.getJavaHome() + File.separator + "bin", javadocCommand );
          }
 +        // On Java 9, this has moved to: /usr/lib/jvm/java-9-openjdk-amd64/bin/javadoc
-+        else if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_9 ) )
++        else if ( org.apache.commons.lang3.SystemUtils.isJavaVersionAtLeast( org.apache.commons.lang3.JavaVersion.JAVA_9 ) )
 +        {
 +            javadocExe =
 +                new File( SystemUtils.getJavaHome() + File.separator + "bin", javadocCommand );

debian/patches/plexus-component-metadata-plugin-version.patch

@@ -5,7 +5,7 @@ Last-Update: 2017-08-21
 
 --- a/pom.xml
 +++ b/pom.xml
-@@ -382,7 +382,7 @@
+@@ -391,7 +391,7 @@
        <plugin>
          <groupId>org.codehaus.plexus</groupId>
          <artifactId>plexus-component-metadata</artifactId>

debian/patches/plexus-utils2-compatibility.patch

-Description: FileUtils.fileWrite(File, String, String) was introduced in
- plexus-utils 2.0.6 but this version isn't available in Debian yet. So we fall
- back to FileUtils.fileWrite(String, String, String)
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: not-needed
---- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
-+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
-@@ -5374,7 +5374,7 @@
-                     StringUtils.replaceOnce( fileContents, "function loadFrames() {", fixData );
-                 if ( !patchedFileContents.equals( fileContents ) )
-                 {
--                    FileUtils.fileWrite( file, outputEncoding, patchedFileContents );
-+                    FileUtils.fileWrite( file.getAbsolutePath(), outputEncoding, patchedFileContents );
-                     patched++;
-                 }
-             }

debian/patches/reproducible-footer.patch

@@ -3,7 +3,7 @@ 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
-@@ -2818,6 +2818,20 @@
+@@ -2821,6 +2821,20 @@
      private String getBottomText()
      {
          int currentYear = Calendar.getInstance().get( Calendar.YEAR );

debian/patches/series

-plexus-utils2-compatibility.patch
 fix-unmappable-characters.patch
 reproducible-footer.patch
 openjdk-9-javadoc-path.patch
 plexus-component-metadata-plugin-version.patch
-MJAVADOC-504.patch
 ignore-source-errors.patch

debian/watch

-version=3
-opts="uversionmangle=s/-(alpha|beta|M)-?/~$1/" \
-  http://svn.apache.org/repos/asf/maven/plugins/tags/ \
-  maven-javadoc-plugin-(\d.*)/ debian debian/orig-tar.sh
+version=4
+opts="repack,compression=xz,uversionmangle=s/-(alpha|beta|M)-/~$1/" \
+https://github.com/apache/maven-javadoc-plugin/tags .*/maven-javadoc-plugin-([\d\.]+).tar.gz

pom.xml

@@ -25,12 +25,12 @@ under the License.
   <parent>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>30</version>
+    <version>31</version>
     <relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
   </parent>
 
   <artifactId>maven-javadoc-plugin</artifactId>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <packaging>maven-plugin</packaging>
 
   <name>Apache Maven Javadoc Plugin</name>
@@ -45,14 +45,19 @@ under the License.
   </prerequisites>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-3.0.0</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-3.0.0</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-javadoc-plugin-3.0.0</url>
+    <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git</developerConnection>
+    <url>https://github.com/apache/maven-javadoc-plugin/tree/${project.scm.tag}</url>
+    <tag>maven-javadoc-plugin-3.0.1</tag>
   </scm>
   <issueManagement>
     <system>jira</system>
     <url>https://issues.apache.org/jira/browse/MJAVADOC</url>
   </issueManagement>
+  <ciManagement>
+    <system>Jenkins</system>
+    <url>https://builds.apache.org/job/maven-box/job/maven-javadoc-plugin/</url>
+  </ciManagement>
   <distributionManagement>
     <site>
       <id>apache.website</id>
@@ -163,12 +168,12 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-archiver</artifactId>
-      <version>3.1.1</version>
+      <version>3.2.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-invoker</artifactId>
-      <version>2.2</version>
+      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
@@ -229,12 +234,12 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-java</artifactId>
-      <version>0.9.5</version>
+      <version>0.9.8</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>3.4</version>
+      <version>3.6.0</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -244,12 +249,16 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-interactivity-api</artifactId>
-      <version>1.0-alpha-4</version>
+      <version>1.0-alpha-6</version>
       <exclusions>
         <exclusion>
           <groupId>plexus</groupId>
           <artifactId>plexus-utils</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-component-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -396,6 +405,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.21.0</version>
         <configuration>
           <systemProperties>
             <property>
@@ -403,6 +413,9 @@ under the License.
               <value>${maven.home}</value>
             </property>
           </systemProperties>
+          <environmentVariables>
+            <JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
+          </environmentVariables>
         </configuration>
       </plugin>
     </plugins>
@@ -431,6 +444,9 @@ under the License.
               <filterProperties>
                 <mrm.3rdparty.url>${mrm.3rdparty.url}</mrm.3rdparty.url>
               </filterProperties>
+              <environmentVariables>
+                <JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
+              </environmentVariables>
             </configuration>
           </plugin>
           <plugin>

src/it/projects/MJAVADOC-325/verify.bsh

@@ -30,7 +30,7 @@ if ( !optionsFile.exists() )
 }
 
 String optionsContent = FileUtils.fileRead( optionsFile );
-String javaApiLink = "'http://docs.oracle.com/javase/1,5,0/docs/api'";
+String javaApiLink = "'https://docs.oracle.com/javase/1.5.0/docs/api'";
 
 if ( !optionsContent.contains( javaApiLink ) )
 {

src/it/projects/MJAVADOC-427/invoker.properties

+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals=clean javadoc:javadoc
+
+# slf4j javadoc is hosted on https site with a "let's encrypt" certificate, signed by IdenTrust only trusted since 8u101 (JDK-8154757)
+invoker.java.version = 1.8.0.101+