From 027a36b2b6c9accd0cdf744c86772ad2f8cbb369 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Mon, 17 Oct 2022 11:05:26 +0200 Subject: [PATCH 1/3] Maven 3.9.x changes for upcoming resolver 1.9.0 Changes: - hook in lifecycle - provide plexus context for parameter injection --- .../java/org/apache/maven/DefaultMaven.java | 3 ++ .../internal/aether/ResolverLifecycle.java | 54 +++++++++++++++++++ .../java/org/apache/maven/cli/MavenCli.java | 24 ++++++++- pom.xml | 2 +- 4 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 maven-core/src/main/java/org/apache/maven/internal/aether/ResolverLifecycle.java 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/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index f2443d18a727..60d2c832ba6f 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -103,6 +103,7 @@ import java.nio.file.Files; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; @@ -637,7 +638,8 @@ PlexusContainer container( CliRequest cliRequest ) ContainerConfiguration cc = new DefaultContainerConfiguration().setClassWorld( cliRequest.classWorld ) .setRealm( containerRealm ).setClassPathScanning( PlexusConstants.SCANNING_INDEX ).setAutoWiring( true ) - .setJSR250Lifecycle( true ).setName( "maven" ); + .setJSR250Lifecycle( true ).setName( "maven" ) + .setContext( plexusContext( cliRequest ) ); Set exportedArtifacts = new HashSet<>( coreEntry.getExportedArtifacts() ); Set exportedPackages = new HashSet<>( coreEntry.getExportedPackages() ); @@ -731,7 +733,8 @@ private List loadCoreExtensions( CliRequest cliRequest, Clas .setClassPathScanning( PlexusConstants.SCANNING_INDEX ) // .setAutoWiring( true ) // .setJSR250Lifecycle( true ) // - .setName( "maven" ); + .setName( "maven" ) + .setContext( plexusContext( cliRequest ) ); DefaultPlexusContainer container = new DefaultPlexusContainer( cc, new AbstractModule() { @@ -790,6 +793,23 @@ private List readCoreExtensionsDescriptor( File extensionsFile ) } + /** + * Sets up Plexus context map, that makes possible named parameters injection into components managed by the + * container. + * + * @param cliRequest The CLI request to source system and user properties from. + * @return The "context" map to be used with Plexus Container. + * @see Sisu Parameters + * @see Configuration + */ + private Map plexusContext( CliRequest cliRequest ) + { + HashMap result = new HashMap<>(); + result.putAll( cliRequest.systemProperties ); + result.putAll( cliRequest.userProperties ); + return result; + } + private ClassRealm setupContainerRealm( ClassWorld classWorld, ClassRealm coreRealm, List extClassPath, List extensions ) throws Exception diff --git a/pom.xml b/pom.xml index ad3df8cbf75c..92bba9f1ca87 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.0 1.7.36 2.2.1 1.7.4 From f77e437fa19ea5fc3bc4650927fe28f217f18514 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Mon, 14 Nov 2022 11:51:05 +0100 Subject: [PATCH 2/3] Bump to 1.9.1 and remove plexus context, no need to expose it --- .../java/org/apache/maven/cli/MavenCli.java | 24 ++----------------- pom.xml | 2 +- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 60d2c832ba6f..f2443d18a727 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -103,7 +103,6 @@ import java.nio.file.Files; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; @@ -638,8 +637,7 @@ PlexusContainer container( CliRequest cliRequest ) ContainerConfiguration cc = new DefaultContainerConfiguration().setClassWorld( cliRequest.classWorld ) .setRealm( containerRealm ).setClassPathScanning( PlexusConstants.SCANNING_INDEX ).setAutoWiring( true ) - .setJSR250Lifecycle( true ).setName( "maven" ) - .setContext( plexusContext( cliRequest ) ); + .setJSR250Lifecycle( true ).setName( "maven" ); Set exportedArtifacts = new HashSet<>( coreEntry.getExportedArtifacts() ); Set exportedPackages = new HashSet<>( coreEntry.getExportedPackages() ); @@ -733,8 +731,7 @@ private List loadCoreExtensions( CliRequest cliRequest, Clas .setClassPathScanning( PlexusConstants.SCANNING_INDEX ) // .setAutoWiring( true ) // .setJSR250Lifecycle( true ) // - .setName( "maven" ) - .setContext( plexusContext( cliRequest ) ); + .setName( "maven" ); DefaultPlexusContainer container = new DefaultPlexusContainer( cc, new AbstractModule() { @@ -793,23 +790,6 @@ private List readCoreExtensionsDescriptor( File extensionsFile ) } - /** - * Sets up Plexus context map, that makes possible named parameters injection into components managed by the - * container. - * - * @param cliRequest The CLI request to source system and user properties from. - * @return The "context" map to be used with Plexus Container. - * @see Sisu Parameters - * @see Configuration - */ - private Map plexusContext( CliRequest cliRequest ) - { - HashMap result = new HashMap<>(); - result.putAll( cliRequest.systemProperties ); - result.putAll( cliRequest.userProperties ); - return result; - } - private ClassRealm setupContainerRealm( ClassWorld classWorld, ClassRealm coreRealm, List extClassPath, List extensions ) throws Exception diff --git a/pom.xml b/pom.xml index 92bba9f1ca87..aceabc87b204 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ under the License. 2.0 2.0 1.3 - 1.9.0 + 1.9.1-SNAPSHOT 1.7.36 2.2.1 1.7.4 From 05ed12f1b1ee69902c202453c2d407053f863b9d Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 17 Nov 2022 16:20:25 +0100 Subject: [PATCH 3/3] Use released resolver. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aceabc87b204..09081cd2eecb 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ under the License. 2.0 2.0 1.3 - 1.9.1-SNAPSHOT + 1.9.1 1.7.36 2.2.1 1.7.4