diff --git a/.github/renovate.json b/.github/renovate.json index 1f023c99f4f5..1de5552206ed 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -36,7 +36,7 @@ ], "enabled": false, "matchPackageNames": [ - "org.eclipse.jetty:jetty-maven-plugin", + "org.eclipse.jetty.ee9:jetty-ee9-maven-plugin", "org.jenkins-ci:winstone" ] }, diff --git a/ath.sh b/ath.sh index 6890d5908ab6..45427edd5214 100644 --- a/ath.sh +++ b/ath.sh @@ -6,7 +6,7 @@ set -o xtrace cd "$(dirname "$0")" # https://github.com/jenkinsci/acceptance-test-harness/releases -export ATH_VERSION=5957.v7c0e2f7ca_63e +export ATH_VERSION=5968.v180888e51761 if [[ $# -eq 0 ]]; then export JDK=17 @@ -26,11 +26,15 @@ fi mkdir -p target/ath-reports chmod a+rwx target/ath-reports +# obtain the groupId to grant to access the docker socket to run tests needing docker +dockergid=$(docker run --rm -v /var/run/docker.sock:/var/run/docker.sock ubuntu:noble stat -c %g /var/run/docker.sock) + exec docker run --rm \ --env JDK \ --env ATH_VERSION \ --env BROWSER \ --shm-size 2g `# avoid selenium.WebDriverException exceptions like 'Failed to decode response from marionette' and webdriver closed` \ + --group-add ${dockergid} \ --volume "$(pwd)"/war/target/jenkins.war:/jenkins.war:ro \ --volume /var/run/docker.sock:/var/run/docker.sock:rw \ --volume "$(pwd)"/target/ath-reports:/reports:rw \ diff --git a/core/src/main/resources/hudson/PluginManager/_table.js b/core/src/main/resources/hudson/PluginManager/_table.js index 8174fa1e833d..4806c3f573bb 100644 --- a/core/src/main/resources/hudson/PluginManager/_table.js +++ b/core/src/main/resources/hudson/PluginManager/_table.js @@ -504,24 +504,27 @@ window.addEventListener("load", function () { }); }); - // Enable/disable the 'Update' button depending on if any updates are checked - const anyCheckboxesSelected = () => { - return ( - document.querySelectorAll("input[type='checkbox']:checked:not(:disabled)") - .length > 0 - ); - }; const updateButton = document.querySelector("#button-update"); - const checkboxes = document.querySelectorAll( - "input[type='checkbox'], [data-select], .jenkins-table__checkbox", - ); - checkboxes.forEach((checkbox) => { - checkbox.addEventListener("click", () => { - setTimeout(() => { - updateButton.disabled = !anyCheckboxesSelected(); + if (updateButton) { + // Enable/disable the 'Update' button depending on if any updates are checked + const anyCheckboxesSelected = () => { + return ( + document.querySelectorAll( + "input[type='checkbox']:checked:not(:disabled)", + ).length > 0 + ); + }; + const checkboxes = document.querySelectorAll( + "input[type='checkbox'], [data-select], .jenkins-table__checkbox", + ); + checkboxes.forEach((checkbox) => { + checkbox.addEventListener("click", () => { + setTimeout(() => { + updateButton.disabled = !anyCheckboxesSelected(); + }); }); }); - }); + } // Show update center error if element exists const updateCenterError = document.querySelector("#update-center-error"); diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly index 3c3ee43e0193..951e0cf2877d 100644 --- a/core/src/main/resources/hudson/PluginManager/installed.jelly +++ b/core/src/main/resources/hudson/PluginManager/installed.jelly @@ -99,6 +99,13 @@ THE SOFTWARE. + +
+ + + +
+
- -
- -
-
+ +
+ +
+
- -
- - -

${%Uninstallation pending}

-
- - -
- - - - - - - - - - - -

- ${%detached-many-dependents(impliedDependents.size())} -

-
-
-
-
- -
- - - -
-
+ + +
+ + +

${%Uninstallation pending}

+
+ + +
+ + + + + + + + + + + +

+ ${%detached-many-dependents(impliedDependents.size())} +

+
+
+
+
+ -
-
-
- - + +
+
+
+ diff --git a/pom.xml b/pom.xml index 25d55bf7eef4..86e2ff541a3c 100644 --- a/pom.xml +++ b/pom.xml @@ -96,8 +96,8 @@ THE SOFTWARE. 4.13.2 1.29 false - - 8.0 + + 8.1 + support-log-formatter copy @@ -642,7 +642,7 @@ THE SOFTWARE. org.eclipse.jetty.ee9 jetty-ee9-maven-plugin - 12.0.12 + 12.0.13