From 7ec47661d4f5db2de817abcc04ddc2da72d4ea9c Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Tue, 27 Dec 2022 16:11:34 +0100
Subject: [PATCH 1/2] [MRESOLVER-302] Integrate onSessionClose

Depends on https://github.com/apache/maven-resolver/pull/232
---
 .../internal/aether/ResolverLifecycle.java      | 17 +++++++++++++++--
 pom.xml                                         |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

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
index 8c3d99779f2d..bdb5b847eaf0 100644
--- 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
@@ -24,17 +24,20 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Provider;
+
+import org.apache.maven.AbstractMavenLifecycleParticipant;
+import org.apache.maven.execution.MavenSession;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.sisu.EagerSingleton;
 
 /**
- * Maven internal component that bridges container "shut down" to {@link RepositorySystem#shutdown()}.
+ * Maven internal component that bridges container "shut down" and "on session end" to {@link RepositorySystem).
  *
  * @since 3.9.0
  */
 @Named
 @EagerSingleton
-public final class ResolverLifecycle {
+public final class ResolverLifecycle extends AbstractMavenLifecycleParticipant {
     private final Provider<RepositorySystem> repositorySystemProvider;
 
     @Inject
@@ -42,6 +45,16 @@ public ResolverLifecycle(Provider<RepositorySystem> repositorySystemProvider) {
         this.repositorySystemProvider = requireNonNull(repositorySystemProvider);
     }
 
+    @Override
+    public void afterSessionStart( MavenSession session) {
+        repositorySystemProvider.get().sessionStarted(session.getRepositorySession());
+    }
+
+    @Override
+    public void afterSessionEnd(MavenSession session) {
+        repositorySystemProvider.get().sessionEnded(session.getRepositorySession());
+    }
+
     @PreDestroy
     public void shutdown() {
         repositorySystemProvider.get().shutdown();
diff --git a/pom.xml b/pom.xml
index 0b801f815eed..60b058dadfdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@ under the License.
     <securityDispatcherVersion>2.0</securityDispatcherVersion>
     <cipherVersion>2.0</cipherVersion>
     <jxpathVersion>1.3</jxpathVersion>
-    <resolverVersion>1.9.2</resolverVersion>
+    <resolverVersion>1.9.3-SNAPSHOT</resolverVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
     <xmlunitVersion>2.2.1</xmlunitVersion>
     <powermockVersion>1.7.4</powermockVersion>

From f49d4a9bef0bf8de122f00a61313c48801cfc80b Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Tue, 27 Dec 2022 16:16:12 +0100
Subject: [PATCH 2/2] Reformat

---
 .../org/apache/maven/internal/aether/ResolverLifecycle.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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
index bdb5b847eaf0..32962539a9b2 100644
--- 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
@@ -24,7 +24,6 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Provider;
-
 import org.apache.maven.AbstractMavenLifecycleParticipant;
 import org.apache.maven.execution.MavenSession;
 import org.eclipse.aether.RepositorySystem;
@@ -46,7 +45,7 @@ public ResolverLifecycle(Provider<RepositorySystem> repositorySystemProvider) {
     }
 
     @Override
-    public void afterSessionStart( MavenSession session) {
+    public void afterSessionStart(MavenSession session) {
         repositorySystemProvider.get().sessionStarted(session.getRepositorySession());
     }