diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index 932827c..a8cd280 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -25,3 +25,5 @@ jobs: build: name: Verify uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4 + with: + maven4-enabled: true \ No newline at end of file diff --git a/src/it/projects/active-profiles_multimodule/invoker.properties b/src/it/projects/active-profiles_multimodule/invoker.properties index 00b168d..5cf9d9a 100644 --- a/src/it/projects/active-profiles_multimodule/invoker.properties +++ b/src/it/projects/active-profiles_multimodule/invoker.properties @@ -16,3 +16,5 @@ # under the License. invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:active-profiles +# not on Maven 4 until fixed https://github.com/apache/maven/issues/12405 +invoker.maven.version = 4- \ No newline at end of file diff --git a/src/it/projects/describe-cmd/verify.groovy b/src/it/projects/describe-cmd/verify.groovy index de3cdb4..90f540f 100644 --- a/src/it/projects/describe-cmd/verify.groovy +++ b/src/it/projects/describe-cmd/verify.groovy @@ -21,13 +21,8 @@ def result = new File(basedir, 'result-deploy.txt').text; def ls = System.getProperty( "line.separator" ); -// used deprecated methods - FIXME in DescribeMojo -if (mavenVersion.startsWith('4.')) { - assert result.contains("'deploy' is a phase within the 'default' lifecycle, which has the following phases:") -} else { - assert result.contains("'deploy' is a phase corresponding to this plugin:" + ls + - "org.apache.maven.plugins:maven-deploy-plugin") -} +assert result.contains("'deploy' is a phase corresponding to this plugin:" + ls + + "org.apache.maven.plugins:maven-deploy-plugin") result = new File(basedir, 'result-site.txt').text; diff --git a/src/it/projects/evaluate-forceStdout/invoker.properties b/src/it/projects/evaluate-forceStdout/invoker.properties index de210ae..3ae0180 100644 --- a/src/it/projects/evaluate-forceStdout/invoker.properties +++ b/src/it/projects/evaluate-forceStdout/invoker.properties @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:evaluate -q +invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:evaluate -q --raw-streams invoker.debug = false -# for Maven 4 we need --raw-streams -invoker.maven.version = 4- +# we need --raw-streams (supported since 3.9.10+) +invoker.maven.version = 3.9.10+