[maven-jenkins-env] branch master updated: Use by default Java 7 for all Maven versions except 4.x line

[sl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git


The following commit(s) were added to refs/heads/master by this push:
     new 1949acb  Use by default Java 7 for all Maven versions except 4.x line
1949acb is described below

commit 1949acb394f1b267a3f05092b28d3db8986a723f
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Apr 3 22:42:48 2021 +0200

    Use by default Java 7 for all Maven versions except 4.x line
---
 vars/jenkinsEnv.groovy | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/vars/jenkinsEnv.groovy b/vars/jenkinsEnv.groovy
index 7b0f21e..b0fbd4d 100644
--- a/vars/jenkinsEnv.groovy
+++ b/vars/jenkinsEnv.groovy
@@ -146,15 +146,10 @@ class jenkinsEnv implements Serializable {
     }
     def jdkForMaven(String version) {
         switch(version) {
-            case ~/^3\.0\..+/:
-                return '6'
-            case ~/^3\.[2356]\..+/:
-            case '3.x.x':
-                return '7'
             case '4.x.x':
                 return '8'
             default:
-                return null
+                return '7'
         }
     }
     def mavenForJdk(String version) {