Merge ~vpa1977/ubuntu/+source/java-common:make-java-21-default into ubuntu/+source/java-common:ubuntu/devel

[Vladimir Petko]

This MP sets Java 21 as default for Ubuntu.

Changes:
 - Set Java 21 as default for Ubuntu architectures.

PPA: ppa:vpa1977/default-jdk-21 [1]

Testing:
 - piuparts test [2]
 - build architecture all package that checks that Java 21 is installed as default-jdk and able to compile and run hello world: amd64[3], arm64[4], armhf[5], ppc64el[6], s390x[7], riscv64 [8]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/default-jdk-21/+packages
[2] https://bugs.launchpad.net/ubuntu/+source/java-common/+bug/2054605/comments/2
[3] https://launchpad.net/~vpa1977/+archive/ubuntu/default-jdk-21/+build/27814647
[4] https://launchpad.net/~vpa1977/+archive/ubuntu/default-jdk-21/+build/27814648
[5] https://launchpad.net/~vpa1977/+archive/ubuntu/default-jdk-21/+build/27814649
[6] https://launchpad.net/~vpa1977/+archive/ubuntu/default-jdk-21/+build/27814650
[7] https://launchpad.net/~vpa1977/+archive/ubuntu/default-jdk-21/+build/27814652
[8] https://launchpad.net/~vpa1977/+archive/ubuntu/default-jdk-21/+build/27814651

diff --git a/debian/changelog b/debian/changelog
index be09565..a12ebec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+java-common (0.75ubuntu1) noble; urgency=medium
+
+  * Use Java 21 as default for Ubuntu architectures (LP: #2054605).
+
+ -- Vladimir Petko <[e-mail]>  Thu, 22 Feb 2024 09:28:43 +1300
+
 java-common (0.75) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index b1b138b..d0ea3a5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: java-common
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders: Matthias Klose <[e-mail]>
 Build-Depends: debhelper-compat (= 13)
 Standards-Version: 4.6.2
diff --git a/debian/java_defaults.mk b/debian/java_defaults.mk
index ea6ef07..303d468 100644
--- a/debian/java_defaults.mk
+++ b/debian/java_defaults.mk
@@ -1,11 +1,15 @@
 # makefile fragment to define the macros java_default_version,
 # java{,8,...,17}_architectures
 
+# Make Ubuntu architectures java-default
+
+java21_architectures = \
+		amd64 armhf arm64 i386 ppc64el riscv64 s390x
+
 java17_architectures = \
-		alpha amd64 arm64 armel armhf i386 \
+		alpha  armel \
 		ia64 loong64 m68k mipsel mips64el \
-		powerpc ppc64 ppc64el \
-		riscv64 s390x sh4 sparc64 x32
+		powerpc ppc64 sh4 sparc64 x32
 java11_architectures = $(java17_architectures) \
 		mips
 java8_architectures = $(java11_architectures)
@@ -19,7 +23,9 @@ java_dependency = $(strip $(1) [$(foreach a,$(filter-out $(java_default_architec
 
 
 _java_host_arch := $(if $(DEB_HOST_ARCH),$(DEB_HOST_ARCH),$(shell dpkg-architecture -qDEB_HOST_ARCH))
-ifneq (,$(filter $(_java_host_arch),$(java17_architectures)))
+ifneq (,$(filter $(_java_host_arch),$(java21_architectures)))
+  java_default_version = 21
+else ifneq (,$(filter $(_java_host_arch),$(java17_architectures)))
   java_default_version = 17
 else ifneq (,$(filter $(_java_host_arch),$(java11_architectures)))
   java_default_version = 11
@@ -30,7 +36,9 @@ endif
 # The minimum source/target compatibility level supported by the default JDK
 # This variable can be used by build scripts invoking directly javac with
 # the -source, -target or --release options.
-ifneq (,$(filter $(_java_host_arch),$(java17_architectures)))
+ifneq (,$(filter $(_java_host_arch),$(java21_architectures)))
+  java_compat_level = 8
+else ifneq (,$(filter $(_java_host_arch),$(java17_architectures)))
   java_compat_level = 7
 else
   java_compat_level = 6