diff --git a/.gitignore b/.gitignore index f8777df..9905d24 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /glassfish-hk2-2.1.93-clean-src-svn.tar.gz /glassfish-hk2-2.3.0.tar.xz +/glassfish-hk2-2.4.0-b24.tar.xz diff --git a/glassfish-hk2-2.3.0-disable-asm-all-repackaged.patch b/glassfish-hk2-2.3.0-disable-asm-all-repackaged.patch deleted file mode 100644 index 1a0f239..0000000 --- a/glassfish-hk2-2.3.0-disable-asm-all-repackaged.patch +++ /dev/null @@ -1,400 +0,0 @@ -diff -Nru glassfish-hk2-2.3.0/class-model/pom.xml glassfish-hk2-2.3.0.external-asm/class-model/pom.xml ---- glassfish-hk2-2.3.0/class-model/pom.xml 2015-05-06 01:03:37.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/class-model/pom.xml 2015-05-06 17:58:55.700981645 +0200 -@@ -84,8 +84,8 @@ - - - -- org.glassfish.hk2.external -- asm-all-repackaged -+ org.ow2.asm -+ asm-all - - - javax.enterprise -diff -Nru glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationModelImpl.java glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationModelImpl.java ---- glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationModelImpl.java 2015-05-06 01:03:37.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationModelImpl.java 2015-05-06 17:57:39.412868761 +0200 -@@ -90,8 +90,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 glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationTypeImpl.java glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationTypeImpl.java ---- glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationTypeImpl.java 2015-05-06 01:03:37.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationTypeImpl.java 2015-05-06 17:57:39.413868711 +0200 -@@ -61,8 +61,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 glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java ---- glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java 2015-05-06 01:03:37.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java 2015-05-06 17:57:39.413868711 +0200 -@@ -76,12 +76,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 typeType = typeBuilder.getType(access); - if (!typeType.equals(AnnotationType.class)) { -@@ -105,7 +105,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; -@@ -162,7 +162,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 typeProxy = typeBuilder.getHolder(interfaceName, InterfaceModel.class); - if (typeProxy.get() == null) { -@@ -241,7 +241,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; -@@ -280,7 +280,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 glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java ---- glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java 2015-05-06 01:03:37.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java 2015-05-06 17:57:39.405869117 +0200 -@@ -40,8 +40,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.*; - -@@ -136,7 +136,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 interfaceTypeProxy = typeBuilder.getHolder(interfaceName, InterfaceModel.class); - if (interfaceTypeProxy!=null) { - ParameterizedInterfaceModelImpl childParameterized = new ParameterizedInterfaceModelImpl(interfaceTypeProxy); -diff -Nru glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypesImpl.java glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypesImpl.java ---- glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypesImpl.java 2015-05-06 01:03:37.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypesImpl.java 2015-05-06 17:57:39.406869066 +0200 -@@ -41,7 +41,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 glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/Parser.java glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/Parser.java ---- glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/Parser.java 2015-05-06 01:03:37.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/Parser.java 2015-05-06 17:57:39.114883888 +0200 -@@ -44,7 +44,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 glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/ParsingContext.java glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/ParsingContext.java ---- glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/ParsingContext.java 2015-05-06 01:03:37.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/ParsingContext.java 2015-05-06 17:57:39.117883736 +0200 -@@ -46,7 +46,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 glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/util/CommonModelRegistry.java glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/util/CommonModelRegistry.java ---- glassfish-hk2-2.3.0/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/util/CommonModelRegistry.java 2015-05-06 01:03:37.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/util/CommonModelRegistry.java 2015-05-06 17:57:39.409868914 +0200 -@@ -40,7 +40,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 glassfish-hk2-2.3.0/hk2-inhabitant-generator/pom.xml glassfish-hk2-2.3.0.external-asm/hk2-inhabitant-generator/pom.xml ---- glassfish-hk2-2.3.0/hk2-inhabitant-generator/pom.xml 2015-05-06 01:03:38.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/hk2-inhabitant-generator/pom.xml 2015-05-06 17:59:59.597725776 +0200 -@@ -77,8 +77,8 @@ - javax.inject - - -- org.glassfish.hk2.external -- asm-all-repackaged -+ org.ow2.asm -+ asm-all - - - org.glassfish.hk2 -diff -Nru glassfish-hk2-2.3.0/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java glassfish-hk2-2.3.0.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java ---- glassfish-hk2-2.3.0/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java 2015-05-06 01:03:38.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java 2015-05-06 17:57:38.557912162 +0200 -@@ -39,8 +39,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 glassfish-hk2-2.3.0/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractClassVisitorImpl.java glassfish-hk2-2.3.0.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractClassVisitorImpl.java ---- glassfish-hk2-2.3.0/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractClassVisitorImpl.java 2015-05-06 01:03:38.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractClassVisitorImpl.java 2015-05-06 17:57:38.611909420 +0200 -@@ -39,12 +39,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 glassfish-hk2-2.3.0/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java glassfish-hk2-2.3.0.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java ---- glassfish-hk2-2.3.0/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java 2015-05-06 01:03:38.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java 2015-05-06 17:57:38.612909370 +0200 -@@ -39,11 +39,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 glassfish-hk2-2.3.0/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/ClassVisitorImpl.java glassfish-hk2-2.3.0.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/ClassVisitorImpl.java ---- glassfish-hk2-2.3.0/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/ClassVisitorImpl.java 2015-05-06 01:03:38.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/ClassVisitorImpl.java 2015-05-06 17:57:37.441968810 +0200 -@@ -57,9 +57,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 glassfish-hk2-2.3.0/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/GeneratorRunner.java glassfish-hk2-2.3.0.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/GeneratorRunner.java ---- glassfish-hk2-2.3.0/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/GeneratorRunner.java 2015-05-06 01:03:38.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/GeneratorRunner.java 2015-05-06 17:57:38.614909268 +0200 -@@ -55,7 +55,7 @@ - import java.util.zip.ZipOutputStream; - - import org.glassfish.hk2.utilities.DescriptorImpl; --import org.glassfish.hk2.external.org.objectweb.asm.ClassReader; -+import org.objectweb.asm.ClassReader; - - /** - * @author jwells -diff -Nru glassfish-hk2-2.3.0/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/Utilities.java glassfish-hk2-2.3.0.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/Utilities.java ---- glassfish-hk2-2.3.0/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/Utilities.java 2015-05-06 01:03:38.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/Utilities.java 2015-05-06 17:57:38.616909167 +0200 -@@ -74,9 +74,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; - - /** - * @author jwells -diff -Nru glassfish-hk2-2.3.0/hk2-testing/hk2-junitrunner/pom.xml glassfish-hk2-2.3.0.external-asm/hk2-testing/hk2-junitrunner/pom.xml ---- glassfish-hk2-2.3.0/hk2-testing/hk2-junitrunner/pom.xml 2015-05-06 01:03:38.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/hk2-testing/hk2-junitrunner/pom.xml 2015-05-06 18:00:33.720987020 +0200 -@@ -94,8 +94,8 @@ - provided - - -- org.glassfish.hk2.external -- asm-all-repackaged -+ org.ow2.asm -+ asm-all - - - -diff -Nru glassfish-hk2-2.3.0/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/HK2Runner.java glassfish-hk2-2.3.0.external-asm/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/HK2Runner.java ---- glassfish-hk2-2.3.0/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/HK2Runner.java 2015-05-06 01:03:38.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/HK2Runner.java 2015-05-06 17:57:38.619909014 +0200 -@@ -67,7 +67,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 glassfish-hk2-2.3.0/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java glassfish-hk2-2.3.0.external-asm/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java ---- glassfish-hk2-2.3.0/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java 2015-05-06 01:03:38.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java 2015-05-06 17:57:39.020888659 +0200 -@@ -45,9 +45,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 glassfish-hk2-2.3.0/hk2-testing/hk2-locator-extras/pom.xml glassfish-hk2-2.3.0.external-asm/hk2-testing/hk2-locator-extras/pom.xml ---- glassfish-hk2-2.3.0/hk2-testing/hk2-locator-extras/pom.xml 2015-05-06 01:03:38.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/hk2-testing/hk2-locator-extras/pom.xml 2015-05-06 18:01:11.231075688 +0200 -@@ -89,8 +89,8 @@ - javax.inject - - -- org.glassfish.hk2.external -- asm-all-repackaged -+ org.ow2.asm -+ asm-all - - - -diff -Nru glassfish-hk2-2.3.0/hk2-testing/hk2-mockito/pom.xml glassfish-hk2-2.3.0.external-asm/hk2-testing/hk2-mockito/pom.xml ---- glassfish-hk2-2.3.0/hk2-testing/hk2-mockito/pom.xml 2015-05-06 01:03:38.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/hk2-testing/hk2-mockito/pom.xml 2015-05-06 18:02:01.189530047 +0200 -@@ -97,8 +97,8 @@ - provided - - -- org.glassfish.hk2.external -- asm-all-repackaged -+ org.ow2.asm -+ asm-all - - - org.mockito -diff -Nru glassfish-hk2-2.3.0/hk2-testing/hk2-testng/pom.xml glassfish-hk2-2.3.0.external-asm/hk2-testing/hk2-testng/pom.xml ---- glassfish-hk2-2.3.0/hk2-testing/hk2-testng/pom.xml 2015-05-06 01:03:38.000000000 +0200 -+++ glassfish-hk2-2.3.0.external-asm/hk2-testing/hk2-testng/pom.xml 2015-05-06 18:02:24.511341680 +0200 -@@ -92,8 +92,8 @@ - provided - - -- org.glassfish.hk2.external -- asm-all-repackaged -+ org.ow2.asm -+ asm-all - - - diff --git a/glassfish-hk2-2.4.0-b24-disable-asm-all-repackaged.patch b/glassfish-hk2-2.4.0-b24-disable-asm-all-repackaged.patch new file mode 100644 index 0000000..8dc87f5 --- /dev/null +++ b/glassfish-hk2-2.4.0-b24-disable-asm-all-repackaged.patch @@ -0,0 +1,388 @@ +diff -Nru glassfish-hk2-2.4.0-b24/class-model/pom.xml glassfish-hk2-2.4.0-b24.external-asm/class-model/pom.xml +--- glassfish-hk2-2.4.0-b24/class-model/pom.xml 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/class-model/pom.xml 2015-05-25 10:53:29.141082562 +0200 +@@ -84,8 +84,8 @@ + + + +- org.glassfish.hk2.external +- asm-all-repackaged ++ org.ow2.asm ++ asm-all + + + javax.enterprise +diff -Nru glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationModelImpl.java glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationModelImpl.java +--- glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationModelImpl.java 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationModelImpl.java 2015-05-25 10:50:23.757004839 +0200 +@@ -90,8 +90,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 glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationTypeImpl.java glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationTypeImpl.java +--- glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationTypeImpl.java 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/AnnotationTypeImpl.java 2015-05-25 10:50:24.025990443 +0200 +@@ -61,8 +61,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 glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java +--- glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java 2015-05-25 10:50:24.026990389 +0200 +@@ -76,12 +76,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 typeType = typeBuilder.getType(access); + if (!typeType.equals(AnnotationType.class)) { +@@ -105,7 +105,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; +@@ -162,7 +162,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 typeProxy = typeBuilder.getHolder(interfaceName, InterfaceModel.class); + if (typeProxy.get() == null) { +@@ -241,7 +241,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; +@@ -280,7 +280,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 glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java +--- glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java 2015-05-25 10:50:23.710007355 +0200 +@@ -40,8 +40,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.*; + +@@ -136,7 +136,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 interfaceTypeProxy = typeBuilder.getHolder(interfaceName, InterfaceModel.class); + if (interfaceTypeProxy!=null) { + ParameterizedInterfaceModelImpl childParameterized = new ParameterizedInterfaceModelImpl(interfaceTypeProxy); +diff -Nru glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypesImpl.java glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypesImpl.java +--- glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypesImpl.java 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/TypesImpl.java 2015-05-25 10:50:23.753005053 +0200 +@@ -41,7 +41,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 glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/Parser.java glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/Parser.java +--- glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/Parser.java 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/Parser.java 2015-05-25 10:50:23.301029244 +0200 +@@ -44,7 +44,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 glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/ParsingContext.java glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/ParsingContext.java +--- glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/ParsingContext.java 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/ParsingContext.java 2015-05-25 10:50:23.302029191 +0200 +@@ -46,7 +46,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 glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/util/CommonModelRegistry.java glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/util/CommonModelRegistry.java +--- glassfish-hk2-2.4.0-b24/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/util/CommonModelRegistry.java 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/util/CommonModelRegistry.java 2015-05-25 10:50:23.754005000 +0200 +@@ -40,7 +40,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 glassfish-hk2-2.4.0-b24/hk2-inhabitant-generator/pom.xml glassfish-hk2-2.4.0-b24.external-asm/hk2-inhabitant-generator/pom.xml +--- glassfish-hk2-2.4.0-b24/hk2-inhabitant-generator/pom.xml 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/hk2-inhabitant-generator/pom.xml 2015-05-25 10:54:21.368287215 +0200 +@@ -77,8 +77,8 @@ + javax.inject + + +- org.glassfish.hk2.external +- asm-all-repackaged ++ org.ow2.asm ++ asm-all + + + org.glassfish.hk2 +diff -Nru glassfish-hk2-2.4.0-b24/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java glassfish-hk2-2.4.0-b24.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java +--- glassfish-hk2-2.4.0-b24/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java 2015-05-25 10:50:23.286030047 +0200 +@@ -39,8 +39,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 glassfish-hk2-2.4.0-b24/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractClassVisitorImpl.java glassfish-hk2-2.4.0-b24.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractClassVisitorImpl.java +--- glassfish-hk2-2.4.0-b24/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractClassVisitorImpl.java 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractClassVisitorImpl.java 2015-05-25 10:50:23.287029994 +0200 +@@ -39,12 +39,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 glassfish-hk2-2.4.0-b24/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java glassfish-hk2-2.4.0-b24.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java +--- glassfish-hk2-2.4.0-b24/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java 2015-05-25 10:50:23.288029940 +0200 +@@ -39,11 +39,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 glassfish-hk2-2.4.0-b24/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/ClassVisitorImpl.java glassfish-hk2-2.4.0-b24.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/ClassVisitorImpl.java +--- glassfish-hk2-2.4.0-b24/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/ClassVisitorImpl.java 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/ClassVisitorImpl.java 2015-05-25 10:50:23.286030047 +0200 +@@ -57,9 +57,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 glassfish-hk2-2.4.0-b24/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/Utilities.java glassfish-hk2-2.4.0-b24.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/Utilities.java +--- glassfish-hk2-2.4.0-b24/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/Utilities.java 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/Utilities.java 2015-05-25 10:50:23.294029619 +0200 +@@ -77,9 +77,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 glassfish-hk2-2.4.0-b24/hk2-testing/hk2-junitrunner/pom.xml glassfish-hk2-2.4.0-b24.external-asm/hk2-testing/hk2-junitrunner/pom.xml +--- glassfish-hk2-2.4.0-b24/hk2-testing/hk2-junitrunner/pom.xml 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/hk2-testing/hk2-junitrunner/pom.xml 2015-05-25 10:54:53.039592077 +0200 +@@ -94,8 +94,8 @@ + provided + + +- org.glassfish.hk2.external +- asm-all-repackaged ++ org.ow2.asm ++ asm-all + + + +diff -Nru glassfish-hk2-2.4.0-b24/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/HK2Runner.java glassfish-hk2-2.4.0-b24.external-asm/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/HK2Runner.java +--- glassfish-hk2-2.4.0-b24/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/HK2Runner.java 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/HK2Runner.java 2015-05-25 10:50:23.297029459 +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 glassfish-hk2-2.4.0-b24/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java glassfish-hk2-2.4.0-b24.external-asm/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java +--- glassfish-hk2-2.4.0-b24/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java 2015-05-25 10:50:23.298029405 +0200 +@@ -45,9 +45,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 glassfish-hk2-2.4.0-b24/hk2-testing/hk2-locator-extras/pom.xml glassfish-hk2-2.4.0-b24.external-asm/hk2-testing/hk2-locator-extras/pom.xml +--- glassfish-hk2-2.4.0-b24/hk2-testing/hk2-locator-extras/pom.xml 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/hk2-testing/hk2-locator-extras/pom.xml 2015-05-25 10:55:13.558493848 +0200 +@@ -89,8 +89,8 @@ + javax.inject + + +- org.glassfish.hk2.external +- asm-all-repackaged ++ org.ow2.asm ++ asm-all + + + +diff -Nru glassfish-hk2-2.4.0-b24/hk2-testing/hk2-mockito/pom.xml glassfish-hk2-2.4.0-b24.external-asm/hk2-testing/hk2-mockito/pom.xml +--- glassfish-hk2-2.4.0-b24/hk2-testing/hk2-mockito/pom.xml 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/hk2-testing/hk2-mockito/pom.xml 2015-05-25 10:55:39.350113408 +0200 +@@ -110,8 +110,8 @@ + provided + + +- org.glassfish.hk2.external +- asm-all-repackaged ++ org.ow2.asm ++ asm-all + + + org.mockito +diff -Nru glassfish-hk2-2.4.0-b24/hk2-testing/hk2-testng/pom.xml glassfish-hk2-2.4.0-b24.external-asm/hk2-testing/hk2-testng/pom.xml +--- glassfish-hk2-2.4.0-b24/hk2-testing/hk2-testng/pom.xml 2015-05-23 16:58:32.000000000 +0200 ++++ glassfish-hk2-2.4.0-b24.external-asm/hk2-testing/hk2-testng/pom.xml 2015-05-25 10:56:07.115627319 +0200 +@@ -108,8 +108,8 @@ + provided + + +- org.glassfish.hk2.external +- asm-all-repackaged ++ org.ow2.asm ++ asm-all + + + org.uncommons diff --git a/glassfish-hk2.spec b/glassfish-hk2.spec index 7364f4d..fa8a506 100644 --- a/glassfish-hk2.spec +++ b/glassfish-hk2.spec @@ -1,21 +1,23 @@ +%global namedreltag -b24 +%global namedversion %{version}%{?namedreltag} Name: glassfish-hk2 -Version: 2.3.0 -Release: 1%{?dist} +Version: 2.4.0 +Release: 0.1.b24%{?dist} Summary: Hundred Kilobytes Kernel License: CDDL or GPLv2 with exceptions URL: http://hk2.java.net/ -# git clone -b hk2-parent-2.3.0 git://java.net/hk2~git glassfish-hk2-2.3.0 -# find glassfish-hk2-2.3.0 -name '*.jar' -type f -print -delete -# find glassfish-hk2-2.3.0 -name '*.class' -print -delete -# tar cJf glassfish-hk2-2.3.0.tar.xz glassfish-hk2-2.3.0 -Source0: glassfish-hk2-2.3.0.tar.xz +# git clone -b hk2-parent-2.4.0-b24 git://java.net/hk2~git glassfish-hk2-2.4.0-b24 +# find glassfish-hk2-2.4.0-b24 -name '*.jar' -type f -print -delete +# find glassfish-hk2-2.4.0-b24 -name '*.class' -print -delete +# tar cJf glassfish-hk2-2.4.0-b24.tar.xz glassfish-hk2-2.4.0-b24 +Source0: glassfish-hk2-2.4.0-b24.tar.xz # https://java.net/jira/browse/HK2-250 # wget -O glassfish-LICENSE.txt https://svn.java.net/svn/glassfish~svn/tags/legal-1.1/src/main/resources/META-INF/LICENSE.txt # glassfish-hk2 package don't include the license file Source1: glassfish-LICENSE.txt Patch0: glassfish-hk2-2.3.0-hk2-utils-osgi_bundle.patch -Patch1: glassfish-hk2-2.3.0-disable-asm-all-repackaged.patch +Patch1: glassfish-hk2-2.4.0-b24-disable-asm-all-repackaged.patch Patch2: glassfish-hk2-2.3.0-disable-external-aopalliance.patch BuildRequires: maven-local @@ -143,6 +145,12 @@ This package provides: * osgiversion-maven-plugin - Maven Plugin for computing OSGi versions from Maven versions. +%package metadata-generator +Summary: HK2 Metadata Generator + +%description metadata-generator +HK2 Metadata Generator Subsystem. + %package osgi Summary: HK2 OSGi Adapter @@ -210,7 +218,7 @@ Summary: Javadoc for %{name} This package contains javadoc for %{name}. %prep -%setup -q -n glassfish-hk2-%{version} +%setup -q -n glassfish-hk2-%{namedversion} %patch0 -p0 %patch1 -p1 %patch2 -p1 @@ -258,11 +266,15 @@ This package contains javadoc for %{name}. %pom_xpath_remove "pom:dependency[pom:groupId ='com.sun']/pom:systemPath" hk2-testing/ant %pom_xpath_remove "pom:profiles/pom:profile[pom:id ='mac']" hk2-testing/ant -# Unavailable test dep org.assertj:assertj-core:1.4.0 +# Unavailable test dep org.assertj:assertj-core:1.4.0 org.uncommons:reportng:jar:1.1.2 %pom_remove_dep org.assertj:assertj-core hk2-testing/hk2-testng +%pom_remove_dep org.uncommons:reportng hk2-testing/hk2-testng rm -r hk2-testing/hk2-testng/src/test/java/* %pom_remove_dep org.assertj:assertj-core hk2-testing/hk2-mockito +%pom_remove_dep org.uncommons:reportng hk2-testing/hk2-mockito rm -r hk2-testing/hk2-mockito/src/test/java/* +%pom_remove_dep org.uncommons:reportng hk2-testing/hk2-runlevel-extras +rm -r hk2-testing/hk2-runlevel-extras/src/test/java/* %pom_xpath_set "pom:plugin[pom:artifactId ='maven-jar-plugin']/pom:configuration/pom:archive/pom:manifest/pom:addClasspath" false dependency-verifier @@ -294,18 +306,22 @@ done cp -p %{SOURCE1} LICENSE.txt sed -i 's/\r//' LICENSE.txt +%mvn_package ":hk2" hk2 %mvn_package ":hk2-api" api %mvn_package ":hk2-bom" %{name} %mvn_package ":hk2-parent" %{name} +%mvn_package ":class-model" class-model +%mvn_package ":core" core %mvn_package ":hk2-configuration" configuration %mvn_package ":hk2-configuration-integration" configuration %mvn_package ":hk2-configuration-hub" configuration %mvn_package ":hk2-configuration-persistence" configuration +%mvn_package ":hk2-xml-parent" configuration %mvn_package ":hk2-xml" configuration +%mvn_package ":hk2-xml-test" configuration %mvn_package ":hk2-xml-dom" configuration %mvn_package ":config-generator" configuration %mvn_package ":config-types" configuration -%mvn_package ":hk2" hk2 %mvn_package ":hk2-config" configuration %mvn_package ":hk2-config-hub-integration" configuration %mvn_package ":hk2-property-file" configuration @@ -314,11 +330,18 @@ sed -i 's/\r//' LICENSE.txt %mvn_package ":hk2-inhabitant-generator" inhabitant-generator %mvn_package ":hk2-jmx" jmx %mvn_package ":hk2-locator" locator +%mvn_package ":hk2-locator-extras" locator-extras +%mvn_package ":hk2-locator-no-proxies" locator-no-proxies +%mvn_package ":hk2-locator-no-proxies2" locator-no-proxies2 %mvn_package ":hk2-maven" maven +%mvn_package ":consolidatedbundle-maven-plugin" maven-plugins +%mvn_package ":osgiversion-maven-plugin" maven-plugins +%mvn_package ":hk2-metadata-generator-parent" metadata-generator +%mvn_package ":hk2-metadata-generator" metadata-generator +%mvn_package ":hk2-metadata-generator-test1" metadata-generator %mvn_package ":hk2-runlevel" runlevel +%mvn_package ":hk2-runlevel-extras" runlevel-extras %mvn_package ":hk2-utils" utils -%mvn_package ":class-model" class-model -%mvn_package ":core" core %mvn_package ":guice-bridge" guice-bridge %mvn_package ":spring-bridge" spring-bridge %mvn_package ":hk2-testing" testing @@ -327,10 +350,6 @@ sed -i 's/\r//' LICENSE.txt %mvn_package ":hk2-collections-tests" testing %mvn_package ":hk2-mockito" testing %mvn_package ":interceptor-events" testing -%mvn_package ":hk2-locator-extras" locator-extras -%mvn_package ":hk2-locator-no-proxies" locator-no-proxies -%mvn_package ":hk2-locator-no-proxies2" locator-no-proxies2 -%mvn_package ":hk2-runlevel-extras" runlevel-extras %mvn_package ":hk2-testng" testng %mvn_package ":osgi" osgi %mvn_package ":osgi-adapter" osgi @@ -340,8 +359,6 @@ sed -i 's/\r//' LICENSE.txt %mvn_package ":no-hk2-bundle" osgi %mvn_package ":sdp-management-bundle" osgi %mvn_package ":test-module-startup" osgi -%mvn_package ":consolidatedbundle-maven-plugin" maven-plugins -%mvn_package ":osgiversion-maven-plugin" maven-plugins %build @@ -353,6 +370,7 @@ sed -i 's/\r//' LICENSE.txt %files -f .mfiles-%{name} %dir %{_javadir}/%{name} +%doc README.md %license LICENSE.txt %files api -f .mfiles-api @@ -395,6 +413,9 @@ sed -i 's/\r//' LICENSE.txt %files maven-plugins -f .mfiles-maven-plugins %license LICENSE.txt +%files metadata-generator -f .mfiles-metadata-generator +%license LICENSE.txt + %files osgi -f .mfiles-osgi %license LICENSE.txt @@ -434,6 +455,9 @@ sed -i 's/\r//' LICENSE.txt %license LICENSE.txt %changelog +* Sat May 23 2015 gil cattaneo 2.4.0-0.1.b24 +- update to 2.4.0-b24 + * Mon May 04 2015 gil cattaneo 2.3.0-1 - update to 2.3.0 diff --git a/sources b/sources index 7a923c9..0ee6730 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c8a3f4c6fb39f477a1f4e0049b1d420 glassfish-hk2-2.3.0.tar.xz +70315209324dd1fb3aedff5e69ea6289 glassfish-hk2-2.4.0-b24.tar.xz