(maven-jenkins-lib) branch master updated: Fix matrix build for plugins

[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 01708bc  Fix matrix build for plugins
01708bc is described below

commit 01708bc580dd37de9faff9f6dde4030022ea3a74
Author: Slawomir Jaranowski <s.jaranow...@gmail.com>
AuthorDate: Wed Dec 13 23:28:25 2023 +0100

    Fix matrix build for plugins
---
 vars/asfMavenTlpPlgnBuild.groovy | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index 8b82e35..afa641d 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -58,13 +58,9 @@ def call(Map params = [:]) {
     boolean first = true
     for (String os in oses) {
       for (def mvn in mavens) {
-        def jdk = Math.max( jdkMin as Integer, jenkinsEnv.jdkForMaven( mvn ) 
as Integer) as String
-        jdks = jdks.findAll{ it != jdk }
-        doCreateTask( os, jdk, mvn, tasks, first, 'build', taskContext )
-      }
-      for (def jdk in jdks) {
-        def mvn = jenkinsEnv.mavenForJdk(jdk)
-        doCreateTask( os, jdk, mvn, tasks, first, 'build', taskContext )
+        for (def jdk in jdks) {
+          doCreateTask(os, jdk, mvn, tasks, first, 'build', taskContext)
+        }
       }
 
       for (def jdk in siteJdks) {