Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "[MNG-7586] Update Maven Resolver to 1.9.1 (#870)" 

This reverts commit 113919a5ef.
This commit is contained in:
Tamas Cservenak 2022-11-17 17:46:08 +01:00
parent 113919a5ef
commit 724ac0b541
3 changed files with 1 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maven-core/src/main/java/org/apache/maven/DefaultMaven.java
View File

@ -481,9 +481,6 @@ private void persistResumptionData( MavenExecutionResult result, MavenSession se
}
}
/**
* TODO: why is this method public?
*/
public RepositorySystemSession newRepositorySession( MavenExecutionRequest request )
{
return repositorySessionFactory.newRepositorySession( request );

54
maven-core/src/main/java/org/apache/maven/internal/aether/ResolverLifecycle.java
View File

@ -1,54 +0,0 @@
package org.apache.maven.internal.aether;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.sisu.EagerSingleton;
import static java.util.Objects.requireNonNull;
/**
* Maven internal component that bridges container "shut down" to {@link RepositorySystem#shutdown()}.
*
* @since 3.9.0
*/
@Named
@EagerSingleton
public final class ResolverLifecycle
{
private final Provider<RepositorySystem> repositorySystemProvider;
@Inject
public ResolverLifecycle( Provider<RepositorySystem> repositorySystemProvider )
{
this.repositorySystemProvider = requireNonNull( repositorySystemProvider );
}
@PreDestroy
public void shutdown()
{
repositorySystemProvider.get().shutdown();
}
}

2
pom.xml
View File

@ -64,7 +64,7 @@ under the License.
<securityDispatcherVersion>2.0</securityDispatcherVersion>
<cipherVersion>2.0</cipherVersion>
<jxpathVersion>1.3</jxpathVersion>
<resolverVersion>1.9.1</resolverVersion>
<resolverVersion>1.8.2</resolverVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<xmlunitVersion>2.6.4</xmlunitVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>