summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/mvel/files')
-rw-r--r--dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch43
-rw-r--r--dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch51
-rw-r--r--dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch26
3 files changed, 0 insertions, 120 deletions
diff --git a/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch b/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch
deleted file mode 100644
index 1cfd9e8abc36..000000000000
--- a/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From fcf12bd0322556b4396a72a5402124d9543781d9 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sun, 16 Jan 2022 09:48:48 -0800
-Subject: [PATCH] Ignore tests that fail even when run by Maven on JUnit 4.13.2
-
-To reproduce the failure, make sure to edit line 249 of pom.xml to use
-JUnit 4.13.2. Note that the failed tests are JUnit 3 tests, which
-cannot be ignored with the @org.junit.Ignore annotation.
-
-When no tests are ignored, only testMapAccessWithNestedMethodCall() will
-fail. However, ignoring that test will cause
-testMapAccessWithNestedProperty() to fail afterwards.
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java b/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
-index ea7661bb..1c92c327 100644
---- a/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
-+++ b/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
-@@ -3431,7 +3431,7 @@ public class CoreConfidenceTests extends AbstractTest {
- assertTrue(result);
- }
-
-- public void testMapAccessWithNestedMethodCall() {
-+ public void noTestMapAccessWithNestedMethodCall() {
- String str = "map[aMethod(1)] == \"one\"";
-
- ParserConfiguration pconf = new ParserConfiguration();
-@@ -3446,7 +3446,7 @@ public class CoreConfidenceTests extends AbstractTest {
- assertTrue(result);
- }
-
-- public void testMapAccessWithNestedProperty() {
-+ public void noTestMapAccessWithNestedProperty() {
- String str = "map[key] == \"one\"";
-
- ParserConfiguration pconf = new ParserConfiguration();
---
-2.34.1
-
diff --git a/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch b/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch
deleted file mode 100644
index d019002cda1f..000000000000
--- a/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 04f476bbc3768d9052ae9c8a1b0aa53340a993b3 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sun, 16 Jan 2022 08:01:46 -0800
-Subject: [PATCH] ASMAccessorOptimizer: Update supported Java versions as of
- 2.4.14
-
-Squashed patch of the following commits:
-
-From: deaddowney <spamcontrol@mac.com>
-Date: Fri, 22 Jun 2018 09:38:24 -0400
-Subject: [PATCH 1/4] Mvel not working with Java 10 (11) GH Issue #159
-
-From: dieter sauvillers <dieter.sauvillers@corilus.be>
-Date: Tue, 2 Apr 2019 10:20:31 +0200
-Subject: [PATCH 2/4] mvel does not work with java 12 #185
-
-From: mmelko <mmelko@redhat.com>
-Date: Fri, 26 Jun 2020 08:55:24 +0200
-Subject: [PATCH 3/4] Fix building on java 14
-
-From: mariofusco <mario.fusco@gmail.com>
-Date: Mon, 24 Aug 2020 08:54:22 +0200
-Subject: [PATCH 4/4] drop compatibility with java versions lower than 1.4
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- .../mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
-index 45520538..4c4c876e 100644
---- a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
-+++ b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
-@@ -118,13 +118,8 @@ public class ASMAccessorOptimizer extends AbstractOptimizer implements AccessorO
- OPCODES_VERSION = Opcodes.V1_4;
- } else if (javaVersion.startsWith("1.5")) {
- OPCODES_VERSION = Opcodes.V1_5;
-- } else if (javaVersion.startsWith("1.6")
-- || javaVersion.startsWith("1.7")
-- || javaVersion.startsWith("1.8")
-- || javaVersion.startsWith("9")) {
-- OPCODES_VERSION = Opcodes.V1_6;
- } else {
-- OPCODES_VERSION = Opcodes.V1_2;
-+ OPCODES_VERSION = Opcodes.V1_6;
- }
-
- String defaultNameSapce = getProperty("mvel2.namespace");
---
-2.34.1
-
diff --git a/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch b/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch
deleted file mode 100644
index 8b7250540b05..000000000000
--- a/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0a316a5cb0d889220fb3e730ea1471c1b4052736 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sun, 16 Jan 2022 10:21:47 -0800
-Subject: [PATCH] Update program version shown in program output
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- src/main/java/org/mvel2/MVEL.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main/java/org/mvel2/MVEL.java b/src/main/java/org/mvel2/MVEL.java
-index eafe17fc..6bbf5f06 100644
---- a/src/main/java/org/mvel2/MVEL.java
-+++ b/src/main/java/org/mvel2/MVEL.java
-@@ -45,7 +45,7 @@ import static org.mvel2.util.ParseTools.optimizeTree;
- public class MVEL {
- public static final String NAME = "MVEL (MVFLEX Expression Language)";
- public static final String VERSION = "2.3";
-- public static final String VERSION_SUB = "0";
-+ public static final String VERSION_SUB = "2";
- public static final String CODENAME = "liberty";
- static boolean DEBUG_FILE = getBoolean("mvel2.debug.fileoutput");
- static String ADVANCED_DEBUGGING_FILE = System.getProperty("mvel2.debugging.file") == null ? "mvel_debug.txt" : System.getProperty("mvel2.debugging.file");
---
-2.34.1
-