[mvel] 41/42: Refreshed the patches

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository mvel.

commit 38a2ca3ee8cf943439cc25c534218d8ffde39c35
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 18 17:37:58 2016 +0100

    Refreshed the patches
---
 debian/changelog                   |  2 +-
 debian/patches/pom.diff            |  2 +-
 debian/patches/use_system_asm.diff | 31 +++++++++++++++++--------------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e932a7..1c050d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mvel (2.2.1-1) UNRELEASED; urgency=medium
+mvel (2.2.7-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
index b1cce25..3a17e69 100644
--- a/debian/patches/pom.diff
+++ b/debian/patches/pom.diff
@@ -3,7 +3,7 @@ Author: Damien Raude-Morvan <drazzib at debian.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -233,6 +233,13 @@
+@@ -273,6 +273,13 @@
          <!--<version>1.0.2.GA</version>-->
          <!--<scope>test</scope>-->
          <!--</dependency>        -->
diff --git a/debian/patches/use_system_asm.diff b/debian/patches/use_system_asm.diff
index e094fa2..2637582 100644
--- a/debian/patches/use_system_asm.diff
+++ b/debian/patches/use_system_asm.diff
@@ -4,10 +4,10 @@ Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2010-02-24
 --- a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
 +++ b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
-@@ -19,10 +19,10 @@
- 
- import com.sun.org.apache.xpath.internal.compiler.OpCodes;
- import org.mvel2.*;
+@@ -23,10 +23,10 @@
+ import org.mvel2.OptimizationFailure;
+ import org.mvel2.ParserContext;
+ import org.mvel2.PropertyAccessException;
 -import org.mvel2.asm.ClassWriter;
 -import org.mvel2.asm.Label;
 -import org.mvel2.asm.MethodVisitor;
@@ -16,10 +16,10 @@ Last-Update: 2010-02-24
 +import org.objectweb.asm.Label;
 +import org.objectweb.asm.MethodVisitor;
 +import org.objectweb.asm.Opcodes;
- import org.mvel2.ast.*;
- import org.mvel2.compiler.*;
- import org.mvel2.integration.GlobalListenerFactory;
-@@ -52,8 +52,8 @@
+ import org.mvel2.ast.FunctionInstance;
+ import org.mvel2.ast.TypeDescriptor;
+ import org.mvel2.ast.WithNode;
+@@ -74,8 +74,8 @@
  import static org.mvel2.DataConversion.convert;
  import static org.mvel2.MVEL.eval;
  import static org.mvel2.MVEL.isAdvancedDebugging;
@@ -30,7 +30,7 @@ Last-Update: 2010-02-24
  import static org.mvel2.ast.TypeDescriptor.getClassReference;
  import static org.mvel2.integration.GlobalListenerFactory.hasGetListeners;
  import static org.mvel2.integration.GlobalListenerFactory.notifyGetListeners;
-@@ -700,7 +700,7 @@
+@@ -723,7 +723,7 @@
      if (clazz.isPrimitive()) {
          mv.visitFieldInsn(GETSTATIC, toNonPrimitiveType(clazz).getName().replace(".", "/"), "TYPE", "Ljava/lang/Class;");
      } else {
@@ -88,12 +88,15 @@ Last-Update: 2010-02-24
 +}
 --- a/src/main/java/org/mvel2/optimizers/OptimizerFactory.java
 +++ b/src/main/java/org/mvel2/optimizers/OptimizerFactory.java
-@@ -42,7 +42,7 @@
-      * By default, activate the JIT if ASM is present in the classpath
+@@ -43,9 +43,9 @@
       */
      try {
--      OptimizerFactory.class.getClassLoader().loadClass("org.mvel2.asm.ClassWriter");
-+      OptimizerFactory.class.getClassLoader().loadClass("org.objectweb.asm.ClassWriter");
+       if (OptimizerFactory.class.getClassLoader() != null) {
+-          OptimizerFactory.class.getClassLoader().loadClass("org.mvel2.asm.ClassWriter");
++          OptimizerFactory.class.getClassLoader().loadClass("org.objectweb.asm.ClassWriter");
+       } else {
+-          ClassLoader.getSystemClassLoader().loadClass("org.mvel2.asm.ClassWriter");
++          ClassLoader.getSystemClassLoader().loadClass("org.objectweb.asm.ClassWriter");
+       }
        accessorCompilers.put("ASM", new ASMAccessorOptimizer());
      }
-     catch (ClassNotFoundException e) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mvel.git