[Git][java-team/java-common][master] [ Emmanuel Bourg ]

[Matthias Klose (@doko)]

Matthias Klose pushed to branch master at Debian Java Maintainers / java-common


Commits:
03daa8bc by Matthias Klose at 2024-07-11T10:46:26+02:00
  [ Emmanuel Bourg ]
  * Use OpenJDK 21 on alpha, amd64, arm64, armel, armhf, i386, ia64, mipsel,
    mips64el, powerpc, ppc64, ppc64el, riscv64, s390x, sh4, sparc64 and x32.

- - - - -


2 changed files:

- debian/changelog
- debian/java_defaults.mk


Changes:

=====================================
debian/changelog
=====================================
@@ -1,7 +1,12 @@
 java-common (0.76) UNRELEASED; urgency=medium
 
+  [ Samuel Thibault ]
   * Add hurd-amd64 case.
 
+  [ Emmanuel Bourg ]
+  * Use OpenJDK 21 on alpha, amd64, arm64, armel, armhf, i386, ia64, mipsel,
+    mips64el, powerpc, ppc64, ppc64el, riscv64, s390x, sh4, sparc64 and x32.
+
  -- Samuel Thibault <sthibault at debian.org>  Mon, 13 Nov 2023 01:57:41 +0100
 
 java-common (0.75) unstable; urgency=medium


=====================================
debian/java_defaults.mk
=====================================
@@ -1,11 +1,13 @@
 # makefile fragment to define the macros java_default_version,
 # java{,8,...,17}_architectures
 
-java17_architectures = \
+java21_architectures = \
 		alpha amd64 arm64 armel armhf i386 \
-		ia64 loong64 m68k mipsel mips64el \
+		ia64 loong64 mipsel mips64el \
 		powerpc ppc64 ppc64el \
 		riscv64 s390x sh4 sparc64 x32
+java17_architectures = $(java21_architectures) \
+		m68k
 java11_architectures = $(java17_architectures) \
 		mips
 java8_architectures = $(java11_architectures)
@@ -19,7 +21,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 +34,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



View it on GitLab: https://salsa.debian.org/java-team/java-common/-/commit/03daa8bcb5a866453b7f05249b4d294ada8ad5e5

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/java-team/java-common/-/commit/03daa8bcb5a866453b7f05249b4d294ada8ad5e5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240711/271fcfa8/attachment.htm>