From 4ef9f029937d84711624f5e494c7b54cbe73ba2b Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Fri, 11 Apr 2025 10:17:56 +0100 Subject: [PATCH] [OPENJDK-3696] Remove JDK11 modules/descriptors Signed-off-by: Jonathan Dowland --- .github/workflows/ubi9-openjdk-11-runtime.yml | 10 --- .github/workflows/ubi9-openjdk-11.yml | 10 --- .../jboss/container/openjdk/jdk/jvm-options | 10 --- modules/jdk/11/configure.sh | 30 --------- modules/jdk/11/module.yaml | 36 ----------- .../jboss/container/openjdk/jre/jvm-options | 10 --- modules/jre/11/configure.sh | 20 ------ modules/jre/11/module.yaml | 36 ----------- modules/maven/11/configure.sh | 12 ---- modules/maven/11/module.yaml | 21 ------- redhat/ubi9-openjdk-11-runtime.yaml | 31 ---------- redhat/ubi9-openjdk-11.yaml | 33 ---------- ubi9-openjdk-11-runtime.yaml | 59 ------------------ ubi9-openjdk-11.yaml | 62 ------------------- 14 files changed, 380 deletions(-) delete mode 100644 .github/workflows/ubi9-openjdk-11-runtime.yml delete mode 100644 .github/workflows/ubi9-openjdk-11.yml delete mode 100644 modules/jdk/11/artifacts/opt/jboss/container/openjdk/jdk/jvm-options delete mode 100755 modules/jdk/11/configure.sh delete mode 100644 modules/jdk/11/module.yaml delete mode 100644 modules/jre/11/artifacts/opt/jboss/container/openjdk/jre/jvm-options delete mode 100755 modules/jre/11/configure.sh delete mode 100644 modules/jre/11/module.yaml delete mode 100755 modules/maven/11/configure.sh delete mode 100644 modules/maven/11/module.yaml delete mode 100644 redhat/ubi9-openjdk-11-runtime.yaml delete mode 100644 redhat/ubi9-openjdk-11.yaml delete mode 100644 ubi9-openjdk-11-runtime.yaml delete mode 100644 ubi9-openjdk-11.yaml diff --git a/.github/workflows/ubi9-openjdk-11-runtime.yml b/.github/workflows/ubi9-openjdk-11-runtime.yml deleted file mode 100644 index 18f225a0..00000000 --- a/.github/workflows/ubi9-openjdk-11-runtime.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: UBI9 OpenJDK 11 Runtime S2I Image CI -on: [push, pull_request] -env: - LANG: en_US.UTF-8 - IMAGE: ubi9-openjdk-11-runtime -jobs: - call-openjdkci: - uses: ./.github/workflows/image-workflow-template.yml - with: - image: ubi9-openjdk-11-runtime diff --git a/.github/workflows/ubi9-openjdk-11.yml b/.github/workflows/ubi9-openjdk-11.yml deleted file mode 100644 index 1d0c6429..00000000 --- a/.github/workflows/ubi9-openjdk-11.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: UBI9 OpenJDK 11 S2I Image CI -on: [push, pull_request] -env: - LANG: en_US.UTF-8 - IMAGE: ubi9-openjdk-11 -jobs: - call-openjdkci: - uses: ./.github/workflows/image-workflow-template.yml - with: - image: ubi9-openjdk-11 diff --git a/modules/jdk/11/artifacts/opt/jboss/container/openjdk/jdk/jvm-options b/modules/jdk/11/artifacts/opt/jboss/container/openjdk/jdk/jvm-options deleted file mode 100644 index 8b5b09c7..00000000 --- a/modules/jdk/11/artifacts/opt/jboss/container/openjdk/jdk/jvm-options +++ /dev/null @@ -1,10 +0,0 @@ - -#!/bin/sh -# ============================================================================== -# JDK specific customizations -# -# ============================================================================== - -function jvm_specific_diagnostics() { - echo "-Xlog:gc::utctime -XX:NativeMemoryTracking=summary -XX:+UnlockDiagnosticVMOptions -XX:+PrintNMTStatistics -verbose:gc" -} diff --git a/modules/jdk/11/configure.sh b/modules/jdk/11/configure.sh deleted file mode 100755 index 635b0cf6..00000000 --- a/modules/jdk/11/configure.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# Configure module -set -e - -SCRIPT_DIR=$(dirname $0) -ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts - -chown -R $USER:root $SCRIPT_DIR -chmod -R ug+rwX $SCRIPT_DIR -chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/* - -pushd ${ARTIFACTS_DIR} -cp -pr * / -popd - -# Set this JDK as the alternative in use -_arch="$(uname -i)" -alternatives --set java java-11-openjdk.${_arch} -alternatives --set javac java-11-openjdk.${_arch} -alternatives --set java_sdk_openjdk java-11-openjdk.${_arch} -alternatives --set jre_openjdk java-11-openjdk.${_arch} - -# Update securerandom.source for quicker starts (must be done after removing jdk 8, or it will hit the wrong files) -JAVA_SECURITY_FILE=/usr/lib/jvm/java/conf/security/java.security -SECURERANDOM=securerandom.source -if grep -q "^$SECURERANDOM=.*" $JAVA_SECURITY_FILE; then - sed -i "s|^$SECURERANDOM=.*|$SECURERANDOM=file:/dev/urandom|" $JAVA_SECURITY_FILE -else - echo $SECURERANDOM=file:/dev/urandom >> $JAVA_SECURITY_FILE -fi diff --git a/modules/jdk/11/module.yaml b/modules/jdk/11/module.yaml deleted file mode 100644 index 8c9e50bc..00000000 --- a/modules/jdk/11/module.yaml +++ /dev/null @@ -1,36 +0,0 @@ -schema_version: 1 - -name: "jboss.container.openjdk.jdk" -description: "Installs the JDK for OpenJDK 11." -version: "11" - -labels: -- name: "org.jboss.product" - value: "openjdk" -- name: "org.jboss.product.version" - value: "11" -- name: "org.jboss.product.openjdk.version" - value: "11" - -envs: -- name: "JAVA_HOME" - value: "/usr/lib/jvm/java-11" -- name: "JAVA_VENDOR" - value: "openjdk" -- name: "JAVA_VERSION" - value: "11" -- name: JBOSS_CONTAINER_OPENJDK_JDK_MODULE - value: /opt/jboss/container/openjdk/jdk - -packages: - install: - - java-11-openjdk-devel - - tzdata-java - -modules: - install: - - name: jboss.container.user - - name: jboss.container.openjdk - -execute: -- script: configure.sh diff --git a/modules/jre/11/artifacts/opt/jboss/container/openjdk/jre/jvm-options b/modules/jre/11/artifacts/opt/jboss/container/openjdk/jre/jvm-options deleted file mode 100644 index a6a96dcb..00000000 --- a/modules/jre/11/artifacts/opt/jboss/container/openjdk/jre/jvm-options +++ /dev/null @@ -1,10 +0,0 @@ - -#!/bin/sh -# ============================================================================== -# JDK specific customizations -# -# ============================================================================== - -function jvm_specific_diagnostics() { - echo "-Xlog:gc::utctime -XX:NativeMemoryTracking=summary" -} diff --git a/modules/jre/11/configure.sh b/modules/jre/11/configure.sh deleted file mode 100755 index 0e528ec8..00000000 --- a/modules/jre/11/configure.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# Configure module -set -e - -SCRIPT_DIR=$(dirname $0) -echo $SCRIPT_DIR -ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts -echo $ARTIFACTS_DIR - -chown -R $USER:root $SCRIPT_DIR -chmod -R ug+rwX $SCRIPT_DIR -chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jre/* - -pushd ${ARTIFACTS_DIR} -cp -pr * / -popd - -# Set this JDK as the alternative in use -_arch="$(uname -i)" -alternatives --set java java-11-openjdk.${_arch} diff --git a/modules/jre/11/module.yaml b/modules/jre/11/module.yaml deleted file mode 100644 index aa6ad0ff..00000000 --- a/modules/jre/11/module.yaml +++ /dev/null @@ -1,36 +0,0 @@ -schema_version: 1 - -name: "jboss.container.openjdk.jre" -description: "Installs only the JRE headless for OpenJDK 11." -version: "11" - -labels: -- name: "org.jboss.product" - value: "openjdk" -- name: "org.jboss.product.version" - value: "11" -- name: "org.jboss.product.openjdk.version" - value: "11" - -envs: -- name: "JAVA_HOME" - value: "/usr/lib/jvm/jre" -- name: "JAVA_VENDOR" - value: "openjdk" -- name: "JAVA_VERSION" - value: "11" -- name: JBOSS_CONTAINER_OPENJDK_JRE_MODULE - value: /opt/jboss/container/openjdk/jre - -packages: - install: - - java-11-openjdk-headless - - tzdata-java - -modules: - install: - - name: jboss.container.user - - name: jboss.container.openjdk - -execute: -- script: configure.sh diff --git a/modules/maven/11/configure.sh b/modules/maven/11/configure.sh deleted file mode 100755 index 84da8a53..00000000 --- a/modules/maven/11/configure.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e - -# This file is shipped by a Maven package and sets JAVA_HOME to -# an OpenJDK-specific path. This causes problems for OpenJ9 containers -# as the path is not correct for them. We don't need this in any of -# the containers because we set JAVA_HOME in the container metadata. -# Blank the file rather than removing it, to avoid a warning message -# from /usr/bin/mvn. -if [ -f /etc/java/maven.conf ]; then - :> /etc/java/maven.conf -fi diff --git a/modules/maven/11/module.yaml b/modules/maven/11/module.yaml deleted file mode 100644 index ff0583dd..00000000 --- a/modules/maven/11/module.yaml +++ /dev/null @@ -1,21 +0,0 @@ -schema_version: 1 -name: jboss.container.maven -version: '3.8.11' -description: Provides Maven v3.8 capabilities to an image. - -envs: -- name: JBOSS_CONTAINER_MAVEN_38_MODULE - value: /opt/jboss/container/maven/38/ -- name: MAVEN_VERSION - value: "3.8" - -modules: - install: - - name: jboss.container.maven.module - -packages: - install: - - maven-openjdk11 - -execute: -- script: configure.sh diff --git a/redhat/ubi9-openjdk-11-runtime.yaml b/redhat/ubi9-openjdk-11-runtime.yaml deleted file mode 100644 index 8262a1c5..00000000 --- a/redhat/ubi9-openjdk-11-runtime.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# This OSBS Base Image is designed and engineered to be the base layer for -# Red Hat products. This base image is only supported for approved Red Hat -# products. This image is maintained by Red Hat and updated regularly. -from: registry.redhat.io/rhel9-osbs/osbs-ubi9-minimal -osbs: - configuration: - container: - compose: - pulp_repos: true - packages: - - java-11-openjdk-headless - signing_intent: release - repository: - name: containers/openjdk - branch: openjdk-11-runtime-ubi9 - -packages: - manager: microdnf - content_sets: - x86_64: - - rhel-9-for-x86_64-baseos-rpms - - rhel-9-for-x86_64-appstream-rpms - ppc64le: - - rhel-9-for-ppc64le-baseos-rpms - - rhel-9-for-ppc64le-appstream-rpms - aarch64: - - rhel-9-for-aarch64-baseos-rpms - - rhel-9-for-aarch64-appstream-rpms - s390x: - - rhel-9-for-s390x-baseos-rpms - - rhel-9-for-s390x-appstream-rpms diff --git a/redhat/ubi9-openjdk-11.yaml b/redhat/ubi9-openjdk-11.yaml deleted file mode 100644 index 69138b38..00000000 --- a/redhat/ubi9-openjdk-11.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# This OSBS Base Image is designed and engineered to be the base layer for -# Red Hat products. This base image is only supported for approved Red Hat -# products. This image is maintained by Red Hat and updated regularly. -from: registry.redhat.io/rhel9-osbs/osbs-ubi9-minimal -osbs: - configuration: - container: - compose: - pulp_repos: true - packages: - - java-11-openjdk - - java-11-openjdk-devel - - java-11-openjdk-headless - signing_intent: release - repository: - name: containers/openjdk - branch: openjdk-11-ubi9 - -packages: - manager: microdnf - content_sets: - x86_64: - - rhel-9-for-x86_64-baseos-rpms - - rhel-9-for-x86_64-appstream-rpms - ppc64le: - - rhel-9-for-ppc64le-baseos-rpms - - rhel-9-for-ppc64le-appstream-rpms - aarch64: - - rhel-9-for-aarch64-baseos-rpms - - rhel-9-for-aarch64-appstream-rpms - s390x: - - rhel-9-for-s390x-baseos-rpms - - rhel-9-for-s390x-appstream-rpms diff --git a/ubi9-openjdk-11-runtime.yaml b/ubi9-openjdk-11-runtime.yaml deleted file mode 100644 index 9da045d2..00000000 --- a/ubi9-openjdk-11-runtime.yaml +++ /dev/null @@ -1,59 +0,0 @@ -# This is an Image descriptor for Cekit - -schema_version: 1 - -from: "registry.access.redhat.com/ubi9/ubi-minimal" -name: &name "ubi9/openjdk-11-runtime" -version: &version "1.21" -description: "Image for Red Hat OpenShift providing OpenJDK 11 runtime" - -labels: -- name: "io.k8s.description" - value: "Platform for running plain Java applications (fat-jar and flat classpath)" -- name: "io.k8s.display-name" - value: "Java Applications" -- name: "io.openshift.tags" - value: "java" -- name: "maintainer" - value: "Red Hat OpenJDK " -- name: "com.redhat.component" - value: "openjdk-11-runtime-ubi9-container" -- name: "usage" - value: &docs "https://rh-openjdk.github.io/redhat-openjdk-containers/" -- name: "com.redhat.license_terms" - value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" -- name: "org.opencontainers.image.documentation" - value: *docs -- name: "name" - value: *name -- name: "version" - value: *version - -envs: -- name: "JBOSS_IMAGE_NAME" - value: *name -- name: "JBOSS_IMAGE_VERSION" - value: *version -- name: "LANG" - value: "C.utf8" - -ports: -- value: 8080 -- value: 8443 - -modules: - repositories: - - path: modules - install: - - name: jboss.container.util.pkg-update - - name: jboss.container.tar - - name: jboss.container.openjdk.jre - version: "11" - - name: jboss.container.util.tzdata - - name: jboss.container.java.jre.run - -help: - add: true - -packages: - manager: microdnf diff --git a/ubi9-openjdk-11.yaml b/ubi9-openjdk-11.yaml deleted file mode 100644 index 2d7db8e7..00000000 --- a/ubi9-openjdk-11.yaml +++ /dev/null @@ -1,62 +0,0 @@ -# This is an Image descriptor for Cekit - -schema_version: 1 - -from: "registry.access.redhat.com/ubi9/ubi-minimal" -name: &name "ubi9/openjdk-11" -version: &version "1.21" -description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 11" - -labels: -- name: "io.k8s.description" - value: "Platform for building and running plain Java applications (fat-jar and flat classpath)" -- name: "io.k8s.display-name" - value: "Java Applications" -- name: "io.openshift.tags" - value: "builder,java" -- name: "maintainer" - value: "Red Hat OpenJDK " -- name: "com.redhat.component" - value: "openjdk-11-ubi9-container" -- name: "usage" - value: &docs "https://rh-openjdk.github.io/redhat-openjdk-containers/" -- name: "com.redhat.license_terms" - value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" -- name: "org.opencontainers.image.documentation" - value: *docs -- name: "name" - value: *name -- name: "version" - value: *version - -envs: -- name: PATH - value: $PATH:"/usr/local/s2i" -- name: "JBOSS_IMAGE_NAME" - value: *name -- name: "JBOSS_IMAGE_VERSION" - value: *version -- name: "LANG" - value: "C.utf8" - -ports: -- value: 8080 -- value: 8443 - -modules: - repositories: - - path: modules - install: - - name: jboss.container.util.pkg-update - - name: jboss.container.openjdk.jdk - version: "11" - - name: jboss.container.maven - version: "3.8.11" - - name: jboss.container.util.tzdata - - name: jboss.container.java.s2i.bash - -help: - add: true - -packages: - manager: microdnf