Merge branch 'jenkinsci:master' into uninstall-plugins

.ci/publish.sh

@@ -68,9 +68,15 @@ else
     LATEST_WEEKLY="false"
 fi
 
+# Build all images including Java 11 if the version match latest LTS version
+# TODO: remove when Java 11 is removed from LTS line
+# See https://github.com/jenkinsci/docker/issues/1890
+TARGET="linux"
+
 if [[ "${JENKINS_VERSION}" == "${latest_lts_version}" ]]
 then
     LATEST_LTS="true"
+    TARGET="linux-lts-with-jdk11"
 else
     LATEST_LTS="false"
 fi
@@ -84,7 +90,7 @@ fi
 
 JENKINS_SHA="$(curl --disable --fail --silent --show-error --location "https://repo.jenkins-ci.org/releases/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war.sha256")"
 COMMIT_SHA=$(git rev-parse HEAD)
-export COMMIT_SHA JENKINS_VERSION JENKINS_SHA LATEST_WEEKLY LATEST_LTS
+export COMMIT_SHA JENKINS_VERSION JENKINS_SHA LATEST_WEEKLY LATEST_LTS TARGET
 
 cat <<EOF
 Using the following settings:
@@ -94,6 +100,7 @@ Using the following settings:
 * COMMIT_SHA: ${COMMIT_SHA}
 * LATEST_WEEKLY: ${LATEST_WEEKLY}
 * LATEST_LTS: ${LATEST_LTS}
+* TARGET: ${TARGET}
 EOF
 
-docker buildx bake --file docker-bake.hcl "${build_opts[@]}" linux
+docker buildx bake --file docker-bake.hcl "${build_opts[@]}" "${TARGET}"

.github/dependabot.yml

@@ -5,22 +5,7 @@ updates:
 # Alpine Linux
 
 - package-ecosystem: docker
-  directory: "17/alpine/hotspot"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 2
-  target-branch: master
-  reviewers:
-  - MarkEWaite
-  - slide
-  labels:
-  - dependencies
-  ignore:
-  # Ignore proposals to update to new versions of Java because updatecli takes care of that.
-  - dependency-name: "eclipse-temurin"
-
-- package-ecosystem: docker
-  directory: "11/alpine/hotspot"
+  directory: "alpine/hotspot"
   schedule:
     interval: weekly
   open-pull-requests-limit: 2
@@ -37,7 +22,7 @@ updates:
 # AlmaLinux
 
 - package-ecosystem: docker
-  directory: "11/almalinux/almalinux8/hotspot"
+  directory: "almalinux/almalinux8/hotspot"
   schedule:
     interval: weekly
   open-pull-requests-limit: 2
@@ -57,37 +42,7 @@ updates:
 # Debian Linux
 
 - package-ecosystem: docker
-  directory: "17/debian/bookworm/hotspot"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 2
-  target-branch: master
-  reviewers:
-  - MarkEWaite
-  - slide
-  labels:
-  - dependencies
-  ignore:
-  # Ignore proposals to update to new versions of Java because updatecli takes care of that.
-  - dependency-name: "eclipse-temurin"
-
-- package-ecosystem: docker
-  directory: "17/debian/bookworm-slim/hotspot"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 2
-  target-branch: master
-  reviewers:
-  - MarkEWaite
-  - slide
-  labels:
-  - dependencies
-  ignore:
-  # Ignore proposals to update to new versions of Java because updatecli takes care of that.
-  - dependency-name: "eclipse-temurin"
-
-- package-ecosystem: docker
-  directory: "11/debian/bookworm/hotspot"
+  directory: "debian/bookworm/hotspot"
   schedule:
     interval: weekly
   open-pull-requests-limit: 2
@@ -102,7 +57,7 @@ updates:
   - dependency-name: "eclipse-temurin"
 
 - package-ecosystem: docker
-  directory: "11/debian/bookworm-slim/hotspot"
+  directory: "debian/bookworm-slim/hotspot"
   schedule:
     interval: weekly
   open-pull-requests-limit: 2
@@ -119,7 +74,7 @@ updates:
 # RHEL UBI
 
 - package-ecosystem: docker
-  directory: "11/rhel/ubi8/hotspot"
+  directory: "rhel/ubi8/hotspot"
   schedule:
     interval: weekly
   open-pull-requests-limit: 2
@@ -134,7 +89,7 @@ updates:
   - dependency-name: "eclipse-temurin"
 
 - package-ecosystem: docker
-  directory: "17/rhel/ubi9/hotspot"
+  directory: "rhel/ubi9/hotspot"
   schedule:
     interval: weekly
   open-pull-requests-limit: 2

.github/release-drafter.yml

@@ -8,6 +8,6 @@ template: |
   <!-- Optional: add a release summary here -->
   ## 📦 Jenkins Core updates
 
-  * Update to Jenkins $NEXT_MINOR_VERSION ([changelog](https://jenkins.io/changelog-stable/#v$NEXT_MINOR_VERSION))
+  * Update to Jenkins $NEXT_MINOR_VERSION ([changelog](https://www.jenkins.io/changelog/$NEXT_MINOR_VERSION))
 
   $CHANGES

.github/workflows/release-drafter.yml

@@ -14,6 +14,6 @@ jobs:
     if: github.repository_owner == 'jenkinsci'
     steps:
       # Drafts your next Release notes as Pull Requests are merged into the default branch
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sync-plugin-manager.yml

@@ -59,7 +59,7 @@ jobs:
 
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         if: ${{ steps.update.outputs.available == 'true' }}
         with:
           token: ${{ steps.generate-token.outputs.token }}

.github/workflows/updatecli.yaml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@v2.54.0
+        uses: updatecli/updatecli-action@v2.61.0
 
       - name: Run Updatecli in Dry Run mode
         run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml