Merge ~vpa1977/ubuntu/+source/metro-policy:java21-ftbfs into ubuntu/+source/metro-policy:ubuntu/devel

[Vladimir Petko]

This MP resolves Java 21 ftbfs.

PPA: ppa:vpa1977/gettext [1]

Changes:
 - Apply proposed fix to resolve Java 21 test failures. Java 21 has a "shorter" stack trace so I've changed the function in line with the existing code for MacOS.

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
[3] https://bugs.launchpad.net/ubuntu/+source/metro-policy/+bug/2054245/comments/1

diff --git a/debian/changelog b/debian/changelog
index d6afbc3..aad473f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+metro-policy (2.7.2-3ubuntu1) noble; urgency=medium
+
+  * d/p/jaa21-stack-offset.patch: apply proposed fix to resolve Java 21
+    test failures (LP: #2054245).
+
+ -- Vladimir Petko <[e-mail]>  Mon, 19 Feb 2024 11:01:08 +1300
+
 metro-policy (2.7.2-3) unstable; urgency=medium
 
   * Removed the dependency on libactivation-java
diff --git a/debian/control b/debian/control
index 21227d0..46af1b2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: metro-policy
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders: Emmanuel Bourg <[e-mail]>
 Build-Depends:
  debhelper (>= 11~),
diff --git a/debian/patches/java21-stack-offset.patch b/debian/patches/java21-stack-offset.patch
new file mode 100644
index 0000000..1a9e8c0
--- /dev/null
+++ b/debian/patches/java21-stack-offset.patch
@@ -0,0 +1,24 @@
+Description: check for "invoke" in getCallerMethodName()
+ Java 21 has same "shorter" stacktrace same as Mac OS X.
+ The method name in the trace is "invoke" instead of "invoke0".
+ This is a bit brittle, but since this approach is already used
+ in the project, I have just updated the condition.
+ Probably the better way would be to check the environment.
+Author: Vladimir Petko <[e-mail]>
+Bug: https://github.com/eclipse-ee4j/metro-policy/pull/29
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057526
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/metro-policy/+bug/2054245
+Last-Update: 2024-01-30
+--- a/src/main/java/com/sun/xml/ws/policy/privateutil/PolicyUtils.java
++++ b/src/main/java/com/sun/xml/ws/policy/privateutil/PolicyUtils.java
+@@ -98,8 +98,8 @@
+          */
+         public static String getCallerMethodName() {
+             String result = getStackMethodName(5);
+-            if (result.equals("invoke0")) {
+-                // We are likely running on Mac OS X, which returns a shorter stack trace
++            if (result.equals("invoke0") || result.equals("invoke")) {
++                // We are likely running on Mac OS X or Java 21, which returns a shorter stack trace
+                 result = getStackMethodName(4);
+             }
+             return result;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..339ca04
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+java21-stack-offset.patch