[eclipselink] 03/15: No longer remove the embedded copy of ASM (Closes: #800851)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Oct 12 20:32:54 UTC 2017 

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

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

commit 0cadccdfbe485eba7be4e3164bfb5e755bf37137
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 28 23:55:00 2017 +0200

    No longer remove the embedded copy of ASM (Closes: #800851)
---
 debian/changelog                              |   1 +
 debian/classpath-debian                       |   1 -
 debian/control                                |   2 -
 debian/libeclipselink-java.manifest           |   2 +-
 debian/patches/disable_asm_embedded_copy.diff | 370 --------------------------
 debian/patches/series                         |   1 -
 6 files changed, 2 insertions(+), 375 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fedcc76..d2543ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ eclipselink (2.6.2-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - New dependency on libjsonp-java
+  * No longer remove the embedded copy of ASM (Closes: #800851)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 19 Jul 2016 11:30:24 +0200
 
diff --git a/debian/classpath-debian b/debian/classpath-debian
index 6d39c38..c51f700 100644
--- a/debian/classpath-debian
+++ b/debian/classpath-debian
@@ -11,6 +11,5 @@ usr/share/java/jsr311-api.jar
 usr/share/java/servlet-api-3.1.jar
 usr/share/java/antlr3.jar
 usr/share/java/antlr3-runtime.jar
-usr/share/java/asm3-all.jar
 usr/share/java/javax.mail.jar
 usr/share/java/javax.json.jar
diff --git a/debian/control b/debian/control
index 25a9683..fd26960 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends:
  default-jdk,
  default-jdk-doc,
  javahelper,
- libasm3-java,
  libcdi-api-java,
  libgeronimo-j2ee-connector-1.5-spec-java,
  libgeronimo-jms-1.1-spec-java,
@@ -33,7 +32,6 @@ Package: libeclipselink-java
 Architecture: all
 Depends:
  antlr3 (>= 3.2),
- libasm3-java,
  libcdi-api-java,
  libgeronimo-j2ee-connector-1.5-spec-java,
  libgeronimo-jms-1.1-spec-java,
diff --git a/debian/libeclipselink-java.manifest b/debian/libeclipselink-java.manifest
index 89582d1..1621145 100644
--- a/debian/libeclipselink-java.manifest
+++ b/debian/libeclipselink-java.manifest
@@ -8,7 +8,7 @@ usr/share/java/eclipselink.jar:
  Specification-Title: Eclipse Persistence Services
  Specification-Version: 2.5.1
  Main-Class: org.eclipse.persistence.Version
- Class-Path: /usr/share/java/javax.persistence-api.jar /usr/share/java/geronimo-jta_1.1_spec.jar /usr/share/java/geronimo-validation.jar /usr/share/java/javax.mail.jar /usr/share/java/geronimo-jms-1.1-spec.jar /usr/share/java/geronimo-j2ee-connector-1.5-spec.jar /usr/share/java/aspectjtools.jar /usr/share/java/sdo-api.jar /usr/share/java/antlr3.jar /usr/share/java/antlr3-runtime.jar /usr/share/java/asm3-all.jar /usr/share/java/cdi-api.jar /usr/share/java/jsr311-api.jar /usr/share/java/se [...]
+ Class-Path: /usr/share/java/javax.persistence-api.jar /usr/share/java/geronimo-jta_1.1_spec.jar /usr/share/java/geronimo-validation.jar /usr/share/java/javax.mail.jar /usr/share/java/geronimo-jms-1.1-spec.jar /usr/share/java/geronimo-j2ee-connector-1.5-spec.jar /usr/share/java/aspectjtools.jar /usr/share/java/sdo-api.jar /usr/share/java/antlr3.jar /usr/share/java/antlr3-runtime.jar /usr/share/java/cdi-api.jar /usr/share/java/jsr311-api.jar /usr/share/java/servlet-api-3.0.jar
 
 usr/share/java/org.eclipse.persistence.jpa.jpql.jar:
  Bundle-Name: EclipseLink Hermes Parser
diff --git a/debian/patches/disable_asm_embedded_copy.diff b/debian/patches/disable_asm_embedded_copy.diff
deleted file mode 100644
index f298a22..0000000
--- a/debian/patches/disable_asm_embedded_copy.diff
+++ /dev/null
@@ -1,370 +0,0 @@
-Description: Remove reference to ASM 1.5 embedded copy
-Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: no
-Last-Update: 2013-09-27
-
---- a/org/eclipse/persistence/internal/xr/XRClassWriter.java
-+++ b/org/eclipse/persistence/internal/xr/XRClassWriter.java
-@@ -17,21 +17,21 @@
- //EclipseLink imports
- import org.eclipse.persistence.dynamic.DynamicClassLoader;
- import org.eclipse.persistence.dynamic.DynamicClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.MethodVisitor;
- import static org.eclipse.persistence.internal.dynamic.DynamicPropertiesManager.PROPERTIES_MANAGER_FIELD;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_PUBLIC;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_STATIC;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_SUPER;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ALOAD;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ARETURN;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.DUP;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.GETSTATIC;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.INVOKESPECIAL;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.NEW;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.PUTSTATIC;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.RETURN;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.V1_5;
-+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-+import static org.objectweb.asm.Opcodes.ACC_STATIC;
-+import static org.objectweb.asm.Opcodes.ACC_SUPER;
-+import static org.objectweb.asm.Opcodes.ALOAD;
-+import static org.objectweb.asm.Opcodes.ARETURN;
-+import static org.objectweb.asm.Opcodes.DUP;
-+import static org.objectweb.asm.Opcodes.GETSTATIC;
-+import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
-+import static org.objectweb.asm.Opcodes.NEW;
-+import static org.objectweb.asm.Opcodes.PUTSTATIC;
-+import static org.objectweb.asm.Opcodes.RETURN;
-+import static org.objectweb.asm.Opcodes.V1_5;
- import static org.eclipse.persistence.internal.xr.XRDynamicClassLoader.COLLECTION_WRAPPER_SUFFIX;
- 
- /**
---- a/org/eclipse/persistence/internal/dbws/SOAPResponseClassLoader.java
-+++ b/org/eclipse/persistence/internal/dbws/SOAPResponseClassLoader.java
-@@ -18,14 +18,14 @@
- // Java extension imports
- 
- // EclipseLink imports
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_PUBLIC;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_SUPER;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ALOAD;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.INVOKESPECIAL;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.RETURN;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.V1_5;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.MethodVisitor;
-+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-+import static org.objectweb.asm.Opcodes.ACC_SUPER;
-+import static org.objectweb.asm.Opcodes.ALOAD;
-+import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
-+import static org.objectweb.asm.Opcodes.RETURN;
-+import static org.objectweb.asm.Opcodes.V1_5;
- 
- /**
-  * <p><b>INTERNAL</b>: A subclass of {@link ClassLoader} that exposes a build method to the hidden
---- a/org/eclipse/persistence/internal/jpa/weaving/RestAdapterClassWriter.java
-+++ b/org/eclipse/persistence/internal/jpa/weaving/RestAdapterClassWriter.java
-@@ -14,9 +14,9 @@
- 
- import org.eclipse.persistence.dynamic.DynamicClassLoader;
- import org.eclipse.persistence.dynamic.EclipseLinkClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Opcodes;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
- 
- public class RestAdapterClassWriter implements EclipseLinkClassWriter, Opcodes {
- 
---- a/org/eclipse/persistence/internal/jpa/weaving/ComputeClassWriter.java
-+++ b/org/eclipse/persistence/internal/jpa/weaving/ComputeClassWriter.java
-@@ -33,9 +33,9 @@
- import java.io.IOException;
- import java.io.InputStream;
- 
--import org.eclipse.persistence.internal.libraries.asm.ClassReader;
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.Opcodes;
-+import org.objectweb.asm.ClassReader;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.Opcodes;
- 
- /**
-  * A ClassWriter that computes the common super class of two classes without
---- a/org/eclipse/persistence/internal/jpa/weaving/ClassWeaver.java
-+++ b/org/eclipse/persistence/internal/jpa/weaving/ClassWeaver.java
-@@ -20,13 +20,13 @@
- import java.util.Iterator;
- 
- import org.eclipse.persistence.internal.helper.Helper;
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.FieldVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Label;
--import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Opcodes;
--import org.eclipse.persistence.internal.libraries.asm.Type;
--import org.eclipse.persistence.internal.libraries.asm.commons.SerialVersionUIDAdder;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.FieldVisitor;
-+import org.objectweb.asm.Label;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.Type;
-+import org.objectweb.asm.commons.SerialVersionUIDAdder;
- 
- /**
-  * INTERNAL: Weaves classes to allow them to support EclipseLink indirection.
---- a/org/eclipse/persistence/internal/jpa/weaving/PersistenceWeaver.java
-+++ b/org/eclipse/persistence/internal/jpa/weaving/PersistenceWeaver.java
-@@ -21,8 +21,8 @@
- 
- import org.eclipse.persistence.config.SystemProperties;
- import org.eclipse.persistence.internal.helper.Helper;
--import org.eclipse.persistence.internal.libraries.asm.ClassReader;
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
-+import org.objectweb.asm.ClassReader;
-+import org.objectweb.asm.ClassWriter;
- import org.eclipse.persistence.internal.sessions.AbstractSession;
- import org.eclipse.persistence.logging.SessionLog;
- import org.eclipse.persistence.sessions.Session;
---- a/org/eclipse/persistence/internal/jpa/weaving/MethodWeaver.java
-+++ b/org/eclipse/persistence/internal/jpa/weaving/MethodWeaver.java
-@@ -14,7 +14,7 @@
- 
- //ASM imports
- import org.eclipse.persistence.internal.descriptors.VirtualAttributeMethodInfo;
--import org.eclipse.persistence.internal.libraries.asm.*;
-+import org.objectweb.asm.*;
- 
- /**
-  * Processes all the methods of a class to weave in persistence code such as,
---- a/org/eclipse/persistence/internal/jpa/weaving/AttributeDetails.java
-+++ b/org/eclipse/persistence/internal/jpa/weaving/AttributeDetails.java
-@@ -12,7 +12,7 @@
-  ******************************************************************************/  
- package org.eclipse.persistence.internal.jpa.weaving;
- 
--import org.eclipse.persistence.internal.libraries.asm.Type;
-+import org.objectweb.asm.Type;
- 
- import org.eclipse.persistence.mappings.DatabaseMapping;
- 
---- a/org/eclipse/persistence/internal/jpa/weaving/TransformerFactory.java
-+++ b/org/eclipse/persistence/internal/jpa/weaving/TransformerFactory.java
-@@ -31,7 +31,7 @@
- import org.eclipse.persistence.internal.jpa.metadata.accessors.objects.MetadataClass;
- import org.eclipse.persistence.internal.jpa.metadata.accessors.objects.MetadataField;
- import org.eclipse.persistence.internal.jpa.metadata.accessors.objects.MetadataMethod;
--import org.eclipse.persistence.internal.libraries.asm.Type;
-+import org.objectweb.asm.Type;
- import org.eclipse.persistence.internal.sessions.AbstractSession;
- import org.eclipse.persistence.internal.weaving.PersistenceWeavedChangeTracking;
- import org.eclipse.persistence.logging.SessionLog;
---- a/org/eclipse/persistence/internal/jpa/metadata/MetadataDynamicClassWriter.java
-+++ b/org/eclipse/persistence/internal/jpa/metadata/MetadataDynamicClassWriter.java
-@@ -13,20 +13,20 @@
-  ******************************************************************************/
- package org.eclipse.persistence.internal.jpa.metadata;
- 
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_PUBLIC;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ALOAD;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ARETURN;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.CHECKCAST;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.INVOKESPECIAL;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.POP;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.RETURN;
-+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-+import static org.objectweb.asm.Opcodes.ALOAD;
-+import static org.objectweb.asm.Opcodes.ARETURN;
-+import static org.objectweb.asm.Opcodes.CHECKCAST;
-+import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
-+import static org.objectweb.asm.Opcodes.POP;
-+import static org.objectweb.asm.Opcodes.RETURN;
- 
- import org.eclipse.persistence.dynamic.DynamicClassWriter;
- import org.eclipse.persistence.internal.helper.ClassConstants;
- import org.eclipse.persistence.internal.jpa.metadata.accessors.mappings.MappingAccessor;
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Type;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Type;
- 
- /**
-  * Custom {@link DynamicClassWriter} adding getter methods for virtual
---- a/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataClass.java
-+++ b/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataClass.java
-@@ -34,7 +34,7 @@
- import java.util.Set;
- 
- import org.eclipse.persistence.internal.helper.Helper;
--import org.eclipse.persistence.internal.libraries.asm.Opcodes;
-+import org.objectweb.asm.Opcodes;
- 
- /**
-  * INTERNAL:
---- a/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAsmFactory.java
-+++ b/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAsmFactory.java
-@@ -28,14 +28,14 @@
- import org.eclipse.persistence.internal.helper.Helper;
- import org.eclipse.persistence.internal.jpa.metadata.MetadataDescriptor;
- import org.eclipse.persistence.internal.jpa.metadata.MetadataLogger;
--import org.eclipse.persistence.internal.libraries.asm.AnnotationVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Attribute;
--import org.eclipse.persistence.internal.libraries.asm.ClassReader;
--import org.eclipse.persistence.internal.libraries.asm.ClassVisitor;
--import org.eclipse.persistence.internal.libraries.asm.FieldVisitor;
--import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Type;
--import org.eclipse.persistence.internal.libraries.asm.commons.EmptyVisitor;
-+import org.objectweb.asm.AnnotationVisitor;
-+import org.objectweb.asm.Attribute;
-+import org.objectweb.asm.ClassReader;
-+import org.objectweb.asm.ClassVisitor;
-+import org.objectweb.asm.FieldVisitor;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Type;
-+import org.objectweb.asm.commons.EmptyVisitor;
- 
- /**
-  * INTERNAL: A metadata factory that uses ASM technology and no reflection
---- a/org/eclipse/persistence/jaxb/compiler/MappingsGenerator.java
-+++ b/org/eclipse/persistence/jaxb/compiler/MappingsGenerator.java
-@@ -72,10 +72,10 @@
- import org.eclipse.persistence.internal.jaxb.many.ManyValue;
- import org.eclipse.persistence.internal.jaxb.many.MapValue;
- import org.eclipse.persistence.internal.jaxb.many.MapValueAttributeAccessor;
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Opcodes;
--import org.eclipse.persistence.internal.libraries.asm.Type;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.Type;
- import org.eclipse.persistence.internal.oxm.Constants;
- 
- import org.eclipse.persistence.internal.oxm.NamespaceResolver;
---- a/org/eclipse/persistence/jaxb/compiler/AnnotationsProcessor.java
-+++ b/org/eclipse/persistence/jaxb/compiler/AnnotationsProcessor.java
-@@ -81,13 +81,13 @@
- import org.eclipse.persistence.internal.jaxb.many.ManyValue;
- import org.eclipse.persistence.internal.jaxb.many.MultiDimensionalArrayValue;
- import org.eclipse.persistence.internal.jaxb.many.MultiDimensionalCollectionValue;
--import org.eclipse.persistence.internal.libraries.asm.AnnotationVisitor;
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.FieldVisitor;
--import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Opcodes;
--import org.eclipse.persistence.internal.libraries.asm.Label;
--import org.eclipse.persistence.internal.libraries.asm.Type;
-+import org.objectweb.asm.AnnotationVisitor;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.FieldVisitor;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.Label;
-+import org.objectweb.asm.Type;
- import org.eclipse.persistence.internal.oxm.Constants;
- import org.eclipse.persistence.internal.oxm.Namespace;
- import org.eclipse.persistence.internal.oxm.XMLConversionManager;
---- a/org/eclipse/persistence/sdo/helper/DynamicClassWriter.java
-+++ b/org/eclipse/persistence/sdo/helper/DynamicClassWriter.java
-@@ -25,10 +25,10 @@
- import org.eclipse.persistence.sdo.SDOProperty;
- import org.eclipse.persistence.sdo.SDOType;
- import org.eclipse.persistence.sdo.helper.extension.SDOUtil;
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Opcodes;
--import org.eclipse.persistence.internal.libraries.asm.Type;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.Type;
- import org.eclipse.persistence.internal.security.PrivilegedAccessHelper;
- 
- import commonj.sdo.helper.HelperContext;
---- a/org/eclipse/persistence/dynamic/DynamicClassWriter.java
-+++ b/org/eclipse/persistence/dynamic/DynamicClassWriter.java
-@@ -25,41 +25,41 @@
- import org.eclipse.persistence.internal.dynamic.DynamicEntityImpl;
- import org.eclipse.persistence.internal.dynamic.DynamicPropertiesManager;
- import org.eclipse.persistence.internal.helper.Helper;
--import org.eclipse.persistence.internal.libraries.asm.ClassWriter;
--import org.eclipse.persistence.internal.libraries.asm.MethodVisitor;
--import org.eclipse.persistence.internal.libraries.asm.Type;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Type;
- 
- import static org.eclipse.persistence.internal.dynamic.DynamicPropertiesManager.PROPERTIES_MANAGER_FIELD;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.AASTORE;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_ENUM;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_FINAL;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_PRIVATE;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_PUBLIC;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_STATIC;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_SUPER;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ACC_SYNTHETIC;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ALOAD;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ANEWARRAY;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ARETURN;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.BIPUSH;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.SIPUSH;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.CHECKCAST;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.DUP;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.GETSTATIC;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_0;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_1;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_2;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_3;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_4;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ICONST_5;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.ILOAD;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.INVOKESPECIAL;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.INVOKESTATIC;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.INVOKEVIRTUAL;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.NEW;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.PUTSTATIC;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.RETURN;
--import static org.eclipse.persistence.internal.libraries.asm.Opcodes.V1_5;
-+import static org.objectweb.asm.Opcodes.AASTORE;
-+import static org.objectweb.asm.Opcodes.ACC_ENUM;
-+import static org.objectweb.asm.Opcodes.ACC_FINAL;
-+import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
-+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-+import static org.objectweb.asm.Opcodes.ACC_STATIC;
-+import static org.objectweb.asm.Opcodes.ACC_SUPER;
-+import static org.objectweb.asm.Opcodes.ACC_SYNTHETIC;
-+import static org.objectweb.asm.Opcodes.ALOAD;
-+import static org.objectweb.asm.Opcodes.ANEWARRAY;
-+import static org.objectweb.asm.Opcodes.ARETURN;
-+import static org.objectweb.asm.Opcodes.BIPUSH;
-+import static org.objectweb.asm.Opcodes.SIPUSH;
-+import static org.objectweb.asm.Opcodes.CHECKCAST;
-+import static org.objectweb.asm.Opcodes.DUP;
-+import static org.objectweb.asm.Opcodes.GETSTATIC;
-+import static org.objectweb.asm.Opcodes.ICONST_0;
-+import static org.objectweb.asm.Opcodes.ICONST_1;
-+import static org.objectweb.asm.Opcodes.ICONST_2;
-+import static org.objectweb.asm.Opcodes.ICONST_3;
-+import static org.objectweb.asm.Opcodes.ICONST_4;
-+import static org.objectweb.asm.Opcodes.ICONST_5;
-+import static org.objectweb.asm.Opcodes.ILOAD;
-+import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
-+import static org.objectweb.asm.Opcodes.INVOKESTATIC;
-+import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
-+import static org.objectweb.asm.Opcodes.NEW;
-+import static org.objectweb.asm.Opcodes.PUTSTATIC;
-+import static org.objectweb.asm.Opcodes.RETURN;
-+import static org.objectweb.asm.Opcodes.V1_5;
- 
- /**
-  * Write the byte codes of a dynamic entity class. The class writer will create
diff --git a/debian/patches/series b/debian/patches/series
index d1fec79..7372a57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 disable_antlr3_embedded_copy.diff
-disable_asm_embedded_copy.diff
 charset.patch
 typeparameters.patch
 explicitcast.patch

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

More information about the pkg-java-commits mailing list