Merge pull request #774 from wildfly-extras/dependabot/maven/version.…

…org.apache.maven-3.9.0 Bump version.org.apache.maven from 3.6.3 to 3.9.0
wildfly-extras · Oct 15, 2024 · c4a6f65 · c4a6f65
2 parents 9d777f1 + a5eff90
commit c4a6f65
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -64,12 +64,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) {
@@ -100,6 +94,7 @@ public DefaultRepositorySystemSession newRepositorySystemSession(RepositorySyste
 
         final LocalRepository localRepo = new LocalRepository(provisioningRepo.toAbsolutePath().toFile());
         session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepo));
+        session.setConfigProperty(AETHER_OFFLINE_PROTOCOLS_PROPERTY, AETHER_OFFLINE_PROTOCOLS_VALUE);
         session.setOffline(offline);
         return session;
     }