From a5eff903ae9de303b70a7a217e77be6085bff811 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 08:46:07 +0000
Subject: [PATCH] Bump version.org.apache.maven from 3.6.3 to 3.9.0

Bumps `version.org.apache.maven` from 3.6.3 to 3.9.0.

Updates `org.apache.maven:maven-artifact` from 3.6.3 to 3.9.0
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.6.3...maven-3.9.0)

Updates `org.apache.maven:maven-builder-support` from 3.6.3 to 3.9.0
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.6.3...maven-3.9.0)

Updates `org.apache.maven:maven-model` from 3.6.3 to 3.9.0
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.6.3...maven-3.9.0)

Updates `org.apache.maven:maven-model-builder` from 3.6.3 to 3.9.0
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.6.3...maven-3.9.0)

Updates `org.apache.maven:maven-repository-metadata` from 3.6.3 to 3.9.0
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.6.3...maven-3.9.0)

Updates `org.apache.maven:maven-resolver-provider` from 3.6.3 to 3.9.0
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.6.3...maven-3.9.0)

---
updated-dependencies:
- dependency-name: org.apache.maven:maven-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven:maven-builder-support
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven:maven-model
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven:maven-model-builder
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven:maven-repository-metadata
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.maven:maven-resolver-provider
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml                                                    | 4 ++--
 .../wildfly/prospero/wfchannel/MavenSessionManager.java    | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index a68b19393..f6ecd3164 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,8 +50,8 @@
         <version.org.apache.maven.plugins.jar>3.0.2</version.org.apache.maven.plugins.jar>
         <version.org.apache.maven.plugins.pmd>3.25.0</version.org.apache.maven.plugins.pmd>
         <version.org.apache.maven.plugins.dependency>3.8.0</version.org.apache.maven.plugins.dependency>
-        <version.org.apache.maven.resolver>1.9.21</version.org.apache.maven.resolver>
-        <version.org.apache.maven>3.6.3</version.org.apache.maven>
+        <version.org.apache.maven.resolver>1.9.22</version.org.apache.maven.resolver>
+        <version.org.apache.maven>3.9.3</version.org.apache.maven>
         <version.org.codehaus.gmaven.groovy-maven-plugin>2.1.1</version.org.codehaus.gmaven.groovy-maven-plugin>
         <version.org.codehaus.plexus-interpolation>1.27</version.org.codehaus.plexus-interpolation>
         <version.org.codehaus.plexus-utils>3.5.0</version.org.codehaus.plexus-utils>
diff --git a/prospero-common/src/main/java/org/wildfly/prospero/wfchannel/MavenSessionManager.java b/prospero-common/src/main/java/org/wildfly/prospero/wfchannel/MavenSessionManager.java
index 8fc901a17..3979c8c6e 100644
--- a/prospero-common/src/main/java/org/wildfly/prospero/wfchannel/MavenSessionManager.java
+++ b/prospero-common/src/main/java/org/wildfly/prospero/wfchannel/MavenSessionManager.java
@@ -65,12 +65,6 @@ public MavenSessionManager(MavenOptions mavenOptions) throws ProvisioningExcepti
         } else {
             this.provisioningRepo = mavenOptions.getLocalCache().toAbsolutePath();
         }
-
-        // allow to resolve file-system repositories in offline mode
-        if (System.getProperty(AETHER_OFFLINE_PROTOCOLS_PROPERTY) == null) {
-            System.setProperty(AETHER_OFFLINE_PROTOCOLS_PROPERTY, AETHER_OFFLINE_PROTOCOLS_VALUE);
-            Runtime.getRuntime().addShutdownHook(new Thread(()-> System.clearProperty(AETHER_OFFLINE_PROTOCOLS_PROPERTY)));
-        }
     }
 
     public MavenSessionManager(MavenSessionManager base) {
@@ -102,6 +96,7 @@ public DefaultRepositorySystemSession newRepositorySystemSession(RepositorySyste
         final LocalRepository localRepo = new LocalRepository(provisioningRepo.toAbsolutePath().toFile());
         session.setRepositoryListener(repositoryListener);
         session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepo));
+        session.setConfigProperty(AETHER_OFFLINE_PROTOCOLS_PROPERTY, AETHER_OFFLINE_PROTOCOLS_VALUE);
         session.setOffline(offline);
         return session;
     }