Merge ~vpa1977/ubuntu/+source/cheshire-clojure:java21-ftbfs into ubuntu/+source/cheshire-clojure:ubuntu/devel

[Vladimir Petko]

This MP resolves Java 21 ftbfs.

PPA: ppa:vpa1977/october-21 [1]

Changes:
 - Use java_compat_level variable provided by java-common to adjust -source/-target level to the minimum required by the default Java

Testing:
 - rebuild in default Java 21 ppa[2]
 - piuparts test [3]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/october-21
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/october-21-2/+sourcepub/15785346/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/cheshire-clojure/+bug/2052757/comments/1

[Julian Andres Klode (juliank)]

Uploaded, thanks

review: Approve

Unmerged commits

51944f1... by Vladimir Petko on 2024-02-12

changelog

6263d82... by Vladimir Petko on 2024-02-12

update-maintainer

8563229... by Vladimir Petko on 2024-02-12

Use JAVA_COMPAT_LEVEL to adjust -source/-target in project.clj

diff --git a/debian/changelog b/debian/changelog
index 7e2e866..fe0d3c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cheshire-clojure (5.11.0-2ubuntu1) noble; urgency=medium
+
+  [ Pushkar Kulkarni ]
+  * debian/patches/0003-compile-with-jdk21.patch: use JAVA_COMPAT_LEVEL
+    environment variable provided by java-common to adjust -source/-target
+    level to the minimum required by the default Java (LP: #2052757).
+
+ -- Vladimir Petko <[e-mail]>  Tue, 13 Feb 2024 10:43:03 +1300
+
 cheshire-clojure (5.11.0-2) unstable; urgency=medium
 
   * d/tests: add autopkgtests
diff --git a/debian/control b/debian/control
index a16162e..b070564 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: cheshire-clojure
 Section: java
 Priority: optional
-Maintainer: Debian Clojure Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Clojure Maintainers <[e-mail]>
 Uploaders:
  Apollon Oikonomopoulos <[e-mail]>,
  Jérôme Charaoui <[e-mail]>,
diff --git a/debian/patches/0003-compile-with-jdk21.patch b/debian/patches/0003-compile-with-jdk21.patch
new file mode 100644
index 0000000..5c23b28
--- /dev/null
+++ b/debian/patches/0003-compile-with-jdk21.patch
@@ -0,0 +1,17 @@
+Description: use java_compat_level variable provided by java-common
+ This is a Debian-specific patch to set javac source and target level options
+ using a variable provided by java-common package.
+Author: Pushkar Kulkarni <[e-mail]>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1053016
+Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/cheshire-clojure/+bug/2052757
+Forwarded: not-needed
+Last-Update: 2024-02-09
+--- a/project.clj
++++ b/project.clj
+@@ -39,5 +39,5 @@
+ ;;             "-XX:+UnlockDiagnosticVMOptions"
+ ;;             "-XX:+PrintInlining"
+              ]
+-  :javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"]
++  :javac-options ["-target" ~(System/getenv, "JAVA_COMPAT_LEVEL") "-source" ~(System/getenv, "JAVA_COMPAT_LEVEL")]
+   :local-repo "debian/maven-repo")
diff --git a/debian/patches/series b/debian/patches/series
index 53c5240..8878832 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Lein-Local.patch
 0002-Skip-failing-test.generative-testcase.patch
+0003-compile-with-jdk21.patch
diff --git a/debian/rules b/debian/rules
index 5940ff3..0e1c6fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,8 @@
 
 include /usr/share/dpkg/pkg-info.mk
 include /usr/share/javahelper/java-vars.mk
-
+include /usr/share/java/java_defaults.mk
+export JAVA_COMPAT_LEVEL=$(java_compat_level)
 export LEIN_HOME=$(CURDIR)/.lein
 export LEIN_OFFLINE=true
 NAME=cheshire