Merge ubuntu-archive-tools:clean-up-java-hard-coding into ubuntu-archive-tools:main

[Steve Langasek]

Don't hard-code all openjdk versions across all Ubuntu releases. We should be selective about which series we hard-code which versions for, so that we can eventually age these out instead of having the list grow indefinitely.

I'm not sure I've gotten this exactly right in terms of which releases we want to allow where, however (due to ppas) so I'm requesting review.

Unmerged commits

ab5ed54... by Steve Langasek on 2024-04-25

Only hard-code intermediate openjdk releases on series where they're shipped

Allow the LTS-supported releases and the currently-latest release to be
whitelisted across all releases. For all other openjdk releases, only
whitelist them for series where they're actually shipped in the archive.

e83ef86... by Steve Langasek on 2024-04-25

Only hard-code openjdk-21 (and deps) in focal, jammy, mantic

openjdk-21 was introduced in the LTS series post-release and was not the
default in mantic

diff --git a/update-i386-whitelist b/update-i386-whitelist
index e00287c..594a4d4 100755
--- a/update-i386-whitelist
+++ b/update-i386-whitelist
@@ -89,18 +89,23 @@ if __name__ == '__main__':
 
     # needed to bootstrap openjdk-N
     newSet.update(['openjdk-lts'])
-    newSet.update(['openjdk-13'])
-    newSet.update(['openjdk-16'])
     newSet.update(['openjdk-17'])
-    newSet.update(['openjdk-18'])
-    newSet.update(['openjdk-19'])
-    newSet.update(['openjdk-20'])
-    newSet.update(['openjdk-21'])
-    newSet.update(['openjdk-22'])
     newSet.update(['openjdk-23'])
     newSet.update(['gsfonts'])
     if opts.release in ('focal','jammy','mantic'):
+        newSet.update(['openjdk-21', 'java-atk-wrapper', 'x11-utils'])
         newSet.update(['openjdk-8'])
+    if opts.release == 'focal':
+        newSet.update(['openjdk-13'])
+        newSet.update(['openjdk-16'])
+    if opts.release in ('jammy', 'mantic'):
+        newSet.update(['openjdk-19'])
+    if opts.release == 'jammy':
+        newSet.update(['openjdk-18'])
+    if opts.release in ('mantic', 'noble'):
+        newSet.update(['openjdk-22'])
+    if opts.release == 'mantic':
+        newSet.update(['openjdk-20'])
 
     newSet.update(['llvm-toolchain-9'])
     newSet.update(['llvm-toolchain-11'])