diff --git a/bom/pom.xml b/bom/pom.xml index 3a8cb791..dd3051bb 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -46,7 +46,7 @@ https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/ https://repository.jboss.org/nexus/content/repositories/snapshots/ - 3.9.8 + 3.9.9 diff --git a/maven/api-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/embedded/DistributionStage.java b/maven/api-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/embedded/DistributionStage.java index d86f0605..58b6068c 100644 --- a/maven/api-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/embedded/DistributionStage.java +++ b/maven/api-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/embedded/DistributionStage.java @@ -27,7 +27,7 @@ public interface DistributionStage, DAEMON_TRIGGER_TYPE extends DaemonBuildTrigger> extends BuildStage { - String DEFAULT_MAVEN_VERSION = "3.9.8"; + String DEFAULT_MAVEN_VERSION = "3.9.9"; /** * Configures EmbeddedMaven to build project with Maven 3 of given version. If the zip file is not cached in directory diff --git a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java index ada57298..4c3992f5 100644 --- a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java +++ b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java @@ -61,11 +61,11 @@ public void testMultiModuleSampleBuildWithMaven310() { BuiltProject builtProject = EmbeddedMaven .withMavenInvokerSet(request, invoker) - .useMaven3Version("3.9.8") + .useMaven3Version("3.9.9") .build(); builtProject.setMavenLog(logBuffer.toString()); - verifyMavenVersion(builtProject, "3.9.8"); + verifyMavenVersion(builtProject, "3.9.9"); verifyMultiModuleSample(builtProject, true); } diff --git a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java index 58e96d2c..80f1162e 100644 --- a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java +++ b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java @@ -51,12 +51,12 @@ public void testWarSampleBuildWithMaven310() { BuiltProject builtProject = EmbeddedMaven .withMavenInvokerSet(request, invoker) - .useMaven3Version("3.9.8") + .useMaven3Version("3.9.9") .build(); builtProject.setMavenLog(logBuffer.toString()); verifyWarSampleWithSources(builtProject); - verifyMavenVersion(builtProject, "3.9.8"); + verifyMavenVersion(builtProject, "3.9.9"); } @Test(expected = IllegalStateException.class) diff --git a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java index 4d7a433e..7bdb3399 100644 --- a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java +++ b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java @@ -32,7 +32,7 @@ public class PomEquippedEmbeddedMavenForMultiModuleSampleTestCase { public void testMultiModuleSampleBuildWithMaven310() { BuiltProject builtProject = EmbeddedMaven .forProject(workDirRule.prepareProject(pathToMultiModulePom)) - .useMaven3Version("3.9.8") + .useMaven3Version("3.9.9") .setUserSettingsFile(new File("src/it/settings.xml")) .setGoals("install") .addProperty(multiModuleactivateModulesParamKey, multiModuleactivateModulesParamValue) @@ -40,7 +40,7 @@ public void testMultiModuleSampleBuildWithMaven310() { .setShowVersion(true) .build(); - verifyMavenVersion(builtProject, "3.9.8"); + verifyMavenVersion(builtProject, "3.9.9"); verifyMultiModuleSample(builtProject, true); } diff --git a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForWarSampleTestCase.java b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForWarSampleTestCase.java index 6acb7979..99305719 100644 --- a/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForWarSampleTestCase.java +++ b/maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/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.8") + .useMaven3Version("3.9.9") .setGoals("clean", "package", "source:jar") .setShowVersion(true) .build(); verifyWarSampleWithSources(builtProject); - verifyMavenVersion(builtProject, "3.9.8"); + verifyMavenVersion(builtProject, "3.9.9"); } @Test(expected = IllegalStateException.class) diff --git a/pom.xml b/pom.xml index f8eb62be..3ac90eb4 100644 --- a/pom.xml +++ b/pom.xml @@ -34,8 +34,8 @@ 1.17.1 1.27.0 2.16.1 - 2.4.15 - 3.9.8 + 2.4.20 + 3.9.9 3.13.1 3.0.1 2.8.0