Remove Java 11 support

.github/dependabot.yml

@@ -2,18 +2,6 @@
 version: 2
 updates:
 
-# Arch Linux
-- package-ecosystem: docker
-  directory: "archlinux"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 2
-  target-branch: master
-  reviewers:
-  - MarkEWaite
-  labels:
-  - dependencies
-
 # GitHub actions
 - package-ecosystem: "github-actions"
   target-branch: master

Makefile

@@ -20,7 +20,7 @@ bake_base_cli := docker buildx bake --file docker-bake.hcl
 bake_cli := $(bake_base_cli) --load
 
 .PHONY: build
-.PHONY: test test-alpine test-archlinux test-debian test-jdk11 test-jdk11-alpine
+.PHONY: test test-alpine test-debian
 
 check-reqs:
 ## Build requirements

README.md

@@ -30,19 +30,14 @@ If you want to see the target images (matching your current architecture) that w
 
 ```bash
 $ make list
-agent_alpine_jdk11
 agent_alpine_jdk17
 agent_alpine_jdk21
-agent_archlinux_jdk11
-agent_debian_jdk11
 agent_debian_jdk17
 agent_debian_jdk21
 agent_rhel_ubi9_jdk17
 agent_rhel_ubi9_jdk21
-inbound-agent_alpine_jdk11
 inbound-agent_alpine_jdk17
 inbound-agent_alpine_jdk21
-inbound-agent_debian_jdk11
 inbound-agent_debian_jdk17
 inbound-agent_debian_jdk21
 inbound-agent_rhel_ubi9_jdk17
@@ -110,20 +105,16 @@ $ make show
   "group": {
     "alpine": {
       "targets": [
-        "agent_alpine_jdk11",
         "agent_alpine_jdk17",
         "agent_alpine_jdk21",
-        "inbound-agent_alpine_jdk11",
         "inbound-agent_alpine_jdk17",
         "inbound-agent_alpine_jdk21"
       ]
     },
     "debian": {
       "targets": [
-        "agent_debian_jdk11",
         "agent_debian_jdk17",
         "agent_debian_jdk21",
-        "inbound-agent_debian_jdk11",
         "inbound-agent_debian_jdk17",
         "inbound-agent_debian_jdk21"
       ]
@@ -135,7 +126,6 @@ $ make show
     },
     "linux": {
       "targets": [
-        "agent_archlinux_jdk11",
         "alpine",
         "debian",
         "rhel_ubi9"
@@ -151,19 +141,23 @@ $ make show
     }
   },
   "target": {
-    "agent_alpine_jdk11": {
+    "agent_alpine_jdk17": {
       "context": ".",
       "dockerfile": "alpine/Dockerfile",
       "args": {
-        "ALPINE_TAG": "3.20.1",
-        "JAVA_VERSION": "11.0.23_9",
-        "VERSION": "3256.v88a_f6e922152"
+        "ALPINE_TAG": "3.20.3",
+        "JAVA_VERSION": "17.0.12_7",
+        "VERSION": "3261.v9c670a_4748a_9"
       },
       "tags": [
-        "docker.io/jenkins/agent:alpine-jdk11",
-        "docker.io/jenkins/agent:alpine3.20-jdk11",
-        "docker.io/jenkins/agent:latest-alpine-jdk11",
-        "docker.io/jenkins/agent:latest-alpine3.20-jdk11"
+        "docker.io/jenkins/agent:alpine",
+        "docker.io/jenkins/agent:alpine3.20",
+        "docker.io/jenkins/agent:latest-alpine",
+        "docker.io/jenkins/agent:latest-alpine3.20",
+        "docker.io/jenkins/agent:alpine-jdk17",
+        "docker.io/jenkins/agent:alpine3.20-jdk17",
+        "docker.io/jenkins/agent:latest-alpine-jdk17",
+        "docker.io/jenkins/agent:latest-alpine3.20-jdk17"
       ],
       "target": "agent",
       "platforms": [

README_agent.md

@@ -43,7 +43,7 @@ docker run -i --rm --name agent1 --init -v agent1-workdir:/home/jenkins/agent je
 Call example for Windows Containers:
 
 ```powershell
-docker run -i --rm --name agent1 --init -v agent1-workdir:C:/Users/jenkins/Work jenkins/agent:jdk11-windowsservercore-ltsc2019 java -jar C:/ProgramData/Jenkins/agent.jar -workDir C:/Users/jenkins/Work
+docker run -i --rm --name agent1 --init -v agent1-workdir:C:/Users/jenkins/Work jenkins/agent:jdk17-windowsservercore-ltsc2019 java -jar C:/ProgramData/Jenkins/agent.jar -workDir C:/Users/jenkins/Work
 ```
 
 ## Configurations
@@ -83,33 +83,13 @@ The image has several supported configurations, which can be accessed via the fo
     * rhel-ubi9 (Based on Red Hat Universal Base Image 9)
       * `jenkins/agent:rhel-ubi9-jdk21`
       * `jenkins/agent:latest-rhel-ubi9-jdk21`
-  * Java 11:
-    * bookworm (Based on `debian:bookworm-${builddate}`):
-      * `jenkins/agent:bookworm`
-      * `jenkins/agent:bookworm-jdk11`
-      * `jenkins/agent:jdk11`
-      * `jenkins/agent:latest-bookworm-jdk11`
-    * alpine (Small image based on Alpine Linux, based on `alpine:${version}`):
-      * `jenkins/agent:alpine` 
-      * `jenkins/agent:alpine-jdk11`
-      * `jenkins/agent:latest-alpine`
-      * `jenkins/agent:latest-alpine-jdk11`
-    * archlinux (Image based on Arch Linux, based on `archlinux:latest`):
-      * `jenkins/agent:archlinux`
-      * `jenkins/agent:archlinux-jdk11`
-      * `jenkins/agent:latest-archlinux`
-      * `jenkins/agent:latest-archlinux-jdk11`
 
 * Windows Images:
   * Java 17 (default):
     * Latest Jenkins agent version on Windows Nano Server and Java 17:
       * `jenkins/agent:jdk17-nanoserver-1809`
       * `jenkins/agent:jdk17-nanoserver-ltsc2019`
       * `jenkins/agent:jdk17-nanoserver-ltsc2022`
-    * Latest Jenkins agent version on Windows Server Core with Java 11:
-      * `jenkins/agent:jdk17-windowsservercore-1809`
-      * `jenkins/agent:jdk17-windowsservercore-ltsc2019`
-      * `jenkins/agent:jdk17-windowsservercore-ltsc2022`
   * Java 21:
     * Latest Jenkins agent version on Windows Nano Server and Java 21:
       * `jenkins/agent:jdk21-nanoserver-1809`
@@ -119,15 +99,6 @@ The image has several supported configurations, which can be accessed via the fo
       * `jenkins/agent:jdk21-windowsservercore-1809`
       * `jenkins/agent:jdk21-windowsservercore-ltsc2019`
       * `jenkins/agent:jdk21-windowsservercore-ltsc2022`
-  * Java 11:
-    * Latest Jenkins agent version on Windows Nano Server and Java 11:
-      * `jenkins/agent:jdk11-nanoserver-1809`
-      * `jenkins/agent:jdk11-nanoserver-ltsc2019`
-      * `jenkins/agent:jdk11-nanoserver-ltsc2022`
-    * Latest Jenkins agent version on Windows Server Core with Java 11:
-      * `jenkins/agent:jdk11-windowsservercore-1809`
-      * `jenkins/agent:jdk11-windowsservercore-ltsc2019`
-      * `jenkins/agent:jdk11-windowsservercore-ltsc2022`
 
 The file [docker-bake.hcl](https://github.com/jenkinsci/docker-agent/blob/master/docker-bake.hcl) defines all the configuration for Linux images and their associated tags.
 

adoptium-get-jdk-link.sh

@@ -74,17 +74,17 @@ for ARCH in ${ARCHS}; do
     URL="https://api.adoptium.net/v3/binary/version/jdk-${ENCODED_ARCHIVE_DIRECTORY}/${OS_TYPE}/${ARCH}/jdk/hotspot/normal/eclipse?project=jdk"
 
     if ! RESPONSE=$(curl --fail --silent --show-error --retry 5 --retry-connrefused --head "${URL}"); then
-        echo "Error: Failed to fetch the URL for architecture ${ARCH}. Exiting with status 1." >&2
+        echo "Error: Failed to fetch the URL for architecture ${ARCH} for ${URL}. Exiting with status 1." >&2
         echo "Response: ${RESPONSE}" >&2
         exit 1
     fi
 
     # Extract the redirect URL from the HTTP response
-    REDIRECTED_URL=$(echo "${RESPONSE}" | grep Location | awk '{print $2}' | tr -d '\r')
+    REDIRECTED_URL=$(echo "${RESPONSE}" | grep -i location | awk '{print $2}' | tr -d '\r')
 
     # If no redirect URL was found, exit the script with an error message
     if [ -z "${REDIRECTED_URL}" ]; then
-        echo "Error: No redirect URL found for architecture ${ARCH}. Exiting with status 1." >&2
+        echo "Error: No redirect URL found for architecture ${ARCH} for ${URL}. Exiting with status 1." >&2
         echo "Response: ${RESPONSE}" >&2
         exit 1
     fi

alpine/Dockerfile

@@ -42,16 +42,14 @@ RUN apk add --no-cache \
 ENV PATH="/opt/jdk-${JAVA_VERSION}/bin:${PATH}"
 
 RUN case "$(jlink --version 2>&1)" in \
-      # jlink version 11 has less features than JDK17+
-      "11."*) set -- "--strip-debug" "--compress=2" ;; \
-      "17."*) set -- "--strip-java-debug-attributes" "--compress=2" ;; \
+      "17."*) set -- "--compress=2" ;; \
       # the compression argument is different for JDK21
-      "21."*) set -- "--strip-java-debug-attributes" "--compress=zip-6" ;; \
+      "21."*) set -- "--compress=zip-6" ;; \
       *) echo "ERROR: unmanaged jlink version pattern" && exit 1 ;; \
     esac; \
     jlink \
+      --strip-java-debug-attributes \
       "$1" \
-      "$2" \
       --add-modules ALL-MODULE-PATH \
       --no-man-pages \
       --no-header-files \

debian/Dockerfile

@@ -47,16 +47,14 @@ ENV PATH="/opt/jdk-${JAVA_VERSION}/bin:${PATH}"
 # while still saving space (approx 200mb from the full distribution)
 RUN if [[ "${TARGETPLATFORM}" != "linux/arm/v7" ]]; then \
     case "$(jlink --version 2>&1)" in \
-      # jlink version 11 has less features than JDK17+
-      "11."*) set -- "--strip-debug" "--compress=2" ;; \
-      "17."*) set -- "--strip-java-debug-attributes" "--compress=2" ;; \
+      "17."*) set -- "--compress=2" ;; \
       # the compression argument is different for JDK21
-      "21."*) set -- "--strip-java-debug-attributes" "--compress=zip-6" ;; \
+      "21."*) set -- "--compress=zip-6" ;; \
       *) echo "ERROR: unmanaged jlink version pattern" && exit 1 ;; \
     esac; \
     jlink \
+      --strip-java-debug-attributes \
       "$1" \
-      "$2" \
       --add-modules ALL-MODULE-PATH \
       --no-man-pages \
       --no-header-files \