Merge pull request #236 from petrberan/SHRINKRES-344

[SHRINKRES-344] Update Maven to 3.9.8 and MIMA to 2.4.15
shrinkwrap · Jul 24, 2024 · c5b3d17 · c5b3d17
2 parents 4b0e35e + e2248b2
commit c5b3d17
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -46,7 +46,7 @@
 
     <jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</jboss.releases.repo.url>
     <jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>
-    <version.org.apache.maven>3.9.6</version.org.apache.maven>
+    <version.org.apache.maven>3.9.8</version.org.apache.maven>
 
   </properties>
 

diff --git a/...ded/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/embedded/DistributionStage.java b/...ded/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/embedded/DistributionStage.java
@@ -27,7 +27,7 @@
 public interface DistributionStage<NEXT_STEP extends BuildStage<DAEMON_TRIGGER_TYPE>, DAEMON_TRIGGER_TYPE extends DaemonBuildTrigger>
     extends BuildStage<DAEMON_TRIGGER_TYPE> {
 
-    String DEFAULT_MAVEN_VERSION = "3.9.6";
+    String DEFAULT_MAVEN_VERSION = "3.9.8";
 
     /**
      * Configures EmbeddedMaven to build project with Maven 3 of given version. If the zip file is not cached in directory

diff --git a/...n/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java b/...n/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java
@@ -60,11 +60,11 @@ public void testMultiModuleSampleBuildWithMaven310() {
 
         BuiltProject builtProject = EmbeddedMaven
             .withMavenInvokerSet(request, invoker)
-            .useMaven3Version("3.9.6")
+            .useMaven3Version("3.9.8")
             .build();
         builtProject.setMavenLog(logBuffer.toString());
 
-        verifyMavenVersion(builtProject, "3.9.6");
+        verifyMavenVersion(builtProject, "3.9.8");
         verifyMultiModuleSample(builtProject, true);
     }
 

diff --git a/...mpl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java b/...mpl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java
@@ -50,12 +50,12 @@ public void testWarSampleBuildWithMaven310() {
 
         BuiltProject builtProject = EmbeddedMaven
             .withMavenInvokerSet(request, invoker)
-            .useMaven3Version("3.9.6")
+            .useMaven3Version("3.9.8")
             .build();
         builtProject.setMavenLog(logBuffer.toString());
 
         verifyWarSampleWithSources(builtProject);
-        verifyMavenVersion(builtProject, "3.9.6");
+        verifyMavenVersion(builtProject, "3.9.8");
     }
 
     @Test(expected = IllegalStateException.class)

diff --git a/...mpl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java b/...mpl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java
@@ -32,15 +32,15 @@ public class PomEquippedEmbeddedMavenForMultiModuleSampleTestCase {
     public void testMultiModuleSampleBuildWithMaven310() {
         BuiltProject builtProject = EmbeddedMaven
             .forProject(workDirRule.prepareProject(pathToMultiModulePom))
-            .useMaven3Version("3.9.6")
+            .useMaven3Version("3.9.8")
             .setUserSettingsFile(new File("src/it/settings.xml"))
             .setGoals("install")
             .addProperty(multiModuleactivateModulesParamKey, multiModuleactivateModulesParamValue)
             .addProperty(archiveNameModuleTwoParamKey, archiveNameModuleTwoParamValue)
             .setShowVersion(true)
             .build();
 
-        verifyMavenVersion(builtProject, "3.9.6");
+        verifyMavenVersion(builtProject, "3.9.8");
         verifyMultiModuleSample(builtProject, true);
     }
 

diff --git a/...solver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForWarSampleTestCase.java b/...solver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForWarSampleTestCase.java
@@ -26,13 +26,13 @@ public void testWarSampleBuildWithMaven310() {
         BuiltProject builtProject = EmbeddedMaven
             .forProject(workDirRule.prepareProject(pathToWarSamplePom))
             .setUserSettingsFile(new File("src/it/settings.xml"))
-            .useMaven3Version("3.9.6")
+            .useMaven3Version("3.9.8")
             .setGoals("clean", "package", "source:jar")
             .setShowVersion(true)
             .build();
 
         verifyWarSampleWithSources(builtProject);
-        verifyMavenVersion(builtProject, "3.9.6");
+        verifyMavenVersion(builtProject, "3.9.8");
     }
 
     @Test(expected = IllegalStateException.class)

diff --git a/pom.xml b/pom.xml
@@ -33,8 +33,8 @@
         <version.com.google.guice>7.0.0</version.com.google.guice>
         <version.commons-codec>1.16.1</version.commons-codec>
         <version.commons-io>2.16.1</version.commons-io>
-        <version.eu.maveniverse.mima>2.4.8</version.eu.maveniverse.mima>
-        <version.org.apache.maven>3.9.6</version.org.apache.maven>
+        <version.eu.maveniverse.mima>2.4.15</version.eu.maveniverse.mima>
+        <version.org.apache.maven>3.9.8</version.org.apache.maven>
         <version.org.apache.maven-plugin-annotations>3.13.1</version.org.apache.maven-plugin-annotations>
         <version.org.apache.maven-invoker>3.0.1</version.org.apache.maven-invoker>
         <version.org.arquillian.arquillian-spacelift>1.0.2</version.org.arquillian.arquillian-spacelift>