From 5d65d117a52ce8494923f71c9a090c859812ec27 Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Fri, 21 Feb 2025 14:29:58 +0100 Subject: [PATCH 1/8] [JENKINS-75321] Clarify the message displayed when loading the content of build history widget --- .../main/resources/hudson/widgets/HistoryWidget/index.jelly | 5 ++++- src/main/js/pages/project/builds-card.js | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly index 6b158ddc4ea6..718ec2fe058c 100644 --- a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly +++ b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly @@ -49,7 +49,10 @@ THE SOFTWARE. clazz="${page.runs.isEmpty() and page.queueItems.isEmpty() ? 'jenkins-hidden' : ''}"/>
-
+
+ +
+ diff --git a/src/main/js/pages/project/builds-card.js b/src/main/js/pages/project/builds-card.js index 44c57c05b57e..8f8c5894ba52 100644 --- a/src/main/js/pages/project/builds-card.js +++ b/src/main/js/pages/project/builds-card.js @@ -9,6 +9,7 @@ const ajaxUrl = buildHistoryPage.getAttribute("page-ajax"); const card = document.querySelector("#jenkins-builds"); const contents = card.querySelector("#jenkins-build-history"); const container = card.querySelector(".app-builds-container"); +const loadingBuilds = card.querySelector("#loading-builds"); const noBuilds = card.querySelector("#no-builds"); // Pagination controls @@ -58,6 +59,7 @@ function load(options = {}) { if (responseText.trim() === "") { contents.innerHTML = ""; noBuilds.style.display = "block"; + loadingBuilds.style.display = "none"; updateCardControls({ pageHasUp: false, pageHasDown: false, @@ -69,7 +71,7 @@ function load(options = {}) { // Show the refreshed builds list contents.innerHTML = responseText; - noBuilds.style.display = "none"; + loadingBuilds.style.display = "none"; behaviorShim.applySubtree(contents); // Show the card controls @@ -146,6 +148,7 @@ document.addEventListener("DOMContentLoaded", function () { debouncedLoad(); }); + container.classList.add("app-builds-container--loading"); load(); window.addEventListener("focus", function () { From fef79c49838f9730e35945de40c95a5222667e99 Mon Sep 17 00:00:00 2001 From: Soham Juneja <138424822+SohamJuneja@users.noreply.github.com> Date: Sat, 22 Feb 2025 22:26:29 +0530 Subject: [PATCH 2/8] Update Gitpod Dockerfile to use Java JDK 21 by default (#10311) --- .gitpod/Dockerfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitpod/Dockerfile b/.gitpod/Dockerfile index 58d3fa8a87f4..4ca4ede5f249 100644 --- a/.gitpod/Dockerfile +++ b/.gitpod/Dockerfile @@ -1,6 +1,10 @@ -FROM gitpod/workspace-full - +FROM gitpod/workspace-full:latest +ARG JAVA_VERSION=21.0.6-tem ARG MAVEN_VERSION=3.9.9 - -RUN brew install gh && \ - bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && sdk install maven ${MAVEN_VERSION} && sdk default maven ${MAVEN_VERSION}" +# Install Java 21, Maven and GitHub CLI +RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && \ + sdk install java ${JAVA_VERSION} && \ + sdk default java ${JAVA_VERSION} && \ + sdk install maven ${MAVEN_VERSION} && \ + sdk default maven ${MAVEN_VERSION} && \ + brew install gh" From 5c8e5eff79de8590525604beb2d8ba978937022c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Feb 2025 21:56:02 +0000 Subject: [PATCH 3/8] Update dependency io.jenkins.plugins:jakarta-activation-api to v2.1.3-2 (#10314) 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 4b8b7a685785..91f05ace1d42 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -539,7 +539,7 @@ THE SOFTWARE. io.jenkins.plugins jakarta-activation-api - 2.1.3-1 + 2.1.3-2 hpi From a3b83ad99532f769a44391b5e3f6a6640fd00744 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Feb 2025 21:56:08 +0000 Subject: [PATCH 4/8] Update dependency io.jenkins.plugins:jakarta-mail-api to v2.1.3-2 (#10315) 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 91f05ace1d42..1723486c9514 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -546,7 +546,7 @@ THE SOFTWARE. io.jenkins.plugins jakarta-mail-api - 2.1.3-1 + 2.1.3-2 hpi From 7076e0797f792ec7eee7c377ea185f353972977d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Feb 2025 21:56:14 +0000 Subject: [PATCH 5/8] Update dependency postcss to v8.5.3 (#10313) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 2be93601245b..9053e55ce6d3 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "globals": "15.15.0", "handlebars-loader": "1.7.3", "mini-css-extract-plugin": "2.9.2", - "postcss": "8.5.2", + "postcss": "8.5.3", "postcss-loader": "8.1.1", "postcss-preset-env": "10.1.4", "postcss-scss": "4.0.9", diff --git a/yarn.lock b/yarn.lock index 3d2e1da505d8..f25d787e1eb3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4396,7 +4396,7 @@ __metadata: jquery: "npm:3.7.1" lodash: "npm:4.17.21" mini-css-extract-plugin: "npm:2.9.2" - postcss: "npm:8.5.2" + postcss: "npm:8.5.3" postcss-loader: "npm:8.1.1" postcss-preset-env: "npm:10.1.4" postcss-scss: "npm:4.0.9" @@ -6126,14 +6126,14 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.5.2, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.5.1": - version: 8.5.2 - resolution: "postcss@npm:8.5.2" +"postcss@npm:8.5.3, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.5.1": + version: 8.5.3 + resolution: "postcss@npm:8.5.3" dependencies: nanoid: "npm:^3.3.8" picocolors: "npm:^1.1.1" source-map-js: "npm:^1.2.1" - checksum: 10c0/3044d49bc725029ab62292e8bf9849741251b95f3b754e191bf8b4025414d40ec3b4ac05c5a563d4b50060b5c8e96683eb4d783d8d8fa3867eb7b763cbe66127 + checksum: 10c0/b75510d7b28c3ab728c8733dd01538314a18c52af426f199a3c9177e63eb08602a3938bfb66b62dc01350b9aed62087eabbf229af97a1659eb8d3513cec823b3 languageName: node linkType: hard From 19977016b1b13ea5cf558e018182b720f50c9e57 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun, 23 Feb 2025 07:55:35 +0000 Subject: [PATCH 6/8] [JENKINS-75273] Fix tabs border radius (#10312) --- src/main/scss/components/_tabs.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scss/components/_tabs.scss b/src/main/scss/components/_tabs.scss index b7ac90c23789..793416d83446 100644 --- a/src/main/scss/components/_tabs.scss +++ b/src/main/scss/components/_tabs.scss @@ -1,6 +1,6 @@ @use "../abstracts/mixins"; -$border-radius: 100px; +$border-radius: 19px; .tabBarFrame { position: relative; @@ -36,7 +36,7 @@ $border-radius: 100px; display: flex; align-items: center; justify-content: center; - min-height: 36px; + min-height: 34px; padding: 0 1.2rem; border-radius: $border-radius; color: var(--tabs-item-foreground); From a7d80388d73c8e6c588067af620fc957323e2499 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 23 Feb 2025 05:54:26 -0700 Subject: [PATCH 7/8] Fill in since annotations (#10306) Co-authored-by: timja <21194782+timja@users.noreply.github.com> --- core/src/main/java/jenkins/model/details/Detail.java | 2 +- core/src/main/java/jenkins/model/details/DetailFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/jenkins/model/details/Detail.java b/core/src/main/java/jenkins/model/details/Detail.java index a8e31e41f13e..10df02f78fb2 100644 --- a/core/src/main/java/jenkins/model/details/Detail.java +++ b/core/src/main/java/jenkins/model/details/Detail.java @@ -15,7 +15,7 @@ *
  • SCM information for the build
    • *
  • who kicked the build off
    • * - * @since TODO + * @since 2.498 */ public abstract class Detail implements ModelObject, IconSpec { diff --git a/core/src/main/java/jenkins/model/details/DetailFactory.java b/core/src/main/java/jenkins/model/details/DetailFactory.java index 2c1dd7ad57bc..edc030de5bcc 100644 --- a/core/src/main/java/jenkins/model/details/DetailFactory.java +++ b/core/src/main/java/jenkins/model/details/DetailFactory.java @@ -36,7 +36,7 @@ /** * Allows you to add multiple details to an Actionable object at once. * @param the type of object to add to; typically an {@link Actionable} subtype - * @since TODO + * @since 2.498 */ public abstract class DetailFactory implements ExtensionPoint { From c37293c52df935c6f71c51f0a1d3b4472d09268f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 07:28:19 +0000 Subject: [PATCH 8/8] Update dependency globals to v16 (#10321) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9053e55ce6d3..338d2330d144 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "eslint": "9.20.1", "eslint-config-prettier": "10.0.1", "eslint-formatter-checkstyle": "8.40.0", - "globals": "15.15.0", + "globals": "16.0.0", "handlebars-loader": "1.7.3", "mini-css-extract-plugin": "2.9.2", "postcss": "8.5.3", diff --git a/yarn.lock b/yarn.lock index f25d787e1eb3..a4587edeec86 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3970,10 +3970,10 @@ __metadata: languageName: node linkType: hard -"globals@npm:15.15.0": - version: 15.15.0 - resolution: "globals@npm:15.15.0" - checksum: 10c0/f9ae80996392ca71316495a39bec88ac43ae3525a438b5626cd9d5ce9d5500d0a98a266409605f8cd7241c7acf57c354a48111ea02a767ba4f374b806d6861fe +"globals@npm:16.0.0": + version: 16.0.0 + resolution: "globals@npm:16.0.0" + checksum: 10c0/8906d5f01838df64a81d6c2a7b7214312e2216cf65c5ed1546dc9a7d0febddf55ffa906cf04efd5b01eec2534d6f14859a89535d1a68241832810e41ef3fd5bb languageName: node linkType: hard @@ -4389,7 +4389,7 @@ __metadata: eslint: "npm:9.20.1" eslint-config-prettier: "npm:10.0.1" eslint-formatter-checkstyle: "npm:8.40.0" - globals: "npm:15.15.0" + globals: "npm:16.0.0" handlebars: "npm:4.7.8" handlebars-loader: "npm:1.7.3" hotkeys-js: "npm:3.12.2"