package update

mvel-2.2.8.Final-tests.patch

@@ -1,101 +0,0 @@
-diff -Nru mvel-mvel2-2.2.8.Final/src/test/java/org/mvel2/tests/classes/ClassTests.java mvel-mvel2-2.2.8.Final.tests/src/test/java/org/mvel2/tests/classes/ClassTests.java
---- mvel-mvel2-2.2.8.Final/src/test/java/org/mvel2/tests/classes/ClassTests.java	2016-03-22 14:39:33.000000000 +0100
-+++ mvel-mvel2-2.2.8.Final.tests/src/test/java/org/mvel2/tests/classes/ClassTests.java	2016-10-17 11:36:24.922633715 +0200
-@@ -14,7 +14,7 @@
-   private final String dir = "src/test/java/" + getClass().getPackage().getName().replaceAll("\\.", "/");
- 
-   public void testScript() throws IOException {
--    final Object o = MVEL.evalFile(new File(dir + "/demo.mvel"), new HashMap<String, Object>());
-+    //final Object o = MVEL.evalFile(new File(dir + "/demo.mvel"), new HashMap<String, Object>());
-   }
- 
- }
-diff -Nru mvel-mvel2-2.2.8.Final/src/test/java/org/mvel2/tests/core/ArraysTests.java mvel-mvel2-2.2.8.Final.tests/src/test/java/org/mvel2/tests/core/ArraysTests.java
---- mvel-mvel2-2.2.8.Final/src/test/java/org/mvel2/tests/core/ArraysTests.java	2016-03-22 14:39:33.000000000 +0100
-+++ mvel-mvel2-2.2.8.Final.tests/src/test/java/org/mvel2/tests/core/ArraysTests.java	2016-10-17 11:36:24.922633715 +0200
-@@ -52,15 +52,15 @@
-   }
- 
-   public void testArrayDefinitionWithCoercion() {
--    double[] d = (double[]) MVEL.executeExpression(MVEL.compileExpression("new double[] { 1,2,3,4 }"));
--    assertEquals(2d,
--        d[1]);
-+    //double[] d = (double[]) MVEL.executeExpression(MVEL.compileExpression("new double[] { 1,2,3,4 }"));
-+    //assertEquals(2d,
-+    //    d[1]);
-   }
- 
-   public void testArrayDefinitionWithCoercion2() {
--    float[] d = (float[]) MVEL.executeExpression( MVEL.compileExpression( "new float[] { 1,2,3,4 }" ) );
--    assertEquals(2f,
--        d[1]);
-+    //float[] d = (float[]) MVEL.executeExpression( MVEL.compileExpression( "new float[] { 1,2,3,4 }" ) );
-+    //assertEquals(2f,
-+    //    d[1]);
-   }
- 
-   public void testArrayCreation2() {
-diff -Nru mvel-mvel2-2.2.8.Final/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java mvel-mvel2-2.2.8.Final.tests/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
---- mvel-mvel2-2.2.8.Final/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java	2016-03-22 14:39:33.000000000 +0100
-+++ mvel-mvel2-2.2.8.Final.tests/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java	2016-10-17 11:36:24.923633656 +0200
-@@ -3384,6 +3384,7 @@
-   public void testNestedEnumFromJar() throws ClassNotFoundException,
-       SecurityException,
-       NoSuchFieldException {
-+/*
-     String expr = "EventRequest.Status.ACTIVE";
- 
-     // creating a classloader for the jar
-@@ -3415,6 +3416,7 @@
-     Object result = MVEL.executeExpression(compiled);
- 
-     assertNotNull(result);
-+*/
-   }
- 
-   public void testContextObjMethodCall() {
-@@ -3427,8 +3429,8 @@
-     ExecutableStatement stmt = (ExecutableStatement) MVEL.compileExpression(str, pctx);
-     Bar ctx = new Bar();
-     ctx.setName("bob");
--    Boolean result = (Boolean) MVEL.executeExpression(stmt, ctx);
--    assertTrue(result);
-+    //Boolean result = (Boolean) MVEL.executeExpression(stmt, ctx);
-+    //assertTrue(result);
-   }
- 
-   public void testMapAccessWithNestedMethodCall() {
-@@ -3442,8 +3444,8 @@
- 
-     POJO ctx = new POJO();
-     ctx.getMap().put("1", "one");
--    Boolean result = (Boolean) MVEL.executeExpression(stmt, ctx);
--    assertTrue(result);
-+    //Boolean result = (Boolean) MVEL.executeExpression(stmt, ctx);
-+    //assertTrue(result);
-   }
- 
-   public void testMapAccessWithNestedProperty() {
-@@ -3457,8 +3459,8 @@
- 
-     POJO ctx = new POJO();
-     ctx.getMap().put("1", "one");
--    Boolean result = (Boolean) MVEL.executeExpression(stmt, ctx);
--    assertTrue(result);
-+    //Boolean result = (Boolean) MVEL.executeExpression(stmt, ctx);
-+    //assertTrue(result);
-   }
- 
-   public void testArrays() {
-diff -Nru mvel-mvel2-2.2.8.Final/src/test/java/org/mvel2/tests/core/WithTests.java mvel-mvel2-2.2.8.Final.tests/src/test/java/org/mvel2/tests/core/WithTests.java
---- mvel-mvel2-2.2.8.Final/src/test/java/org/mvel2/tests/core/WithTests.java	2016-03-22 14:39:33.000000000 +0100
-+++ mvel-mvel2-2.2.8.Final.tests/src/test/java/org/mvel2/tests/core/WithTests.java	2016-10-17 11:36:24.923633656 +0200
-@@ -353,7 +353,7 @@
- 
-     Serializable s = MVEL.compileExpression(expr);
- 
--    assertEquals("foo", MVEL.executeExpression(s));
-+    //assertEquals("foo", MVEL.executeExpression(s));
-   }
- 
-   public void testWithAndEnumInPackageImport() {

mvel.spec

@@ -1,21 +1,19 @@
 %global namedreltag .Final
 %global namedversion %{version}%{?namedreltag}
 Name:                mvel
-Version:             2.2.8
+Version:             2.5.0
 Release:             1
 Summary:             MVFLEX Expression Language
 License:             ASL 2.0
 Url:                 https://github.com/mvel/mvel
 Source0:             https://github.com/mvel/mvel/archive/%{name}2-%{namedversion}.tar.gz
 Source1:             %{name}-script
-Patch0:              %{name}-2.2.7.Final-use-system-asm.patch
-Patch1:              %{name}-2.2.8.Final-tests.patch
 
 BuildRequires:       maven-local mvn(com.thoughtworks.xstream:xstream) mvn(junit:junit)
 BuildRequires:       mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:       mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:       mvn(org.apache.maven.plugins:maven-surefire-report-plugin) mvn(org.ow2.asm:asm)
-BuildRequires:       mvn(org.ow2.asm:asm-util)
+BuildRequires:       mvn(org.ow2.asm:asm-util) mvn(org.apache.maven.plugins:maven-shade-plugin)
 Requires:            javapackages-tools
 BuildArch:           noarch
 
@@ -35,9 +33,7 @@ This package contains javadoc for %{name}.
 find . -name "*.jar" -delete
 find . -name "*.class" -delete
 rm ASM-LICENSE.txt
-%patch0 -p1
 rm -rf src/main/java/org/mvel2/asm
-%patch1 -p1
 sed -i '/Unsafe/d' src/main/java/org/mvel2/util/JITClassLoader.java
 %pom_remove_plugin :maven-source-plugin
 %pom_xpath_remove "pom:project/pom:build/pom:extensions"
@@ -61,5 +57,8 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
 %license LICENSE.txt
 
 %changelog
+* Tue Aug 22 2023 wulei <wu_lei@hoperun.com> - 2.5.0-1
+- Update to 2.5.0
+
 * Sat Jul 25 2020 leiju <leiju4@huawei.com> - 2.2.8-1
 - Package init