diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 2dc39d11..95ac9af3 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -16,4 +16,4 @@ # under the License. wrapperVersion=3.3.2 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip 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 112e9fb9..0938ddbc 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.15"; + String DEFAULT_MAVEN_VERSION = "3.9.16"; /** * 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 7788a4ff..bd9f1134 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 @@ void testMultiModuleSampleBuildWithMaven310() { BuiltProject builtProject = EmbeddedMaven .withMavenInvokerSet(request, invoker) - .useMaven3Version("3.9.15") + .useMaven3Version("3.9.16") .build(); builtProject.setMavenLog(logBuffer.toString()); - verifyMavenVersion(builtProject, "3.9.15"); + verifyMavenVersion(builtProject, "3.9.16"); 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 f0f4fa3c..69f7f9b2 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 @@ -52,12 +52,12 @@ void testWarSampleBuildWithMaven310() { BuiltProject builtProject = EmbeddedMaven .withMavenInvokerSet(request, invoker) - .useMaven3Version("3.9.15") + .useMaven3Version("3.9.16") .build(); builtProject.setMavenLog(logBuffer.toString()); verifyWarSampleWithSources(builtProject); - verifyMavenVersion(builtProject, "3.9.15"); + verifyMavenVersion(builtProject, "3.9.16"); } @Test 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 7c9c78ab..84a257e1 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 @@ class PomEquippedEmbeddedMavenForMultiModuleSampleTestCase { void testMultiModuleSampleBuildWithMaven310() { BuiltProject builtProject = EmbeddedMaven .forProject(workDirExtension.prepareProject(pathToMultiModulePom)) - .useMaven3Version("3.9.15") + .useMaven3Version("3.9.16") .setUserSettingsFile(new File("src/it/settings.xml")) .setGoals("install") .addProperty(multiModuleactivateModulesParamKey, multiModuleactivateModulesParamValue) @@ -40,7 +40,7 @@ void testMultiModuleSampleBuildWithMaven310() { .setShowVersion(true) .build(); - verifyMavenVersion(builtProject, "3.9.15"); + verifyMavenVersion(builtProject, "3.9.16"); 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 fa73c0e1..27a373c2 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 @@ void testWarSampleBuildWithMaven310() { BuiltProject builtProject = EmbeddedMaven .forProject(workDirExtension.prepareProject(pathToWarSamplePom)) .setUserSettingsFile(new File("src/it/settings.xml")) - .useMaven3Version("3.9.15") + .useMaven3Version("3.9.16") .setGoals("clean", "package", "source:jar") .setShowVersion(true) .build(); verifyWarSampleWithSources(builtProject); - verifyMavenVersion(builtProject, "3.9.15"); + verifyMavenVersion(builtProject, "3.9.16"); } @Test diff --git a/pom.xml b/pom.xml index 92d8615b..c4b624fc 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 1.28.0 2.22.0 2.4.44 - 3.9.15 + 3.9.16 3.15.2 3.3.0 2.12.0