[WFCORE-7076] Upgrade maven dependencies to 3.9.9

wildfly · Dec 6, 2024 · 0481dde · 0481dde
1 parent 50f662c
commit 0481dde
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/elytron/pom.xml b/elytron/pom.xml
@@ -391,6 +391,16 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/model-test/src/main/java/org/jboss/as/model/test/MavenUtil.java b/model-test/src/main/java/org/jboss/as/model/test/MavenUtil.java
@@ -19,9 +19,11 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.maven.repository.internal.DefaultArtifactDescriptorReader;
+import org.apache.maven.repository.internal.DefaultModelCacheFactory;
 import org.apache.maven.repository.internal.DefaultVersionRangeResolver;
 import org.apache.maven.repository.internal.DefaultVersionResolver;
 import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
+import org.apache.maven.repository.internal.ModelCacheFactory;
 import org.apache.maven.repository.internal.SnapshotMetadataGeneratorFactory;
 import org.apache.maven.repository.internal.VersionsMetadataGeneratorFactory;
 import org.eclipse.aether.AbstractRepositoryListener;
@@ -281,8 +283,6 @@ private RepositorySystemSession newRepositorySystemSession() {
             return this.session;
         }
         DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();
-
-
         LocalRepository localRepo = new LocalRepository(mavenSettings.getLocalRepository().toString());
         session.setLocalRepositoryManager(REPOSITORY_SYSTEM.newLocalRepositoryManager(session, localRepo));
 
@@ -295,6 +295,11 @@ public void transferFailed(TransferEvent event) {
                 super.transferFailed(event);
             }
         });
+
+        // these properties are needed by Maven to correctly parse poms when resolving nested dependencies
+        session.setSystemProperty("java.version", System.getProperty("java.version"));
+        session.setSystemProperty("java.home", System.getProperty("java.home"));
+
         this.session = session;
         return session;
     }
@@ -312,11 +317,14 @@ static RepositorySystem newRepositorySystem() {
              */
 
         DefaultServiceLocator locator = new DefaultServiceLocator();
+
+
         locator.addService(ArtifactDescriptorReader.class, DefaultArtifactDescriptorReader.class);
         locator.addService(VersionResolver.class, DefaultVersionResolver.class);
         locator.addService(VersionRangeResolver.class, DefaultVersionRangeResolver.class);
         locator.addService(MetadataGeneratorFactory.class, SnapshotMetadataGeneratorFactory.class);
         locator.addService(MetadataGeneratorFactory.class, VersionsMetadataGeneratorFactory.class);
+        locator.addService(ModelCacheFactory.class, DefaultModelCacheFactory.class);
         locator.setErrorHandler(new MyErrorHandler());
 
         locator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);

diff --git a/pom.xml b/pom.xml
@@ -196,8 +196,8 @@
         <version.org.apache.httpcomponents.httpclient>4.5.14</version.org.apache.httpcomponents.httpclient>
         <version.org.apache.httpcomponents.httpcore>4.4.16</version.org.apache.httpcomponents.httpcore>
         <version.org.apache.logging.log4j>2.23.1</version.org.apache.logging.log4j>
-        <version.org.apache.maven.provider>3.5.4</version.org.apache.maven.provider>
-        <version.org.apache.maven.resolver>1.1.1</version.org.apache.maven.resolver>
+        <version.org.apache.maven.provider>3.9.9</version.org.apache.maven.provider>
+        <version.org.apache.maven.resolver>1.9.22</version.org.apache.maven.resolver>
         <version.org.apache.sshd>2.14.0</version.org.apache.sshd>
         <version.org.apache.velocity>2.3</version.org.apache.velocity>
         <version.org.bouncycastle>1.79</version.org.bouncycastle>

diff --git a/testsuite/shared/pom.xml b/testsuite/shared/pom.xml
@@ -67,6 +67,15 @@
             <artifactId>shrinkwrap-impl-base</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>