From 056c774ca1b6cf2ec9de41ffa7bca4597e5b1253 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 4 Nov 2023 16:44:46 +0100 Subject: [PATCH 01/17] Update dependency postcss-preset-env to v9.3.0 (#8676) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- war/package.json | 2 +- war/yarn.lock | 50 +++++++++++++++++++++++++++++++++--------------- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/war/package.json b/war/package.json index de8bfde533fe..6f10e59f735b 100644 --- a/war/package.json +++ b/war/package.json @@ -36,7 +36,7 @@ "mini-css-extract-plugin": "2.7.6", "postcss": "8.4.31", "postcss-loader": "7.3.3", - "postcss-preset-env": "9.2.0", + "postcss-preset-env": "9.3.0", "postcss-scss": "4.0.9", "prettier": "3.0.3", "sass": "1.69.5", diff --git a/war/yarn.lock b/war/yarn.lock index acac401026fb..009483efa858 100644 --- a/war/yarn.lock +++ b/war/yarn.lock @@ -1407,15 +1407,15 @@ __metadata: languageName: node linkType: hard -"@csstools/postcss-cascade-layers@npm:^4.0.0": - version: 4.0.0 - resolution: "@csstools/postcss-cascade-layers@npm:4.0.0" +"@csstools/postcss-cascade-layers@npm:^4.0.1": + version: 4.0.1 + resolution: "@csstools/postcss-cascade-layers@npm:4.0.1" dependencies: "@csstools/selector-specificity": "npm:^3.0.0" postcss-selector-parser: "npm:^6.0.13" peerDependencies: postcss: ^8.4 - checksum: a46011124edd86ea674cc89e8d50a2c56f3e7a11e0bf05652b0709554066f0ad569ea16582d8e4c24bac987ebe116d4741850f2d40438e8a6f010d1d9599fedb + checksum: e15e01546de886a1d8a03828ce9409dcf1656d38a9d7c211893075d4370acca2b86fcbc8796a4ed59fa5420e57cd8cca26d5221e4ea5bee283ab8545b916bd9f languageName: node linkType: hard @@ -1553,6 +1553,24 @@ __metadata: languageName: node linkType: hard +"@csstools/postcss-logical-overflow@npm:^1.0.0": + version: 1.0.0 + resolution: "@csstools/postcss-logical-overflow@npm:1.0.0" + peerDependencies: + postcss: ^8.4 + checksum: 5268a8960f484841d0fc070d1fcb8cc5e46290253300a116532498ab8ceb1d8900cb45ddbca33ad2f344af207176e6bde54a17ccbe88126c4a5de7830ad0efa7 + languageName: node + linkType: hard + +"@csstools/postcss-logical-overscroll-behavior@npm:^1.0.0": + version: 1.0.0 + resolution: "@csstools/postcss-logical-overscroll-behavior@npm:1.0.0" + peerDependencies: + postcss: ^8.4 + checksum: b468fb9c8bd836a9a2c3d4126d68c0ab25b3b5042e63a4e9eb9c55394fed8928c751d8f1c67f754702605963385d4becfa2cf9fe7446606ffbe33b580fb9a29e + languageName: node + linkType: hard + "@csstools/postcss-logical-resize@npm:^2.0.0": version: 2.0.0 resolution: "@csstools/postcss-logical-resize@npm:2.0.0" @@ -3165,10 +3183,10 @@ __metadata: languageName: node linkType: hard -"cssdb@npm:^7.8.0": - version: 7.8.0 - resolution: "cssdb@npm:7.8.0" - checksum: 6799e1abb2e6ad9b51b555addd23be54f62fbaf7b4ee1aeb8ac531757db240a2a87e7d9c6f999153eb8e7ab21f93199bca9223c88847ac1d39ec5d4fb8033260 +"cssdb@npm:^7.9.0": + version: 7.9.0 + resolution: "cssdb@npm:7.9.0" + checksum: 7c8082c58a0288d0ee04e8d44357dc9070ad600e02fb446cfaca01d820f3e00f7d7cbd4151a5b155dd6c6b51b60fc1381acf27268ae3fe00cd90b5b86c918a7f languageName: node linkType: hard @@ -4393,7 +4411,7 @@ __metadata: mini-css-extract-plugin: "npm:2.7.6" postcss: "npm:8.4.31" postcss-loader: "npm:7.3.3" - postcss-preset-env: "npm:9.2.0" + postcss-preset-env: "npm:9.3.0" postcss-scss: "npm:4.0.9" prettier: "npm:3.0.3" sass: "npm:1.69.5" @@ -5905,11 +5923,11 @@ __metadata: languageName: node linkType: hard -"postcss-preset-env@npm:9.2.0": - version: 9.2.0 - resolution: "postcss-preset-env@npm:9.2.0" +"postcss-preset-env@npm:9.3.0": + version: 9.3.0 + resolution: "postcss-preset-env@npm:9.3.0" dependencies: - "@csstools/postcss-cascade-layers": "npm:^4.0.0" + "@csstools/postcss-cascade-layers": "npm:^4.0.1" "@csstools/postcss-color-function": "npm:^3.0.7" "@csstools/postcss-color-mix-function": "npm:^2.0.7" "@csstools/postcss-exponential-functions": "npm:^1.0.1" @@ -5921,6 +5939,8 @@ __metadata: "@csstools/postcss-initial": "npm:^1.0.0" "@csstools/postcss-is-pseudo-class": "npm:^4.0.3" "@csstools/postcss-logical-float-and-clear": "npm:^2.0.0" + "@csstools/postcss-logical-overflow": "npm:^1.0.0" + "@csstools/postcss-logical-overscroll-behavior": "npm:^1.0.0" "@csstools/postcss-logical-resize": "npm:^2.0.0" "@csstools/postcss-logical-viewport-units": "npm:^2.0.3" "@csstools/postcss-media-minmax": "npm:^1.1.0" @@ -5940,7 +5960,7 @@ __metadata: css-blank-pseudo: "npm:^6.0.0" css-has-pseudo: "npm:^6.0.0" css-prefers-color-scheme: "npm:^9.0.0" - cssdb: "npm:^7.8.0" + cssdb: "npm:^7.9.0" postcss-attribute-case-insensitive: "npm:^6.0.2" postcss-clamp: "npm:^4.1.0" postcss-color-functional-notation: "npm:^6.0.2" @@ -5969,7 +5989,7 @@ __metadata: postcss-value-parser: "npm:^4.2.0" peerDependencies: postcss: ^8.4 - checksum: 6f598076ca00facc0c1a95f948cc90e1f1c9e1eb6cf5ad5e4e0b4778dbf1ef0c447b3b2ad7078feec42732663b1163098a0a50b295fa57edbb1e11710eff0573 + checksum: f244c7e334bea8b55d4277527319f92660f6122a77501c5d1669d7eaffb4532f845dcc886593b04d2912aff307b059d7738f8690d1d7ffbb7001becb15aceffe languageName: node linkType: hard From 9463397ea54cceb476970e62655191f93e084636 Mon Sep 17 00:00:00 2001 From: Mysterious_Dev <40738104+Mysterious-Dev@users.noreply.github.com> Date: Sat, 4 Nov 2023 16:46:24 +0100 Subject: [PATCH 02/17] Finish French translations for Update Center (#8672) * Update index_fr.properties * Update index_fr.properties * Update index_fr.properties * Update index_fr.properties * Update index_fr.properties --- .../hudson/util/HudsonIsRestarting/index_fr.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_fr.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_fr.properties index 71c5c9a696a9..1cf409e873f7 100644 --- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_fr.properties +++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_fr.properties @@ -20,5 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. +Restarting \Jenkins=Redémarrage de Jenkins Please\ wait\ while\ Jenkins\ is\ restarting=Veuillez attendre pendant que Jenkins redémarre -Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Votre navigateur se connectera automatiquement quand Jenkins sera prêt +Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Votre navigateur se rafraîchira automatiquement quand Jenkins sera prêt. +Safe\ Restart=Redémarrage sans danger +Builds\ on\ agents\ can\ usually\ continue.=Les builds sur les agents peuvent généralement se poursuivre. From d3295776738cb4675161e71c992777b4605991e8 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 4 Nov 2023 08:47:17 -0700 Subject: [PATCH 03/17] [JENKINS-72266] Upgrade Winstone from 6.14 to 6.16 (upgrade Jetty from 10.0.17 to 10.0.18 (#8666) [JENKINS-72266] Upgrade Winstone from 6.14 to 6.16 (upgrade Jetty from 10.0.17 to 10.0.18) --- pom.xml | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f7915017b244..a03d0f12b9af 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ THE SOFTWARE. 1.29 false - 6.14 + 6.16 - org.kohsuke.stapler - stapler-adjunct-timeline - 1.5 - tests - test - org.mockito mockito-core diff --git a/core/src/main/java/hudson/model/BuildTimelineWidget.java b/core/src/main/java/hudson/model/BuildTimelineWidget.java index 563f8a18823a..8849e95555dc 100644 --- a/core/src/main/java/hudson/model/BuildTimelineWidget.java +++ b/core/src/main/java/hudson/model/BuildTimelineWidget.java @@ -24,14 +24,13 @@ package hudson.model; -import hudson.Util; import hudson.util.RunList; -import java.io.IOException; -import java.util.Date; +import java.util.ArrayList; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; -import org.koshuke.stapler.simile.timeline.Event; -import org.koshuke.stapler.simile.timeline.TimelineEventList; /** * UI widget for showing the SIMILE timeline control. @@ -41,7 +40,9 @@ * * @author Kohsuke Kawaguchi * @since 1.372 + * @deprecated since TODO */ +@Deprecated public class BuildTimelineWidget { protected final RunList builds; @@ -59,22 +60,13 @@ public BuildTimelineWidget(RunList builds) { return builds.getLastBuild(); } - public TimelineEventList doData(StaplerRequest req, @QueryParameter long min, @QueryParameter long max) throws IOException { - TimelineEventList result = new TimelineEventList(); - for (Run r : builds.byTimestamp(min, max)) { - Event e = new Event(); - e.start = new Date(r.getStartTimeInMillis()); - e.end = new Date(r.getStartTimeInMillis() + r.getDuration()); - // due to SimileAjax.HTML.deEntify (in simile-ajax-bundle.js), "<" are transformed back to "<", but not the "<"; - // to protect against XSS - e.title = Util.escape(r.getFullDisplayName()).replace("<", "<"); - e.link = req.getContextPath() + '/' + r.getUrl(); - BallColor c = r.getIconColor(); - e.color = String.format("#%06X", c.getBaseColor().darker().getRGB() & 0xFFFFFF); - e.classname = "event-" + c.noAnime().toString() + " " + (c.isAnimated() ? "animated" : ""); - result.add(e); - } - return result; + public HttpResponse doData(StaplerRequest req, @QueryParameter long min, @QueryParameter long max) { + return (req1, rsp, node) -> { + JSONObject o = new JSONObject(); + o.put("events", JSONArray.fromObject(new ArrayList<>())); + rsp.setContentType("application/javascript;charset=UTF-8"); + o.write(rsp.getWriter()); + }; } } diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java index 31e0c0bc804b..97571910f671 100644 --- a/core/src/main/java/hudson/model/Computer.java +++ b/core/src/main/java/hudson/model/Computer.java @@ -618,6 +618,8 @@ public LoadStatistics getLoadStatistics() { return LabelAtom.get(nodeName != null ? nodeName : Jenkins.get().getSelfLabel().toString()).loadStatistics; } + @Deprecated + @Restricted(DoNotUse.class) public BuildTimelineWidget getTimeline() { return new BuildTimelineWidget(getBuilds()); } diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index 9ae605609292..c40eee681de3 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -114,6 +114,7 @@ import org.jfree.ui.RectangleInsets; import org.jvnet.localizer.Localizable; import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.DoNotUse; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.CmdLineException; @@ -1597,6 +1598,8 @@ public ACL getACL() { return Jenkins.get().getAuthorizationStrategy().getACL(this); } + @Deprecated + @Restricted(DoNotUse.class) public BuildTimelineWidget getTimeline() { return new BuildTimelineWidget(getBuilds()); } diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java index d09ab50033c3..c752adc24247 100644 --- a/core/src/main/java/hudson/model/View.java +++ b/core/src/main/java/hudson/model/View.java @@ -1173,6 +1173,8 @@ public RunList getBuilds() { return new RunList(this); } + @Deprecated + @Restricted(DoNotUse.class) public BuildTimelineWidget getTimeline() { return new BuildTimelineWidget(getBuilds()); } diff --git a/core/src/main/resources/hudson/model/BuildTimelineWidget/build-timeline-widget.js b/core/src/main/resources/hudson/model/BuildTimelineWidget/build-timeline-widget.js deleted file mode 100644 index eb7c1fa2cc88..000000000000 --- a/core/src/main/resources/hudson/model/BuildTimelineWidget/build-timeline-widget.js +++ /dev/null @@ -1,133 +0,0 @@ -/* global Timeline */ - -var targetDiv = document.querySelector("#build-timeline-div"); -var tz = targetDiv.getAttribute("data-hour-local-timezone"); -var tl = null; -var interval = 24 * 60 * 60 * 1000; - -function getData(eventSource1, current, min, max) { - if (current < min) { - return; - } - if (!eventSource1.loaded[current]) { - eventSource1.loaded[current] = true; - fetch("timeline/data", { - method: "POST", - headers: crumb.wrap({ - "Content-Type": "application/x-www-form-urlencoded", - }), - body: new URLSearchParams({ - min: current * interval, - max: (current + 1) * interval, - }), - }).then((t) => { - if (t.ok) { - t.json() - .then((json) => { - eventSource1.loadJSON(json, "."); - getData(eventSource1, current - 1, min, max); - }) - .catch((err) => { - alert(err); - }); - } - }); - } -} - -function doLoad() { - var tl_el = document.getElementById("tl"); - var eventSource1 = new Timeline.DefaultEventSource(); - eventSource1.loaded = {}; - eventSource1.ensureVisible = function (band) { - // make sure all data are loaded for the portion visible in the band - // $('status').innerHTML = "min="+band.getMinDate()+" max="+band.getMaxDate(); - var min = Math.floor(band.getMinVisibleDate().getTime() / interval); - var max = Math.ceil(band.getMaxVisibleDate().getTime() / interval); - getData(eventSource1, max, min, max); - }; - - var theme1 = Timeline.ClassicTheme.create(); - //theme1.autoWidth = true; // Set the Timeline's "width" automatically. - // Set autoWidth on the Timeline's first band's theme, - // will affect all bands. - - var bandInfos = [ - // the bar that shows outline - Timeline.createBandInfo({ - width: "20%", - intervalUnit: Timeline.DateTime.DAY, - intervalPixels: 200, - eventSource: eventSource1, - timeZone: tz, - theme: theme1, - layout: "overview", // original, overview, detailed - }), - // the main area - Timeline.createBandInfo({ - width: "80%", - eventSource: eventSource1, - timeZone: tz, - theme: theme1, - intervalUnit: Timeline.DateTime.HOUR, - intervalPixels: 200, - }), - ]; - bandInfos[0].highlight = true; - bandInfos[0].syncWith = 1; - - // create the Timeline - tl = Timeline.create(tl_el, bandInfos, Timeline.HORIZONTAL); - - tl.getBand(0).addOnScrollListener(function (band) { - eventSource1.ensureVisible(band); - }); - - tl.layout(); // display the Timeline - - // if resized, redo layout - var resizeTimerID = null; - function doResize() { - if (resizeTimerID == null) { - resizeTimerID = window.setTimeout(function () { - resizeTimerID = null; - tl.layout(); - }, 500); - } - } - - if (window.addEventListener) { - window.addEventListener("resize", doResize, false); - } else if (window.attachEvent) { - window.attachEvent("onresize", doResize); - } else if (window.onResize) { - window.onresize = doResize; - } -} - -if (window.addEventListener) { - window.addEventListener("load", doLoad, false); -} else if (window.attachEvent) { - window.attachEvent("onload", doLoad); -} else if (window.onLoad) { - window.onload = doLoad; -} - -//add resize handle -(function () { - var resize = new YAHOO.util.Resize("resizeContainer", { - handles: "b", - minHeight: 300, // this should be the same as the height of the container div, - // to fix an issue when it's resized to be smaller than the original height - }); - - //update timeline after resizing - resize.on( - "endResize", - function () { - tl.layout(); - }, - null, - true, - ); -})(); diff --git a/core/src/main/resources/hudson/model/BuildTimelineWidget/control.jelly b/core/src/main/resources/hudson/model/BuildTimelineWidget/control.jelly deleted file mode 100644 index 70973ac3285d..000000000000 --- a/core/src/main/resources/hudson/model/BuildTimelineWidget/control.jelly +++ /dev/null @@ -1,43 +0,0 @@ - - - - - Show timeline trend image. It takes two builds - - - - -
-
-
-
- - - - - -
- - \ No newline at end of file diff --git a/core/src/main/resources/hudson/model/Computer/builds.jelly b/core/src/main/resources/hudson/model/Computer/builds.jelly index 4b0e166c9a53..fc9e5f0a5402 100644 --- a/core/src/main/resources/hudson/model/Computer/builds.jelly +++ b/core/src/main/resources/hudson/model/Computer/builds.jelly @@ -35,8 +35,6 @@ THE SOFTWARE. ${%disclaimer}

- - diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly index 9743bceb27f1..4021ab4109a4 100644 --- a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly +++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly @@ -31,9 +31,6 @@ THE SOFTWARE. -

${%Timeline}

- -

${%Build Time Trend}

[${%Build time graph}] @@ -44,7 +41,7 @@ THE SOFTWARE. ${handler.setBuilds(it.builds)} - diff --git a/core/src/main/resources/hudson/model/User/builds.jelly b/core/src/main/resources/hudson/model/User/builds.jelly index 1b8ba2b8b548..27711159fd4b 100644 --- a/core/src/main/resources/hudson/model/User/builds.jelly +++ b/core/src/main/resources/hudson/model/User/builds.jelly @@ -31,7 +31,6 @@ THE SOFTWARE. ${%title(it)} - diff --git a/core/src/main/resources/hudson/model/View/builds.jelly b/core/src/main/resources/hudson/model/View/builds.jelly index 27fdd502e5c3..134637ad0cf5 100644 --- a/core/src/main/resources/hudson/model/View/builds.jelly +++ b/core/src/main/resources/hudson/model/View/builds.jelly @@ -37,10 +37,6 @@ THE SOFTWARE. - - - - diff --git a/test/src/test/java/jenkins/widgets/BuildListTableTest.java b/test/src/test/java/jenkins/widgets/BuildListTableTest.java index e9a1b473e1ef..6d3258eaa311 100644 --- a/test/src/test/java/jenkins/widgets/BuildListTableTest.java +++ b/test/src/test/java/jenkins/widgets/BuildListTableTest.java @@ -60,14 +60,14 @@ public class BuildListTableTest { v2.add(p); d.addView(v2); JenkinsRule.WebClient wc = r.createWebClient(); - HtmlPage page = wc.goTo("view/v1/job/d/view/v2/builds?suppressTimelineControl=true"); + HtmlPage page = wc.goTo("view/v1/job/d/view/v2/builds"); assertEquals(0, wc.waitForBackgroundJavaScript(120000)); HtmlAnchor anchor = page.getAnchorByText("d » d2 » p"); String href = anchor.getHrefAttribute(); URL target = URI.create(page.getUrl().toExternalForm()).resolve(href).toURL(); wc.getPage(target); assertEquals(href, r.getURL() + "view/v1/job/d/view/v2/job/d2/job/p/", target.toString()); - page = wc.goTo("job/d/view/All/builds?suppressTimelineControl=true"); + page = wc.goTo("job/d/view/All/builds"); assertEquals(0, wc.waitForBackgroundJavaScript(120000)); anchor = page.getAnchorByText("d » d2 » p"); href = anchor.getHrefAttribute(); From 7bae60538498950b83b78c97ee8e067248a3297f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 14:09:54 +0100 Subject: [PATCH 08/17] Update dependency lit to v3.0.2 (#8680) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- core/src/site/site.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/site/site.xml b/core/src/site/site.xml index 3fc4b2d15521..4007e34aab89 100644 --- a/core/src/site/site.xml +++ b/core/src/site/site.xml @@ -6,7 +6,7 @@ + From 608d5003ce7cc69e5faf36d8009b3d776881a7d4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 08:41:26 +0000 Subject: [PATCH 09/17] Update dependency eslint to v8.53.0 (#8682) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- war/package.json | 2 +- war/yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/war/package.json b/war/package.json index 6f10e59f735b..ba9258f18492 100644 --- a/war/package.json +++ b/war/package.json @@ -30,7 +30,7 @@ "clean-webpack-plugin": "4.0.0", "css-loader": "6.8.1", "css-minimizer-webpack-plugin": "5.0.1", - "eslint": "8.52.0", + "eslint": "8.53.0", "eslint-config-prettier": "9.0.0", "handlebars-loader": "1.7.3", "mini-css-extract-plugin": "2.7.6", diff --git a/war/yarn.lock b/war/yarn.lock index 009483efa858..9d6c47073ead 100644 --- a/war/yarn.lock +++ b/war/yarn.lock @@ -1773,9 +1773,9 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^2.1.2": - version: 2.1.2 - resolution: "@eslint/eslintrc@npm:2.1.2" +"@eslint/eslintrc@npm:^2.1.3": + version: 2.1.3 + resolution: "@eslint/eslintrc@npm:2.1.3" dependencies: ajv: "npm:^6.12.4" debug: "npm:^4.3.2" @@ -1786,14 +1786,14 @@ __metadata: js-yaml: "npm:^4.1.0" minimatch: "npm:^3.1.2" strip-json-comments: "npm:^3.1.1" - checksum: 00efdc3797e6f05518060522b7788e5f5aff02f13facbd0c83b176c3dee86554023283a5f68542df379c5137685d2d29745c87f62bf2406a1d38d95471f44ce6 + checksum: f4103f4346126292eb15581c5a1d12bef03410fd3719dedbdb92e1f7031d46a5a2d60de8566790445d5d4b70b75ba050876799a11f5fff8265a91ee3fa77dab0 languageName: node linkType: hard -"@eslint/js@npm:8.52.0": - version: 8.52.0 - resolution: "@eslint/js@npm:8.52.0" - checksum: cdcf8f9b54994fe1a5dc086c714a75dca5fe5899f9b362986abd12b3b5bec9c9755f7608e663ce072edd3fa3910cc752afef8d149fda0288a477652b65865a1c +"@eslint/js@npm:8.53.0": + version: 8.53.0 + resolution: "@eslint/js@npm:8.53.0" + checksum: d29f6c207b2f6dc4ef174d16a3c07b0d3a17ca3d805680496ff267edd773e3bac41db4e7dcab622ca1970d892535bd19671e2a756d4eac75e96fd8c8dcdb619b languageName: node linkType: hard @@ -3541,14 +3541,14 @@ __metadata: languageName: node linkType: hard -"eslint@npm:8.52.0": - version: 8.52.0 - resolution: "eslint@npm:8.52.0" +"eslint@npm:8.53.0": + version: 8.53.0 + resolution: "eslint@npm:8.53.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.2.0" "@eslint-community/regexpp": "npm:^4.6.1" - "@eslint/eslintrc": "npm:^2.1.2" - "@eslint/js": "npm:8.52.0" + "@eslint/eslintrc": "npm:^2.1.3" + "@eslint/js": "npm:8.53.0" "@humanwhocodes/config-array": "npm:^0.11.13" "@humanwhocodes/module-importer": "npm:^1.0.1" "@nodelib/fs.walk": "npm:^1.2.8" @@ -3585,7 +3585,7 @@ __metadata: text-table: "npm:^0.2.0" bin: eslint: bin/eslint.js - checksum: 9269b32ccf6e9947d994f871888d5b541da4a8539160ee19d80ecac0c70c51a7d3a7c111a58cf1adf81f093a7c1b5564edefa5c6dbe29b1df9c9f3e30700af30 + checksum: c5cd0049488c0463dab7d97466767ca5a1d0b3b59d0a223122683dc8039ecea30b27867fb9e38906b4c1ab9d09ece8a802a6c540d8905016f1cc4b4bb27329af languageName: node linkType: hard @@ -4401,7 +4401,7 @@ __metadata: clean-webpack-plugin: "npm:4.0.0" css-loader: "npm:6.8.1" css-minimizer-webpack-plugin: "npm:5.0.1" - eslint: "npm:8.52.0" + eslint: "npm:8.53.0" eslint-config-prettier: "npm:9.0.0" handlebars: "npm:4.7.8" handlebars-loader: "npm:1.7.3" From 8bf97d72336b075b549d70ece61a1788a4eb3a90 Mon Sep 17 00:00:00 2001 From: Jenkins Release Bot <66998184+jenkins-release-bot@users.noreply.github.com> Date: Tue, 7 Nov 2023 13:01:47 +0000 Subject: [PATCH 10/17] [maven-release-plugin] prepare release jenkins-2.431 --- bom/pom.xml | 2 +- cli/pom.xml | 2 +- core/pom.xml | 2 +- coverage/pom.xml | 2 +- pom.xml | 4 ++-- test/pom.xml | 2 +- war/pom.xml | 2 +- websocket/jetty10/pom.xml | 2 +- websocket/spi/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 595b6b3f383a..521678dfdaad 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.431 jenkins-bom diff --git a/cli/pom.xml b/cli/pom.xml index fa8971e32ac7..3d237a8f4a78 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.431 cli diff --git a/core/pom.xml b/core/pom.xml index 45539865962a..2dfbd27776bb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.431 jenkins-core diff --git a/coverage/pom.xml b/coverage/pom.xml index 9f27c8d11cf0..8313a4a6230c 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.431 jenkins-coverage diff --git a/pom.xml b/pom.xml index a03d0f12b9af..7a18e56e1df3 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.431 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.431 https://github.com/jenkinsci/jenkins diff --git a/test/pom.xml b/test/pom.xml index d96f8b9535e1..aaaf5e6b4a3a 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.431 jenkins-test diff --git a/war/pom.xml b/war/pom.xml index b6082a6d1ada..ac4363a85af1 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.431 jenkins-war diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml index eb4a169a59d1..fa509747196d 100644 --- a/websocket/jetty10/pom.xml +++ b/websocket/jetty10/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.431 ../.. diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml index 77abcc3b7248..3db9b3d6bb62 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.431 ../.. From 6052e4dc8c6fd6f72287d24ee3c1a10530572b0a Mon Sep 17 00:00:00 2001 From: Jenkins Release Bot <66998184+jenkins-release-bot@users.noreply.github.com> Date: Tue, 7 Nov 2023 13:01:59 +0000 Subject: [PATCH 11/17] [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 | 6 +++--- test/pom.xml | 2 +- war/pom.xml | 2 +- websocket/jetty10/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 521678dfdaad..595b6b3f383a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.431 + ${revision}${changelist} jenkins-bom diff --git a/cli/pom.xml b/cli/pom.xml index 3d237a8f4a78..fa8971e32ac7 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - 2.431 + ${revision}${changelist} cli diff --git a/core/pom.xml b/core/pom.xml index 2dfbd27776bb..45539865962a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.431 + ${revision}${changelist} jenkins-core diff --git a/coverage/pom.xml b/coverage/pom.xml index 8313a4a6230c..9f27c8d11cf0 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - 2.431 + ${revision}${changelist} jenkins-coverage diff --git a/pom.xml b/pom.xml index 7a18e56e1df3..d34fb923a219 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.431 + ${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.431 + ${scmTag} https://github.com/jenkinsci/jenkins @@ -73,7 +73,7 @@ THE SOFTWARE. - 2.431 + 2.432 -SNAPSHOT diff --git a/test/pom.xml b/test/pom.xml index aaaf5e6b4a3a..d96f8b9535e1 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.431 + ${revision}${changelist} jenkins-test diff --git a/war/pom.xml b/war/pom.xml index ac4363a85af1..b6082a6d1ada 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.431 + ${revision}${changelist} jenkins-war diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml index fa509747196d..eb4a169a59d1 100644 --- a/websocket/jetty10/pom.xml +++ b/websocket/jetty10/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.431 + ${revision}${changelist} ../.. diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml index 3db9b3d6bb62..77abcc3b7248 100644 --- a/websocket/spi/pom.xml +++ b/websocket/spi/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.431 + ${revision}${changelist} ../.. From 293b86fd866eda15de0289fe5df09191ade5fe81 Mon Sep 17 00:00:00 2001 From: Stefan Spieker Date: Tue, 7 Nov 2023 21:32:59 +0100 Subject: [PATCH 12/17] Deleted long deprecated and unused `UserProperties` (#8679) deleted deprecated UserProperties --- .../java/hudson/model/UserProperties.java | 44 ------------------- 1 file changed, 44 deletions(-) delete mode 100644 core/src/main/java/hudson/model/UserProperties.java diff --git a/core/src/main/java/hudson/model/UserProperties.java b/core/src/main/java/hudson/model/UserProperties.java deleted file mode 100644 index cb840e40752d..000000000000 --- a/core/src/main/java/hudson/model/UserProperties.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -package hudson.model; - -import hudson.Extension; -import hudson.util.DescriptorList; -import java.util.List; - -/** - * List of all installed {@link UserProperty} types. - * @author Kohsuke Kawaguchi - * @deprecated as of 1.286 - */ -@Deprecated -public class UserProperties { - /** - * @deprecated as of 1.286 - * Use {@link UserProperty#all()} for read access and {@link Extension} for auto-registration. - */ - @Deprecated - public static final List LIST = (List) new DescriptorList<>(UserProperty.class); -} From 942f93224241c81b2b8661d351b3cf8e7ece96ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 13:38:34 -0700 Subject: [PATCH 13/17] Bump org.jenkins-ci.main:jenkins-test-harness from 2104.v8d1866dd0ea_f to 2105.v5a_7b_f123294f (#8683) Bump org.jenkins-ci.main:jenkins-test-harness Bumps [org.jenkins-ci.main:jenkins-test-harness](https://github.com/jenkinsci/jenkins-test-harness) from 2104.v8d1866dd0ea_f to 2105.v5a_7b_f123294f. - [Release notes](https://github.com/jenkinsci/jenkins-test-harness/releases) - [Changelog](https://github.com/jenkinsci/jenkins-test-harness/blob/master/docs/CHANGELOG-OLD.md) - [Commits](https://github.com/jenkinsci/jenkins-test-harness/commits) --- updated-dependencies: - dependency-name: org.jenkins-ci.main:jenkins-test-harness dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[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 d96f8b9535e1..dcd75f28cd18 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -121,7 +121,7 @@ THE SOFTWARE. ${project.groupId} jenkins-test-harness - 2104.v8d1866dd0ea_f + 2105.v5a_7b_f123294f test From e4fe5042e4f591b1e09ae4ec78354a8a5cf57370 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 8 Nov 2023 08:39:28 -0500 Subject: [PATCH 14/17] Temporary memory leak in `FutureImpl.executors` (#8640) * Temporary memory leak in `FutureImpl.executors` * https://github.com/jenkinsci/jenkins-test-harness/pull/669 released * Skip new test on Windows https://github.com/jenkinsci/jenkins/pull/8640#discussion_r1373797374 --- .../java/hudson/model/queue/FutureImpl.java | 4 ++++ .../hudson/model/queue/WorkUnitContext.java | 1 + .../test/java/hudson/model/ComputerTest.java | 24 +++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/core/src/main/java/hudson/model/queue/FutureImpl.java b/core/src/main/java/hudson/model/queue/FutureImpl.java index f6bba013f2cc..d57453ece5d6 100644 --- a/core/src/main/java/hudson/model/queue/FutureImpl.java +++ b/core/src/main/java/hudson/model/queue/FutureImpl.java @@ -95,4 +95,8 @@ public synchronized void setAsCancelled() { synchronized void addExecutor(@NonNull Executor executor) { this.executors.add(executor); } + + synchronized void finished() { + executors.clear(); + } } diff --git a/core/src/main/java/hudson/model/queue/WorkUnitContext.java b/core/src/main/java/hudson/model/queue/WorkUnitContext.java index 31829ba7dd1f..83320ab5d4f9 100644 --- a/core/src/main/java/hudson/model/queue/WorkUnitContext.java +++ b/core/src/main/java/hudson/model/queue/WorkUnitContext.java @@ -190,6 +190,7 @@ public void synchronizeEnd(Executor e, Queue.Executable executable, Throwable pr } } } + future.finished(); } } } diff --git a/test/src/test/java/hudson/model/ComputerTest.java b/test/src/test/java/hudson/model/ComputerTest.java index b0ce7a754600..a3392ee448af 100644 --- a/test/src/test/java/hudson/model/ComputerTest.java +++ b/test/src/test/java/hudson/model/ComputerTest.java @@ -31,6 +31,7 @@ import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.isA; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; @@ -39,12 +40,16 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeThat; import hudson.ExtensionList; +import hudson.Functions; import hudson.diagnosis.OldDataMonitor; +import hudson.remoting.Channel; import hudson.slaves.DumbSlave; import hudson.slaves.OfflineCause; import java.io.File; +import java.lang.ref.WeakReference; import java.net.HttpURLConnection; import java.nio.charset.StandardCharsets; import java.util.Map; @@ -66,6 +71,7 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; import org.jvnet.hudson.test.LoggerRule; +import org.jvnet.hudson.test.MemoryAssert; import org.jvnet.hudson.test.MockAuthorizationStrategy; import org.jvnet.hudson.test.MockFolder; import org.jvnet.hudson.test.SmokeTest; @@ -263,4 +269,22 @@ public void testTerminatedNodeAjaxExecutorsDoesNotShowTrace() throws Exception { j.assertBuildStatus(Result.FAILURE, j.waitForCompletion(b)); } + @Test + public void computersCollected() throws Exception { + assumeThat("Seems to crash the test JVM at least in CI", Functions.isWindows(), is(false)); + DumbSlave agent = j.createOnlineSlave(); + FreeStyleProject p = j.createFreeStyleProject(); + p.setAssignedNode(agent); + j.buildAndAssertSuccess(p); + Computer computer = agent.toComputer(); + WeakReference computerRef = new WeakReference<>(computer); + WeakReference channelRef = new WeakReference<>((Channel) computer.getChannel()); + computer.disconnect(null); + computer = null; + j.jenkins.removeNode(agent); + agent = null; + MemoryAssert.assertGC(computerRef, false); + MemoryAssert.assertGC(channelRef, false); + } + } From 41d09e0fa0b61e61bc3e2393b1fc2f1d85893ae2 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Thu, 9 Nov 2023 07:09:00 -0800 Subject: [PATCH 15/17] Stop recommending `-jnlpUrl` (#8639) --- .../main/java/hudson/slaves/JNLPLauncher.java | 56 +++++++++++++++++++ .../hudson/slaves/JNLPLauncher/main.jelly | 33 ++++++----- src/checkstyle/checkstyle-configuration.xml | 2 +- 3 files changed, 75 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/hudson/slaves/JNLPLauncher.java b/core/src/main/java/hudson/slaves/JNLPLauncher.java index e8bf009eb9b3..917097d8267b 100644 --- a/core/src/main/java/hudson/slaves/JNLPLauncher.java +++ b/core/src/main/java/hudson/slaves/JNLPLauncher.java @@ -24,6 +24,8 @@ package hudson.slaves; +import com.google.common.escape.Escaper; +import com.google.common.escape.Escapers; import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -38,6 +40,7 @@ import jenkins.slaves.RemotingWorkDirSettings; import jenkins.util.SystemProperties; import jenkins.websocket.WebSockets; +import org.apache.commons.lang.StringUtils; import org.jenkinsci.Symbol; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; @@ -195,6 +198,59 @@ public void launch(SlaveComputer computer, TaskListener listener) { @Restricted(NoExternalUse.class) public static /*almost final*/ Descriptor DESCRIPTOR; + @NonNull + @Restricted(NoExternalUse.class) + public String getRemotingOptionsUnix(@NonNull Computer computer) { + return getRemotingOptions(escapeUnix(computer.getName())); + } + + @NonNull + @Restricted(NoExternalUse.class) + public String getRemotingOptionsWindows(@NonNull Computer computer) { + return getRemotingOptions(escapeWindows(computer.getName())); + } + + private String getRemotingOptions(String computerName) { + StringBuilder sb = new StringBuilder(); + sb.append("-name "); + sb.append(computerName); + sb.append(' '); + if (isWebSocket()) { + sb.append("-webSocket "); + } + if (tunnel != null) { + sb.append(" -tunnel "); + sb.append(tunnel); + sb.append(' '); + } + return sb.toString(); + } + + /** + * {@link Jenkins#checkGoodName(String)} saves us from most troublesome characters, but we still have to deal with + * spaces and therefore with double quotes and backticks. + */ + private static String escapeUnix(String input) { + if (StringUtils.isAlphanumeric(input)) { + return input; + } + Escaper escaper = + Escapers.builder().addEscape('"', "\\\"").addEscape('`', "\\`").build(); + return "\"" + escaper.escape(input) + "\""; + } + + /** + * {@link Jenkins#checkGoodName(String)} saves us from most troublesome characters, but we still have to deal with + * spaces and therefore with double quotes. + */ + private static String escapeWindows(String input) { + if (StringUtils.isAlphanumeric(input)) { + return input; + } + Escaper escaper = Escapers.builder().addEscape('"', "\\\"").build(); + return "\"" + escaper.escape(input) + "\""; + } + /** * Gets work directory options as a String. * diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly index 96066cc8e216..621d9ffdf068 100644 --- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly +++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly @@ -35,71 +35,74 @@ THE SOFTWARE. - + +

${%slaveAgent.cli.run} (Unix) - + 

 ${copy_agent_jar_unix}
-${copy_java_cmd}
+${copy_java_cmd_unix}

${%slaveAgent.cli.run} (Windows) - + 

 ${copy_agent_jar_windows}
-${copy_java_cmd}
+${copy_java_cmd_windows}
- + +

${%slaveAgent.cli.run} (Unix) - + 

 ${copy_agent_jar_unix}
-${copy_java_cmd_secret}
+${copy_java_cmd_secret_unix}

${%slaveAgent.cli.run} (Windows) - + 

 ${copy_agent_jar_windows}
-${copy_java_cmd_secret}
+${copy_java_cmd_secret_windows}
- + +

${%slaveAgent.cli.run.secret} (Unix) - + 

 ${copy_secret_to_file}
 ${copy_agent_jar_unix}
-${copy_java_cmd_secret2}
+${copy_java_cmd_secret2_unix}

${%slaveAgent.cli.run.secret} (Windows) - + 

 ${copy_secret_to_file}
 ${copy_agent_jar_windows}
-${copy_java_cmd_secret2}
+${copy_java_cmd_secret2_windows}
diff --git a/src/checkstyle/checkstyle-configuration.xml b/src/checkstyle/checkstyle-configuration.xml index d2454e254844..92261fb123bf 100644 --- a/src/checkstyle/checkstyle-configuration.xml +++ b/src/checkstyle/checkstyle-configuration.xml @@ -58,7 +58,7 @@ - + From a18400cb2f6b9935ac45aebd1ccb26573744820d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Nov 2023 06:48:53 -0800 Subject: [PATCH 16/17] Bump org.jenkins-ci.plugins:credentials from 1307.v3757c78f17c3 to 1309.v8835d63eb_d8a_ (#8687) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[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 dcd75f28cd18..f3568ce932f2 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -196,7 +196,7 @@ THE SOFTWARE. org.jenkins-ci.plugins credentials - 1307.v3757c78f17c3 + 1309.v8835d63eb_d8a_ test From 790f77320ba0e73ab58e2eaab0cc4669e6043eb2 Mon Sep 17 00:00:00 2001 From: Mysterious_Dev <40738104+Mysterious-Dev@users.noreply.github.com> Date: Sat, 11 Nov 2023 15:36:25 +0100 Subject: [PATCH 17/17] Update French translation for Save button and add one for Apply (#8684) Update configure_fr.properties --- .../main/resources/hudson/model/Job/configure_fr.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/model/Job/configure_fr.properties b/core/src/main/resources/hudson/model/Job/configure_fr.properties index 0d1028b10a83..eb6da2e9e368 100644 --- a/core/src/main/resources/hudson/model/Job/configure_fr.properties +++ b/core/src/main/resources/hudson/model/Job/configure_fr.properties @@ -22,6 +22,7 @@ name=Nom du {0} Description=Description -Save=Sauver +Save=Sauvegarder +Apply=Appliquer LOADING=CHARGEMENT Strategy=Stratégie