From 7b260dcce45ce05390e1ee30efa3aa72f96db820 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Thu, 28 May 2026 23:02:37 +0200 Subject: [PATCH] Fix ITs for Maven 3.10.x --- src/it/projects/describe-cmd/verify.groovy | 3 ++- src/main/java/org/apache/maven/plugins/help/DescribeMojo.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/it/projects/describe-cmd/verify.groovy b/src/it/projects/describe-cmd/verify.groovy index 6cecaea..b46af06 100644 --- a/src/it/projects/describe-cmd/verify.groovy +++ b/src/it/projects/describe-cmd/verify.groovy @@ -21,7 +21,8 @@ def result = new File(basedir, 'result-deploy.txt').text; def ls = System.getProperty( "line.separator" ); -if (mavenVersion.startsWith('4.')) { +// used deprecated methods - FIXME in DescribeMojo +if (mavenVersion.startsWith('4.') || mavenVersion.startsWith('3.10.')) { 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 + diff --git a/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java b/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java index 33a0151..9caa5cf 100644 --- a/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java +++ b/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java @@ -650,6 +650,7 @@ private boolean describeCommand(StringBuilder descriptionBuffer) throws MojoExec throw new MojoExecutionException("The given phase '" + cmd + "' is an unknown phase."); } + // FIXME don't use a deprecated methods Map defaultLifecyclePhases = lifecycleMappings .get(project.getPackaging()) .getLifecycles()