Fix withMaven that fails to recognize the installed maven version (#1329)

* Fix withMaven that fails to recognize the installed maven version

Add calculated envs when the step execution launch maven command to retrieve the version

* fix unit test and detection with colors

---------

Co-authored-by: Benoit GUERIN <benoit.guerin1@free.fr>

Author: nfalco79

pipeline-maven/src/main/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepExecution2.java

@@ -662,8 +662,10 @@ private MavenVersion readMavenVersion(String mvnExecPath) {
             try (ByteArrayOutputStream stdout = new ByteArrayOutputStream();
                     ByteArrayOutputStream stderr = new ByteArrayOutputStream()) {
                 ProcStarter ps = launcher.launch();
-                Proc p = launcher.launch(
-                        ps.cmds(mvnExecPath, "--version").stdout(stdout).stderr(stderr));
+                Proc p = launcher.launch(ps.cmds(mvnExecPath, "--version")
+                        .envs(env.overrideAll(envOverride))
+                        .stdout(stdout)
+                        .stderr(stderr));
                 int exitCode = p.join();
                 if (exitCode == 0) {
                     Optional<String> version = stdout.toString(getComputer().getDefaultCharset())

pipeline-maven/src/main/java/org/jenkinsci/plugins/pipeline/maven/util/MavenVersionUtils.java

@@ -1,19 +1,19 @@
 package org.jenkinsci.plugins.pipeline.maven.util;
 
 import java.util.function.Predicate;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class MavenVersionUtils {
 
+    private static final Pattern PATTERN = Pattern.compile(".*Apache Maven (\\d+\\.\\d+\\.\\d+)(.*)( \\(.*\\))?");
+
     public static Predicate<String> containsMavenVersion() {
-        return string -> string != null && string.matches("Apache Maven \\d+\\.\\d+\\.\\d+(.*) \\(.*\\)");
+        return string -> string != null && PATTERN.matcher(string).matches();
     }
 
     public static MavenVersion parseMavenVersion(String outputLine) {
-        int prefixLength = "Apache Maven ".length();
-        int startHashIndex = outputLine.indexOf("(");
-        String version = startHashIndex != -1
-                ? outputLine.substring(prefixLength, startHashIndex)
-                : outputLine.substring(prefixLength);
-        return MavenVersion.fromString(version.trim());
+        Matcher m = PATTERN.matcher(outputLine);
+        return m.matches() && m.groupCount() > 1 ? MavenVersion.fromString(m.group(1)) : null;
     }
 }

pipeline-maven/src/test/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepITest.java

@@ -174,6 +174,9 @@ public void tesWithDifferentJavasForBuild(String jdkName, String jdkPath) throws
             assertThat(archives).hasSize(1);
             assertThat(archives.iterator().next().endsWith("mono-dependency-maven-project-0.1-SNAPSHOT.jar"))
                     .isTrue();
+            jenkinsRule.assertLogNotContains(
+                    "[withMaven] WARNING: You are running an old version of Maven (UNKNOWN), you should update to at least 3.8.x",
+                    run);
         }
     }
 

pipeline-maven/src/test/java/org/jenkinsci/plugins/pipeline/maven/util/MavenVersionUtilsTest.java

@@ -14,20 +14,29 @@ public void should_detect_maven_version() {
         assertThat(MavenVersionUtils.containsMavenVersion().test("not a version"))
                 .isFalse();
         assertThat(MavenVersionUtils.containsMavenVersion().test("3.8.6")).isFalse();
-        assertThat(MavenVersionUtils.containsMavenVersion().test("Apache Maven 3.9.6"))
-                .isFalse();
 
+        assertThat(MavenVersionUtils.containsMavenVersion().test(new String(new byte[] {
+                    27, 91, 49, 109, 65, 112, 97, 99, 104, 101, 32, 77, 97, 118, 101, 110, 32, 51, 46, 56, 46, 55, 27,
+                    91, 109
+                })))
+                .isTrue();
+        assertThat(MavenVersionUtils.containsMavenVersion().test("Apache Maven 3.9.6"))
+                .isTrue();
         assertThat(MavenVersionUtils.containsMavenVersion()
                         .test("Apache Maven 3.9.6 (bc0240f3c744dd6b6ec2920b3cd08dcc295161ae)"))
                 .isTrue();
-
         assertThat(MavenVersionUtils.containsMavenVersion()
                         .test("Apache Maven 4.0.0-beta-3 (e92f645c2749eb2a4f5a8843cf01e7441e4b559f)"))
                 .isTrue();
     }
 
     @Test
     public void should_parse_maven_version() {
+        assertThat(MavenVersionUtils.parseMavenVersion(new String(new byte[] {
+                    27, 91, 49, 109, 65, 112, 97, 99, 104, 101, 32, 77, 97, 118, 101, 110, 32, 51, 46, 56, 46, 55, 27,
+                    91, 109
+                })))
+                .isEqualTo(new MavenVersion(3, 8, 7));
         assertThat(MavenVersionUtils.parseMavenVersion("Apache Maven 3.9.6 (bc0240f3c744dd6b6ec2920b3cd08dcc295161ae)"))
                 .isEqualTo(new MavenVersion(3, 9, 6));
         assertThat(MavenVersionUtils.parseMavenVersion("Apache Maven 3.8.8 (4c87b05d9aedce574290d1acc98575ed5eb6cd39)"))