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


Commits:
1f4b68d0 by Matthias Klose at 2026-03-07T13:31:55+01:00
* Default to OpenJDK 25

- - - - -


2 changed files:

- debian/changelog
- debian/java_defaults.mk


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,9 @@
 java-common (0.77) UNRELEASED; urgency=medium
 
   * Bump standards version.
+  * Default to OpenJDK 25 on alpha, amd64, arm64, armel, armhf, i386, loong64,
+    mipsel, mips64el, powerpc, ppc64, ppc64el, riscv64, s390x, sh4, sparc64
+    and x32.
 
  -- Matthias Klose <[email protected]>  Sat, 07 Mar 2026 13:22:04 +0100
 


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



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

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/java-common/-/commit/1f4b68d0a9577262fc520d3284940c0d97094ec1
You're receiving this email because of your account on salsa.debian.org.


_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to