From 56393caa61b2107792d22f2721e9bda4249eaff9 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Tue, 9 Sep 2025 19:25:58 +0200 Subject: [PATCH 01/10] Migrate Commons Lang from 2 to 3 and StringEscapeUtils to Commons Text --- pom.xml | 4 ++++ .../org/jenkinsci/plugins/workflow/libs/LibraryAdder.java | 2 +- .../plugins/workflow/libs/LibraryCachingConfiguration.java | 2 +- .../org/jenkinsci/plugins/workflow/libs/LibraryRecord.java | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1ffa86a4..55fdbfb5 100644 --- a/pom.xml +++ b/pom.xml @@ -83,6 +83,10 @@ + + io.jenkins.plugins + commons-lang3-api + org.apache.ivy ivy diff --git a/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryAdder.java b/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryAdder.java index 4d281002..e7165acc 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryAdder.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryAdder.java @@ -53,7 +53,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; import java.util.regex.Pattern; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jenkinsci.plugins.workflow.cps.CpsFlowExecution; import org.jenkinsci.plugins.workflow.cps.GlobalVariable; import org.jenkinsci.plugins.workflow.cps.GlobalVariableSet; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryCachingConfiguration.java b/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryCachingConfiguration.java index 1350993a..5bf93a79 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryCachingConfiguration.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryCachingConfiguration.java @@ -26,7 +26,7 @@ import java.util.logging.Logger; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public final class LibraryCachingConfiguration extends AbstractDescribableImpl { diff --git a/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryRecord.java b/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryRecord.java index 5e2f534e..d56aef1b 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryRecord.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryRecord.java @@ -30,7 +30,7 @@ import java.util.TreeSet; import jenkins.security.HMACConfidentialKey; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean; From 2d2975387556f4428f4f59148435998d4fe63d49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 03:02:31 +0000 Subject: [PATCH 02/10] Bump io.jenkins.tools.bom:bom-2.504.x Bumps [io.jenkins.tools.bom:bom-2.504.x](https://github.com/jenkinsci/bom) from 4948.vcf1d17350668 to 5388.v3ea_2e00a_719a_. - [Release notes](https://github.com/jenkinsci/bom/releases) - [Commits](https://github.com/jenkinsci/bom/commits) --- updated-dependencies: - dependency-name: io.jenkins.tools.bom:bom-2.504.x dependency-version: 5388.v3ea_2e00a_719a_ dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1ffa86a4..4352c5b8 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ io.jenkins.tools.bom bom-${jenkins.baseline}.x - 4948.vcf1d17350668 + 5388.v3ea_2e00a_719a_ import pom From c99b2a6691bfc5c7e7c6cf8231f3f2fe490ebc03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 03:03:18 +0000 Subject: [PATCH 03/10] Bump io.jenkins.tools.incrementals:git-changelist-maven-extension Bumps [io.jenkins.tools.incrementals:git-changelist-maven-extension](https://github.com/jenkinsci/incrementals-tools) from 1.8 to 1.13. - [Release notes](https://github.com/jenkinsci/incrementals-tools/releases) - [Commits](https://github.com/jenkinsci/incrementals-tools/compare/parent-1.8...parent-1.13) --- updated-dependencies: - dependency-name: io.jenkins.tools.incrementals:git-changelist-maven-extension dependency-version: '1.13' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .mvn/extensions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 4e0774d5..9440b180 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -2,6 +2,6 @@ io.jenkins.tools.incrementals git-changelist-maven-extension - 1.8 + 1.13 From 19e650053c6d83de0530f61bdfab96c9e624f531 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 03:12:05 +0000 Subject: [PATCH 04/10] Bump org.jenkins-ci.plugins:plugin from 5.24 to 5.26 Bumps [org.jenkins-ci.plugins:plugin](https://github.com/jenkinsci/plugin-pom) from 5.24 to 5.26. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-5.24...plugin-5.26) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-version: '5.26' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1ffa86a4..bcc1e1a7 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.jenkins-ci.plugins plugin - 5.24 + 5.26 io.jenkins.plugins From b506ad8b4dcaf30ecb9008b9827346b8bdd02a42 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 20 Sep 2025 19:29:58 -0600 Subject: [PATCH 05/10] Use plugin BOM 5422.v0fce72a_b_b_8cf --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a8f49e17..9b50058b 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ io.jenkins.tools.bom bom-${jenkins.baseline}.x - 5388.v3ea_2e00a_719a_ + 5422.v0fce72a_b_b_8cf import pom From 86a45de57992a5e1eeae3f31f1cc9fb3e45ae291 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 20 Sep 2025 19:31:22 -0600 Subject: [PATCH 06/10] Require Jenkins 2.504.3, not 2.504.1 One of the dependencies requires it Also recommended by Jenkins documentation --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9b50058b..888f1bff 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 999999-SNAPSHOT 2.504 - ${jenkins.baseline}.1 + ${jenkins.baseline}.3 jenkinsci/${project.artifactId}-plugin true ivy From 29784c3843b61e9e2235f959c5560b41d8b98759 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 20 Sep 2025 19:34:04 -0600 Subject: [PATCH 07/10] Compile and test on Java 25 --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 52525eb3..a57ba5a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,4 +3,5 @@ buildPlugin( configurations: [ [platform: 'linux', jdk: 21], [platform: 'windows', jdk: 17], + [platform: 'linux', jdk: 25], ]) From f5cbad21f90368893344bc861235e1b36534f867 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 20 Sep 2025 19:35:06 -0600 Subject: [PATCH 08/10] Use consistent indentation in pom.xml addition --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 888f1bff..5fed8821 100644 --- a/pom.xml +++ b/pom.xml @@ -83,10 +83,10 @@ - - io.jenkins.plugins - commons-lang3-api - + + io.jenkins.plugins + commons-lang3-api + org.apache.ivy ivy From 3666d6ed0c18866f556315c56f9b280e3d41884c Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sun, 21 Sep 2025 02:49:13 -0600 Subject: [PATCH 09/10] Use spaces, not tabs in pom file --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5fed8821..8e9b414f 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ io.jenkins.tools.bom bom-${jenkins.baseline}.x - 5422.v0fce72a_b_b_8cf + 5422.v0fce72a_b_b_8cf import pom From ca977f3836d796c921241ef5ce3455b8d06a91b0 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Mon, 22 Sep 2025 12:00:53 -0600 Subject: [PATCH 10/10] Revert "Migrate Commons Lang from 2 to 3 and StringEscapeUtils to Commons Text" https://github.com/jenkinsci/pipeline-groovy-lib-plugin/pull/200#discussion_r2368624755 advises to remove this. This reverts commit 56393caa61b2107792d22f2721e9bda4249eaff9. --- pom.xml | 4 ---- .../org/jenkinsci/plugins/workflow/libs/LibraryAdder.java | 2 +- .../plugins/workflow/libs/LibraryCachingConfiguration.java | 2 +- .../org/jenkinsci/plugins/workflow/libs/LibraryRecord.java | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 8e9b414f..665044f2 100644 --- a/pom.xml +++ b/pom.xml @@ -83,10 +83,6 @@ - - io.jenkins.plugins - commons-lang3-api - org.apache.ivy ivy diff --git a/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryAdder.java b/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryAdder.java index e7165acc..4d281002 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryAdder.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryAdder.java @@ -53,7 +53,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; import java.util.regex.Pattern; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; import org.jenkinsci.plugins.workflow.cps.CpsFlowExecution; import org.jenkinsci.plugins.workflow.cps.GlobalVariable; import org.jenkinsci.plugins.workflow.cps.GlobalVariableSet; diff --git a/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryCachingConfiguration.java b/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryCachingConfiguration.java index 5bf93a79..1350993a 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryCachingConfiguration.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryCachingConfiguration.java @@ -26,7 +26,7 @@ import java.util.logging.Logger; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; public final class LibraryCachingConfiguration extends AbstractDescribableImpl { diff --git a/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryRecord.java b/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryRecord.java index d56aef1b..5e2f534e 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryRecord.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryRecord.java @@ -30,7 +30,7 @@ import java.util.TreeSet; import jenkins.security.HMACConfidentialKey; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; import org.kohsuke.stapler.export.Exported; import org.kohsuke.stapler.export.ExportedBean;