diff --git a/.gitignore b/.gitignore index 0dae839..a197e7f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /mvel2-2.2.2.Final.tar.gz /mvel2-2.2.6.Final.tar.gz /mvel2-2.2.7.Final.tar.gz +/mvel2-2.2.8.Final.tar.gz diff --git a/mvel-2.2.7.Final-tests.patch b/mvel-2.2.7.Final-tests.patch deleted file mode 100644 index 4cc6dc5..0000000 --- a/mvel-2.2.7.Final-tests.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -Nru mvel-mvel2-2.2.7.Final/src/test/java/org/mvel2/tests/classes/ClassTests.java mvel-mvel2-2.2.7.Final.tests/src/test/java/org/mvel2/tests/classes/ClassTests.java ---- mvel-mvel2-2.2.7.Final/src/test/java/org/mvel2/tests/classes/ClassTests.java 2015-09-28 18:09:36.000000000 +0200 -+++ mvel-mvel2-2.2.7.Final.tests/src/test/java/org/mvel2/tests/classes/ClassTests.java 2016-02-11 17:14:27.689737089 +0100 -@@ -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()); -+ //final Object o = MVEL.evalFile(new File(dir + "/demo.mvel"), new HashMap()); - } - - } -diff -Nru mvel-mvel2-2.2.7.Final/src/test/java/org/mvel2/tests/core/ArraysTests.java mvel-mvel2-2.2.7.Final.tests/src/test/java/org/mvel2/tests/core/ArraysTests.java ---- mvel-mvel2-2.2.7.Final/src/test/java/org/mvel2/tests/core/ArraysTests.java 2015-09-28 18:09:36.000000000 +0200 -+++ mvel-mvel2-2.2.7.Final.tests/src/test/java/org/mvel2/tests/core/ArraysTests.java 2016-02-11 17:24:28.945306361 +0100 -@@ -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.7.Final/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java mvel-mvel2-2.2.7.Final.tests/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java ---- mvel-mvel2-2.2.7.Final/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java 2015-09-28 18:09:36.000000000 +0200 -+++ mvel-mvel2-2.2.7.Final.tests/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java 2016-02-11 17:14:27.690737032 +0100 -@@ -3382,6 +3382,7 @@ - public void testNestedEnumFromJar() throws ClassNotFoundException, - SecurityException, - NoSuchFieldException { -+/* - String expr = "EventRequest.Status.ACTIVE"; - - // creating a classloader for the jar -@@ -3413,6 +3414,7 @@ - Object result = MVEL.executeExpression(compiled); - - assertNotNull(result); -+*/ - } - - public void testContextObjMethodCall() { -@@ -3425,8 +3427,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() { -@@ -3440,8 +3442,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() { -@@ -3455,8 +3457,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.7.Final/src/test/java/org/mvel2/tests/core/WithTests.java mvel-mvel2-2.2.7.Final.tests/src/test/java/org/mvel2/tests/core/WithTests.java ---- mvel-mvel2-2.2.7.Final/src/test/java/org/mvel2/tests/core/WithTests.java 2015-09-28 18:09:36.000000000 +0200 -+++ mvel-mvel2-2.2.7.Final.tests/src/test/java/org/mvel2/tests/core/WithTests.java 2016-02-11 17:14:27.691736975 +0100 -@@ -353,7 +353,7 @@ - - Serializable s = MVEL.compileExpression(expr); - -- assertEquals("foo", MVEL.executeExpression(s)); -+ //assertEquals("foo", MVEL.executeExpression(s)); - } - - public void testWithAndEnumInPackageImport() { diff --git a/mvel-2.2.8.Final-tests.patch b/mvel-2.2.8.Final-tests.patch new file mode 100644 index 0000000..626c98f --- /dev/null +++ b/mvel-2.2.8.Final-tests.patch @@ -0,0 +1,101 @@ +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()); ++ //final Object o = MVEL.evalFile(new File(dir + "/demo.mvel"), new HashMap()); + } + + } +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() { diff --git a/mvel.spec b/mvel.spec index 1df1e3f..9c330c7 100644 --- a/mvel.spec +++ b/mvel.spec @@ -2,8 +2,8 @@ %global namedversion %{version}%{?namedreltag} Name: mvel -Version: 2.2.7 -Release: 2%{?dist} +Version: 2.2.8 +Release: 1%{?dist} Summary: MVFLEX Expression Language License: ASL 2.0 Url: https://github.com/mvel @@ -11,7 +11,7 @@ Source0: https://github.com/mvel/mvel/archive/%{name}2-%{namedversion}.tar Source1: %{name}-script Patch0: %{name}-2.2.7.Final-use-system-asm.patch # remove tests which require internal objectweb-asm libraries -Patch1: %{name}-2.2.7.Final-tests.patch +Patch1: %{name}-2.2.8.Final-tests.patch BuildRequires: maven-local BuildRequires: mvn(com.thoughtworks.xstream:xstream) @@ -49,7 +49,7 @@ rm -rf src/main/java/org/mvel2/asm # See https://bugzilla.redhat.com/show_bug.cgi?id=1095339 sed -i '/Unsafe/d' src/main/java/org/mvel2/util/JITClassLoader.java -# Uwanted +# Unwanted task %pom_remove_plugin :maven-source-plugin # Remove org.apache.maven.wagon:wagon-webdav:1.0-beta-2 %pom_xpath_remove "pom:project/pom:build/pom:extensions" @@ -80,6 +80,9 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} %license LICENSE.txt %changelog +* Mon Oct 17 2016 gil cattaneo 2.2.8-1 +- update to 2.2.8.Final + * Thu Jun 30 2016 gil cattaneo 2.2.7-2 - add missing build requires diff --git a/sources b/sources index 45e3870..4e8a353 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01c93b157041bd7102bc90fdc76642e4 mvel2-2.2.7.Final.tar.gz +057b26a3f9fee6182113fca2d9964a82 mvel2-2.2.8.Final.tar.gz