[mvel] 31/42: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Jan 18 17:01:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository mvel.
commit 63de88da7b9398a75f1cde640ccc6f149115b87f
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Jan 18 16:53:26 2016 +0100
Refreshed the patches
---
debian/changelog | 2 +-
debian/patches/java8-compatibility.patch | 20 +++---
debian/patches/pom.diff | 4 +-
debian/patches/use_system_asm.diff | 106 ++++++++++++++++---------------
4 files changed, 67 insertions(+), 65 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 90053de..5a0e1be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mvel (2.0.19-1) UNRELEASED; urgency=medium
+mvel (2.1.0-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch
index 5c05680..fc9dc79 100644
--- a/debian/patches/java8-compatibility.patch
+++ b/debian/patches/java8-compatibility.patch
@@ -4,15 +4,15 @@ Forwarded: no
--- a/src/main/java/org/mvel2/util/JITClassLoader.java
+++ b/src/main/java/org/mvel2/util/JITClassLoader.java
@@ -45,11 +45,6 @@
- }
+ }
- public Class<?> defineClassX(String className, byte[] b, int off, int len) {
-- if (sunJVM) {
-- return ((Unsafe) sunUnsafe).defineClass(className, b, off, len);
-- }
-- else {
-- return super.defineClass(className, b, off, len);
-- }
-+ return super.defineClass(className, b, off, len);
- }
+ public Class<?> defineClassX(String className, byte[] b, int off, int len) {
+- if (sunJVM) {
+- return ((Unsafe) sunUnsafe).defineClass(className, b, off, len);
+- }
+- else {
+- return super.defineClass(className, b, off, len);
+- }
++ return super.defineClass(className, b, off, len);
+ }
}
diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
index c168ee4..dc00371 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
-@@ -175,6 +175,13 @@
+@@ -233,6 +233,13 @@
<!--<version>1.0.2.GA</version>-->
<!--<scope>test</scope>-->
<!--</dependency> -->
@@ -16,4 +16,4 @@ Forwarded: not-needed
+
</dependencies>
-
+ <distributionManagement>
diff --git a/debian/patches/use_system_asm.diff b/debian/patches/use_system_asm.diff
index 0301654..034cd3f 100644
--- a/debian/patches/use_system_asm.diff
+++ b/debian/patches/use_system_asm.diff
@@ -5,40 +5,40 @@ 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
@@ -18,10 +18,10 @@
- package org.mvel2.optimizers.impl.asm;
-
- import org.mvel2.*;
--import org.mvel2.asm.ClassWriter;
--import org.mvel2.asm.Label;
--import org.mvel2.asm.MethodVisitor;
--import org.mvel2.asm.Opcodes;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.Label;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
- import org.mvel2.ast.Function;
- import org.mvel2.ast.TypeDescriptor;
- import org.mvel2.ast.WithNode;
-@@ -53,8 +53,8 @@
- import static org.mvel2.DataConversion.convert;
- import static org.mvel2.MVEL.eval;
- import static org.mvel2.MVEL.isAdvancedDebugging;
--import static org.mvel2.asm.Opcodes.*;
--import static org.mvel2.asm.Type.*;
-+import static org.objectweb.asm.Opcodes.*;
-+import static org.objectweb.asm.Type.*;
- import static org.mvel2.ast.TypeDescriptor.getClassReference;
- import static org.mvel2.integration.GlobalListenerFactory.hasGetListeners;
- import static org.mvel2.integration.GlobalListenerFactory.notifyGetListeners;
-@@ -648,7 +648,7 @@
-
- mv = cw.visitMethod(ACC_PUBLIC, "getKnownEgressType", "()Ljava/lang/Class;", null, null);
- mv.visitCode();
-- mv.visitLdcInsn(org.mvel2.asm.Type.getType(returnType != null ? returnType : Object.class));
-+ mv.visitLdcInsn(org.objectweb.asm.Type.getType(returnType != null ? returnType : Object.class));
- mv.visitInsn(ARETURN);
-
- mv.visitMaxs(1, 1);
+ package org.mvel2.optimizers.impl.asm;
+
+ import org.mvel2.*;
+-import org.mvel2.asm.ClassWriter;
+-import org.mvel2.asm.Label;
+-import org.mvel2.asm.MethodVisitor;
+-import org.mvel2.asm.Opcodes;
++import org.objectweb.asm.ClassWriter;
++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;
+@@ -51,8 +51,8 @@
+ import static org.mvel2.DataConversion.convert;
+ import static org.mvel2.MVEL.eval;
+ import static org.mvel2.MVEL.isAdvancedDebugging;
+-import static org.mvel2.asm.Opcodes.*;
+-import static org.mvel2.asm.Type.*;
++import static org.objectweb.asm.Opcodes.*;
++import static org.objectweb.asm.Type.*;
+ import static org.mvel2.ast.TypeDescriptor.getClassReference;
+ import static org.mvel2.integration.GlobalListenerFactory.hasGetListeners;
+ import static org.mvel2.integration.GlobalListenerFactory.notifyGetListeners;
+@@ -702,7 +702,7 @@
+ if (clazz.isPrimitive()) {
+ mv.visitFieldInsn(GETSTATIC, toNonPrimitiveType(clazz).getName().replace(".", "/"), "TYPE", "Ljava/lang/Class;");
+ } else {
+- mv.visitLdcInsn(org.mvel2.asm.Type.getType(clazz));
++ mv.visitLdcInsn(org.objectweb.asm.Type.getType(clazz));
+ }
+ }
+
--- a/src/main/java/org/mvel2/optimizers/impl/asm/ProducesBytecode.java
+++ b/src/main/java/org/mvel2/optimizers/impl/asm/ProducesBytecode.java
@@ -18,7 +18,7 @@
@@ -52,46 +52,48 @@ Last-Update: 2010-02-24
/**
--- 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 @@
+@@ -1,9 +1,9 @@
package org.mvel2.tests.core.res;
-import org.mvel2.asm.MethodVisitor;
++import org.objectweb.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 @@
+@@ -3,9 +3,9 @@
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.mvel2.asm.Opcodes.*;
+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 @@
+@@ -389,4 +389,4 @@
- assertEquals("foobie", wo.getFieldValue("foo"));
- }
+ 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
-@@ -45,7 +45,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());
- }
-
+@@ -42,7 +42,7 @@
+ * By default, activate the JIT if ASM is present in the classpath
+ */
+ try {
+- OptimizerFactory.class.getClassLoader().loadClass("org.mvel2.asm.ClassWriter");
++ OptimizerFactory.class.getClassLoader().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
More information about the pkg-java-commits
mailing list