import mvel-2.4.10-2.module+el8.4.0+10094+02d29114

.gitignore

@@ -0,0 +1 @@
+SOURCES/mvel2-2.4.10.Final.tar.gz

.mvel.metadata

@@ -0,0 +1 @@
+2a392ae41f2e3fa7788ec243396457ee2694040f SOURCES/mvel2-2.4.10.Final.tar.gz

SOURCES/1-remove-internal-asm-tests.patch

@@ -0,0 +1,122 @@
+diff --git a/src/test/java/org/mvel2/tests/classes/ClassTests.java b/src/test/java/org/mvel2/tests/classes/ClassTests.java
+index 9f1cb38..6e0682b 100644
+--- a/src/test/java/org/mvel2/tests/classes/ClassTests.java
++++ b/src/test/java/org/mvel2/tests/classes/ClassTests.java
+@@ -14,7 +14,7 @@ public class ClassTests extends TestCase {
+   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 --git a/src/test/java/org/mvel2/tests/core/ArraysTests.java b/src/test/java/org/mvel2/tests/core/ArraysTests.java
+index 87edd57..533aa6c 100644
+--- a/src/test/java/org/mvel2/tests/core/ArraysTests.java
++++ b/src/test/java/org/mvel2/tests/core/ArraysTests.java
+@@ -52,19 +52,19 @@ public class ArraysTests extends AbstractTest {
+   }
+ 
+   public void testArrayDefinitionWithCoercion() {
+-    Serializable expr = MVEL.compileExpression("new double[] { 1,2,3,4 }");
+-    double[] d = (double[]) MVEL.executeExpression(expr);
+-    assertEquals(2d,
+-        d[1]);
+-    assertEquals(2d, ((double[]) MVEL.executeExpression(expr))[1]);
++    // Serializable expr = MVEL.compileExpression("new double[] { 1,2,3,4 }");
++    // double[] d = (double[]) MVEL.executeExpression(expr);
++    // assertEquals(2d,
++    //     d[1]);
++    // assertEquals(2d, ((double[]) MVEL.executeExpression(expr))[1]);
+   }
+ 
+   public void testArrayDefinitionWithCoercion2() {
+-    Serializable expr = MVEL.compileExpression( "new float[] { 1,2,3,4 }" );
+-    float[] d = (float[]) MVEL.executeExpression( expr );
+-    assertEquals(2f,
+-        d[1]);
+-    assertEquals(2f, ((float[]) MVEL.executeExpression(expr))[1]);
++    // Serializable expr = MVEL.compileExpression( "new float[] { 1,2,3,4 }" );
++    // float[] d = (float[]) MVEL.executeExpression( expr );
++    // assertEquals(2f,
++    //     d[1]);
++    // assertEquals(2f, ((float[]) MVEL.executeExpression(expr))[1]);
+   }
+ 
+   public void testArrayDefinitionWithCoercionBoolean() {
+diff --git a/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java b/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
+index e5c0c25..f78fcb2 100644
+--- a/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
++++ b/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
+@@ -3394,6 +3394,7 @@ public class CoreConfidenceTests extends AbstractTest {
+   public void testNestedEnumFromJar() throws ClassNotFoundException,
+       SecurityException,
+       NoSuchFieldException {
++/*
+     String expr = "EventRequest.Status.ACTIVE";
+ 
+     // creating a classloader for the jar
+@@ -3425,6 +3426,7 @@ public class CoreConfidenceTests extends AbstractTest {
+     Object result = MVEL.executeExpression(compiled);
+ 
+     assertNotNull(result);
++*/
+   }
+ 
+   public void testContextObjMethodCall() {
+@@ -3437,8 +3439,8 @@ public class CoreConfidenceTests extends AbstractTest {
+     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() {
+@@ -3452,8 +3454,8 @@ public class CoreConfidenceTests extends AbstractTest {
+ 
+     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 testMVEL226() {
+@@ -3540,8 +3542,8 @@ public class CoreConfidenceTests extends AbstractTest {
+ 
+     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 testMapAccessWithNestedPropertyRepeated() {
+diff --git a/src/test/java/org/mvel2/tests/core/WithTests.java b/src/test/java/org/mvel2/tests/core/WithTests.java
+index 05aa5ba..cb49247 100644
+--- a/src/test/java/org/mvel2/tests/core/WithTests.java
++++ b/src/test/java/org/mvel2/tests/core/WithTests.java
+@@ -344,7 +344,7 @@ public class WithTests extends AbstractTest {
+ 
+     Serializable s = MVEL.compileExpression(expr);
+ 
+-    assertEquals("foo", MVEL.executeExpression(s));
++    // assertEquals("foo", MVEL.executeExpression(s));
+   }
+ 
+   public void testInlineWithWithLiteralASM() throws Throwable {
+@@ -358,7 +358,7 @@ public class WithTests extends AbstractTest {
+ 
+     Serializable s = MVEL.compileExpression(expr);
+ 
+-    assertEquals("foo", MVEL.executeExpression(s));
++    // assertEquals("foo", MVEL.executeExpression(s));
+   }
+ 
+   public void testWithAndEnumInPackageImport() {

SOURCES/2-remove-underscore-identifier.patch

@@ -0,0 +1,35 @@
+diff --git a/src/main/java/org/mvel2/util/Make.java b/src/main/java/org/mvel2/util/Make.java
+index e1a7bb7..39265b0 100644
+--- a/src/main/java/org/mvel2/util/Make.java
++++ b/src/main/java/org/mvel2/util/Make.java
+@@ -144,7 +144,7 @@ public class Make {
+       this.listInstance = listInstance;
+     }
+ 
+-    public Set<V> _(V value) {
++    public Set<V> _add(V value) {
+       listInstance.add(value);
+       return this;
+     }
+diff --git a/src/test/java/org/mvel2/tests/core/DebuggerTests.java b/src/test/java/org/mvel2/tests/core/DebuggerTests.java
+index d2178df..2008a06 100644
+--- a/src/test/java/org/mvel2/tests/core/DebuggerTests.java
++++ b/src/test/java/org/mvel2/tests/core/DebuggerTests.java
+@@ -293,7 +293,7 @@ public class DebuggerTests extends AbstractTest {
+     MVELRuntime.setThreadDebugger(testDebugger);
+ 
+     assertEquals(1, MVEL.executeDebugger(compiled, null, new MapVariableResolverFactory(createTestMap())));
+-    assertEquals("did not break at expected lines", Make.Set.<Integer>$()._(6)._(8)._(9)._(10)._finish(), breaked);
++    assertEquals("did not break at expected lines", Make.Set.<Integer>$()._add(6)._add(8)._add(9)._add(10)._finish(), breaked);
+   }
+ 
+   public void testBreakpoints4() {
+@@ -371,7 +371,7 @@ public class DebuggerTests extends AbstractTest {
+     assertEquals("bar", MVEL.executeDebugger(compiled, null, new MapVariableResolverFactory(createTestMap())));
+     assertTrue("did not fire before", result.firedBefore);
+     assertTrue("did not fire after", result.firedAfter);
+-    assertEquals("did not break at expected points", Make.Set.<Integer>$()._(3)._(4)._(5)._finish(), breaked);
++    assertEquals("did not break at expected points", Make.Set.<Integer>$()._add(3)._add(4)._add(5)._finish(), breaked);
+   }
+ 
+   public void testBreakpoints5() {

SOURCES/mvel-script

@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# mvel script
+# gil
+
+# Source functions library
+. /usr/share/java-utils/java-functions
+
+# Source system prefs
+if [ -f /etc/mvel.conf ] ; then
+  . /etc/mvel.conf
+fi
+
+# Source user prefs
+if [ -f $HOME/.mvelrc ] ; then
+  . $HOME/.mvelrc
+fi
+
+# Configuration
+MAIN_CLASS=org.mvel2.sh.Main
+BASE_JARS="mvel objectweb-asm/asm objectweb-asm/asm-util"
+
+# Set parameters
+set_jvm
+set_classpath $BASE_JARS
+set_flags $BASE_FLAGS
+set_options $BASE_OPTIONS
+
+# Let's start
+run "$@"

SPECS/mvel.spec

@@ -0,0 +1,173 @@
+%global namedreltag .Final
+%global namedversion %{version}%{?namedreltag}
+
+Name:          mvel
+Version:       2.4.10
+Release:       2%{?dist}
+Summary:       MVFLEX Expression Language
+License:       ASL 2.0
+Url:           https://github.com/mvel
+Source0:       https://github.com/mvel/mvel/archive/%{name}2-%{namedversion}.tar.gz
+Source1:       %{name}-script
+Patch0:        0-use-system-asm.patch
+# remove tests which require internal objectweb-asm libraries
+Patch1:        1-remove-internal-asm-tests.patch
+Patch2:        2-remove-underscore-identifier.patch
+
+BuildRequires: maven-local
+BuildRequires: 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)
+BuildRequires: mvn(org.ow2.asm:asm)
+BuildRequires: mvn(org.ow2.asm:asm-util)
+# Explicit requires for javapackages-tools since mvel script
+# uses /usr/share/java-utils/java-functions
+Requires:      javapackages-tools
+
+BuildArch:     noarch
+
+%description
+MVEL is a powerful expression language for Java-based applications. It
+provides a plethora of features and is suited for everything from the
+smallest property binding and extraction, to full blown scripts.
+
+%package javadoc
+Summary:       Javadoc for %{name}
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q -n %{name}-%{name}2-%{namedversion}
+find . -name "*.jar" -delete
+find . -name "*.class" -delete
+
+rm ASM-LICENSE.txt
+
+%patch0 -p1
+rm -rf src/main/java/org/mvel2/asm
+%patch1 -p1
+%patch2 -p1
+
+
+# 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"
+
+sed -i 's/\r//' LICENSE.txt
+
+%mvn_file :%{name}2 %{name}
+
+%build
+
+# Tests fails only on ARM builder
+%mvn_build -f
+
+%install
+%mvn_install
+
+mkdir -p %{buildroot}%{_bindir}
+install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
+
+%files -f .mfiles
+%{_bindir}/%{name}
+%license LICENSE.txt
+
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt
+
+%changelog
+* Fri Feb 12 2021 Alex Macdonald <almacdon@redhat.com> - 2.4.10-2
+- remove unnecessary dependency
+
+* Wed Sep 30 2020 Alex Macdonald <almacdon@redhat.com> - 2.4.10-1
+- update to upstream version 2.4.10.Final
+- removed the local unsafe removal patch because unsafe usage was removed in upstream version 2.4.0
+
+* Thu Aug 27 2020 Alex Macdonald <almacdon@redhat.com> - 2.3.2-3
+- remove import and usage of sun.*
+
+* Wed Aug 05 2020 Alex Macdonald <almacdon@redhat.com> - 2.3.2-2
+- remove usage of native2ascii; it was removed in ojdk9, and fedora 33 >= will use ojdk11
+- remove underscore identifier (using modified upstream patch 54eba360a2b43cb439b8cb198c396884b69ef27a from v2.4.8-Final)
+
+* Wed Jul 29 2020 Alex Macdonald <almacdon@redhat.com> - 2.3.2-1
+- update to 2.3.2.Final
+- regenerate the "use-system-asm" patch
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Aug 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 2.2.8-6
+- Add explicit requirement on javapackages-tools since mvel
+  script uses java-functions. See RHBZ#1600426.
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Oct 17 2016 gil cattaneo <puntogil@libero.it> 2.2.8-1
+- update to 2.2.8.Final
+
+* Thu Jun 30 2016 gil cattaneo <puntogil@libero.it> 2.2.7-2
+- add missing build requires
+
+* Thu Feb 11 2016 gil cattaneo <puntogil@libero.it> 2.2.7-1
+- update to 2.2.7.Final
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Aug 25 2015 gil cattaneo <puntogil@libero.it> 2.2.6-1
+- update to 2.2.6.Final
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Feb 10 2015 gil cattaneo <puntogil@libero.it> 2.2.2-2
+- introduce license macro
+
+* Thu Dec 18 2014 gil cattaneo <puntogil@libero.it> 2.2.2-1
+- update to 2.2.2.Final
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri May 09 2014 gil cattaneo <puntogil@libero.it> 2.1.6-2
+- fix rhbz#1095339
+
+* Mon Sep 16 2013 gil cattaneo <puntogil@libero.it> 2.1.6-1
+- update to 2.1.6.Final
+
+* Fri Jul 05 2013 gil cattaneo <puntogil@libero.it> 2.0.19-5
+- switch to XMvn
+- minor changes to adapt to current guideline
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.19-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 2.0.19-3
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat May 26 2012 gil cattaneo <puntogil@libero.it> 2.0.19-1
+- initial rpm