Merge ~vpa1977/ubuntu/+source/libjxmpp-java:ubuntu/devel into ubuntu/+source/libjxmpp-java: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/15798706/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/libjxmpp-java/+bug/2054240/comments/1

diff --git a/debian/changelog b/debian/changelog
index fca8f16..e4c46a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libjxmpp-java (1.0.1-3ubuntu1) noble; urgency=medium
+
+  * d/p/02-avoid-this-escape.patch: apply upstream fix to resolve Java
+    21 ftbfs (LP: #2054240).
+
+ -- Vladimir Petko <[e-mail]>  Mon, 19 Feb 2024 10:07:15 +1300
+
 libjxmpp-java (1.0.1-3) unstable; urgency=medium
 
   * Don't build jxmpp-stringprep-libidn
diff --git a/debian/control b/debian/control
index a965fac..69cad86 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libjxmpp-java
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders:
  Sunil Mohan Adapa <[e-mail]>,
  James Valleroy <[e-mail]>
diff --git a/debian/patches/02-avoid-this-escape.patch b/debian/patches/02-avoid-this-escape.patch
new file mode 100644
index 0000000..eb1c1d5
--- /dev/null
+++ b/debian/patches/02-avoid-this-escape.patch
@@ -0,0 +1,29 @@
+Description: workaround this-escape warnings for Java 21
+ Workaround this-escape warning for Java 21 (declare final or
+ suppress the warning where inheritance is present).
+Author: Vladimir Petko <[e-mail]>
+Bug: https://github.com/igniterealtime/jxmpp/pull/43
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057520
+Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/libjxmpp-java/+bug/2054240
+Last-Update: 2024-01-30
+--- a/jxmpp-util-cache/src/main/java/org/jxmpp/util/cache/ExpirationCache.java
++++ b/jxmpp-util-cache/src/main/java/org/jxmpp/util/cache/ExpirationCache.java
+@@ -43,7 +43,7 @@
+ 	 *
+ 	 * @param defaultExpirationTime the default expiration time.
+ 	 */
+-	public void setDefaultExpirationTime(long defaultExpirationTime) {
++	public final void setDefaultExpirationTime(long defaultExpirationTime) {
+ 		if (defaultExpirationTime <= 0) {
+ 			throw new IllegalArgumentException();
+ 		}
+--- a/jxmpp-core/src/main/java/org/jxmpp/stringprep/XmppStringprepException.java
++++ b/jxmpp-core/src/main/java/org/jxmpp/stringprep/XmppStringprepException.java
+@@ -36,6 +36,7 @@
+ 	 * @param causingString the String causing the exception.
+ 	 * @param exception the exception.
+ 	 */
++	@SuppressWarnings("this-escape")
+ 	public XmppStringprepException(String causingString, Exception exception) {
+ 		super("XmppStringprepException caused by '" + causingString + "': " + exception);
+ 		initCause(exception);
diff --git a/debian/patches/series b/debian/patches/series
index 4be79a9..61299b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-edit-build-system.patch
+02-avoid-this-escape.patch