From f0d65eb742cba0c02a876342267b1b0df233f4ae Mon Sep 17 00:00:00 2001 From: James Nord Date: Sat, 20 Sep 2025 14:29:03 +0100 Subject: [PATCH 1/7] [JENKINS-76135] work around eclipse compiler bug (#11087) https://github.com/eclipse-jdt/eclipse.jdt.core/issues/2860 prevents the code from compiling in eclipse. Move the class out so that eclipse is happy. As the class was private there should be no impact to anything. (cherry picked from commit c23cf20ea2b923ba7a61e29523df6a9b0913688a) --- .../test/java/hudson/PluginManagerUtil.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/test/src/test/java/hudson/PluginManagerUtil.java b/test/src/test/java/hudson/PluginManagerUtil.java index f3c6f36f12..73eb01f2ce 100644 --- a/test/src/test/java/hudson/PluginManagerUtil.java +++ b/test/src/test/java/hudson/PluginManagerUtil.java @@ -71,20 +71,21 @@ public class PluginManagerUtil { ).evaluate(); } - private static final class CustomJenkinsRule extends JenkinsRule { - CustomJenkinsRule(File home, int port) { - setPluginManager(null); - with(() -> home); - localPort = port; - } - - int getPort() { - return localPort; - } - } }; } + private static final class CustomJenkinsRule extends JenkinsRule { + CustomJenkinsRule(File home, int port) { + setPluginManager(null); + with(() -> home); + localPort = port; + } + + int getPort() { + return localPort; + } + } + public static void dynamicLoad(String plugin, Jenkins jenkins) throws IOException, InterruptedException, RestartRequiredException { dynamicLoad(plugin, jenkins, false); } From 0cbf72b116fa5c35c0b4641f1cfebb2405183451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pochat?= Date: Wed, 17 Sep 2025 16:09:18 +0200 Subject: [PATCH 2/7] [JENKINS-76002] Apply number instead of string comparison (#11059) (cherry picked from commit 88dd0bf930b022781ed73918571bcfa9976d55c1) --- war/src/main/webapp/scripts/hudson-behavior.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js index 92a6bd9745..f9e53754f9 100644 --- a/war/src/main/webapp/scripts/hudson-behavior.js +++ b/war/src/main/webapp/scripts/hudson-behavior.js @@ -821,16 +821,16 @@ function registerMinMaxValidator(e) { } if (isInteger(this.value)) { + const valueInt = parseInt(this.value); + // Ensure the value is an integer if (min !== null && isInteger(min) && max !== null && isInteger(max)) { // Both min and max attributes are available - - if (min <= max) { + const minInt = parseInt(min); + const maxInt = parseInt(max); + if (minInt <= maxInt) { // Add the validator if min <= max - if ( - parseInt(min) > parseInt(this.value) || - parseInt(this.value) > parseInt(max) - ) { + if (minInt > valueInt || valueInt > maxInt) { // The value is out of range updateValidationArea( this.targetElement, @@ -850,7 +850,8 @@ function registerMinMaxValidator(e) { ) { // There is only 'min' available - if (parseInt(min) > parseInt(this.value)) { + const minInt = parseInt(min); + if (minInt > valueInt) { updateValidationArea( this.targetElement, `
This value should be larger than ${min}
`, @@ -868,7 +869,8 @@ function registerMinMaxValidator(e) { ) { // There is only 'max' available - if (parseInt(max) < parseInt(this.value)) { + const maxInt = parseInt(max); + if (maxInt < valueInt) { updateValidationArea( this.targetElement, `
This value should be less than ${max}
`, From 63bcbfdc93caef86690f31207671414dbf15a1e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pochat?= Date: Sat, 20 Sep 2025 15:27:38 +0200 Subject: [PATCH 3/7] [JENKINS-76114] Bring back the "All/None/Suggested" buttons in the plugin configuration wizard (#11070) Fix padding (cherry picked from commit 02b40b1dd150427b49f7513c18947aec274b41e4) --- src/main/scss/pluginSetupWizard.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/scss/pluginSetupWizard.scss b/src/main/scss/pluginSetupWizard.scss index 1877cc4af1..83a7a2f34f 100644 --- a/src/main/scss/pluginSetupWizard.scss +++ b/src/main/scss/pluginSetupWizard.scss @@ -263,7 +263,6 @@ top: 0; right: 0; left: 0; - padding: 0 10px; height: 2.75em; z-index: 100; background: rgb(0 0 0 / 0.03); From 79743a1c22c215a6538ee2e89c2d3a3796e8e470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Tue, 30 Sep 2025 14:47:54 +0200 Subject: [PATCH 4/7] fix: add `-DdetectOfflineLinks=false` tp `mvn` parameter Avoid the following error: [ERROR] Failed to execute goal org.apache.maven.plugins:maven-javadoc-plugin:3.11.3:jar (attach-javadocs) on project jenkins-war: Execution attach-javadocs of goal org.apache.maven.plugins:maven-javadoc-plugin:3.11.3:jar failed: Null charset name -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-javadoc-plugin:3.11.3:jar (attach-javadocs) on project jenkins-war: Execution attach-javadocs of goal org.apache.maven.plugins:maven-javadoc-plugin:3.11.3:jar failed: Null charset name --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2380b3b66d..82dff17f4e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -101,6 +101,7 @@ axes.values().combinations { 'help:evaluate', '-Dexpression=changelist', "-Doutput=$changelistF", + '-DdetectOfflineLinks=false', 'clean', 'install', ] From d62976931e8b2a9845b1ac8b0e71b30f1eed4bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Tue, 30 Sep 2025 18:17:08 +0200 Subject: [PATCH 5/7] Revert "fix: add `-DdetectOfflineLinks=false` tp `mvn` parameter" This reverts commit 79743a1c22c215a6538ee2e89c2d3a3796e8e470. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 82dff17f4e..2380b3b66d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -101,7 +101,6 @@ axes.values().combinations { 'help:evaluate', '-Dexpression=changelist', "-Doutput=$changelistF", - '-DdetectOfflineLinks=false', 'clean', 'install', ] From 742357c46c7300ed954a77d9e7f8a54fe8edc1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Tue, 30 Sep 2025 14:47:54 +0200 Subject: [PATCH 6/7] Add `detectOfflineLinks` set to `false` in `maven-javadoc-plugin` configuration See https://github.com/apache/maven-javadoc-plugin/issues/1241#issuecomment-3214956373 Avoid the following error: [ERROR] Failed to execute goal org.apache.maven.plugins:maven-javadoc-plugin:3.11.3:jar (attach-javadocs) on project jenkins-war: Execution attach-javadocs of goal org.apache.maven.plugins:maven-javadoc-plugin:3.11.3:jar failed: Null charset name -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-javadoc-plugin:3.11.3:jar (attach-javadocs) on project jenkins-war: Execution attach-javadocs of goal org.apache.maven.plugins:maven-javadoc-plugin:3.11.3:jar failed: Null charset name --- pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 31658de672..b56b216331 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,10 @@ THE SOFTWARE. false 8.13.1 - 24.7.0 + 24.9.0 + + + false 8.13.1 - 24.9.0 + 24.7.0 false