File maven4-resolver-2.0.13.patch of Package maven
--- apache-maven-4.0.0-rc-4/compat/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java 2025-10-10 21:17:50.744001976 +0200
+++ apache-maven-4.0.0-rc-4/compat/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java 2025-10-10 21:18:36.919939768 +0200
@@ -310,7 +310,7 @@
DependencyTraverser depTraverser = new FatArtifactTraverser();
session.setDependencyTraverser(depTraverser);
- DependencyManager depManager = new ClassicDependencyManager(true, session.getScopeManager());
+ DependencyManager depManager = new ClassicDependencyManager(session.getScopeManager());
session.setDependencyManager(depManager);
DependencySelector depFilter = new AndDependencySelector(
--- apache-maven-4.0.0-rc-4/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSessionBuilderSupplier.java 2025-10-10 21:17:50.867561422 +0200
+++ apache-maven-4.0.0-rc-4/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSessionBuilderSupplier.java 2025-10-10 21:18:36.920296709 +0200
@@ -43,6 +43,7 @@
import org.eclipse.aether.resolution.ArtifactDescriptorPolicy;
import org.eclipse.aether.util.artifact.DefaultArtifactTypeRegistry;
import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
+import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
import org.eclipse.aether.util.graph.transformer.ChainedDependencyGraphTransformer;
@@ -95,7 +96,9 @@
}
public DependencyManager getDependencyManager(boolean transitive) {
- return new ClassicDependencyManager(transitive, getScopeManager());
+ return transitive
+ ? new TransitiveDependencyManager(getScopeManager())
+ : new ClassicDependencyManager(getScopeManager());
}
protected DependencySelector getDependencySelector() {
--- apache-maven-4.0.0-rc-4/impl/maven-impl/src/main/java/org/apache/maven/impl/standalone/RepositorySystemSupplier.java 2025-10-10 21:17:50.961478455 +0200
+++ apache-maven-4.0.0-rc-4/impl/maven-impl/src/main/java/org/apache/maven/impl/standalone/RepositorySystemSupplier.java 2025-10-10 21:18:36.920559817 +0200
@@ -195,12 +195,14 @@
TransporterProvider transporterProvider,
RepositoryLayoutProvider layoutProvider,
ChecksumPolicyProvider checksumPolicyProvider,
+ PathProcessor pathProcessor,
ChecksumProcessor checksumProcessor,
Map<String, ProvidedChecksumsSource> providedChecksumsSources) {
return new BasicRepositoryConnectorFactory(
transporterProvider,
layoutProvider,
checksumPolicyProvider,
+ pathProcessor,
checksumProcessor,
providedChecksumsSources);
}
@@ -251,8 +253,8 @@
@Provides
@Named(GroupIdRemoteRepositoryFilterSource.NAME)
static GroupIdRemoteRepositoryFilterSource newGroupIdRemoteRepositoryFilterSource(
- RepositorySystemLifecycle repositorySystemLifecycle) {
- return new GroupIdRemoteRepositoryFilterSource(repositorySystemLifecycle);
+ RepositorySystemLifecycle repositorySystemLifecycle, PathProcessor pathProcessor) {
+ return new GroupIdRemoteRepositoryFilterSource(repositorySystemLifecycle, pathProcessor);
}
@Provides
@@ -566,8 +568,10 @@
@Provides
@Named(SummaryFileTrustedChecksumsSource.NAME)
static SummaryFileTrustedChecksumsSource newSummaryFileTrustedChecksumsSource(
- LocalPathComposer localPathComposer, RepositorySystemLifecycle repositorySystemLifecycle) {
- return new SummaryFileTrustedChecksumsSource(localPathComposer, repositorySystemLifecycle);
+ LocalPathComposer localPathComposer,
+ RepositorySystemLifecycle repositorySystemLifecycle,
+ PathProcessor pathProcessor) {
+ return new SummaryFileTrustedChecksumsSource(localPathComposer, repositorySystemLifecycle, pathProcessor);
}
@Provides
--- apache-maven-4.0.0-rc-4/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/RepositorySystemSupplier.java 2025-10-10 21:17:50.972576348 +0200
+++ apache-maven-4.0.0-rc-4/impl/maven-testing/src/main/java/org/apache/maven/api/plugin/testing/stubs/RepositorySystemSupplier.java 2025-10-10 21:18:36.920919746 +0200
@@ -541,7 +541,7 @@
HashMap<String, RemoteRepositoryFilterSource> result = new HashMap<>();
result.put(
GroupIdRemoteRepositoryFilterSource.NAME,
- new GroupIdRemoteRepositoryFilterSource(getRepositorySystemLifecycle()));
+ new GroupIdRemoteRepositoryFilterSource(getRepositorySystemLifecycle(), getPathProcessor()));
result.put(
PrefixesRemoteRepositoryFilterSource.NAME,
new PrefixesRemoteRepositoryFilterSource(
@@ -608,7 +608,8 @@
new SparseDirectoryTrustedChecksumsSource(getChecksumProcessor(), getLocalPathComposer()));
result.put(
SummaryFileTrustedChecksumsSource.NAME,
- new SummaryFileTrustedChecksumsSource(getLocalPathComposer(), getRepositorySystemLifecycle()));
+ new SummaryFileTrustedChecksumsSource(
+ getLocalPathComposer(), getRepositorySystemLifecycle(), getPathProcessor()));
return result;
}
@@ -709,6 +710,7 @@
getTransporterProvider(),
getRepositoryLayoutProvider(),
getChecksumPolicyProvider(),
+ getPathProcessor(),
getChecksumProcessor(),
getProvidedChecksumsSources());
}
--- apache-maven-4.0.0-rc-4/pom.xml 2025-10-10 21:17:50.878162075 +0200
+++ apache-maven-4.0.0-rc-4/pom.xml 2025-10-10 21:18:36.921414917 +0200
@@ -162,7 +162,7 @@
<plexusInterpolationVersion>1.28</plexusInterpolationVersion>
<plexusTestingVersion>1.5.0</plexusTestingVersion>
<plexusXmlVersion>4.1.0</plexusXmlVersion>
- <resolverVersion>2.0.11</resolverVersion>
+ <resolverVersion>2.0.13</resolverVersion>
<securityDispatcherVersion>4.1.0</securityDispatcherVersion>
<sisuVersion>0.9.0.M4</sisuVersion>
<slf4jVersion>2.0.17</slf4jVersion>
Only in apache-maven-4.0.0-rc-4: pom.xml.orig