(maven-jenkins-lib) branch master updated: Use the latest version of Maven in build

[sjaranowski]

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

sjaranowski 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 da1a59d  Use the latest version of Maven in build
da1a59d is described below

commit da1a59d78549eba3c844a4eb48873e410a0b63df
Author: Slawomir Jaranowski <s.jaranow...@gmail.com>
AuthorDate: Tue Dec 12 00:02:01 2023 +0100

    Use the latest version of Maven in build
---
 vars/asfMavenTlpPlgnBuild.groovy | 6 +++---
 vars/asfMavenTlpStdBuild.groovy  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index e8e8efa..8b82e35 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -40,12 +40,12 @@ def call(Map params = [:]) {
     // minimum, LTS, current and next ea
     def jdks = params.containsKey('jdks') ? params.jdks : 
params.containsKey('jdk') ? params.jdk : ['8','11','17']
     def jdkMin = jdks[0];
-    def mavens = params.containsKey('maven') ? params.maven : ['3.6.x', 
'3.8.x']
+    def mavens = params.containsKey('maven') ? params.maven : ['3.6.x', 
'3.9.x']
     // def failFast = params.containsKey('failFast') ? params.failFast : true
     // Just temporarily
     def failFast = false;
     def siteJdks = params.containsKey('siteJdk') ? params.siteJdk : ['11']
-    def siteMvn = params.containsKey('siteMvn') ? params.siteMvn : '3.8.x'
+    def siteMvn = params.containsKey('siteMvn') ? params.siteMvn : '3.9.x'
     def tmpWs = params.containsKey('tmpWs') ? params.tmpWs : false
 
     
@@ -140,7 +140,7 @@ def doCreateTask( os, jdk, maven, tasks, first, plan, 
taskContext )
 
   if (plan == 'build') {
       cmd += 'clean'
-      if (env.BRANCH_NAME == 'master' && jdk == '17' && maven == '3.6.x' && os 
== 'linux' ) {
+      if (env.BRANCH_NAME == 'master' && jdk == '17' && maven == '3.9.x' && os 
== 'linux' ) {
         cmd += 'deploy'
       } else {
         cmd += 'verify -Dpgpverify.skip'      
diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy
index 6abb1c6..e69e50d 100644
--- a/vars/asfMavenTlpStdBuild.groovy
+++ b/vars/asfMavenTlpStdBuild.groovy
@@ -38,7 +38,7 @@ def call(Map params = [:]) {
     def oses = params.containsKey('os') ? params.os : ['linux']
     // minimum, LTS, current and next ea
     def jdks = params.containsKey('jdks') ? params.jdks : 
params.containsKey('jdk') ? params.jdk : ['8','11','17']
-    def maven = params.containsKey('maven') ? params.maven : '3.8.x'
+    def maven = params.containsKey('maven') ? params.maven : '3.9.x'
     def tmpWs = params.containsKey('tmpWs') ? params.tmpWs : false
     def mavenArgs = params.containsKey('mavenArgs') ? params.mavenArgs : ''
     // def failFast = params.containsKey('failFast') ? params.failFast : true