From bc4e51292c6e6fe574d092baef5774987f96f293 Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Wed, 20 Mar 2024 19:01:20 +0100 Subject: [PATCH] Fixed #440 - Upgrade ITF Framework Maven Version minimum to 3.8.1 --- .../asciidoc/release-notes/_release-notes-0.14.0.adoc | 3 ++- .../soebes/itf/examples/goals/MetaAnnotationGoalIT.java | 2 -- .../com/soebes/itf/maven/plugin/failure/FailureIT.java | 8 +++----- pom.xml | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) 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 5bd79df03b..4168365e61 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 @@ -31,6 +31,7 @@ :issue-453: https://github.com/khmarbaise/maven-it-extension/issues/453[Fixed #453] :issue-455: https://github.com/khmarbaise/maven-it-extension/issues/455[Fixed #455] :issue-456: https://github.com/khmarbaise/maven-it-extension/issues/456[Fixed #456] +:issue-440: https://github.com/khmarbaise/maven-it-extension/issues/440[Fixed #440] :release_0_14_0: https://github.com/khmarbaise/maven-it-extension/milestone/14 @@ -56,7 +57,7 @@ * {issue-420} - Upgrade assertj-bom to 3.25.0 * {issue-451} - Upgrade assertj-bom to 3.25.1 * {issue-453} - Upgrade memoryfilesystem to 2.8.0 - * {issue-???} - ? + * {issue-440} - Upgrade ITF Framework Maven Version minimum to 3.8.1 *Build Improvements* diff --git a/itf-examples/src/test/java/com/soebes/itf/examples/goals/MetaAnnotationGoalIT.java b/itf-examples/src/test/java/com/soebes/itf/examples/goals/MetaAnnotationGoalIT.java index f25666ad07..cbf9dd7a30 100644 --- a/itf-examples/src/test/java/com/soebes/itf/examples/goals/MetaAnnotationGoalIT.java +++ b/itf-examples/src/test/java/com/soebes/itf/examples/goals/MetaAnnotationGoalIT.java @@ -39,8 +39,6 @@ void clean_verify(MavenExecutionResult result) { .info() .containsSubsequence( "Scanning for projects...", - "-------------------< com.soebes.katas:kata-fraction >-------------------", - "--------------------------------[ jar ]---------------------------------", "--- clean:3.3.2:clean (default-clean) @ kata-fraction ---", "--- enforcer:3.4.1:enforce (enforce-maven) @ kata-fraction ---", "--- jacoco:0.8.11:prepare-agent (default) @ kata-fraction ---", 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 0ec51b4f0d..a87bc4fca4 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,9 +30,7 @@ @MavenJupiterExtension class FailureIT { - private static final String SEPARATOR_LINE = "------------------------------------------------------------------------"; - - @MavenTest + @MavenTest @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."); @@ -42,7 +40,7 @@ void basic_configuration(MavenExecutionResult project) { void fail_with_mojo_execution_exception(MavenExecutionResult result) { assertThat(result).isFailure(); - assertThat(result).out().info().containsSequence(SEPARATOR_LINE, "BUILD FAILURE", SEPARATOR_LINE); + assertThat(result).out().info().containsSequence("BUILD FAILURE"); //TODO: Is there a simpler way to do this? Can we somehow create better support for that? assertThat(result).out().error().filteredOn(s -> s.startsWith("Failed to execute goal ")).satisfies(s -> { @@ -58,7 +56,7 @@ void fail_with_mojo_execution_exception(MavenExecutionResult result) { void fail_with_mojo_failure_exception(MavenExecutionResult result) { assertThat(result).isFailure(); - assertThat(result).out().info().containsSequence(SEPARATOR_LINE, "BUILD FAILURE", SEPARATOR_LINE); + assertThat(result).out().info().containsSequence("BUILD FAILURE"); //TODO: Is there a simpler way to do this? Can we somehow create better support for that? assertThat(result).out().error().filteredOn(s -> s.startsWith("Failed to execute goal ")).satisfies(s -> { diff --git a/pom.xml b/pom.xml index 234a390af4..6d1b972097 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ org.apache.maven maven-model - 3.2.5 + 3.8.1 org.apache.maven.resolver