[MJAVADOC-798] Consider passing user settings when using invoker

This closes #290

Author: cpfeiffer

src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java

@@ -655,7 +655,8 @@ private void executeClirr() throws MavenInvocationException {
                 Collections.singletonList(clirrGoal),
                 properties,
                 invokerLogFile,
-                session.getRequest().getGlobalSettingsFile());
+                session.getRequest().getGlobalSettingsFile(),
+                session.getRequest().getUserSettingsFile());
 
         try {
             if (invokerLogFile.exists()) {

src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java

@@ -5514,7 +5514,8 @@ private List<OfflineLink> getModulesLinks() throws MavenReportException {
                             Collections.singletonList(javadocGoal),
                             null,
                             invokerLogFile,
-                            session.getRequest().getGlobalSettingsFile());
+                            session.getRequest().getGlobalSettingsFile(),
+                            session.getRequest().getUserSettingsFile());
                 } catch (MavenInvocationException e) {
                     logError("MavenInvocationException: " + e.getMessage(), e);
 

src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java

@@ -714,6 +714,7 @@ protected static void copyResource(URL url, File file) throws IOException {
      * @param properties the properties for the goals, could be null.
      * @param invokerLog the log file where the invoker will be written, if null using <code>System.out</code>.
      * @param globalSettingsFile reference to settings file, could be null.
+     * @param userSettingsFile reference to user settings file, could be null.
      * @throws MavenInvocationException if any
      * @since 2.6
      */
@@ -724,7 +725,8 @@ protected static void invokeMaven(
             List<String> goals,
             Properties properties,
             File invokerLog,
-            File globalSettingsFile)
+            File globalSettingsFile,
+            File userSettingsFile)
             throws MavenInvocationException {
         if (projectFile == null) {
             throw new IllegalArgumentException("projectFile should be not null.");
@@ -760,6 +762,7 @@ protected static void invokeMaven(
         request.setBaseDirectory(projectFile.getParentFile());
         request.setPomFile(projectFile);
         request.setGlobalSettingsFile(globalSettingsFile);
+        request.setUserSettingsFile(userSettingsFile);
         request.setBatchMode(true);
         if (log != null) {
             request.setDebug(log.isDebugEnabled());

src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java

@@ -540,7 +540,14 @@ private void invokeCompileGoal(File testPom, Log log) throws Exception {
         Properties properties = new Properties();
 
         JavadocUtil.invokeMaven(
-                log, new File(getBasedir(), "target/local-repo"), testPom, goals, properties, invokerLogFile, null);
+                log,
+                new File(getBasedir(), "target/local-repo"),
+                testPom,
+                goals,
+                properties,
+                invokerLogFile,
+                null,
+                null);
     }
 
     // ----------------------------------------------------------------------