Skip to content

[MJAVADOC-810] [REGRESSION] MJAVADOC-791 causes forked Maven execution fail if any toolchains or settings file isn't present #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 27, 2024
Merged

[MJAVADOC-810] [REGRESSION] MJAVADOC-791 causes forked Maven execution fail if any toolchains or settings file isn't present #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a424c6b
[MJAVADOC-810] [REGRESSION] MJAVADOC-791 causes forked Maven executio…
cstamas Aug 27, 2024
54a7651
Add goal prefix
michael-o Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/it/projects/MJAVADOC-257/mymojo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,16 @@
<version>@mavenVersion@</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<goalPrefix>mjavadoc-257</goalPrefix>
</configuration>
</plugin>
</plugins>
</build>
</project>
16 changes: 12 additions & 4 deletions src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,10 +780,18 @@ protected static void invokeMaven(
InvocationRequest request = new DefaultInvocationRequest();
request.setBaseDirectory(projectFile.getParentFile());
request.setPomFile(projectFile);
request.setGlobalSettingsFile(globalSettingsFile);
request.setUserSettingsFile(userSettingsFile);
request.setGlobalToolchainsFile(globalToolchainsFile);
request.setToolchainsFile(userToolchainsFile);
if (globalSettingsFile != null && globalSettingsFile.isFile()) {
request.setGlobalSettingsFile(globalSettingsFile);
}
if (userSettingsFile != null && userSettingsFile.isFile()) {
request.setUserSettingsFile(userSettingsFile);
}
if (globalToolchainsFile != null && globalToolchainsFile.isFile()) {
request.setGlobalToolchainsFile(globalToolchainsFile);
}
if (userToolchainsFile != null && userToolchainsFile.isFile()) {
request.setToolchainsFile(userToolchainsFile);
}
request.setBatchMode(true);
if (log != null) {
request.setDebug(log.isDebugEnabled());
Expand Down