Skip to content

[MNG-8461] Initial settings method must restore context state #2004

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
Dec 22, 2024
Merged

[MNG-8461] Initial settings method must restore context state #2004

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
a9f6f3b
[MNG-8461] Initial settings method must restore context state
cstamas Dec 20, 2024
c2844ed
Merge remote-tracking branch 'upstream/master' into MNG-8461
cstamas Dec 22, 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
14 changes: 13 additions & 1 deletion impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,8 +501,12 @@ protected void settings(C context) throws Exception {
* If there are Maven3 passwords presents in settings, this results in doubled warnings emitted. So Plexus DI
* creation call keeps "emitSettingsWarnings" false. If there are fatal issues, it will anyway "die" at that
* spot before warnings would be emitted.
* <p>
* The method returns a "cleaner" runnable, as during extension loading the context needs to be "cleaned", restored
* to previous state (as it was before extension loading).
*/
protected void settings(C context, boolean emitSettingsWarnings, SettingsBuilder settingsBuilder) throws Exception {
protected Runnable settings(C context, boolean emitSettingsWarnings, SettingsBuilder settingsBuilder)
throws Exception {
Options mavenOptions = context.invokerRequest.options();

Path userSettingsFile = null;
Expand Down Expand Up @@ -612,6 +616,14 @@ protected void settings(C context, boolean emitSettingsWarnings, SettingsBuilder
}
context.logger.info("");
}
return () -> {
context.installationSettingsPath = null;
context.projectSettingsPath = null;
context.userSettingsPath = null;
context.effectiveSettings = null;
context.interactive = true;
context.localRepositoryPath = null;
};
}

protected void customizeSettingsRequest(C context, SettingsBuilderRequest settingsBuilderRequest)
Expand Down
6 changes: 5 additions & 1 deletion ...maven-cli/src/main/java/org/apache/maven/cling/invoker/PlexusContainerCapsuleFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,13 +273,14 @@ protected void configure() {
});

ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
Runnable settingsCleaner = null;
try {
container.setLookupRealm(null);
container.setLoggerManager(createLoggerManager());
container.getLoggerManager().setThresholds(toPlexusLoggingLevel(context.loggerLevel));
Thread.currentThread().setContextClassLoader(container.getContainerRealm());

invoker.settings(context, false, container.lookup(SettingsBuilder.class));
settingsCleaner = invoker.settings(context, false, container.lookup(SettingsBuilder.class));

MavenExecutionRequest mer = new DefaultMavenExecutionRequest();
invoker.populateRequest(context, new DefaultLookup(container), mer);
Expand All @@ -288,6 +289,9 @@ protected void configure() {
.lookup(BootstrapCoreExtensionManager.class)
.loadCoreExtensions(mer, providedArtifacts, extensions));
} finally {
if (settingsCleaner != null) {
settingsCleaner.run();
}
try {
container.dispose();
} finally {
Expand Down
Loading