From 78b85ddc70bb0fd2fb23bced8da1f3cde3ad30f1 Mon Sep 17 00:00:00 2001 From: Alex Earl Date: Fri, 17 Jan 2025 05:23:47 -0700 Subject: [PATCH 01/21] Allow UpdateSite to create the URLConnection Different UpdateSites may need to connect to URLs differently, this adds a method to UpdateSite which creates the URLConnection that will be used for connecting. This allows an implementation of a password protected UpdateSite which can add the authorization information to the connection prior to returning it. --- .../main/java/hudson/model/UpdateCenter.java | 7 ++++++ .../main/java/hudson/model/UpdateSite.java | 23 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java index 437444feb4..5d0f1d0ef1 100644 --- a/core/src/main/java/hudson/model/UpdateCenter.java +++ b/core/src/main/java/hudson/model/UpdateCenter.java @@ -1273,6 +1273,9 @@ public class UpdateCenter extends AbstractModelObject implements Loadable, Savea * @throws IOException if the validation fails */ public void preValidate(DownloadJob job, URL src) throws IOException { + if(job.site != null) { + job.site.preValidate(src); + } } /** @@ -1410,6 +1413,10 @@ public class UpdateCenter extends AbstractModelObject implements Loadable, Savea * how the connection gets established. */ protected URLConnection connect(DownloadJob job, URL src) throws IOException { + if(job.site != null) { + return job.site.connect(src); + } + // fall back to just using the normal ProxyConfiguration if the site is null return ProxyConfiguration.open(src); } diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java index 22764fd403..b0c30e861e 100644 --- a/core/src/main/java/hudson/model/UpdateSite.java +++ b/core/src/main/java/hudson/model/UpdateSite.java @@ -37,6 +37,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.ExtensionList; import hudson.PluginManager; import hudson.PluginWrapper; +import hudson.ProxyConfiguration; import hudson.Util; import hudson.lifecycle.Lifecycle; import hudson.model.UpdateCenter.UpdateCenterJob; @@ -48,6 +49,7 @@ import java.io.File; import java.io.IOException; import java.net.URI; import java.net.URL; +import java.net.URLConnection; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.time.Instant; @@ -202,6 +204,27 @@ public class UpdateSite { } } + /** + * Opens a connection to the given URL + * @param src the url to connect to + * @return A {@code URLConnection} for the given src URL + * @since TODO + */ + public URLConnection connect(URL src) throws IOException { + return ProxyConfiguration.open(src); + } + + /** + * Validate the URL of the resource before downloading it. + * + * @param src The location of the resource on the network + * @throws IOException if the validation fails + * @since TODO + */ + public void preValidate(URL src) throws IOException { + // no validation needed in the default setup + } + /** * Forces an update of the data file from the configured URL, irrespective of the last time the data was retrieved. * @return A {@code FormValidation} indicating the if the update metadata was successfully downloaded from the configured update site From 0cdc63c97883d9534577dfa7df62fff058bf30dc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 09:29:18 -0700 Subject: [PATCH 02/21] Update dependency org.jenkins-ci.plugins:structs to v343 (#10319) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index 12910f3491..e391f31df2 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -254,7 +254,7 @@ THE SOFTWARE. org.jenkins-ci.plugins structs - 338.v848422169819 + 343.vdcf37b_a_c81d5 test diff --git a/war/pom.xml b/war/pom.xml index 1723486c95..73638ab04a 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -427,7 +427,7 @@ THE SOFTWARE. org.jenkins-ci.plugins structs - 338.v848422169819 + 343.vdcf37b_a_c81d5 hpi From 84294b69276a29525f747edaf020bab06c3bba08 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 09:29:42 -0700 Subject: [PATCH 03/21] Update peter-evans/create-pull-request digest to dd2324f (#10324) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/run-since-updater.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-since-updater.yml b/.github/workflows/run-since-updater.yml index e0986b5e74..619adca29c 100644 --- a/.github/workflows/run-since-updater.yml +++ b/.github/workflows/run-since-updater.yml @@ -29,7 +29,7 @@ jobs: id: run_script shell: bash - name: Create Pull Request - uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7 + uses: peter-evans/create-pull-request@dd2324fc52d5d43c699a5636bcf19fceaa70c284 # v7 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Fill in since annotations From b6b4d70890493e75caad3f691b5c6e29704526f3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 11:37:08 -0800 Subject: [PATCH 04/21] Update dependency org.jenkins-ci.plugins:junit to v1317 (#10323) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index e391f31df2..b592a6c4fb 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -230,7 +230,7 @@ THE SOFTWARE. org.jenkins-ci.plugins junit - 1316.v13ec14a_de230 + 1317.v5b_35d792b_06a_ test diff --git a/war/pom.xml b/war/pom.xml index 73638ab04a..3744e4560a 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -316,7 +316,7 @@ THE SOFTWARE. org.jenkins-ci.plugins junit - 1316.v13ec14a_de230 + 1317.v5b_35d792b_06a_ hpi From 86353631ef7137afc0e3922bf8c7ab78da5aef1b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 11:41:00 -0800 Subject: [PATCH 05/21] Update dependency org.awaitility:awaitility to v4.3.0 (#10310) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pom.xml b/test/pom.xml index b592a6c4fb..00d5feed9f 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -162,7 +162,7 @@ THE SOFTWARE. org.awaitility awaitility - 4.2.2 + 4.3.0 test From 23ce1bc5de0493b2f0ded60dc16c1dd8e9eb62a2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 11:42:18 -0800 Subject: [PATCH 06/21] Update dependency io.jenkins.plugins:javax-mail-api to v1.6.2-11 (#10317) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index 00d5feed9f..9f37779d82 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -156,7 +156,7 @@ THE SOFTWARE. io.jenkins.plugins javax-mail-api - 1.6.2-10 + 1.6.2-11 test diff --git a/war/pom.xml b/war/pom.xml index 3744e4560a..a6148101cd 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -483,7 +483,7 @@ THE SOFTWARE. io.jenkins.plugins javax-mail-api - 1.6.2-10 + 1.6.2-11 hpi From 418d5cf136a326d7a3dcfb52f83df4d8eff6788c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 11:42:38 -0800 Subject: [PATCH 07/21] Update dependency io.jenkins.plugins:javax-activation-api to v1.2.0-8 (#10316) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index 9f37779d82..45d84269fd 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -85,7 +85,7 @@ THE SOFTWARE. io.jenkins.plugins javax-activation-api - 1.2.0-7 + 1.2.0-8 io.jenkins.plugins diff --git a/war/pom.xml b/war/pom.xml index a6148101cd..5a157ec311 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -476,7 +476,7 @@ THE SOFTWARE. io.jenkins.plugins javax-activation-api - 1.2.0-7 + 1.2.0-8 hpi From 92c83bd6267f94c381c422859853821c02291e63 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 11:43:32 -0800 Subject: [PATCH 08/21] Update dependency com.puppycrawl.tools:checkstyle to v10.21.3 (#10322) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 67aa08ddab..d2b46ad088 100644 --- a/pom.xml +++ b/pom.xml @@ -281,7 +281,7 @@ THE SOFTWARE. com.puppycrawl.tools checkstyle - 10.21.2 + 10.21.3 From 0239a80a0acd9f9efcee5ba48179c0f8881f2528 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 11:44:20 -0800 Subject: [PATCH 09/21] Update dependency io.jenkins.plugins:eddsa-api to v0.3.0-13.v7cb_69ed68f00 (#10327) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- war/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/war/pom.xml b/war/pom.xml index 5a157ec311..e67b55c5c2 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -374,7 +374,7 @@ THE SOFTWARE. io.jenkins.plugins eddsa-api - 0.3.0-4.v84c6f0f4969e + 0.3.0-13.v7cb_69ed68f00 hpi From 7bed3675a9be4c798e61a463cf5e078b445c8db4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 11:44:54 -0800 Subject: [PATCH 10/21] Update dependency org.jenkins-ci.plugins:antisamy-markup-formatter to v173 (#10330) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index 45d84269fd..d697eebdce 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -212,7 +212,7 @@ THE SOFTWARE. org.jenkins-ci.plugins antisamy-markup-formatter - 162.v0e6ec0fcfcf6 + 173.v680e3a_b_69ff3 test diff --git a/war/pom.xml b/war/pom.xml index e67b55c5c2..43216aed96 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -295,7 +295,7 @@ THE SOFTWARE. org.jenkins-ci.plugins antisamy-markup-formatter - 162.v0e6ec0fcfcf6 + 173.v680e3a_b_69ff3 hpi From 3148e6ca6d2072b44edf4d0176e53c73ff33cb9e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 11:45:04 -0800 Subject: [PATCH 11/21] Update dependency org.jenkins-ci.plugins.workflow:workflow-step-api to v700 (#10329) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index d697eebdce..d074e15eea 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -128,7 +128,7 @@ THE SOFTWARE. org.jenkins-ci.plugins.workflow workflow-step-api - 686.v603d058a_e148 + 700.v6e45cb_a_5a_a_21 diff --git a/war/pom.xml b/war/pom.xml index 43216aed96..bca0c9c80c 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -413,7 +413,7 @@ THE SOFTWARE. org.jenkins-ci.plugins.workflow workflow-step-api - 686.v603d058a_e148 + 700.v6e45cb_a_5a_a_21 hpi From c7ed76b0285be74b3574f19daa86efdc76e8fdfa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 11:45:27 -0800 Subject: [PATCH 12/21] Update mina-sshd.version to v2.15.0 (#10325) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- cli/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/pom.xml b/cli/pom.xml index 2473629d23..cf30714cac 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -15,7 +15,7 @@ https://github.com/jenkinsci/jenkins - 2.14.0 + 2.15.0 From ba363253a0f117277fae0608dc2122b758c0a034 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 11:47:00 -0800 Subject: [PATCH 13/21] Update dependency io.jenkins.plugins:ionicons-api to v82 (#10328) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index d074e15eea..f99aa138b2 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -80,7 +80,7 @@ THE SOFTWARE. io.jenkins.plugins ionicons-api - 74.v93d5eb_813d5f + 82.v0597178874e1 io.jenkins.plugins diff --git a/war/pom.xml b/war/pom.xml index bca0c9c80c..f879ef0e82 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -532,7 +532,7 @@ THE SOFTWARE. io.jenkins.plugins ionicons-api - 74.v93d5eb_813d5f + 82.v0597178874e1 hpi From e07691ebc47985b6dbe0ab5d876e1e350633b841 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 11:47:23 -0800 Subject: [PATCH 14/21] Update dependency org.jenkins-ci.plugins:ant to v513 (#10318) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pom.xml b/test/pom.xml index f99aa138b2..6d25496278 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -95,7 +95,7 @@ THE SOFTWARE. org.jenkins-ci.plugins ant - 511.v0a_a_1a_334f41b_ + 513.vde9e7b_a_0da_0f org.jenkins-ci.plugins From 3f22a1d8c3b40e359f58404a1a77e0df80486bd0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 14:28:04 -0800 Subject: [PATCH 15/21] Update dependency org.jenkins-ci.plugins:trilead-api to v2.190.v1ed19f8137f8 (#10332) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- war/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/war/pom.xml b/war/pom.xml index f879ef0e82..d973c1d766 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -469,7 +469,7 @@ THE SOFTWARE. org.jenkins-ci.plugins trilead-api - 2.147.vb_73cc728a_32e + 2.190.v1ed19f8137f8 hpi From fa1361f5bc9b65392119b02003bdb25ac04c80c5 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 24 Feb 2025 14:28:51 -0800 Subject: [PATCH 16/21] Revert "[JENKINS-75152] Update hudson.model.Queue for long buildableItem queue cycle acceleration" (#10331) --- core/src/main/java/hudson/model/Queue.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index 28b5acb696..797cba56f3 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -1615,9 +1615,6 @@ public class Queue extends ResourceController implements Saveable { // Ensure that identification of blocked tasks is using the live state: JENKINS-27708 & JENKINS-27871 updateSnapshot(); - // JENKINS-75152. Save the label and blockage reasons of items that have no candidates into this map. - // It is used to speed up the judgement of other buildable items with the same label. - Map> noCandidateLabelsMap = new HashMap<>(); // allocate buildable jobs to executors for (BuildableItem p : new ArrayList<>( buildables)) { // copy as we'll mutate the list in the loop @@ -1644,13 +1641,6 @@ public class Queue extends ResourceController implements Saveable { updateSnapshot(); } } else { - // JENKINS-75152. Skip the remaining steps if the label of this item has been determined - // to have no candidate executors in the previous allocation process. - Label itemLabel = p.getAssignedLabel(); - if (noCandidateLabelsMap.containsKey(itemLabel)) { - p.transientCausesOfBlockage = noCandidateLabelsMap.get(itemLabel); - continue; - } List candidates = new ArrayList<>(parked.size()); Map reasonMap = new HashMap<>(); @@ -1683,11 +1673,6 @@ public class Queue extends ResourceController implements Saveable { new Object[]{p, candidates, parked.values()}); List reasons = reasonMap.values().stream().filter(Objects::nonNull).collect(Collectors.toList()); p.transientCausesOfBlockage = reasons.isEmpty() ? null : reasons; - // If no candidates, save the label and blockage reasons. - if (candidates.isEmpty()) { - noCandidateLabelsMap.put(itemLabel, p.transientCausesOfBlockage); - LOGGER.log(Level.FINEST, "{0} changes to the state of no candidate executor", itemLabel); - } continue; } From d5d4b9afc5eec4e4dbb3c17df810bf89910d673c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 22:29:55 +0000 Subject: [PATCH 17/21] Update eslint monorepo to v9.21.0 --- package.json | 4 +-- yarn.lock | 93 ++++++++++++++++++++++++---------------------------- 2 files changed, 44 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index 338d2330d1..7152a1156c 100644 --- a/package.json +++ b/package.json @@ -26,12 +26,12 @@ "@babel/cli": "7.26.4", "@babel/core": "7.26.9", "@babel/preset-env": "7.26.9", - "@eslint/js": "9.20.0", + "@eslint/js": "9.21.0", "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", "css-loader": "7.1.2", "css-minimizer-webpack-plugin": "7.0.0", - "eslint": "9.20.1", + "eslint": "9.21.0", "eslint-config-prettier": "10.0.1", "eslint-formatter-checkstyle": "8.40.0", "globals": "16.0.0", diff --git a/yarn.lock b/yarn.lock index a4587edeec..4be9571e00 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1649,38 +1649,29 @@ __metadata: languageName: node linkType: hard -"@eslint/config-array@npm:^0.19.0": - version: 0.19.1 - resolution: "@eslint/config-array@npm:0.19.1" +"@eslint/config-array@npm:^0.19.2": + version: 0.19.2 + resolution: "@eslint/config-array@npm:0.19.2" dependencies: - "@eslint/object-schema": "npm:^2.1.5" + "@eslint/object-schema": "npm:^2.1.6" debug: "npm:^4.3.1" minimatch: "npm:^3.1.2" - checksum: 10c0/43b01f596ddad404473beae5cf95c013d29301c72778d0f5bf8a6699939c8a9a5663dbd723b53c5f476b88b0c694f76ea145d1aa9652230d140fe1161e4a4b49 + checksum: 10c0/dd68da9abb32d336233ac4fe0db1e15a0a8d794b6e69abb9e57545d746a97f6f542496ff9db0d7e27fab1438546250d810d90b1904ac67677215b8d8e7573f3d languageName: node linkType: hard -"@eslint/core@npm:^0.10.0": - version: 0.10.0 - resolution: "@eslint/core@npm:0.10.0" +"@eslint/core@npm:^0.12.0": + version: 0.12.0 + resolution: "@eslint/core@npm:0.12.0" dependencies: "@types/json-schema": "npm:^7.0.15" - checksum: 10c0/074018075079b3ed1f14fab9d116f11a8824cdfae3e822badf7ad546962fafe717a31e61459bad8cc59cf7070dc413ea9064ddb75c114f05b05921029cde0a64 + checksum: 10c0/d032af81195bb28dd800c2b9617548c6c2a09b9490da3c5537fd2a1201501666d06492278bb92cfccac1f7ac249e58601dd87f813ec0d6a423ef0880434fa0c3 languageName: node linkType: hard -"@eslint/core@npm:^0.11.0": - version: 0.11.0 - resolution: "@eslint/core@npm:0.11.0" - dependencies: - "@types/json-schema": "npm:^7.0.15" - checksum: 10c0/1e0671d035c908175f445864a7864cf6c6a8b67a5dfba8c47b2ac91e2d3ed36e8c1f2fd81d98a73264f8677055559699d4adb0f97d86588e616fc0dc9a4b86c9 - languageName: node - linkType: hard - -"@eslint/eslintrc@npm:^3.2.0": - version: 3.2.0 - resolution: "@eslint/eslintrc@npm:3.2.0" +"@eslint/eslintrc@npm:^3.3.0": + version: 3.3.0 + resolution: "@eslint/eslintrc@npm:3.3.0" dependencies: ajv: "npm:^6.12.4" debug: "npm:^4.3.2" @@ -1691,31 +1682,31 @@ __metadata: js-yaml: "npm:^4.1.0" minimatch: "npm:^3.1.2" strip-json-comments: "npm:^3.1.1" - checksum: 10c0/43867a07ff9884d895d9855edba41acf325ef7664a8df41d957135a81a477ff4df4196f5f74dc3382627e5cc8b7ad6b815c2cea1b58f04a75aced7c43414ab8b + checksum: 10c0/215de990231b31e2fe6458f225d8cea0f5c781d3ecb0b7920703501f8cd21b3101fc5ef2f0d4f9a38865d36647b983e0e8ce8bf12fd2bcdd227fc48a5b1a43be languageName: node linkType: hard -"@eslint/js@npm:9.20.0": - version: 9.20.0 - resolution: "@eslint/js@npm:9.20.0" - checksum: 10c0/10e7b5b9e628b5192e8fc6b0ecd27cf48322947e83e999ff60f9f9e44ac8d499138bcb9383cbfa6e51e780d53b4e76ccc2d1753b108b7173b8404fd484d37328 +"@eslint/js@npm:9.21.0": + version: 9.21.0 + resolution: "@eslint/js@npm:9.21.0" + checksum: 10c0/86c24a2668808995037e3f40c758335df2ae277c553ac0cf84381a1a8698f3099d8a22dd9c388947e6b7f93fcc1142f62406072faaa2b83c43ca79993fc01bb3 languageName: node linkType: hard -"@eslint/object-schema@npm:^2.1.5": - version: 2.1.5 - resolution: "@eslint/object-schema@npm:2.1.5" - checksum: 10c0/5320691ed41ecd09a55aff40ce8e56596b4eb81f3d4d6fe530c50fdd6552d88102d1c1a29d970ae798ce30849752a708772de38ded07a6f25b3da32ebea081d8 +"@eslint/object-schema@npm:^2.1.6": + version: 2.1.6 + resolution: "@eslint/object-schema@npm:2.1.6" + checksum: 10c0/b8cdb7edea5bc5f6a96173f8d768d3554a628327af536da2fc6967a93b040f2557114d98dbcdbf389d5a7b290985ad6a9ce5babc547f36fc1fde42e674d11a56 languageName: node linkType: hard -"@eslint/plugin-kit@npm:^0.2.5": - version: 0.2.5 - resolution: "@eslint/plugin-kit@npm:0.2.5" +"@eslint/plugin-kit@npm:^0.2.7": + version: 0.2.7 + resolution: "@eslint/plugin-kit@npm:0.2.7" dependencies: - "@eslint/core": "npm:^0.10.0" + "@eslint/core": "npm:^0.12.0" levn: "npm:^0.4.1" - checksum: 10c0/ba9832b8409af618cf61791805fe201dd62f3c82c783adfcec0f5cd391e68b40beaecb47b9a3209e926dbcab65135f410cae405b69a559197795793399f61176 + checksum: 10c0/0a1aff1ad63e72aca923217e556c6dfd67d7cd121870eb7686355d7d1475d569773528a8b2111b9176f3d91d2ea81f7413c34600e8e5b73d59e005d70780b633 languageName: node linkType: hard @@ -1750,10 +1741,10 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/retry@npm:^0.4.1": - version: 0.4.1 - resolution: "@humanwhocodes/retry@npm:0.4.1" - checksum: 10c0/be7bb6841c4c01d0b767d9bb1ec1c9359ee61421ce8ba66c249d035c5acdfd080f32d55a5c9e859cdd7868788b8935774f65b2caf24ec0b7bd7bf333791f063b +"@humanwhocodes/retry@npm:^0.4.2": + version: 0.4.2 + resolution: "@humanwhocodes/retry@npm:0.4.2" + checksum: 10c0/0235525d38f243bee3bf8b25ed395fbf957fb51c08adae52787e1325673071abe856c7e18e530922ed2dd3ce12ed82ba01b8cee0279ac52a3315fcdc3a69ef0c languageName: node linkType: hard @@ -3524,20 +3515,20 @@ __metadata: languageName: node linkType: hard -"eslint@npm:9.20.1": - version: 9.20.1 - resolution: "eslint@npm:9.20.1" +"eslint@npm:9.21.0": + version: 9.21.0 + resolution: "eslint@npm:9.21.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.2.0" "@eslint-community/regexpp": "npm:^4.12.1" - "@eslint/config-array": "npm:^0.19.0" - "@eslint/core": "npm:^0.11.0" - "@eslint/eslintrc": "npm:^3.2.0" - "@eslint/js": "npm:9.20.0" - "@eslint/plugin-kit": "npm:^0.2.5" + "@eslint/config-array": "npm:^0.19.2" + "@eslint/core": "npm:^0.12.0" + "@eslint/eslintrc": "npm:^3.3.0" + "@eslint/js": "npm:9.21.0" + "@eslint/plugin-kit": "npm:^0.2.7" "@humanfs/node": "npm:^0.16.6" "@humanwhocodes/module-importer": "npm:^1.0.1" - "@humanwhocodes/retry": "npm:^0.4.1" + "@humanwhocodes/retry": "npm:^0.4.2" "@types/estree": "npm:^1.0.6" "@types/json-schema": "npm:^7.0.15" ajv: "npm:^6.12.4" @@ -3569,7 +3560,7 @@ __metadata: optional: true bin: eslint: bin/eslint.js - checksum: 10c0/056789dd5a00897730376f8c0a191e22840e97b7276916068ec096341cb2ec3a918c8bd474bf94ccd7b457ad9fbc16e5c521a993c7cc6ebcf241933e2fd378b0 + checksum: 10c0/558edb25b440cd51825d66fed3e84f1081bd6f4cb2cf994e60ece4c5978fa0583e88b75faf187c1fc21688c4ff7072f12bf5f6d1be1e09a4d6af78cff39dc520 languageName: node linkType: hard @@ -4381,12 +4372,12 @@ __metadata: "@babel/cli": "npm:7.26.4" "@babel/core": "npm:7.26.9" "@babel/preset-env": "npm:7.26.9" - "@eslint/js": "npm:9.20.0" + "@eslint/js": "npm:9.21.0" babel-loader: "npm:9.2.1" clean-webpack-plugin: "npm:4.0.0" css-loader: "npm:7.1.2" css-minimizer-webpack-plugin: "npm:7.0.0" - eslint: "npm:9.20.1" + eslint: "npm:9.21.0" eslint-config-prettier: "npm:10.0.1" eslint-formatter-checkstyle: "npm:8.40.0" globals: "npm:16.0.0" From 916f74e85fb61b6860c4ccbaf9286c10190f2538 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 17:07:56 -0700 Subject: [PATCH 18/21] Update dependency io.jenkins.plugins:bootstrap5-api to v5.3.3-3 (#10333) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index 6d25496278..63e98847f4 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -360,7 +360,7 @@ THE SOFTWARE. io.jenkins.plugins bootstrap5-api - 5.3.3-2 + 5.3.3-3 hpi ${project.build.outputDirectory}/plugins bootstrap5-api.jpi diff --git a/war/pom.xml b/war/pom.xml index d973c1d766..4a7d62d991 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -337,7 +337,7 @@ THE SOFTWARE. io.jenkins.plugins bootstrap5-api - 5.3.3-2 + 5.3.3-3 hpi From c526faeedd6e9b30d86eebb6d9e47af5c57e3da0 Mon Sep 17 00:00:00 2001 From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com> Date: Tue, 25 Feb 2025 13:24:24 +0100 Subject: [PATCH 19/21] Fix checkstyle errors (#10338) Co-authored-by: Daniel Beck --- core/src/main/java/hudson/model/UpdateCenter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java index 5d0f1d0ef1..c4e7880325 100644 --- a/core/src/main/java/hudson/model/UpdateCenter.java +++ b/core/src/main/java/hudson/model/UpdateCenter.java @@ -1273,7 +1273,7 @@ public class UpdateCenter extends AbstractModelObject implements Loadable, Savea * @throws IOException if the validation fails */ public void preValidate(DownloadJob job, URL src) throws IOException { - if(job.site != null) { + if (job.site != null) { job.site.preValidate(src); } } @@ -1413,7 +1413,7 @@ public class UpdateCenter extends AbstractModelObject implements Loadable, Savea * how the connection gets established. */ protected URLConnection connect(DownloadJob job, URL src) throws IOException { - if(job.site != null) { + if (job.site != null) { return job.site.connect(src); } // fall back to just using the normal ProxyConfiguration if the site is null From 9e5edded84a89f69562071f1d338060b001e9dbb Mon Sep 17 00:00:00 2001 From: Jenkins Release Bot <66998184+jenkins-release-bot@users.noreply.github.com> Date: Tue, 25 Feb 2025 15:56:49 +0000 Subject: [PATCH 20/21] [maven-release-plugin] prepare release jenkins-2.499 --- bom/pom.xml | 2 +- cli/pom.xml | 2 +- core/pom.xml | 2 +- coverage/pom.xml | 2 +- pom.xml | 6 +++--- test/pom.xml | 2 +- war/pom.xml | 2 +- websocket/jetty12-ee9/pom.xml | 2 +- websocket/spi/pom.xml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 7ebb05d082..7584573879 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.499 jenkins-bom diff --git a/cli/pom.xml b/cli/pom.xml index cf30714cac..98b6f099a4 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.499 cli diff --git a/core/pom.xml b/core/pom.xml index 0c9b072e0b..1fab9659fc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.499 jenkins-core diff --git a/coverage/pom.xml b/coverage/pom.xml index fe1e89a120..9a9c0ebab6 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.499 jenkins-coverage diff --git a/pom.xml b/pom.xml index d2b46ad088..c55cca3ba5 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.499 pom Jenkins main module @@ -63,7 +63,7 @@ THE SOFTWARE. scm:git:https://github.com/jenkinsci/jenkins.git scm:git:git@github.com:jenkinsci/jenkins.git - ${scmTag} + jenkins-2.499 https://github.com/jenkinsci/jenkins @@ -75,7 +75,7 @@ THE SOFTWARE. 2.499 -SNAPSHOT - 2025-02-18T14:10:14Z + 2025-02-25T12:39:16Z github diff --git a/test/pom.xml b/test/pom.xml index 63e98847f4..ec8dbf1d51 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.499 jenkins-test diff --git a/war/pom.xml b/war/pom.xml index 4a7d62d991..6e70b2c70f 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.499 jenkins-war diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml index 2253163b3c..6f744b7f62 100644 --- a/websocket/jetty12-ee9/pom.xml +++ b/websocket/jetty12-ee9/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.499 ../.. diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml index 178413f92c..d1b86cc95d 100644 --- a/websocket/spi/pom.xml +++ b/websocket/spi/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.499 ../.. From 68425e2cd4c6f85b09e69d0207d90ac682e4514c Mon Sep 17 00:00:00 2001 From: Jenkins Release Bot <66998184+jenkins-release-bot@users.noreply.github.com> Date: Tue, 25 Feb 2025 15:57:51 +0000 Subject: [PATCH 21/21] [maven-release-plugin] prepare for next development iteration --- bom/pom.xml | 2 +- cli/pom.xml | 2 +- core/pom.xml | 2 +- coverage/pom.xml | 2 +- pom.xml | 8 ++++---- test/pom.xml | 2 +- war/pom.xml | 2 +- websocket/jetty12-ee9/pom.xml | 2 +- websocket/spi/pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 7584573879..7ebb05d082 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.499 + ${revision}${changelist} jenkins-bom diff --git a/cli/pom.xml b/cli/pom.xml index 98b6f099a4..cf30714cac 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - 2.499 + ${revision}${changelist} cli diff --git a/core/pom.xml b/core/pom.xml index 1fab9659fc..0c9b072e0b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.499 + ${revision}${changelist} jenkins-core diff --git a/coverage/pom.xml b/coverage/pom.xml index 9a9c0ebab6..fe1e89a120 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - 2.499 + ${revision}${changelist} jenkins-coverage diff --git a/pom.xml b/pom.xml index c55cca3ba5..74fe1325fc 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.499 + ${revision}${changelist} pom Jenkins main module @@ -63,7 +63,7 @@ THE SOFTWARE. scm:git:https://github.com/jenkinsci/jenkins.git scm:git:git@github.com:jenkinsci/jenkins.git - jenkins-2.499 + ${scmTag} https://github.com/jenkinsci/jenkins @@ -73,9 +73,9 @@ THE SOFTWARE. - 2.499 + 2.500 -SNAPSHOT - 2025-02-25T12:39:16Z + 2025-02-25T15:56:49Z github diff --git a/test/pom.xml b/test/pom.xml index ec8dbf1d51..63e98847f4 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.499 + ${revision}${changelist} jenkins-test diff --git a/war/pom.xml b/war/pom.xml index 6e70b2c70f..4a7d62d991 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.499 + ${revision}${changelist} jenkins-war diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml index 6f744b7f62..2253163b3c 100644 --- a/websocket/jetty12-ee9/pom.xml +++ b/websocket/jetty12-ee9/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.499 + ${revision}${changelist} ../.. diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml index d1b86cc95d..178413f92c 100644 --- a/websocket/spi/pom.xml +++ b/websocket/spi/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.499 + ${revision}${changelist} ../..