[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2024-11-03 Thread Miroslav Šulc
commit: 0bdeccdfbc9095fb41313b2608d363faac21d19d
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Nov  3 14:08:47 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Nov  4 07:18:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bdeccdf

dev-java/mvel: drop 2.5.0-r1 - CVE-2023-51079

Bug: https://bugs.gentoo.org/923610
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/39191
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/mvel/Manifest |  1 -
 dev-java/mvel/mvel-2.5.0-r1.ebuild | 66 --
 2 files changed, 67 deletions(-)

diff --git a/dev-java/mvel/Manifest b/dev-java/mvel/Manifest
index f3955c69ec4b..ac9a36913bb6 100644
--- a/dev-java/mvel/Manifest
+++ b/dev-java/mvel/Manifest
@@ -1,2 +1 @@
-DIST mvel2-2.5.0.Final.tar.gz 2182715 BLAKE2B 
1e8dbde4b75e36ea4d285ab45c0040957b9af7b5819786daf6469ae509c9c1e16ba2b201a05f9f9cf1c694bac816afd2d613226a8eb3b06f9049a898c6586b85
 SHA512 
29ca1ef8fdc4cbb97b5847f59e7c3118e837022d7292b507869208da1798b55d0445c40214d72c159e610d7094df7002c091296b2b31775a1ad0606f622d12b5
 DIST mvel2-2.5.2.Final.tar.gz 2184489 BLAKE2B 
4e7b79f096a2a87a1d60b5edc0909fbadc754aa3927d5d439ebf8f2df2b05b6a85248d31d720b3a4f13e5890c45079388f8745baba32cffe5a2c998748cfb1a6
 SHA512 
ff1c0ee2b3cbce9d5f996e16df72cd1620087543b74c65c52632951a4842a7dc17d764303eac48c2df6a94feda0bbfffae7573b44409647db16ef2066930b4f1

diff --git a/dev-java/mvel/mvel-2.5.0-r1.ebuild 
b/dev-java/mvel/mvel-2.5.0-r1.ebuild
deleted file mode 100644
index 3a49e8935721..
--- a/dev-java/mvel/mvel-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.mvel:mvel2:${PV}.Final"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="MVFLEX Expression Language"
-HOMEPAGE="https://github.com/mvel/mvel";
-SRC_URI="https://github.com/mvel/mvel/archive/mvel2-${PV}.Final.tar.gz";
-S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND="
-   dev-java/asm:9
-   >=virtual/jdk-1.8:*
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-# Required due to use of '_' as identifiers in source files
-JAVADOC_ARGS="-source 8"
-JAVA_CLASSPATH_EXTRA="asm-9"
-JAVA_MAIN_CLASS="org.mvel2.sh.Main"
-JAVA_SRC_DIR="src/main/java"
-
-# Significantly speed up test execution
-# https://github.com/mvel/mvel/blob/mvel2-2.3.2.Final/pom.xml#L158-L171
-JAVA_TEST_EXTRA_ARGS=(
-   -Dfile.encoding=UTF-8
-   -Dmvel.disable.jit=true
-   -Dmvel.tests.quick=true
-)
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" )
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_test() {
-   # ${S}/pom.xml#201-214
-   pushd src/test/java || die
-   local JAVA_TEST_RUN_ONLY=$(find * \
-   \( -name "*Test.java" \
-   -o -name '*Tests.java' \
-   -o -name 'UsageDemos.java' \)\
-   ! -name "AbstractTest.java*" \
-   ! -name "CompiledUnitTestEx.java" \
-   ! -name "PerfTest.java" \
-   ! -name "DroolsTest.java" \
-   ! -name "FailureTests.java" \
-   ! -name "PerformanceTest.java" \
-   ! -name "CompiledPerformanceTests.java" \
-   ! -name "MVELThreadTest.java*" \
-   ! -name "SimpleTests.java*" \
-   ! -name "BaseOperatorsTest.java*" \
-   )
-   popd
-   JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-   JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-   java-pkg-simple_src_test
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2024-11-03 Thread Michał Górny
commit: 57c5dfa6c39e3f32fa173346a1a73a3a35ee80f4
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov  3 13:31:09 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  3 13:31:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57c5dfa6

dev-java/mvel: Stabilize 2.5.2 arm64, #942771

Signed-off-by: Michał Górny  gentoo.org>

 dev-java/mvel/mvel-2.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/mvel/mvel-2.5.2.ebuild b/dev-java/mvel/mvel-2.5.2.ebuild
index ef85b80a6aec..a3474156664b 100644
--- a/dev-java/mvel/mvel-2.5.2.ebuild
+++ b/dev-java/mvel/mvel-2.5.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 
 DEPEND="
dev-java/asm:9



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2024-11-02 Thread Sam James
commit: 4b0ca70866bfa16bf8c77d9975632bcd90d3f687
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov  2 22:51:23 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  2 22:51:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0ca708

dev-java/mvel: Stabilize 2.5.2 ppc64, #942771

Signed-off-by: Sam James  gentoo.org>

 dev-java/mvel/mvel-2.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/mvel/mvel-2.5.2.ebuild b/dev-java/mvel/mvel-2.5.2.ebuild
index 52d20ee6b3e9..ef85b80a6aec 100644
--- a/dev-java/mvel/mvel-2.5.2.ebuild
+++ b/dev-java/mvel/mvel-2.5.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ppc64"
 
 DEPEND="
dev-java/asm:9



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2024-11-02 Thread Sam James
commit: 8579284f1bd8d5f51e60861d1a1a6109b93278da
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov  2 20:17:50 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  2 20:17:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8579284f

dev-java/mvel: Stabilize 2.5.2 amd64, #942771

Signed-off-by: Sam James  gentoo.org>

 dev-java/mvel/mvel-2.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/mvel/mvel-2.5.2.ebuild b/dev-java/mvel/mvel-2.5.2.ebuild
index a97925897508..52d20ee6b3e9 100644
--- a/dev-java/mvel/mvel-2.5.2.ebuild
+++ b/dev-java/mvel/mvel-2.5.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 
 DEPEND="
dev-java/asm:9



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2024-10-09 Thread Miroslav Šulc
commit: c75076e867d8d25cfd4c597f3086a7b05d9df159
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Oct  6 09:37:34 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct  9 09:36:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75076e8

dev-java/mvel: add 2.5.2

Bug: https://bugs.gentoo.org/923610
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/38891
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/mvel/Manifest  |  1 +
 dev-java/mvel/mvel-2.5.2.ebuild | 67 +
 2 files changed, 68 insertions(+)

diff --git a/dev-java/mvel/Manifest b/dev-java/mvel/Manifest
index 41568dbf8e17..f3955c69ec4b 100644
--- a/dev-java/mvel/Manifest
+++ b/dev-java/mvel/Manifest
@@ -1 +1,2 @@
 DIST mvel2-2.5.0.Final.tar.gz 2182715 BLAKE2B 
1e8dbde4b75e36ea4d285ab45c0040957b9af7b5819786daf6469ae509c9c1e16ba2b201a05f9f9cf1c694bac816afd2d613226a8eb3b06f9049a898c6586b85
 SHA512 
29ca1ef8fdc4cbb97b5847f59e7c3118e837022d7292b507869208da1798b55d0445c40214d72c159e610d7094df7002c091296b2b31775a1ad0606f622d12b5
+DIST mvel2-2.5.2.Final.tar.gz 2184489 BLAKE2B 
4e7b79f096a2a87a1d60b5edc0909fbadc754aa3927d5d439ebf8f2df2b05b6a85248d31d720b3a4f13e5890c45079388f8745baba32cffe5a2c998748cfb1a6
 SHA512 
ff1c0ee2b3cbce9d5f996e16df72cd1620087543b74c65c52632951a4842a7dc17d764303eac48c2df6a94feda0bbfffae7573b44409647db16ef2066930b4f1

diff --git a/dev-java/mvel/mvel-2.5.2.ebuild b/dev-java/mvel/mvel-2.5.2.ebuild
new file mode 100644
index ..bc25f1af94ef
--- /dev/null
+++ b/dev-java/mvel/mvel-2.5.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.mvel:mvel2:${PV}.Final"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="MVFLEX Expression Language"
+HOMEPAGE="https://github.com/mvel/mvel";
+SRC_URI="https://github.com/mvel/mvel/archive/mvel2-${PV}.Final.tar.gz";
+S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+   dev-java/asm:9
+   >=virtual/jdk-1.8:*
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+# Required due to use of '_' as identifiers in source files
+JAVADOC_ARGS="-source 8"
+JAVA_CLASSPATH_EXTRA="asm-9"
+JAVA_MAIN_CLASS="org.mvel2.sh.Main"
+JAVA_SRC_DIR="src/main/java"
+
+# Significantly speed up test execution
+# https://github.com/mvel/mvel/blob/mvel2-2.3.2.Final/pom.xml#L158-L171
+JAVA_TEST_EXTRA_ARGS=(
+   -Dfile.encoding=UTF-8
+   -Dmvel.disable.jit=true
+   -Dmvel.tests.quick=true
+)
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" )
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+   # ${S}/pom.xml#201-214
+   pushd src/test/java || die
+   local JAVA_TEST_RUN_ONLY=$(find * \
+   \( -name "*Test.java" \
+   -o -name '*Tests.java' \
+   -o -name 'UsageDemos.java' \)\
+   ! -name "AbstractTest.java*" \
+   ! -name "CompiledUnitTestEx.java" \
+   ! -name "PerfTest.java" \
+   ! -name "DroolsTest.java" \
+   ! -name "FailureTests.java" \
+   ! -name "PerformanceTest.java" \
+   ! -name "CompiledPerformanceTests.java" \
+   ! -name "MVELThreadTest.java*" \
+   ! -name "SimpleTests.java*" \
+   ! -name "BaseOperatorsTest.java*" \
+   ! -name "BaseMvelTest.java*" \
+   )
+   popd
+   JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+   JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+   java-pkg-simple_src_test
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/, dev-java/lz4-java/

2024-10-09 Thread Miroslav Šulc
commit: e467eb15d20eb0dfd556535be25ed9d2ed99b74c
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Oct  6 09:35:10 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct  9 09:34:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e467eb15

dev-java/*: default slot for dev-java/mvel

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: 
https://github.com/gentoo/gentoo/pull/38891/commits/c798993a9d021ee5383d1c08dfa7fb9958bfdfb0
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../lz4-java/{lz4-java-1.8.0-r5.ebuild => lz4-java-1.8.0-r6.ebuild}   | 4 ++--
 dev-java/mvel/{mvel-2.5.0.ebuild => mvel-2.5.0-r1.ebuild} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild 
b/dev-java/lz4-java/lz4-java-1.8.0-r6.ebuild
similarity index 97%
rename from dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild
rename to dev-java/lz4-java/lz4-java-1.8.0-r6.ebuild
index 1eca00a9a589..4f6cc6a110a7 100644
--- a/dev-java/lz4-java/lz4-java-1.8.0-r5.ebuild
+++ b/dev-java/lz4-java/lz4-java-1.8.0-r6.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
app-arch/lz4:=
-   dev-java/mvel:2.5
+   dev-java/mvel:0
dev-libs/xxhash:0
>=virtual/jdk-1.8:*
test? ( dev-java/randomized-runner:0 )"
@@ -52,7 +52,7 @@ src_compile() {
einfo "Code generation"
"$(java-config -J)" \
-Dout.dir="src/java" \
-   -cp "$(java-pkg_getjars --build-only mvel-2.5)" \
+   -cp "$(java-pkg_getjars --build-only mvel)" \
org.mvel2.sh.Main \
src/build/gen_sources.mvel \
|| die

diff --git a/dev-java/mvel/mvel-2.5.0.ebuild 
b/dev-java/mvel/mvel-2.5.0-r1.ebuild
similarity index 99%
rename from dev-java/mvel/mvel-2.5.0.ebuild
rename to dev-java/mvel/mvel-2.5.0-r1.ebuild
index dc7079a91c1c..52097f6f110d 100644
--- a/dev-java/mvel/mvel-2.5.0.ebuild
+++ b/dev-java/mvel/mvel-2.5.0-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/mvel/mvel/archive/mvel2-${PV}.Final.tar.gz";
 S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
 
 LICENSE="Apache-2.0"
-SLOT="2.5"
+SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/files/, dev-java/mvel/

2024-01-03 Thread Miroslav Šulc
commit: fd524375b3949a724db22a24e20f22bf7d2edb44
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Jan  3 09:21:43 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jan  3 22:12:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd524375

dev-java/mvel: drop 2.3.2-r1

Closes: https://bugs.gentoo.org/836218
Closes: https://bugs.gentoo.org/916529
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/mvel/Manifest |  1 -
 .../files/mvel-2.3.2-ignore-failing-tests.patch| 43 
 ...mvel-2.3.2-update-supported-java-versions.patch | 51 --
 .../mvel-2.3.2-update-version-in-output.patch  | 26 ---
 dev-java/mvel/mvel-2.3.2-r1.ebuild | 81 --
 5 files changed, 202 deletions(-)

diff --git a/dev-java/mvel/Manifest b/dev-java/mvel/Manifest
index 63212e9bcedb..41568dbf8e17 100644
--- a/dev-java/mvel/Manifest
+++ b/dev-java/mvel/Manifest
@@ -1,2 +1 @@
-DIST mvel2-2.3.2.Final.tar.gz 2405839 BLAKE2B 
5f12652a0f4375f6e24f18313d99a02bb86463cc1acc2f8845b815c9c7afcda410d67c9f1c30544f9ab1cd50a48ce0ab72e9cca94faafab776f3704b1d5fa087
 SHA512 
9d1c92bfe90aa4cfe5f4bbdd7eef2060bfaec3979c5c07a5baf3ddb4d84a00632dcaec266bab675b31d5b745bfa36a89dd5969ababeb64332069939a4df23dbc
 DIST mvel2-2.5.0.Final.tar.gz 2182715 BLAKE2B 
1e8dbde4b75e36ea4d285ab45c0040957b9af7b5819786daf6469ae509c9c1e16ba2b201a05f9f9cf1c694bac816afd2d613226a8eb3b06f9049a898c6586b85
 SHA512 
29ca1ef8fdc4cbb97b5847f59e7c3118e837022d7292b507869208da1798b55d0445c40214d72c159e610d7094df7002c091296b2b31775a1ad0606f622d12b5

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..
--- 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 
-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 

- 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..
--- 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 
-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 
-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 
-Date: Tue, 2 Apr 2019 10:20:31 +0200
-Subject: [PATCH 2/4] mvel does not work with java 12 #185
-
-From: mmelko 
-Date: Fri, 26 Jun 2020 08:55:24 +0200
-Subject: [PATCH 3/4] Fix building on java 14
-
-From: mariofusco 
-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 

- .../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/ASMAccessorOp

[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2024-01-03 Thread Sam James
commit: 0012282b0bf999fe14319bd6793437025ea70490
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  3 09:11:50 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  3 09:11:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0012282b

dev-java/mvel: Stabilize 2.5.0 x86, #919137

Signed-off-by: Sam James  gentoo.org>

 dev-java/mvel/mvel-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/mvel/mvel-2.5.0.ebuild b/dev-java/mvel/mvel-2.5.0.ebuild
index a18ba479ed99..dc7079a91c1c 100644
--- a/dev-java/mvel/mvel-2.5.0.ebuild
+++ b/dev-java/mvel/mvel-2.5.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
dev-java/asm:9



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2024-01-03 Thread Sam James
commit: 2b9bf677e26fcd95d9a8cef1a6f0228ba5baa5e7
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  3 08:52:49 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  3 08:52:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b9bf677

dev-java/mvel: Stabilize 2.5.0 ppc64, #919137

Signed-off-by: Sam James  gentoo.org>

 dev-java/mvel/mvel-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/mvel/mvel-2.5.0.ebuild b/dev-java/mvel/mvel-2.5.0.ebuild
index 25339d6573b3..a18ba479ed99 100644
--- a/dev-java/mvel/mvel-2.5.0.ebuild
+++ b/dev-java/mvel/mvel-2.5.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 DEPEND="
dev-java/asm:9



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2024-01-03 Thread Sam James
commit: a0d8e0d3098208db8a58f3ce229a48e35c8f5c9c
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  3 08:52:48 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  3 08:52:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0d8e0d3

dev-java/mvel: Stabilize 2.5.0 amd64, #919137

Signed-off-by: Sam James  gentoo.org>

 dev-java/mvel/mvel-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/mvel/mvel-2.5.0.ebuild b/dev-java/mvel/mvel-2.5.0.ebuild
index 9aa16bc27f7f..25339d6573b3 100644
--- a/dev-java/mvel/mvel-2.5.0.ebuild
+++ b/dev-java/mvel/mvel-2.5.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 
 DEPEND="
dev-java/asm:9



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2024-01-03 Thread Sam James
commit: 1ba30e9c12042eaea60409dc53fcd070d222eb92
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  3 08:52:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  3 08:52:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ba30e9c

dev-java/mvel: Stabilize 2.5.0 arm64, #919137

Signed-off-by: Sam James  gentoo.org>

 dev-java/mvel/mvel-2.5.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/mvel/mvel-2.5.0.ebuild b/dev-java/mvel/mvel-2.5.0.ebuild
index 79dbf2350f51..9aa16bc27f7f 100644
--- a/dev-java/mvel/mvel-2.5.0.ebuild
+++ b/dev-java/mvel/mvel-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
 
 DEPEND="
dev-java/asm:9



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2023-11-26 Thread Miroslav Šulc
commit: 21adfc881f009a587be71d72939d6b09bf273dc3
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Jul 30 10:58:57 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Nov 26 09:08:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21adfc88

dev-java/mvel: add 2.5.0

Bug: https://bugs.gentoo.org/916529
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/mvel/Manifest  |  1 +
 dev-java/mvel/mvel-2.5.0.ebuild | 66 +
 2 files changed, 67 insertions(+)

diff --git a/dev-java/mvel/Manifest b/dev-java/mvel/Manifest
index 4af3792b6c2f..63212e9bcedb 100644
--- a/dev-java/mvel/Manifest
+++ b/dev-java/mvel/Manifest
@@ -1 +1,2 @@
 DIST mvel2-2.3.2.Final.tar.gz 2405839 BLAKE2B 
5f12652a0f4375f6e24f18313d99a02bb86463cc1acc2f8845b815c9c7afcda410d67c9f1c30544f9ab1cd50a48ce0ab72e9cca94faafab776f3704b1d5fa087
 SHA512 
9d1c92bfe90aa4cfe5f4bbdd7eef2060bfaec3979c5c07a5baf3ddb4d84a00632dcaec266bab675b31d5b745bfa36a89dd5969ababeb64332069939a4df23dbc
+DIST mvel2-2.5.0.Final.tar.gz 2182715 BLAKE2B 
1e8dbde4b75e36ea4d285ab45c0040957b9af7b5819786daf6469ae509c9c1e16ba2b201a05f9f9cf1c694bac816afd2d613226a8eb3b06f9049a898c6586b85
 SHA512 
29ca1ef8fdc4cbb97b5847f59e7c3118e837022d7292b507869208da1798b55d0445c40214d72c159e610d7094df7002c091296b2b31775a1ad0606f622d12b5

diff --git a/dev-java/mvel/mvel-2.5.0.ebuild b/dev-java/mvel/mvel-2.5.0.ebuild
new file mode 100644
index ..79dbf2350f51
--- /dev/null
+++ b/dev-java/mvel/mvel-2.5.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.mvel:mvel2:${PV}.Final"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="MVFLEX Expression Language"
+HOMEPAGE="https://github.com/mvel/mvel";
+SRC_URI="https://github.com/mvel/mvel/archive/mvel2-${PV}.Final.tar.gz";
+S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
+
+LICENSE="Apache-2.0"
+SLOT="2.5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+   dev-java/asm:9
+   >=virtual/jdk-1.8:*
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+# Required due to use of '_' as identifiers in source files
+JAVADOC_ARGS="-source 8"
+JAVA_CLASSPATH_EXTRA="asm-9"
+JAVA_MAIN_CLASS="org.mvel2.sh.Main"
+JAVA_SRC_DIR="src/main/java"
+
+# Significantly speed up test execution
+# https://github.com/mvel/mvel/blob/mvel2-2.3.2.Final/pom.xml#L158-L171
+JAVA_TEST_EXTRA_ARGS=(
+   -Dfile.encoding=UTF-8
+   -Dmvel.disable.jit=true
+   -Dmvel.tests.quick=true
+)
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" )
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+   # ${S}/pom.xml#201-214
+   pushd src/test/java || die
+   local JAVA_TEST_RUN_ONLY=$(find * \
+   \( -name "*Test.java" \
+   -o -name '*Tests.java' \
+   -o -name 'UsageDemos.java' \)\
+   ! -name "AbstractTest.java*" \
+   ! -name "CompiledUnitTestEx.java" \
+   ! -name "PerfTest.java" \
+   ! -name "DroolsTest.java" \
+   ! -name "FailureTests.java" \
+   ! -name "PerformanceTest.java" \
+   ! -name "CompiledPerformanceTests.java" \
+   ! -name "MVELThreadTest.java*" \
+   ! -name "SimpleTests.java*" \
+   ! -name "BaseOperatorsTest.java*" \
+   )
+   popd
+   JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+   JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+   java-pkg-simple_src_test
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2022-02-25 Thread Sam James
commit: a60ff35744e4dbe0e0e46ce2371b9308824fd87e
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 25 21:06:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 25 21:06:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a60ff357

dev-java/mvel: Stabilize 2.3.2-r1 arm64, #833607

Signed-off-by: Sam James  gentoo.org>

 dev-java/mvel/mvel-2.3.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/mvel/mvel-2.3.2-r1.ebuild 
b/dev-java/mvel/mvel-2.3.2-r1.ebuild
index 9299a3c64edb..2fc29e17956e 100644
--- a/dev-java/mvel/mvel-2.3.2-r1.ebuild
+++ b/dev-java/mvel/mvel-2.3.2-r1.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/mvel/mvel/archive/refs/tags/mvel2-${PV}.Final.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
>=virtual/jdk-1.8:*



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2022-02-18 Thread Arthur Zamarin
commit: 0de4fe20e7d8c521a2bb351a3305ea4325b4ee57
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb 18 21:28:52 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb 18 21:28:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de4fe20

dev-java/mvel: Stabilize 2.3.2-r1 x86, #833607

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/mvel/mvel-2.3.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/mvel/mvel-2.3.2-r1.ebuild 
b/dev-java/mvel/mvel-2.3.2-r1.ebuild
index dbc1db5ef2f7..9299a3c64edb 100644
--- a/dev-java/mvel/mvel-2.3.2-r1.ebuild
+++ b/dev-java/mvel/mvel-2.3.2-r1.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/mvel/mvel/archive/refs/tags/mvel2-${PV}.Final.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 DEPEND="
>=virtual/jdk-1.8:*



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2022-02-18 Thread Arthur Zamarin
commit: ec1ad6ef67d045ac56515e45811b453a344093ec
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb 18 18:09:17 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb 18 18:09:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec1ad6ef

dev-java/mvel: Stabilize 2.3.2-r1 ppc64, #833607

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/mvel/mvel-2.3.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/mvel/mvel-2.3.2-r1.ebuild 
b/dev-java/mvel/mvel-2.3.2-r1.ebuild
index 8e5c3464b3ea..dbc1db5ef2f7 100644
--- a/dev-java/mvel/mvel-2.3.2-r1.ebuild
+++ b/dev-java/mvel/mvel-2.3.2-r1.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/mvel/mvel/archive/refs/tags/mvel2-${PV}.Final.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
 
 DEPEND="
>=virtual/jdk-1.8:*



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2022-02-18 Thread Arthur Zamarin
commit: 45e7d2c1d75f71698289a1e53eeada393039eb15
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb 18 17:49:53 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb 18 17:49:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45e7d2c1

dev-java/mvel: Stabilize 2.3.2-r1 amd64, #833607

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/mvel/mvel-2.3.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/mvel/mvel-2.3.2-r1.ebuild 
b/dev-java/mvel/mvel-2.3.2-r1.ebuild
index 0b93cdde5b40..8e5c3464b3ea 100644
--- a/dev-java/mvel/mvel-2.3.2-r1.ebuild
+++ b/dev-java/mvel/mvel-2.3.2-r1.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/mvel/mvel/archive/refs/tags/mvel2-${PV}.Final.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 DEPEND="
>=virtual/jdk-1.8:*



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2022-01-19 Thread Miroslav Šulc
commit: 5aba65ab0da2a663f442a6a2498f94dd2dcbe379
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Jan 19 15:57:17 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jan 19 15:57:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aba65ab

dev-java/mvel: installed launcher must have slot number

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/mvel/{mvel-2.3.2.ebuild => mvel-2.3.2-r1.ebuild} | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-java/mvel/mvel-2.3.2.ebuild 
b/dev-java/mvel/mvel-2.3.2-r1.ebuild
similarity index 98%
rename from dev-java/mvel/mvel-2.3.2.ebuild
rename to dev-java/mvel/mvel-2.3.2-r1.ebuild
index 21b646cc9f9f..0b93cdde5b40 100644
--- a/dev-java/mvel/mvel-2.3.2.ebuild
+++ b/dev-java/mvel/mvel-2.3.2-r1.ebuild
@@ -37,7 +37,6 @@ JAVA_SRC_DIR="src/main/java"
 JAVADOC_ARGS="-source 8"
 # https://github.com/mvel/mvel/blob/mvel2-2.3.2.Final/pom.xml#L131
 JAVA_MAIN_CLASS="org.mvel2.sh.Main"
-JAVA_LAUNCHER_FILENAME="${PN}"
 
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 JAVA_TEST_SRC_DIR="src/test/java"



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/

2022-01-19 Thread Miroslav Šulc
commit: aca6695a2a627c5d6239ba808cc6ec427a0886af
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Jan 19 09:26:44 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jan 19 09:26:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca6695a

dev-java/mvel: changed 2.3.0 to slot 2.3

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/mvel/mvel-2.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/mvel/mvel-2.3.2.ebuild b/dev-java/mvel/mvel-2.3.2.ebuild
index 1c0e3cd39852..21b646cc9f9f 100644
--- a/dev-java/mvel/mvel-2.3.2.ebuild
+++ b/dev-java/mvel/mvel-2.3.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/mvel/mvel";
 
SRC_URI="https://github.com/mvel/mvel/archive/refs/tags/mvel2-${PV}.Final.tar.gz";
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="2.3"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-java/mvel/files/, dev-java/mvel/

2022-01-19 Thread Miroslav Šulc
commit: 28f70d482376d73456a37367becda59a6d79acb4
Author: Yuan Liao  gmail  com>
AuthorDate: Mon Dec 20 16:59:15 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jan 19 09:22:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28f70d48

dev-java/mvel: Initial import

Signed-off-by: Yuan Liao  gmail.com>
Closes: 
https://github.com/gentoo/gentoo/pull/23438/commits/d5e0c70697375cdd5351448f086e33d6cf3260ff
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/mvel/Manifest |  1 +
 .../files/mvel-2.3.2-ignore-failing-tests.patch| 43 
 ...mvel-2.3.2-update-supported-java-versions.patch | 51 ++
 .../mvel-2.3.2-update-version-in-output.patch  | 26 +++
 dev-java/mvel/metadata.xml | 11 +++
 dev-java/mvel/mvel-2.3.2.ebuild| 82 ++
 6 files changed, 214 insertions(+)

diff --git a/dev-java/mvel/Manifest b/dev-java/mvel/Manifest
new file mode 100644
index ..4af3792b6c2f
--- /dev/null
+++ b/dev-java/mvel/Manifest
@@ -0,0 +1 @@
+DIST mvel2-2.3.2.Final.tar.gz 2405839 BLAKE2B 
5f12652a0f4375f6e24f18313d99a02bb86463cc1acc2f8845b815c9c7afcda410d67c9f1c30544f9ab1cd50a48ce0ab72e9cca94faafab776f3704b1d5fa087
 SHA512 
9d1c92bfe90aa4cfe5f4bbdd7eef2060bfaec3979c5c07a5baf3ddb4d84a00632dcaec266bab675b31d5b745bfa36a89dd5969ababeb64332069939a4df23dbc

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
new file mode 100644
index ..1cfd9e8abc36
--- /dev/null
+++ b/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch
@@ -0,0 +1,43 @@
+From fcf12bd0322556b4396a72a5402124d9543781d9 Mon Sep 17 00:00:00 2001
+From: Yuan Liao 
+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 
+---
+ 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
new file mode 100644
index ..d019002cda1f
--- /dev/null
+++ b/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch
@@ -0,0 +1,51 @@
+From 04f476bbc3768d9052ae9c8a1b0aa53340a993b3 Mon Sep 17 00:00:00 2001
+From: Yuan Liao 
+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 
+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 
+Date: Tue, 2 Apr 2019 10:20:31 +0200
+Subject: [PATCH 2/4] mvel does not work with java 12 #185
+
+From: mmelko 
+Date: Fri, 26 Jun 2020 08:55:24 +0200
+Subject: [PATCH 3/4] Fix building on java 14
+
+From: mariofusco 
+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 
+---
+ .../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/ASMAccessorOptim