Skip to content

fix: preserve dependencies from version-range winners #13453

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

Closed
efegokdemir wants to merge 2 commits into from
Closed

fix: preserve dependencies from version-range winners #13453

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
2b2bc6b
fix: use versioned dependency collector skipper by default
efegokdemir Oct 13, 2026
389acce
style: keep resolver transport constants together
efegokdemir Oct 13, 2026
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
6 changes: 6 additions & 0 deletions ...src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@
@Singleton
public class DefaultRepositorySystemSessionFactory implements RepositorySystemSessionFactory {

private static final String MAVEN_RESOLVER_BF_COLLECTOR_SKIPPER = "aether.dependencyCollector.bf.skipper";
Comment thread
efegokdemir marked this conversation as resolved.

public static final String MAVEN_RESOLVER_TRANSPORT_DEFAULT = "default";

public static final String MAVEN_RESOLVER_TRANSPORT_WAGON = "wagon";
Expand Down Expand Up @@ -194,6 +196,10 @@ public SessionBuilder newRepositorySessionBuilder(MavenExecutionRequest request)
configProps.put(ConfigurationProperties.INTERACTIVE, request.isInteractiveMode());
configProps.put("maven.startTime", request.getStartTime());
configProps.put(Constants.MAVEN_START_INSTANT, request.getStartInstant());
if (!mergedProps.containsKey(MAVEN_RESOLVER_BF_COLLECTOR_SKIPPER)) {
// Keep dependencies of the eventual version-range winner when another version was visited first.
configProps.put(MAVEN_RESOLVER_BF_COLLECTOR_SKIPPER, "versioned");
}

sessionBuilder.setOffline(request.isOffline());
sessionBuilder.setChecksumPolicy(request.getGlobalChecksumPolicy());
Expand Down
31 changes: 31 additions & 0 deletions ...test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,37 @@ void isSnapshotUpdatesTest() throws InvalidRepositoryException {
systemSessionFactory.newRepositorySession(request).getUpdatePolicy());
}

@Test
void versionedDependencyCollectorSkipperIsDefaultAndCanBeOverridden() throws InvalidRepositoryException {
DefaultRepositorySystemSessionFactory systemSessionFactory = new DefaultRepositorySystemSessionFactory(
aetherRepositorySystem,
eventSpyDispatcher,
information,
defaultTypeRegistry,
versionScheme,
Collections.emptyMap(),
versionFilterBuilder);

MavenExecutionRequest request = new DefaultMavenExecutionRequest();
request.setLocalRepository(getLocalRepository());
assertEquals(
"versioned",
systemSessionFactory
.newRepositorySession(request)
.getConfigProperties()
.get("aether.dependencyCollector.bf.skipper"));

Properties properties = new Properties();
properties.setProperty("aether.dependencyCollector.bf.skipper", "versionless");
request.setSystemProperties(properties);
assertEquals(
"versionless",
systemSessionFactory
.newRepositorySession(request)
.getConfigProperties()
.get("aether.dependencyCollector.bf.skipper"));
}

@Test
void wagonProviderConfigurationTest() throws InvalidRepositoryException {
Server server = new Server();
Expand Down
Loading