This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch maven-3.9.x in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.9.x by this push: new c3919cdd0 [MNG-7586] Update Maven Resolver to 1.9.2 (#881) c3919cdd0 is described below commit c3919cdd0e312c1ad1704d24bbb4787137c285a7 Author: Tamas Cservenak <ta...@cservenak.net> AuthorDate: Sat Nov 26 20:08:09 2022 +0100 [MNG-7586] Update Maven Resolver to 1.9.2 (#881) * [MNG-7586] Update Maven Resolver to 1.9.2 Updates resolver to latest release. --- https://issues.apache.org/jira/browse/MNG-7586 --- .../maven/internal/aether/ResolverLifecycle.java | 54 ++++++++++++++++++++++ pom.xml | 2 +- 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/ResolverLifecycle.java b/maven-core/src/main/java/org/apache/maven/internal/aether/ResolverLifecycle.java new file mode 100644 index 000000000..68cbf52b0 --- /dev/null +++ b/maven-core/src/main/java/org/apache/maven/internal/aether/ResolverLifecycle.java @@ -0,0 +1,54 @@ +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(); + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index ad3df8cbf..198a65efe 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ under the License. <securityDispatcherVersion>2.0</securityDispatcherVersion> <cipherVersion>2.0</cipherVersion> <jxpathVersion>1.3</jxpathVersion> - <resolverVersion>1.8.2</resolverVersion> + <resolverVersion>1.9.2</resolverVersion> <slf4jVersion>1.7.36</slf4jVersion> <xmlunitVersion>2.2.1</xmlunitVersion> <powermockVersion>1.7.4</powermockVersion>