This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mvel.
commit 192851a1d074e7866dda8ce7fff02d29cba49cef Author: Emmanuel Bourg <[email protected]> Date: Wed Jul 16 15:44:54 2014 +0000 Fixed the OptimizerFactory class and the unit tests to work with the system version of ASM --- debian/changelog | 4 +++- debian/patches/use_system_asm.diff | 45 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f9ebb14..6fd4d12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,9 +2,11 @@ mvel (2.0.18-4) unstable; urgency=medium * Team upload. * Fixed a compilation error with Java 8 + * Fixed the OptimizerFactory class and the unit tests to work + with the system version of ASM * debian/watch: Updated to watch the release tags on Github - -- Emmanuel Bourg <[email protected]> Wed, 14 May 2014 00:45:07 +0200 + -- Emmanuel Bourg <[email protected]> Wed, 16 Jul 2014 17:43:57 +0200 mvel (2.0.18-3) unstable; urgency=low diff --git a/debian/patches/use_system_asm.diff b/debian/patches/use_system_asm.diff index dee13f0..7cd9a6c 100644 --- a/debian/patches/use_system_asm.diff +++ b/debian/patches/use_system_asm.diff @@ -44,3 +44,48 @@ Last-Update: 2010-02-24 import org.mvel2.integration.VariableResolverFactory; /** +--- a/src/test/java/org/mvel2/tests/core/res/SampleBeanAccessor.java ++++ b/src/test/java/org/mvel2/tests/core/res/SampleBeanAccessor.java +@@ -1,8 +1,8 @@ + package org.mvel2.tests.core.res; + +-import org.mvel2.asm.MethodVisitor; +-import static org.mvel2.asm.Opcodes.CHECKCAST; +-import static org.mvel2.asm.Opcodes.INVOKEVIRTUAL; ++import org.objectweb.asm.MethodVisitor; ++import static org.objectweb.asm.Opcodes.CHECKCAST; ++import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; + import org.mvel2.integration.PropertyHandler; + import org.mvel2.integration.VariableResolverFactory; + import org.mvel2.optimizers.impl.asm.ProducesBytecode; +--- a/src/test/java/org/mvel2/tests/core/PropertyHandlerTests.java ++++ b/src/test/java/org/mvel2/tests/core/PropertyHandlerTests.java +@@ -3,8 +3,8 @@ + import junit.framework.TestCase; + import org.mvel2.MVEL; + import org.mvel2.PropertyAccessor; +-import org.mvel2.asm.MethodVisitor; +-import static org.mvel2.asm.Opcodes.*; ++import org.objectweb.asm.MethodVisitor; ++import static org.objectweb.asm.Opcodes.*; + import org.mvel2.integration.*; + import org.mvel2.optimizers.OptimizerFactory; + import org.mvel2.optimizers.impl.asm.ProducesBytecode; +@@ -387,4 +387,4 @@ + + assertEquals("foobie", wo.getFieldValue("foo")); + } +-} +\ No newline at end of file ++} +--- a/src/main/java/org/mvel2/optimizers/OptimizerFactory.java ++++ b/src/main/java/org/mvel2/optimizers/OptimizerFactory.java +@@ -44,7 +44,7 @@ + * By default, activate the JIT if ASM is present in the classpath + */ + try { +- currentThread().getContextClassLoader().loadClass("org.mvel2.asm.ClassWriter"); ++ currentThread().getContextClassLoader().loadClass("org.objectweb.asm.ClassWriter"); + accessorCompilers.put("ASM", new ASMAccessorOptimizer()); + } + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mvel.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
