Skip to content

Commit 6c4d7b2

Browse files
authored
Merge pull request #46271 from Ladicek/maven-fix-discovering-settings-security-xml
Maven Resolver: fix discovering settings-security.xml
2 parents 9fcb390 + b435ed7 commit 6c4d7b2

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,18 @@ private DefaultRepositorySystemSession newRepositorySystemSession() throws Boots
533533
DefaultSettingsDecryptionRequest decrypt = new DefaultSettingsDecryptionRequest();
534534
decrypt.setProxies(settings.getProxies());
535535
decrypt.setServers(settings.getServers());
536+
// need to set `settings-security.xml` location extra, because it isn't discovered
537+
// by BeanBag when constructing `DefaultSecDispatcher`
538+
File settingsSecurityXml = null;
539+
boolean setSettingsSecurity = !System.getProperties().containsKey(SETTINGS_SECURITY)
540+
&& (settingsSecurityXml = new File(getUserMavenConfigurationHome(), "settings-security.xml")).exists();
541+
if (setSettingsSecurity) {
542+
System.setProperty(SETTINGS_SECURITY, settingsSecurityXml.toString());
543+
}
536544
SettingsDecryptionResult decrypted = getSettingsDecrypter().decrypt(decrypt);
545+
if (setSettingsSecurity) {
546+
System.clearProperty(SETTINGS_SECURITY);
547+
}
537548

538549
if (!decrypted.getProblems().isEmpty() && log.isDebugEnabled()) {
539550
for (SettingsProblem problem : decrypted.getProblems()) {

0 commit comments

Comments
 (0)