[maven-jenkins-lib] branch master updated: INFRA-22584 Revert to 3.6.x

[slachiewicz]

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-lib.git


The following commit(s) were added to refs/heads/master by this push:
     new b2f0f41  INFRA-22584 Revert to 3.6.x
b2f0f41 is described below

commit b2f0f417cad6a3e6262e6604ce281bf33b4d5bc1
Author: Sylwester Lachiewicz <slachiew...@apache.org>
AuthorDate: Wed Dec 8 00:43:34 2021 +0100

    INFRA-22584 Revert to 3.6.x
---
 vars/asfMavenTlpPlgnBuild.groovy | 4 ++--
 vars/asfMavenTlpStdBuild.groovy  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index d5104f6..ab4836b 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -38,12 +38,12 @@ def call(Map params = [:]) {
        // minimum, LTS, current and next ea
     def jdks = params.containsKey('jdks') ? params.jdks : 
params.containsKey('jdk') ? params.jdk : ['17','11','8']
     def jdkMin = jdks[0];
-    def mavens = params.containsKey('maven') ? params.maven : 
['3.2.x','3.3.x','3.5.x','3.6.x','3.8.x']
+    def mavens = params.containsKey('maven') ? params.maven : 
['3.2.x','3.3.x','3.5.x','3.6.x']
     // def failFast = params.containsKey('failFast') ? params.failFast : true
     // Just temporarily
     def failFast = false;
     def siteJdks = params.containsKey('siteJdk') ? params.siteJdk : ['8','17']
-    def siteMvn = params.containsKey('siteMvn') ? params.siteMvn : '3.8.x'
+    def siteMvn = params.containsKey('siteMvn') ? params.siteMvn : '3.6.x'
     def tmpWs = params.containsKey('tmpWs') ? params.tmpWs : false
     
     taskContext['failFast'] = failFast;
diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy
index 230ef62..cc416c4 100644
--- a/vars/asfMavenTlpStdBuild.groovy
+++ b/vars/asfMavenTlpStdBuild.groovy
@@ -37,7 +37,7 @@ def call(Map params = [:]) {
     def oses = params.containsKey('os') ? params.os : ['linux', 'windows']
     // minimum, LTS, current and next ea
     def jdks = params.containsKey('jdks') ? params.jdks : 
params.containsKey('jdk') ? params.jdk : ['17','11','8']
-    def maven = params.containsKey('maven') ? params.maven : '3.8.x'
+    def maven = params.containsKey('maven') ? params.maven : '3.6.x'
     def tmpWs = params.containsKey('tmpWs') ? params.tmpWs : false
     // def failFast = params.containsKey('failFast') ? params.failFast : true
     // Just temporarily