Merge ~vpa1977/ubuntu/+source/qpid-proton-j-extensions:ubuntu/devel into ubuntu/+source/qpid-proton-j-extensions:ubuntu/devel

[Vladimir Petko]

This MP resolves Java 21 ftbfs.

PPA: ppa:vpa1977/gettext [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/gettext
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext-21/+sourcepub/15798611/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/qpid-proton-j-extensions/+bug/2054236/comments/1

diff --git a/debian/changelog b/debian/changelog
index 32b04f6..d64059d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qpid-proton-j-extensions (1.2.4-1ubuntu1) noble; urgency=medium
+
+  [ Pushkar Kulkarni ]
+  * Use java-common's java_compat_level for -source/-target. Disable -Xlint
+    options warning (LP: #2054236).
+
+ -- Vladimir Petko <[e-mail]>  Mon, 19 Feb 2024 08:42:11 +1300
+
 qpid-proton-j-extensions (1.2.4-1) unstable; urgency=medium
 
   * Initial release
diff --git a/debian/control b/debian/control
index a8259ec..1b0d9db 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: qpid-proton-j-extensions
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders: Joseph Nahmias <[e-mail]>
 Build-Depends:
  debhelper-compat (= 13),
diff --git a/debian/patches/javac-source-target.patch b/debian/patches/javac-source-target.patch
new file mode 100644
index 0000000..9756675
--- /dev/null
+++ b/debian/patches/javac-source-target.patch
@@ -0,0 +1,30 @@
+Description: use java-common's java_compat_level for -source/-target
+ This is a Debian/Ubuntu-specific patch to replace hardcoded
+ -source/-target level with the one provided by java-common.
+  Disable -Xlint options warning.
+Author: Pushkar Kulkarni <[e-mail]>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057533
+Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/qpid-proton-j-extensions/+bug/2054236
+Forwarded: not-needed
+Last-Update: 2024-02-19
+--- a/pom.xml
++++ b/pom.xml
+@@ -183,6 +183,7 @@
+               <arg>-Xlint:try</arg>
+               <arg>-Xlint:unchecked</arg>
+               <arg>-Xlint:varargs</arg>
++              <arg>-Xlint:-options</arg>
+             </compilerArgs>
+           </configuration>
+         </plugin>
+@@ -357,8 +358,8 @@
+         <jdk>[1.8,9)</jdk>
+       </activation>
+       <properties>
+-        <maven.compiler.source>8</maven.compiler.source>
+-        <maven.compiler.target>8</maven.compiler.target>
++        <maven.compiler.source>${env.JAVA_SOURCE_VERSION}</maven.compiler.source>
++        <maven.compiler.target>${env.JAVA_TARGET_VERSION}</maven.compiler.target>
+       </properties>
+       <build>
+         <plugins>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0b3f39e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+javac-source-target.patch
diff --git a/debian/rules b/debian/rules
index 2d33f6a..21a32ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,8 @@
 #!/usr/bin/make -f
 
+include /usr/share/java/java_defaults.mk
+export JAVA_SOURCE_VERSION = $(java_compat_level)
+export JAVA_TARGET_VERSION = $(java_compat_level)
+
 %:
 	dh $@