Skip to content
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.

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

Maven Resolver: fix discovering settings-security.xml #46271

Conversation

Ladicek
Copy link
Contributor

@Ladicek Ladicek commented Feb 14, 2025

Follows up on #45794

Fixes #46260

@@ -533,7 +533,18 @@ private DefaultRepositorySystemSession newRepositorySystemSession() throws Boots
DefaultSettingsDecryptionRequest decrypt = new DefaultSettingsDecryptionRequest();
decrypt.setProxies(settings.getProxies());
decrypt.setServers(settings.getServers());
// need to set `settings-security.xml` location extra, because it isn't discovered
// by BeanBag when constructing `DefaultSecDispatcher`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should it be? Or this is the experted behavior?

Wondering as it would be nice not having to think about that every time.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code existed before my previous PR, where I tried to make the code a lot closer to the Maven original. The comment explains why it was there and why it should be there again.

I'm honestly not sure whether BeanBag actually could discover the location itself, it's declared as

@Inject
public DefaultSecDispatcher( final PlexusCipher _cipher,
                             final Map<String, PasswordDecryptor> _decryptors,
                             @Named( "${_configurationFile:-" + DEFAULT_CONFIGURATION + "}" )
                             final String _configurationFile )
{
    ...
}

It seems to me that this is out of BeanBag's reach.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

@aloubyansky aloubyansky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @Ladicek

@geoand geoand added the triage/waiting-for-ci Ready to merge when CI successfully finishes label Feb 14, 2025

This comment has been minimized.

@Ladicek Ladicek force-pushed the maven-fix-discovering-settings-security-xml branch from 3aba510 to b435ed7 Compare February 14, 2025 16:00
Copy link

quarkus-bot bot commented Feb 14, 2025

Status for workflow Quarkus CI

This is the status report for running Quarkus CI on commit b435ed7.

✅ The latest workflow run for the pull request has completed successfully.

It should be safe to merge provided you have a look at the other checks in the summary.

You can consult the Develocity build scans.


Flaky tests - Develocity

⚙️ JVM Tests - JDK 17

📦 extensions/hibernate-reactive/deployment

io.quarkus.hibernate.reactive.publicfields.PublicFieldAccessInheritanceTest.testFieldAccess(UniAsserter) - History

  • Expecting actual not to be null - java.lang.AssertionError
java.lang.AssertionError: 

Expecting actual not to be null
	at io.quarkus.hibernate.reactive.publicfields.PublicFieldAccessInheritanceTest$FieldAccessEnhancedDelegate$2.assertValue(PublicFieldAccessInheritanceTest.java:127)
	at io.quarkus.test.vertx.DefaultUniAsserter$1.accept(DefaultUniAsserter.java:38)
	at io.smallrye.context.impl.wrappers.SlowContextualConsumer.accept(SlowContextualConsumer.java:21)
	at io.smallrye.mutiny.operators.uni.UniOnItemConsume$UniOnItemComsumeProcessor.invokeEventHandler(UniOnItemConsume.java:77)
	at io.smallrye.mutiny.operators.uni.UniOnItemConsume$UniOnItemComsumeProcessor.onItem(UniOnItemConsume.java:42)

@aloubyansky aloubyansky merged commit 6c4d7b2 into quarkusio:main Feb 14, 2025
55 checks passed
@quarkus-bot quarkus-bot bot removed the triage/waiting-for-ci Ready to merge when CI successfully finishes label Feb 14, 2025
@quarkus-bot quarkus-bot bot added this to the 3.21 - main milestone Feb 14, 2025
@Ladicek Ladicek deleted the maven-fix-discovering-settings-security-xml branch February 17, 2025 07:59
@gsmet gsmet modified the milestones: 3.21 - main, 3.19.0 Feb 18, 2025
@gsmet gsmet modified the milestones: 3.19.0, 3.18.4 Feb 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/maven kind/bugfix triage/flaky-test
Projects
None yet
5 participants