Skip to content

Commit 42a88f9

Browse files
jmjaffe37steelhead31
jmjaffe37
and
steelhead31
authored
Completely removed support for Debian:buster (adoptium#1220)
* Removed debian_buster from checkJdkDebian tests to restore expected behavior * Removed all remaining references do debian buster * Responded to PR feedback * Committed gh suggestion Co-authored-by: Scott Fryer <60462088+steelhead31@users.noreply.github.com> * fixed formatting --------- Co-authored-by: Scott Fryer <60462088+steelhead31@users.noreply.github.com>
1 parent 143b7b4 commit 42a88f9

File tree

15 files changed

+9
-20
lines changed

15 files changed

+9
-20
lines changed

‎docs/Guide_To_The_Linux_Installers.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Supported Linux Distros:
4545
Distribution Type| Supported Versions
4646
----------|---------
4747
Apk (Alpine)| All supported version.
48-
Deb (Debian)| Trixie (Debian 13)<br>Bookworm (Debian 12)</br>Bullseye (Debian 11)<br>Buster (Debian 10)</br> Oracular (Ubuntu 24.10)</br>Noble (Ubuntu 24.04)</br>Jammy (Ubuntu 22.04)</br>Focal (Ubuntu 20.04)</br>Bionic (Ubuntu 18.04)
48+
Deb (Debian)| Trixie (Debian 13)<br>Bookworm (Debian 12)</br>Bullseye (Debian 11)<br>Oracular (Ubuntu 24.10)</br>Noble (Ubuntu 24.04)</br>Jammy (Ubuntu 22.04)</br>Focal (Ubuntu 20.04)</br>Bionic (Ubuntu 18.04)
4949
RPM (RHEL)| centos 7</br> rocky 8</br>RHEL7 , RHEL8 & RHEL9</br> Fedora 35, 36, 37, 38 ,39 , 40</br>Oracle Linux 7 & 8</br>Amazon Linux 2
5050
RPM(SUSE) | Opensuse 15.3</br>Opensuse 15.4</br>Opensuse 15.5</br>SLES 12</br>SLES15
5151

@@ -387,9 +387,10 @@ The versions of each specific distribution supported can be viewed can be found
387387
<details>
388388
<summary>Table Of Currently Supported Versions As Of 05/2024 </summary>
389389
Supported Linux Distros:
390+
390391
Distribution Type| Supported Versions
391392
----------|---------
392-
Deb (Debian)| Trixie (Debian 13)<br>Bookworm (Debian 12)</br>Bullseye (Debian 11)<br>Buster (Debian 10)</br> Noble (Ubuntu 24.04)</br>Jammy (Ubuntu 24.04)</br>Focal (Ubuntu 20.04)</br>Bionic (Ubuntu 18.04)
393+
Deb (Debian)| Trixie (Debian 13)<br>Bookworm (Debian 12)</br>Bullseye (Debian 11)<br>Noble (Ubuntu 24.04)</br>Jammy (Ubuntu 24.04)</br>Focal (Ubuntu 20.04)</br>Bionic (Ubuntu 18.04)
393394
RPM (RHEL)| centos 7</br> rocky 8</br>RHEL7 , RHEL8 & RHEL9</br> Fedora 35, 36, 37, 38 ,39 , 40</br>Oracle Linux 7 & 8</br>Amazon Linux 2
394395
RPM(SUSE) | Opensuse 15.3</br>Opensuse 15.4</br>Opensuse 15.5</br>SLES 12</br>SLES15
395396
</details></br>
@@ -447,7 +448,7 @@ In addition to the updates detailed above, it is also important to change the fo
447448
the following line should be changed :
448449

449450
```
450-
debVersionList="trixie bookworm bullseye buster oracular noble jammy focal bionic"
451+
debVersionList="trixie bookworm bullseye oracular noble jammy focal bionic"
451452
```
452453

453454
And similarly in the following two files
@@ -463,7 +464,6 @@ The array needs to be updated to add or remove distributions as necessary as sho
463464
Arguments.of("debian", "trixie"), // Debian/13 (testing)
464465
Arguments.of("debian", "bookworm"), // Debian/12 (testing)
465466
Arguments.of("debian", "bullseye"), // Debian/11 (stable)
466-
Arguments.of("debian", "buster"), // Debian/10 (oldstable)
467467
Arguments.of("ubuntu", "oracular"), // Ubuntu/24.10 (STS)
468468
Arguments.of("ubuntu", "noble"), // Ubuntu/24.04 (LTS)
469469
Arguments.of("ubuntu", "jammy"), // Ubuntu/22.04 (LTS)
@@ -563,7 +563,6 @@ linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/Ch
563563
"trixie", // Debian/13
564564
"bookworm", // Debian/12
565565
"bullseye", // Debian/11
566-
"buster", // Debian/10
567566
"noble", // Ubuntu/24.04 (LTS)
568567
"jammy", // Ubuntu/22.04 (LTS)
569568
"focal", // Ubuntu/20.04 (LTS)
@@ -580,7 +579,6 @@ linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/De
580579
Arguments.of("debian", "trixie"), // Debian/13 (testing)
581580
Arguments.of("debian", "bookworm"), // Debian/12 (testing)
582581
Arguments.of("debian", "bullseye"), // Debian/11 (stable)
583-
Arguments.of("debian", "buster"), // Debian/10 (oldstable)
584582
Arguments.of("ubuntu", "noble"), // Ubuntu/24.04 (LTS)
585583
Arguments.of("ubuntu", "jammy"), // Ubuntu/22.04 (LTS)
586584
Arguments.of("ubuntu", "focal"), // Ubuntu/20.04 (LTS)

‎linux/Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ def uploadDebArtifacts(String buildArch, String Version) {
541541
]
542542
def distro_list = ''
543543
deb_versions.each { deb_version ->
544-
// Creates list like deb.distribution=stretch;deb.distribution=buster;
544+
// Creates list like deb.distribution=stretch;deb.distribution=trixie;
545545
distro_list += "deb.distribution=${deb_version};"
546546
}
547547

‎linux/README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ Supported platform amd64, arm64, armhf, ppc64le, s390x (s390x is only available
201201
|------------------------------|:----------------------:|:----:|
202202
| debian/12 (bookworm/testing) | x86_64 | |
203203
| debian/11 (bullseye/stable) | x86_64 | |
204-
| debian/10 (buster/oldstable) | x86_64 | |
205204
| ubuntu/24.10 (oracular) | x86_64 | |
206205
| ubuntu/24.04 (noble) | x86_64 | |
207206
| ubuntu/22.04 (jammy) | x86_64 | |

‎linux/ca-certificates/debian/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ def deb_versions = [
2828
"trixie", // Debian/13
2929
"bookworm", // Debian/12
3030
"bullseye", // Debian/11
31-
"buster", // Debian/10
3231
"oracular", // Ubuntu/24.10 (STS)
3332
"noble", // Ubuntu/24.04 (LTS)
3433
"jammy", // Ubuntu/22.04 (LTS)

‎linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class ChangesVerificationTest {
3535
"trixie", // Debian/13
3636
"bookworm", // Debian/12
3737
"bullseye", // Debian/11
38-
"buster", // Debian/10
3938
"oracular", // Ubuntu/24.10 (STS)
4039
"noble", // Ubuntu/24.04 (LTS)
4140
"jammy", // Ubuntu/22.04 (LTS)

‎linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
4848
Arguments.of(containerRegistry + "debian", "trixie"), // Debian/13 (testing)
4949
Arguments.of(containerRegistry + "debian", "bookworm"), // Debian/12 (testing)
5050
Arguments.of(containerRegistry + "debian", "bullseye"), // Debian/11 (stable)
51-
Arguments.of(containerRegistry + "debian", "buster"), // Debian/10 (oldstable)
5251
Arguments.of(containerRegistry + "ubuntu", "oracular"), // Ubuntu/24.10 (STS)
5352
Arguments.of(containerRegistry + "ubuntu", "noble"), // Ubuntu/24.04 (LTS)
5453
Arguments.of(containerRegistry + "ubuntu", "jammy"), // Ubuntu/22.04 (LTS)

‎linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
4949
Arguments.of(containerRegistry + "debian", "trixie"), // Debian/13 (testing)
5050
Arguments.of(containerRegistry + "debian", "bookworm"), // Debian/12 (testing)
5151
Arguments.of(containerRegistry + "debian", "bullseye"), // Debian/11 (stable)
52-
Arguments.of(containerRegistry + "debian", "buster"), // Debian/10 (oldstable)
5352
Arguments.of(containerRegistry + "ubuntu", "oracular"), // Ubuntu/24.10 (STS)
5453
Arguments.of(containerRegistry + "ubuntu", "noble"), // Ubuntu/24.04 (LTS)
5554
Arguments.of(containerRegistry + "ubuntu", "jammy"), // Ubuntu/22.04 (LTS)

‎linux/jre/debian/src/main/packaging/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if [ "$buildLocalFlag" == "true" ]; then
2727
fi
2828

2929
# $ and $ARCH are env variables passing in from "docker run"
30-
debVersionList="trixie bookworm bullseye buster oracular noble jammy focal bionic"
30+
debVersionList="trixie bookworm bullseye oracular noble jammy focal bionic"
3131

3232
# the target package is only based on the host machine's ARCH
3333
# ${buildArch} is only used for debug purpose what really matter is the label on the jenkins agent

‎linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
4949
Arguments.of(containerRegistry + "debian", "trixie"), // Debian/13 (testing)
5050
Arguments.of(containerRegistry + "debian", "bookworm"), // Debian/12 (testing)
5151
Arguments.of(containerRegistry + "debian", "bullseye"), // Debian/11 (stable)
52-
Arguments.of(containerRegistry + "debian", "buster"), // Debian/10 (oldstable)
5352
Arguments.of(containerRegistry + "ubuntu", "oracular"), // Ubuntu/24.10 (STS)
5453
Arguments.of(containerRegistry + "ubuntu", "noble"), // Ubuntu/24.04 (LTS)
5554
Arguments.of(containerRegistry + "ubuntu", "jammy"), // Ubuntu/22.04 (LTS)

‎linux_new/Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ stage('Publish Packages') {
896896
echo "Preparing For Debian Upload"
897897
def DebFileName = ''
898898
def DebTarget = ''
899-
// Creates list like deb.distribution=stretch;deb.distribution=buster;
899+
// Creates list like deb.distribution=stretch;deb.distribution=trixie;
900900
deb_distros.each { deb_version ->
901901
distro_list += "deb.distribution=${deb_version};"
902902
}

0 commit comments

Comments
 (0)