(tapestry-5) 02/02: TAP5-2819: Jenkinsfile move javadoc into matrix, fix build artifact names

[benw]

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

benw pushed a commit to branch javax
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git

commit 1144383b34797efa025ddc6ca41bc8c1e0e40faf
Author: Ben Weidig <b...@netzgut.net>
AuthorDate: Sun Apr 5 18:33:12 2026 +0200

    TAP5-2819: Jenkinsfile move javadoc into matrix, fix build artifact names
---
 Jenkinsfile | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3c72adf88..89bd2cd42 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,7 +49,8 @@ pipeline {
                             always {
                                 // Prefix the JUnit classnames so the Test UI 
shows which JDK ran which test
                                 sh """
-                                    find . -path 
'*/build/test-results/test/*.xml' -exec \
+                                    find . -path 
'*/build/test-results/test/*.xml' \
+                                           -not -path './matrix-artifacts/*' 
-exec \
                                         sed -i 
's/classname="/classname="${JDK_VERSION}./g' {} +
                                 """
 
@@ -74,28 +75,27 @@ pipeline {
                             }
                         }
                     }
-                }
-            }
-        }
 
-        // -- 03: JavaDoc Generation 
-------------------------------------------
+                    // -- 03: JavaDoc Generation 
-------------------------------------------
 
-        stage('Aggregate Javadoc') {
-            agent { node { label 'ubuntu' } }
-            tools {
-                jdk 'jdk_21_latest'
-            }
-            steps {
-                sh './gradlew aggregateJavadoc'
-            }
-            post {
-                always {
-                    publishHTML(target: [
-                        reportDir:   'build/documentation/javadocs',
-                        reportFiles: 'index.html',
-                        reportName:  'Aggregate Javadoc',
-                        keepAll:     true
-                    ])
+                    stage('Aggregate Javadoc') {
+                        when {
+                            expression { JDK_VERSION == 'jdk_21_latest' }
+                        }
+                        steps {
+                            sh './gradlew aggregateJavadoc'
+                        }
+                        post {
+                            always {
+                                publishHTML(target: [
+                                    reportDir:   
'build/documentation/javadocs',
+                                    reportFiles: 'index.html',
+                                    reportName:  'Aggregate Javadoc',
+                                    keepAll:     true
+                                ])
+                            }
+                        }
+                    }
                 }
             }
         }