mirror of https://github.com/apache/maven.git
Revert "[MNG-7586] Update Maven Resolver to 1.9.1 (#870)"
This reverts commit 113919a5ef
.
This commit is contained in:
parent
113919a5ef
commit
724ac0b541
|
@ -481,9 +481,6 @@ public class DefaultMaven
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO: why is this method public?
|
|
||||||
*/
|
|
||||||
public RepositorySystemSession newRepositorySession( MavenExecutionRequest request )
|
public RepositorySystemSession newRepositorySession( MavenExecutionRequest request )
|
||||||
{
|
{
|
||||||
return repositorySessionFactory.newRepositorySession( request );
|
return repositorySessionFactory.newRepositorySession( request );
|
||||||
|
|
|
@ -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
2
pom.xml
|
@ -64,7 +64,7 @@ under the License.
|
||||||
<securityDispatcherVersion>2.0</securityDispatcherVersion>
|
<securityDispatcherVersion>2.0</securityDispatcherVersion>
|
||||||
<cipherVersion>2.0</cipherVersion>
|
<cipherVersion>2.0</cipherVersion>
|
||||||
<jxpathVersion>1.3</jxpathVersion>
|
<jxpathVersion>1.3</jxpathVersion>
|
||||||
<resolverVersion>1.9.1</resolverVersion>
|
<resolverVersion>1.8.2</resolverVersion>
|
||||||
<slf4jVersion>1.7.36</slf4jVersion>
|
<slf4jVersion>1.7.36</slf4jVersion>
|
||||||
<xmlunitVersion>2.6.4</xmlunitVersion>
|
<xmlunitVersion>2.6.4</xmlunitVersion>
|
||||||
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
|
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
|
||||||
|
|
Loading…
Reference in New Issue