Skip to content

Commit

Permalink
Fixed #458 - Upgrade Maven 4.0.0 Alpha 13
Browse files Browse the repository at this point in the history
  • Loading branch information
khmarbaise committed Apr 2, 2024
1 parent 1f781b6 commit 8335566
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull-m4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: hb0730/[email protected]
with:
maven-version: 4.0.0
url: https://repo1.maven.org/maven2/org/apache/maven/apache-maven/4.0.0-alpha-12/apache-maven-4.0.0-alpha-12-bin.tar.gz
url: https://repo1.maven.org/maven2/org/apache/maven/apache-maven/4.0.0-alpha-13/apache-maven-4.0.0-alpha-13-bin.tar.gz
- name: Build with Maven
run: mvn verify -Prun-its -e -B -V --no-transfer-progress

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-issue-m4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ jobs:
uses: hb0730/[email protected]
with:
maven-version: 4.0.0
url: https://repo1.maven.org/maven2/org/apache/maven/apache-maven/4.0.0-alpha-12/apache-maven-4.0.0-alpha-12-bin.tar.gz
url: https://repo1.maven.org/maven2/org/apache/maven/apache-maven/4.0.0-alpha-13/apache-maven-4.0.0-alpha-13-bin.tar.gz
- name: "Building with Maven."
run: mvn verify -e -B -V --no-transfer-progress
Original file line number Diff line number Diff line change
Expand Up @@ -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-458: https://github.com/khmarbaise/maven-it-extension/issues/458[Fixed #458]

:release_0_14_0: https://github.com/khmarbaise/maven-it-extension/milestone/14

Expand Down Expand Up @@ -63,6 +64,7 @@
* {issue-447} - Move to use maven-resolver instead of aether
* {issue-455} - Upgrade asciidoctor-maven-plugin 2.2.5
* {issue-456} - Upgrade to Maven 4.0.0 Alpha 12
* {issue-458} - Upgrade to Maven 4.0.0 Alpha 13

*Documentation Improvements*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
@MavenJupiterExtension
class FailureIT {

private static final String SEPARATOR_LINE = "------------------------------------------------------------------------";

@MavenTest
@DisplayName("The basic configuration should result in a successful build.")
void basic_configuration(MavenExecutionResult project) {
Expand All @@ -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 -> {
Expand All @@ -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 -> {
Expand Down

0 comments on commit 8335566

Please sign in to comment.