diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index 68fb64d665b6..f8f7d8cad586 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -366,6 +366,9 @@ private void afterSessionEnd( Collection projects, MavenSession se } } + /** + * TODO: why is this method public? + */ public RepositorySystemSession newRepositorySession( MavenExecutionRequest request ) { return repositorySessionFactory.newRepositorySession( request ); 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 000000000000..8df0fae603ca --- /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 repositorySystemProvider; + + @Inject + public ResolverLifecycle( Provider repositorySystemProvider ) + { + this.repositorySystemProvider = requireNonNull( repositorySystemProvider ); + } + + @PreDestroy + public void shutdown() + { + repositorySystemProvider.get().shutdown(); + } +} diff --git a/pom.xml b/pom.xml index ad3df8cbf75c..09081cd2eecb 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ under the License. 2.0 2.0 1.3 - 1.8.2 + 1.9.1 1.7.36 2.2.1 1.7.4