Skip to content

Commit a424c6b

Browse files
cstamasmichael-o
authored andcommitted
[MJAVADOC-810] [REGRESSION] MJAVADOC-791 causes forked Maven execution fail if any toolchains or settings file isn't present
As request carries the "effective" value (default or user overriden ones) but it does not mean they exist. And as invoker used, effect is same as user would use -s/-t CLI commands with non-existent files: mvn CLI failure. Co-authored-by: Michael Osipov <michaelo@apache.org> This closes #313
1 parent d9c0002 commit a424c6b

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

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

+12-4
Original file line numberDiff line numberDiff line change
@@ -780,10 +780,18 @@ protected static void invokeMaven(
780780
InvocationRequest request = new DefaultInvocationRequest();
781781
request.setBaseDirectory(projectFile.getParentFile());
782782
request.setPomFile(projectFile);
783-
request.setGlobalSettingsFile(globalSettingsFile);
784-
request.setUserSettingsFile(userSettingsFile);
785-
request.setGlobalToolchainsFile(globalToolchainsFile);
786-
request.setToolchainsFile(userToolchainsFile);
783+
if (globalSettingsFile != null && globalSettingsFile.isFile()) {
784+
request.setGlobalSettingsFile(globalSettingsFile);
785+
}
786+
if (userSettingsFile != null && userSettingsFile.isFile()) {
787+
request.setUserSettingsFile(userSettingsFile);
788+
}
789+
if (globalToolchainsFile != null && globalToolchainsFile.isFile()) {
790+
request.setGlobalToolchainsFile(globalToolchainsFile);
791+
}
792+
if (userToolchainsFile != null && userToolchainsFile.isFile()) {
793+
request.setToolchainsFile(userToolchainsFile);
794+
}
787795
request.setBatchMode(true);
788796
if (log != null) {
789797
request.setDebug(log.isDebugEnabled());

0 commit comments

Comments
 (0)