diff -Nru hk2-hk2-parent-2.4.0-b31/bom/pom.xml hk2-hk2-parent-2.4.0-b31.asm/bom/pom.xml
--- hk2-hk2-parent-2.4.0-b31/bom/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/bom/pom.xml 2015-08-19 14:56:40.945737619 +0200
@@ -175,9 +175,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>asm-all-repackaged</artifactId>
- <version>${project.version}</version>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
diff -Nru hk2-hk2-parent-2.4.0-b31/class-model/pom.xml hk2-hk2-parent-2.4.0-b31.asm/class-model/pom.xml
--- hk2-hk2-parent-2.4.0-b31/class-model/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/class-model/pom.xml 2015-08-19 14:57:22.792698725 +0200
@@ -84,8 +84,8 @@
<dependencies>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>asm-all-repackaged</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
diff -Nru hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationModelImpl.java hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationModelImpl.java
--- hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationModelImpl.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationModelImpl.java 2015-08-19 14:33:15.582899379 +0200
@@ -91,8 +91,8 @@
}
private Object unwrap(Object value) {
- if (org.glassfish.hk2.external.org.objectweb.asm.Type.class.isInstance(value)) {
- return org.glassfish.hk2.external.org.objectweb.asm.Type.class.cast(value).getClassName();
+ if (org.objectweb.asm.Type.class.isInstance(value)) {
+ return org.objectweb.asm.Type.class.cast(value).getClassName();
}
return value;
}
diff -Nru hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationTypeImpl.java hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationTypeImpl.java
--- hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationTypeImpl.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationTypeImpl.java 2015-08-19 14:33:15.588899100 +0200
@@ -62,8 +62,8 @@
}
public void addDefaultValue(String name, Object value) {
- if (org.glassfish.hk2.external.org.objectweb.asm.Type.class.isInstance(value)) {
- defValues.put(name, org.glassfish.hk2.external.org.objectweb.asm.Type.class.cast(value).getClassName());
+ if (org.objectweb.asm.Type.class.isInstance(value)) {
+ defValues.put(name, org.objectweb.asm.Type.class.cast(value).getClassName());
} else {
defValues.put(name, value);
}
diff -Nru hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java
--- hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java 2015-08-19 14:33:15.583899333 +0200
@@ -77,12 +77,12 @@
@Override
public String getReturnType() {
- return org.glassfish.hk2.external.org.objectweb.asm.Type.getReturnType(signature).getClassName();
+ return org.objectweb.asm.Type.getReturnType(signature).getClassName();
}
@Override
public String[] getArgumentTypes() {
- org.glassfish.hk2.external.org.objectweb.asm.Type[] types = org.glassfish.hk2.external.org.objectweb.asm.Type.getArgumentTypes(signature);
+ org.objectweb.asm.Type[] types = org.objectweb.asm.Type.getArgumentTypes(signature);
String[] stringTypes = new String[types.length];
for (int i=0;i<types.length;i++) {
stringTypes[i] = types[i].getClassName();
diff -Nru hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelBuilder.java hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelBuilder.java
--- hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelBuilder.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelBuilder.java 2015-08-19 14:33:15.588899100 +0200
@@ -41,7 +41,7 @@
package org.glassfish.hk2.classmodel.reflect.impl;
import org.glassfish.hk2.classmodel.reflect.*;
-import org.glassfish.hk2.external.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Opcodes;
import java.net.URI;
import java.util.Collection;
diff -Nru hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java
--- hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java 2015-08-19 14:33:15.586899193 +0200
@@ -42,8 +42,8 @@
import org.glassfish.hk2.classmodel.reflect.*;
import org.glassfish.hk2.classmodel.reflect.Type;
-import org.glassfish.hk2.external.org.objectweb.asm.*;
-import org.glassfish.hk2.external.org.objectweb.asm.signature.SignatureReader;
+import org.objectweb.asm.*;
+import org.objectweb.asm.signature.SignatureReader;
import java.net.URI;
import java.net.URISyntaxException;
@@ -95,7 +95,7 @@
@Override
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
- String parentName = (superName!=null?org.glassfish.hk2.external.org.objectweb.asm.Type.getObjectType(superName).getClassName():null);
+ String parentName = (superName!=null?org.objectweb.asm.Type.getObjectType(superName).getClassName():null);
TypeProxy parent = null;
Class<? extends Type> typeType = typeBuilder.getType(access);
if (!typeType.equals(AnnotationType.class)) {
@@ -106,7 +106,7 @@
TypeImpl parentType = typeBuilder.getType(access, parentName, null);
parent.set(parentType);
}
- String className = org.glassfish.hk2.external.org.objectweb.asm.Type.getObjectType(name).getClassName();
+ String className = org.objectweb.asm.Type.getObjectType(name).getClassName();
URI classDefURI=null;
try {
int index = entryName.length() - name.length() - 6;
@@ -163,7 +163,7 @@
} else {
if (!typeType.equals(AnnotationType.class)) {
for (String intf : interfaces) {
- String interfaceName = org.glassfish.hk2.external.org.objectweb.asm.Type.getObjectType(intf).getClassName();
+ String interfaceName = org.objectweb.asm.Type.getObjectType(intf).getClassName();
TypeImpl interfaceModel = typeBuilder.getType(Opcodes.ACC_INTERFACE, interfaceName, null);
TypeProxy<InterfaceModel> typeProxy = typeBuilder.getHolder(interfaceName, InterfaceModel.class);
if (typeProxy.get() == null) {
@@ -242,7 +242,7 @@
}
cm = (ExtensibleTypeImpl) type;
- org.glassfish.hk2.external.org.objectweb.asm.Type asmType = org.glassfish.hk2.external.org.objectweb.asm.Type.getType(desc);
+ org.objectweb.asm.Type asmType = org.objectweb.asm.Type.getType(desc);
TypeProxy<?> fieldType = typeBuilder.getHolder(asmType.getClassName());
if (fieldType==null) return null;
@@ -281,7 +281,7 @@
}
private String unwrap(String desc) {
- return org.glassfish.hk2.external.org.objectweb.asm.Type.getType(desc).getClassName();
+ return org.objectweb.asm.Type.getType(desc).getClassName();
}
private static class ClassVisitingContext {
diff -Nru hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java
--- hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java 2015-08-19 14:33:15.586899193 +0200
@@ -41,8 +41,8 @@
package org.glassfish.hk2.classmodel.reflect.impl;
import org.glassfish.hk2.classmodel.reflect.InterfaceModel;
-import org.glassfish.hk2.external.org.objectweb.asm.Opcodes;
-import org.glassfish.hk2.external.org.objectweb.asm.signature.SignatureVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.signature.SignatureVisitor;
import java.util.*;
@@ -137,7 +137,7 @@
@Override
public void visitClassType(String s) {
- String interfaceName = org.glassfish.hk2.external.org.objectweb.asm.Type.getObjectType(s).getClassName();
+ String interfaceName = org.objectweb.asm.Type.getObjectType(s).getClassName();
TypeProxy<InterfaceModel> interfaceTypeProxy = typeBuilder.getHolder(interfaceName, InterfaceModel.class);
if (interfaceTypeProxy!=null) {
ParameterizedInterfaceModelImpl childParameterized = new ParameterizedInterfaceModelImpl(interfaceTypeProxy);
diff -Nru hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypesImpl.java hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypesImpl.java
--- hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypesImpl.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypesImpl.java 2015-08-19 14:33:15.587899146 +0200
@@ -42,7 +42,7 @@
import org.glassfish.hk2.classmodel.reflect.*;
import org.glassfish.hk2.classmodel.reflect.util.ParsingConfig;
-import org.glassfish.hk2.external.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Opcodes;
import java.net.URI;
diff -Nru hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/Parser.java hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/Parser.java
--- hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/Parser.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/Parser.java 2015-08-19 14:33:15.598898634 +0200
@@ -45,7 +45,7 @@
import org.glassfish.hk2.classmodel.reflect.util.DirectoryArchive;
import org.glassfish.hk2.classmodel.reflect.util.JarArchive;
import org.glassfish.hk2.classmodel.reflect.util.ResourceLocator;
-import org.glassfish.hk2.external.org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassReader;
import java.io.Closeable;
import java.io.File;
diff -Nru hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/ParsingContext.java hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/ParsingContext.java
--- hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/ParsingContext.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/ParsingContext.java 2015-08-19 14:33:15.595898773 +0200
@@ -47,7 +47,7 @@
import org.glassfish.hk2.classmodel.reflect.util.CommonModelRegistry;
import org.glassfish.hk2.classmodel.reflect.util.ParsingConfig;
import org.glassfish.hk2.classmodel.reflect.util.ResourceLocator;
-import org.glassfish.hk2.external.org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassVisitor;
import java.util.Collections;
import java.util.HashMap;
diff -Nru hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/util/CommonModelRegistry.java hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/util/CommonModelRegistry.java
--- hk2-hk2-parent-2.4.0-b31/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/util/CommonModelRegistry.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/util/CommonModelRegistry.java 2015-08-19 14:33:15.591898960 +0200
@@ -41,7 +41,7 @@
package org.glassfish.hk2.classmodel.reflect.util;
import org.glassfish.hk2.classmodel.reflect.ParsingContext;
-import org.glassfish.hk2.external.org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassReader;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.service.packageadmin.ExportedPackage;
diff -Nru hk2-hk2-parent-2.4.0-b31/examples/ctm/pom.xml hk2-hk2-parent-2.4.0-b31.asm/examples/ctm/pom.xml
--- hk2-hk2-parent-2.4.0-b31/examples/ctm/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/examples/ctm/pom.xml 2015-08-19 14:58:39.058982832 +0200
@@ -116,8 +116,8 @@
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>asm-all-repackaged</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
diff -Nru hk2-hk2-parent-2.4.0-b31/examples/custom-resolver/pom.xml hk2-hk2-parent-2.4.0-b31.asm/examples/custom-resolver/pom.xml
--- hk2-hk2-parent-2.4.0-b31/examples/custom-resolver/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/examples/custom-resolver/pom.xml 2015-08-19 14:59:01.633882923 +0200
@@ -81,8 +81,8 @@
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>asm-all-repackaged</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/pom.xml hk2-hk2-parent-2.4.0-b31.asm/hk2-inhabitant-generator/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/hk2-inhabitant-generator/pom.xml 2015-08-19 15:01:35.834369871 +0200
@@ -77,8 +77,8 @@
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>asm-all-repackaged</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java hk2-hk2-parent-2.4.0-b31.asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java
--- hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java 2015-08-19 14:33:14.627943888 +0200
@@ -40,8 +40,8 @@
package org.jvnet.hk2.generator.internal;
-import org.glassfish.hk2.external.org.objectweb.asm.AnnotationVisitor;
-import org.glassfish.hk2.external.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Opcodes;
/**
* This just makes the main-line code less messy
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractClassVisitorImpl.java hk2-hk2-parent-2.4.0-b31.asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractClassVisitorImpl.java
--- hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractClassVisitorImpl.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractClassVisitorImpl.java 2015-08-19 14:33:14.627943888 +0200
@@ -40,12 +40,12 @@
package org.jvnet.hk2.generator.internal;
-import org.glassfish.hk2.external.org.objectweb.asm.AnnotationVisitor;
-import org.glassfish.hk2.external.org.objectweb.asm.Attribute;
-import org.glassfish.hk2.external.org.objectweb.asm.ClassVisitor;
-import org.glassfish.hk2.external.org.objectweb.asm.FieldVisitor;
-import org.glassfish.hk2.external.org.objectweb.asm.MethodVisitor;
-import org.glassfish.hk2.external.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
/**
* @author jwells
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java hk2-hk2-parent-2.4.0-b31.asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java
--- hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java 2015-08-19 14:33:14.628943841 +0200
@@ -40,11 +40,11 @@
package org.jvnet.hk2.generator.internal;
-import org.glassfish.hk2.external.org.objectweb.asm.AnnotationVisitor;
-import org.glassfish.hk2.external.org.objectweb.asm.Attribute;
-import org.glassfish.hk2.external.org.objectweb.asm.Label;
-import org.glassfish.hk2.external.org.objectweb.asm.MethodVisitor;
-import org.glassfish.hk2.external.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
/**
* This in only here to keep the main-line code less messy
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/ClassVisitorImpl.java hk2-hk2-parent-2.4.0-b31.asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/ClassVisitorImpl.java
--- hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/ClassVisitorImpl.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/ClassVisitorImpl.java 2015-08-19 14:33:14.625943981 +0200
@@ -58,9 +58,9 @@
import org.glassfish.hk2.api.Factory;
import org.glassfish.hk2.utilities.DescriptorImpl;
import org.glassfish.hk2.utilities.reflection.ReflectionHelper;
-import org.glassfish.hk2.external.org.objectweb.asm.AnnotationVisitor;
-import org.glassfish.hk2.external.org.objectweb.asm.MethodVisitor;
-import org.glassfish.hk2.external.org.objectweb.asm.Type;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Type;
/**
* @author jwells
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/Utilities.java hk2-hk2-parent-2.4.0-b31.asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/Utilities.java
--- hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/Utilities.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/Utilities.java 2015-08-19 14:33:14.622944121 +0200
@@ -78,9 +78,9 @@
import org.glassfish.hk2.api.Rank;
import org.jvnet.hk2.annotations.Contract;
import org.jvnet.hk2.annotations.ContractsProvided;
-import org.glassfish.hk2.external.org.objectweb.asm.AnnotationVisitor;
-import org.glassfish.hk2.external.org.objectweb.asm.ClassReader;
-import org.glassfish.hk2.external.org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.MethodVisitor;
import org.glassfish.hk2.utilities.DescriptorImpl;
/**
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-junitrunner/pom.xml hk2-hk2-parent-2.4.0-b31.asm/hk2-testing/hk2-junitrunner/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-junitrunner/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/hk2-testing/hk2-junitrunner/pom.xml 2015-08-19 15:02:56.407444140 +0200
@@ -94,8 +94,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>asm-all-repackaged</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
</dependency>
</dependencies>
</project>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/HK2Runner.java hk2-hk2-parent-2.4.0-b31.asm/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/HK2Runner.java
--- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/HK2Runner.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/HK2Runner.java 2015-08-19 14:33:14.953928694 +0200
@@ -74,7 +74,7 @@
import org.jvnet.hk2.testing.junit.internal.ClassVisitorImpl;
import org.jvnet.hk2.testing.junit.internal.ErrorServiceImpl;
import org.jvnet.hk2.testing.junit.internal.JustInTimeInjectionResolverImpl;
-import org.glassfish.hk2.external.org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassReader;
/**
* This class should be extended by test classes in order to get an automatically
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java hk2-hk2-parent-2.4.0-b31.asm/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java
--- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java 2015-08-19 14:33:14.951928788 +0200
@@ -46,9 +46,9 @@
import org.glassfish.hk2.api.ActiveDescriptor;
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
-import org.glassfish.hk2.external.org.objectweb.asm.AnnotationVisitor;
-import org.glassfish.hk2.external.org.objectweb.asm.ClassVisitor;
-import org.glassfish.hk2.external.org.objectweb.asm.Opcodes;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.Opcodes;
/**
* @author jwells
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-locator-extras/pom.xml hk2-hk2-parent-2.4.0-b31.asm/hk2-testing/hk2-locator-extras/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-locator-extras/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/hk2-testing/hk2-locator-extras/pom.xml 2015-08-19 15:03:21.833205330 +0200
@@ -89,8 +89,8 @@
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>asm-all-repackaged</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
</dependency>
</dependencies>
</project>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-mockito/pom.xml hk2-hk2-parent-2.4.0-b31.asm/hk2-testing/hk2-mockito/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-mockito/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/hk2-testing/hk2-mockito/pom.xml 2015-08-19 15:03:56.610510889 +0200
@@ -111,8 +111,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>asm-all-repackaged</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-testng/pom.xml hk2-hk2-parent-2.4.0-b31.asm/hk2-testing/hk2-testng/pom.xml
--- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-testng/pom.xml 2015-08-07 00:36:23.000000000 +0200
+++ hk2-hk2-parent-2.4.0-b31.asm/hk2-testing/hk2-testng/pom.xml 2015-08-19 15:04:25.486103994 +0200
@@ -109,8 +109,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>asm-all-repackaged</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
</dependency>
<dependency>
<groupId>org.uncommons</groupId>