[Git][java-team/mvel][master] 3 commits: add upstream patch to solve Java 21 ftbfs

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / mvel


Commits:
bdbe0519 by Vladimir Petko at 2023-11-23T14:27:42+13:00
add upstream patch to solve Java 21 ftbfs

- - - - -
310f626d by Vladimir Petko at 2023-11-23T14:28:58+13:00
changelog

- - - - -
113710e7 by Tony Mancill at 2023-11-23T05:59:06+00:00
Merge branch 'master' into 'master'

Resolve Java 21 FTBFS

See merge request java-team/mvel!1
- - - - -


3 changed files:

- debian/changelog
- + debian/patches/remove_useless_class_literals.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+mvel (2.4.4-2) UNRELEASED; urgency=medium
+
+  * d/p/remove_useless_class_literals.patch: apply upstream patch to
+    resolve FTBFS (Closes: #1056554).
+
+ -- Vladimir Petko <vladimir.petko at canonical.com>  Thu, 23 Nov 2023 14:28:13 +1300
+
 mvel (2.4.4-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/remove_useless_class_literals.patch
=====================================
@@ -0,0 +1,41 @@
+Description: Remove useless class literals
+ Upstream patch that removes deprecated and removed class literals.
+Author: Mario Fusco <<mario.fusco at gmail.com>
+Origin: upstream
+Bug: https://github.com/mvel/mvel/pull/329
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1056554
+Applied-Upstream: https://github.com/mvel/mvel/commit/2eba49dee022e5fd786941be52dde89c6d3631f9
+diff --git a/src/main/java/org/mvel2/compiler/AbstractParser.java b/src/main/java/org/mvel2/compiler/AbstractParser.java
+index f126ac21..85f4d2a7 100644
+--- a/src/main/java/org/mvel2/compiler/AbstractParser.java
++++ b/src/main/java/org/mvel2/compiler/AbstractParser.java
+@@ -212,16 +212,9 @@ public class AbstractParser implements Parser, Serializable {
+       CLASS_LITERALS.put("ClassLoader", ClassLoader.class);
+       CLASS_LITERALS.put("Runtime", Runtime.class);
+       CLASS_LITERALS.put("Thread", Thread.class);
+-      CLASS_LITERALS.put("Compiler", Compiler.class);
+-      CLASS_LITERALS.put("StringBuffer", StringBuffer.class);
+-      CLASS_LITERALS.put("ThreadLocal", ThreadLocal.class);
+-      CLASS_LITERALS.put("SecurityManager", SecurityManager.class);
+-      CLASS_LITERALS.put("StrictMath", StrictMath.class);
+
+       CLASS_LITERALS.put("Exception", Exception.class);
+-
+       CLASS_LITERALS.put("Array", java.lang.reflect.Array.class);
+-
+       CLASS_LITERALS.put("StringBuilder", StringBuilder.class);
+
+       // Setup LITERALS
+diff --git a/src/test/java/org/mvel2/tests/core/ControlFlowTests.java b/src/test/java/org/mvel2/tests/core/ControlFlowTests.java
+index 032e7343..c2987b5f 100644
+--- a/src/test/java/org/mvel2/tests/core/ControlFlowTests.java
++++ b/src/test/java/org/mvel2/tests/core/ControlFlowTests.java
+@@ -246,7 +246,7 @@ public class ControlFlowTests extends AbstractTest {
+
+   public void testStaticallyTypedItemInForEach() {
+     assertEquals("1234",
+-        test("StringBuffer sbuf = new StringBuffer(); foreach (int i : new int[] { 1,2,3,4 })" +
++        test("java.lang.StringBuffer sbuf = new java.lang.StringBuffer(); foreach (int i : new int[] { 1,2,3,4 })" +
+             " { sbuf.append(i); }; sbuf.toString()"));
+   }
+


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 use_system_asm.diff
+remove_useless_class_literals.patch



View it on GitLab: https://salsa.debian.org/java-team/mvel/-/compare/1c71b40994133d4a6b9ef94d24433d76357a186a...113710e7e75b4407fae06141983d018c8b5ba115

-- 
View it on GitLab: https://salsa.debian.org/java-team/mvel/-/compare/1c71b40994133d4a6b9ef94d24433d76357a186a...113710e7e75b4407fae06141983d018c8b5ba115
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20231123/5062e884/attachment.htm>