diff --git a/.github/workflows/cacert-publish.yml b/.github/workflows/cacert-publish.yml index 5289c96c6..90678aadc 100644 --- a/.github/workflows/cacert-publish.yml +++ b/.github/workflows/cacert-publish.yml @@ -71,7 +71,7 @@ jobs: - name: Upload deb file to Artifactory if: steps.check-deb.outputs.file_exists == 'false' run: | - DISTRO_LIST="trixie,bookworm,buster,noble,jammy,focal,bionic" + DISTRO_LIST="trixie,bookworm,buster,oracular,noble,jammy,focal,bionic" FILE=$(ls ca-certificates/debian/build/ospackage/*.deb) # Upload cacerts deb file jf rt u "$FILE" "deb/pool/main/a/adoptium-ca-certificates/$(basename ${FILE})" --flat=true diff --git a/docs/Guide_To_The_Linux_Installers.md b/docs/Guide_To_The_Linux_Installers.md index 2046be792..d7dcb068b 100644 --- a/docs/Guide_To_The_Linux_Installers.md +++ b/docs/Guide_To_The_Linux_Installers.md @@ -45,7 +45,7 @@ Supported Linux Distros: Distribution Type| Supported Versions ----------|--------- Apk (Alpine)| All supported version. -Deb (Debian)| Trixie (Debian 13)
Bookworm (Debian 12)
Bullseye (Debian 11)
Buster (Debian 10)
Noble (Ubuntu 24.04)
Jammy (Ubuntu 24.04)
Focal (Ubuntu 20.04)
Bionic (Ubuntu 18.04) +Deb (Debian)| Trixie (Debian 13)
Bookworm (Debian 12)
Bullseye (Debian 11)
Buster (Debian 10)
Oracular (Ubuntu 24.10)
Noble (Ubuntu 24.04)
Jammy (Ubuntu 22.04)
Focal (Ubuntu 20.04)
Bionic (Ubuntu 18.04) RPM (RHEL)| centos 7
rocky 8
RHEL7 , RHEL8 & RHEL9
Fedora 35, 36, 37, 38 ,39 , 40
Oracle Linux 7 & 8
Amazon Linux 2 RPM(SUSE) | Opensuse 15.3
Opensuse 15.4
Opensuse 15.5
SLES 12
SLES15 @@ -429,6 +429,7 @@ For Debian based distributions a similar process is required, firstly add the di "bookworm", // Debian/12 "bullseye", // Debian/11 "buster", // Debian/10 + "oracular", // Ubuntu/24.10 (STS) "noble", // Ubuntu/24.04 (LTS) "jammy", // Ubuntu/22.04 (LTS) "focal", // Ubuntu/20.04 (LTS) @@ -446,7 +447,7 @@ In addition to the updates detailed above, it is also important to change the fo the following line should be changed : ``` -debVersionList="trixie bookworm bullseye buster noble jammy focal bionic" +debVersionList="trixie bookworm bullseye buster oracular noble jammy focal bionic" ``` And similarly in the following two files @@ -463,6 +464,7 @@ The array needs to be updated to add or remove distributions as necessary as sho Arguments.of("debian", "bookworm"), // Debian/12 (testing) Arguments.of("debian", "bullseye"), // Debian/11 (stable) Arguments.of("debian", "buster"), // Debian/10 (oldstable) + Arguments.of("ubuntu", "oracular"), // Ubuntu/24.10 (STS) Arguments.of("ubuntu", "noble"), // Ubuntu/24.04 (LTS) Arguments.of("ubuntu", "jammy"), // Ubuntu/22.04 (LTS) Arguments.of("ubuntu", "focal"), // Ubuntu/20.04 (LTS) @@ -486,7 +488,7 @@ Simply add or remove the supported distributions to the debVersionList li - name: Upload deb file to Artifactory if: steps.check-deb.outputs.file_exists == 'false' run: | - debVersionList=("bookworm" "bullseye" "buster" "jammy" "focal" "bionic") + debVersionList=("bookworm" "bullseye" "buster" "oracular" "jammy" "focal" "bionic") for debVersion in "${debVersionList[@]}"; do distroList+="deb.distribution=${debVersion};" done @@ -503,14 +505,15 @@ Again, new distributions should be added or removed in the array. ``` def deb_versions = [ - "trixie", // Debian/13 + "trixie", // Debian/13 "bookworm", // Debian/12 "bullseye", // Debian/11 "buster", // Debian/10 + "oracular" // Ubuntu/24.10 (STS) "noble", // Ubuntu/24.04 (LTS) "jammy", // Ubuntu/22.04 (LTS) "focal", // Ubuntu/20.04 (LTS) - "bionic" // Ubuntu/18.04 (LTS) + "bionic" // Ubuntu/18.04 (LTS) ] ``` @@ -537,13 +540,13 @@ In addition to the previous changes, the automated test source code also needs u linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/AptOperationsTest.java ``` -This file requires that the .contains("Version: 1.0.3-1") line be updated to reflect the new version number added to the changelog above. +This file requires that the .contains("Version: 1.0.4-1") line be updated to reflect the new version number added to the changelog above. ``` result = runShell(container, "apt-cache show adoptium-ca-certificates"); assertThat(result.getExitCode()).isEqualTo(0); assertThat(result.getStdout()) .contains("Package: adoptium-ca-certificates") - .contains("Version: 1.0.3-1") + .contains("Version: 1.0.4-1") .contains("Priority: optional") .contains("Architecture: all") .contains("Status: install ok installed"); diff --git a/linux/Jenkinsfile b/linux/Jenkinsfile index 87b9716fc..5a2179ddb 100644 --- a/linux/Jenkinsfile +++ b/linux/Jenkinsfile @@ -523,19 +523,21 @@ def uploadDebArtifacts(String buildArch, String Version) { echo "Debian Architecture Upload List = ${debArchList}" /* - Debian/Ubuntu 10.0 11.0 16.04 20.04 22.04 22.10 24.04 + Debian 10.0 11.0 12.0 + Ubuntu 18.04 20.04 22.04 24.04 24.10 add more into list when available for release also update linux/{jdk,jre}/debian/main/packing/build.sh */ def deb_versions = [ - "trixie", // Debian/13 + "trixie", // Debian/13 "bookworm", // Debian/12 "bullseye", // Debian/11 "buster", // Debian/10 + "oracular", // Ubuntu/24.10 (STS) "noble", // Ubuntu/24.04 (LTS) "jammy", // Ubuntu/22.04 (LTS) "focal", // Ubuntu/20.04 (LTS) - "bionic" // Ubuntu/18.04 (LTS) + "bionic" // Ubuntu/18.04 (LTS) ] def distro_list = '' deb_versions.each { deb_version -> diff --git a/linux/README.md b/linux/README.md index 0f56d907a..dd1b952b8 100644 --- a/linux/README.md +++ b/linux/README.md @@ -202,6 +202,8 @@ Supported platform amd64, arm64, armhf, ppc64le, s390x (s390x is only available | debian/12 (bookworm/testing) | x86_64 | | | debian/11 (bullseye/stable) | x86_64 | | | debian/10 (buster/oldstable) | x86_64 | | +| ubuntu/24.10 (oracular) | x86_64 | | +| ubuntu/24.04 (noble) | x86_64 | | | ubuntu/22.04 (jammy) | x86_64 | | | ubuntu/20.04 (focal) | x86_64 | | | ubuntu/18.04 (bionic) | x86_64 | | diff --git a/linux/ca-certificates/debian/build.gradle b/linux/ca-certificates/debian/build.gradle index 69c6b24cc..e0c6dc1b0 100644 --- a/linux/ca-certificates/debian/build.gradle +++ b/linux/ca-certificates/debian/build.gradle @@ -29,6 +29,7 @@ def deb_versions = [ "bookworm", // Debian/12 "bullseye", // Debian/11 "buster", // Debian/10 + "oracular", // Ubuntu/24.10 (STS) "noble", // Ubuntu/24.04 (LTS) "jammy", // Ubuntu/22.04 (LTS) "focal", // Ubuntu/20.04 (LTS) diff --git a/linux/ca-certificates/debian/src/main/packaging/debian/changelog b/linux/ca-certificates/debian/src/main/packaging/debian/changelog index c6bf0fa9e..d4d87204c 100644 --- a/linux/ca-certificates/debian/src/main/packaging/debian/changelog +++ b/linux/ca-certificates/debian/src/main/packaging/debian/changelog @@ -1,3 +1,9 @@ +adoptium-ca-certificates (1.0.4-1) STABLE; urgency=medium + + * Add Ubuntu Oracular Oriole to the list of supported releases. + + -- Eclipse Adoptium Package Maintainers Thu, 16 December 2024 12:00:00 +0000 + adoptium-ca-certificates (1.0.3-1) STABLE; urgency=medium * Add Debian Trixie & Ubuntu Noble to the list of supported releases. diff --git a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/AptOperationsTest.java b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/AptOperationsTest.java index 06a4bf87d..e953fbc4d 100644 --- a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/AptOperationsTest.java +++ b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/AptOperationsTest.java @@ -60,7 +60,7 @@ void packageSuccessfullyInstalled(String distribution, String codename) { assertThat(result.getExitCode()).isEqualTo(0); assertThat(result.getStdout()) .contains("Package: adoptium-ca-certificates") - .contains("Version: 1.0.3-1") + .contains("Version: 1.0.4-1") .contains("Priority: optional") .contains("Architecture: all") .contains("Status: install ok installed"); diff --git a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java index 817837235..43346b268 100644 --- a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java +++ b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java @@ -36,6 +36,7 @@ class ChangesVerificationTest { "bookworm", // Debian/12 "bullseye", // Debian/11 "buster", // Debian/10 + "oracular", // Ubuntu/24.10 (STS) "noble", // Ubuntu/24.04 (LTS) "jammy", // Ubuntu/22.04 (LTS) "focal", // Ubuntu/20.04 (LTS) diff --git a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java index 8e47bcf00..7c5efaa7b 100644 --- a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java +++ b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java @@ -49,6 +49,7 @@ public Stream provideArguments(ExtensionContext context) { Arguments.of(containerRegistry + "debian", "bookworm"), // Debian/12 (testing) Arguments.of(containerRegistry + "debian", "bullseye"), // Debian/11 (stable) Arguments.of(containerRegistry + "debian", "buster"), // Debian/10 (oldstable) + Arguments.of(containerRegistry + "ubuntu", "oracular"), // Ubuntu/24.10 (STS) Arguments.of(containerRegistry + "ubuntu", "noble"), // Ubuntu/24.04 (LTS) Arguments.of(containerRegistry + "ubuntu", "jammy"), // Ubuntu/22.04 (LTS) Arguments.of(containerRegistry + "ubuntu", "focal"), // Ubuntu/20.04 (LTS) diff --git a/linux/jdk/debian/src/main/packaging/build.sh b/linux/jdk/debian/src/main/packaging/build.sh index 4f32c1b46..ede09ccbc 100644 --- a/linux/jdk/debian/src/main/packaging/build.sh +++ b/linux/jdk/debian/src/main/packaging/build.sh @@ -27,7 +27,7 @@ if [ "$buildLocalFlag" == "true" ]; then fi # $ and $ARCH are env variables passing in from "docker run" -debVersionList="trixie bookworm bullseye buster noble jammy focal bionic" +debVersionList="trixie bookworm bullseye buster oracular noble jammy focal bionic" # the target package is only based on the host machine's ARCH # ${buildArch} is only used for debug purpose what really matter is the label on the jenkins agent diff --git a/linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java b/linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java index 46fe10246..a1e48d5e1 100644 --- a/linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java +++ b/linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java @@ -50,6 +50,7 @@ public Stream provideArguments(ExtensionContext context) { Arguments.of(containerRegistry + "debian", "bookworm"), // Debian/12 (testing) Arguments.of(containerRegistry + "debian", "bullseye"), // Debian/11 (stable) Arguments.of(containerRegistry + "debian", "buster"), // Debian/10 (oldstable) + Arguments.of(containerRegistry + "ubuntu", "oracular"), // Ubuntu/24.10 (STS) Arguments.of(containerRegistry + "ubuntu", "noble"), // Ubuntu/24.04 (LTS) Arguments.of(containerRegistry + "ubuntu", "jammy"), // Ubuntu/22.04 (LTS) Arguments.of(containerRegistry + "ubuntu", "focal"), // Ubuntu/20.04 (LTS) diff --git a/linux/jre/debian/src/main/packaging/build.sh b/linux/jre/debian/src/main/packaging/build.sh index 99bb687aa..3874372c1 100644 --- a/linux/jre/debian/src/main/packaging/build.sh +++ b/linux/jre/debian/src/main/packaging/build.sh @@ -27,7 +27,7 @@ if [ "$buildLocalFlag" == "true" ]; then fi # $ and $ARCH are env variables passing in from "docker run" -debVersionList="trixie bookworm bullseye buster noble jammy focal bionic" +debVersionList="trixie bookworm bullseye buster oracular noble jammy focal bionic" # the target package is only based on the host machine's ARCH # ${buildArch} is only used for debug purpose what really matter is the label on the jenkins agent diff --git a/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java b/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java index 8cc234c83..3bfffc509 100644 --- a/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java +++ b/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java @@ -50,6 +50,7 @@ public Stream provideArguments(ExtensionContext context) { Arguments.of(containerRegistry + "debian", "bookworm"), // Debian/12 (testing) Arguments.of(containerRegistry + "debian", "bullseye"), // Debian/11 (stable) Arguments.of(containerRegistry + "debian", "buster"), // Debian/10 (oldstable) + Arguments.of(containerRegistry + "ubuntu", "oracular"), // Ubuntu/24.10 (STS) Arguments.of(containerRegistry + "ubuntu", "noble"), // Ubuntu/24.04 (LTS) Arguments.of(containerRegistry + "ubuntu", "jammy"), // Ubuntu/22.04 (LTS) Arguments.of(containerRegistry + "ubuntu", "focal"), // Ubuntu/20.04 (LTS)