[MNG-7994] Update to Resolver 2.0.0-alpha-6 (apache#1373)

Update to alpha-6. Also, move off from deprecated default ctor of def repo session in tests. --- https://issues.apache.org/jira/browse/MNG-7994
olamy · Jan 11, 2024 · c4ccba7 · c4ccba7
1 parent cfa13f5
commit c4ccba7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -369,7 369,7 @@ public static RepositorySystemSession overlay(
  }
  newSession = new DefaultRepositorySystemSession(session);
  } else {
- newSession = new DefaultRepositorySystemSession();
  newSession = new DefaultRepositorySystemSession(h -> false); // no close handle used
  }
 
  final LocalRepositoryManager llrm =

diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilderTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilderTest.java
@@ -65,7 65,10 @@ public void execute(MavenSession session, List<MojoExecution> mojoExecutions, Pr
  mavenExecutionRequest.setExecutionListener(new AbstractExecutionListener());
  mavenExecutionRequest.setGoals(Arrays.asList("clean"));
  final MavenSession session = new MavenSession(
- null, new DefaultRepositorySystemSession(), mavenExecutionRequest, defaultMavenExecutionResult);
  null,
  new DefaultRepositorySystemSession(h -> false),
  mavenExecutionRequest,
  defaultMavenExecutionResult);
  final ProjectDependencyGraphStub dependencyGraphStub = new ProjectDependencyGraphStub();
  session.setProjectDependencyGraph(dependencyGraphStub);
  session.setProjects(dependencyGraphStub.getSortedProjects());

diff --git a/...-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java b/...-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java
@@ -312,7 312,8 @@ private static MavenSession createSession(PlexusContainer container, ArtifactRep
  .setBaseDirectory(new File(""))
  .setLocalRepository(repo);
 
- DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
  DefaultRepositorySystemSession repositorySession =
  new DefaultRepositorySystemSession(h -> false); // no close handle
  repositorySession.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory()
  .newInstance(repositorySession, new LocalRepository(repo.getUrl())));
  MavenSession session =

diff --git a/...mbedder/src/test/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListenerTest.java b/...mbedder/src/test/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListenerTest.java
@@ -72,7 72,7 @@ public void print(Object o) {
  TransferResource resource = new TransferResource(null, null, "http://maven.org/test/test-resource", null, null);
  resource.setContentLength(size - 1);
 
- DefaultRepositorySystemSession session = new DefaultRepositorySystemSession();
  DefaultRepositorySystemSession session = new DefaultRepositorySystemSession(h -> false); // no close handle
 
  // warm up
  test(listener, session, resource, 0);

diff --git a/...ovider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/...ovider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -63,7 63,7 @@ private MavenRepositorySystemUtils() {
  */
  @Deprecated
  public static DefaultRepositorySystemSession newSession() {
- DefaultRepositorySystemSession session = new DefaultRepositorySystemSession();
  DefaultRepositorySystemSession session = new DefaultRepositorySystemSession(h -> false); // no close handle
 
  DependencyTraverser depTraverser = new FatArtifactTraverser();
  session.setDependencyTraverser(depTraverser);

diff --git a/pom.xml b/pom.xml
@@ -176,7 176,7 @@ under the License.
  <plexusInterpolationVersion>1.26</plexusInterpolationVersion>
  <plexusTestingVersion>1.0.0</plexusTestingVersion>
  <plexusXmlVersion>4.0.1</plexusXmlVersion>
- <resolverVersion>2.0.0-alpha-5</resolverVersion>
  <resolverVersion>2.0.0-alpha-6</resolverVersion>
  <securityDispatcherVersion>2.0</securityDispatcherVersion>
  <sisuVersion>0.9.0.M2</sisuVersion>
  <slf4jVersion>2.0.11</slf4jVersion>