diff --git a/itf-documentation/src/main/asciidoc/release-notes/_release-notes-0.14.0.adoc b/itf-documentation/src/main/asciidoc/release-notes/_release-notes-0.14.0.adoc index 218125a4cf..f33e2f1539 100644 --- a/itf-documentation/src/main/asciidoc/release-notes/_release-notes-0.14.0.adoc +++ b/itf-documentation/src/main/asciidoc/release-notes/_release-notes-0.14.0.adoc @@ -24,6 +24,7 @@ :issue-420: https://github.com/khmarbaise/maven-it-extension/issues/420[Fixed #420] :issue-421: https://github.com/khmarbaise/maven-it-extension/issues/421[Fixed #421] :issue-421: https://github.com/khmarbaise/maven-it-extension/issues/421[Fixed #421] +:issue-440: https://github.com/khmarbaise/maven-it-extension/issues/440[Fixed #440] :issue-444: https://github.com/khmarbaise/maven-it-extension/issues/444[Fixed #444] :issue-447: https://github.com/khmarbaise/maven-it-extension/issues/447[Fixed #447] :issue-449: https://github.com/khmarbaise/maven-it-extension/issues/449[Fixed #449] @@ -35,6 +36,7 @@ :issue-463: https://github.com/khmarbaise/maven-it-extension/issues/463[Fixed #463] :issue-464: https://github.com/khmarbaise/maven-it-extension/issues/464[Fixed #464] :issue-457: https://github.com/khmarbaise/maven-it-extension/issues/457[Fixed #457] +:pr-460: https://github.com/khmarbaise/maven-it-extension/pull/460[Pull request #460] :pr-462: https://github.com/khmarbaise/maven-it-extension/pull/262[Pull request #462] :release_0_14_0: https://github.com/khmarbaise/maven-it-extension/milestone/14 @@ -56,6 +58,8 @@ * https://github.com/JOpsDev[Tobias Frech] with {pr-462} ** Inconsistent documentation of minimum required Maven version +* https://github.com/sparsick[Sandra Parsick] with {pr-460} +** Upgrade ITF Framework Maven Version minimum to 3.8.1 *Dependency Upgrades* @@ -63,6 +67,7 @@ * {issue-451} - Upgrade assertj-bom to 3.25.1 * {issue-453} - Upgrade memoryfilesystem to 2.8.0 * {issue-463} - Upgrade smpp to 6.0.6 + * {issue-440} - Upgrade ITF Framework Maven Version minimum to 3.8.1 * {issue-???} - ? *Build Improvements* diff --git a/itf-failure-plugin/src/test/java/com/soebes/itf/maven/plugin/failure/FailureIT.java b/itf-failure-plugin/src/test/java/com/soebes/itf/maven/plugin/failure/FailureIT.java index 0a62ea27dd..86066a5848 100644 --- a/itf-failure-plugin/src/test/java/com/soebes/itf/maven/plugin/failure/FailureIT.java +++ b/itf-failure-plugin/src/test/java/com/soebes/itf/maven/plugin/failure/FailureIT.java @@ -30,7 +30,11 @@ @MavenJupiterExtension class FailureIT { +<<<<<<< HEAD @MavenTest +======= + @MavenTest +>>>>>>> bc4e51292 (Fixed #440 - Upgrade ITF Framework Maven Version minimum to 3.8.1) @DisplayName("The basic configuration should result in a successful build.") void basic_configuration(MavenExecutionResult project) { assertThat(project).isSuccessful().out().warn().contains("Neither executionException nor failureException has been set."); diff --git a/pom.xml b/pom.xml index 8f979a431f..19e0bf6c13 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ org.apache.maven maven-model - 3.2.5 + 3.8.1 org.apache.maven.resolver