diff --git a/.gitignore b/.gitignore index 123a785..5d71e11 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /hk2-parent-2.4.0-b25.tar.gz /hk2-parent-2.4.0-b31.tar.gz /hk2-parent-2.4.0-b32.tar.gz +/hk2-parent-2.4.0.tar.gz diff --git a/glassfish-hk2-2.4.0-b31-disable-asm-all-repackaged.patch b/glassfish-hk2-2.4.0-b31-disable-asm-all-repackaged.patch deleted file mode 100644 index 8ab2a8a..0000000 --- a/glassfish-hk2-2.4.0-b31-disable-asm-all-repackaged.patch +++ /dev/null @@ -1,432 +0,0 @@ -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 @@ - ${project.version} - - -- org.glassfish.hk2.external -- asm-all-repackaged -- ${project.version} -+ org.ow2.asm -+ asm-all -+ ${asm.version} - - - org.glassfish.hk2.external -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 @@ - - - -- org.glassfish.hk2.external -- asm-all-repackaged -+ org.ow2.asm -+ asm-all - - - javax.enterprise -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 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 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 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 @@ - javax.inject - - -- org.glassfish.hk2.external -- asm-all-repackaged -+ org.ow2.asm -+ asm-all - - - org.glassfish.hk2 -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 @@ - javax.inject - - -- org.glassfish.hk2.external -- asm-all-repackaged -+ org.ow2.asm -+ asm-all - - - org.glassfish.hk2 -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 @@ - javax.inject - - -- org.glassfish.hk2.external -- asm-all-repackaged -+ org.ow2.asm -+ asm-all - - - org.glassfish.hk2 -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 @@ - provided - - -- org.glassfish.hk2.external -- asm-all-repackaged -+ org.ow2.asm -+ asm-all - - - -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 @@ - javax.inject - - -- org.glassfish.hk2.external -- asm-all-repackaged -+ org.ow2.asm -+ asm-all - - - -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 @@ - provided - - -- org.glassfish.hk2.external -- asm-all-repackaged -+ org.ow2.asm -+ asm-all - - - org.mockito -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 @@ - provided - - -- org.glassfish.hk2.external -- asm-all-repackaged -+ org.ow2.asm -+ asm-all - - - org.uncommons diff --git a/glassfish-hk2-2.4.0-b31-remove-hk2_external.patch b/glassfish-hk2-2.4.0-b31-remove-hk2_external.patch deleted file mode 100644 index 7554c2f..0000000 --- a/glassfish-hk2-2.4.0-b31-remove-hk2_external.patch +++ /dev/null @@ -1,306 +0,0 @@ -diff -Nru hk2-hk2-parent-2.4.0-b31/bom/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/bom/pom.xml ---- hk2-hk2-parent-2.4.0-b31/bom/pom.xml 2015-08-19 15:09:19.769765723 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/bom/pom.xml 2015-08-19 15:14:34.498066159 +0200 -@@ -170,9 +170,9 @@ - ${project.version} - - -- org.glassfish.hk2.external -- aopalliance-repackaged -- ${project.version} -+ aopalliance -+ aopalliance -+ ${aopalliance.version} - - - org.ow2.asm -@@ -180,29 +180,19 @@ - ${asm.version} - - -- org.glassfish.hk2.external -- bean-validator -- ${project.version} -- -- -- org.glassfish.hk2.external -- bean-validator-cdi -- ${project.version} -+ org.hibernate -+ hibernate-validator-cdi -+ ${hibernate-validator.version} - - -- org.glassfish.hk2.external -+ javax.inject - javax.inject -- ${project.version} -+ ${javax.inject.version} - - -- org.glassfish.hk2 -- external -- ${project.version} -- -- -- org.glassfish.hk2 -- tiger-types-osgi -- ${project.version} -+ org.jvnet -+ tiger-types -+ ${tiger-types.version} - - - org.glassfish.hk2 -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-api/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-api/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-api/pom.xml 2015-08-07 00:36:23.000000000 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-api/pom.xml 2015-08-19 15:18:08.077633513 +0200 -@@ -98,8 +98,8 @@ - hk2-utils - - -- org.glassfish.hk2.external -- aopalliance-repackaged -+ aopalliance -+ aopalliance - - - -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-configuration/persistence/hk2-xml-dom/hk2-config/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-configuration/persistence/hk2-xml-dom/hk2-config/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-configuration/persistence/hk2-xml-dom/hk2-config/pom.xml 2015-08-07 00:36:23.000000000 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-configuration/persistence/hk2-xml-dom/hk2-config/pom.xml 2015-08-19 15:20:19.128618519 +0200 -@@ -120,8 +120,8 @@ - use hk2:run goal and that requires javax.valiation to be found. Only, the APIs are not - enough. We need the full provider as well. - --> -- org.glassfish.hk2.external -- bean-validator -+ org.hibernate -+ hibernate-validator - - - -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-configuration/persistence/hk2-xml-dom/hub-integration/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-configuration/persistence/hk2-xml-dom/hub-integration/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-configuration/persistence/hk2-xml-dom/hub-integration/pom.xml 2015-08-07 00:36:23.000000000 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-configuration/persistence/hk2-xml-dom/hub-integration/pom.xml 2015-08-19 15:21:16.002574127 +0200 -@@ -127,8 +127,8 @@ - hk2-configuration-hub - - -- org.glassfish.hk2.external -- bean-validator -+ org.hibernate -+ hibernate-validator - - - org.glassfish.hk2 -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-extras/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-extras/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-extras/pom.xml 2015-08-07 00:36:23.000000000 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-extras/pom.xml 2015-08-19 15:21:58.654291034 +0200 -@@ -99,8 +99,8 @@ - hk2-api - - -- org.glassfish.hk2.external -- aopalliance-repackaged -+ aopalliance -+ aopalliance - - - -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-inhabitant-generator/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-inhabitant-generator/pom.xml 2015-08-19 15:09:19.793764553 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-inhabitant-generator/pom.xml 2015-08-19 15:22:22.050038689 +0200 -@@ -73,7 +73,7 @@ - - - -- org.glassfish.hk2.external -+ javax.inject - javax.inject - - -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-locator/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-locator/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-locator/pom.xml 2015-08-07 00:36:23.000000000 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-locator/pom.xml 2015-08-19 15:23:04.287777756 +0200 -@@ -94,12 +94,12 @@ - true - - -- org.glassfish.hk2.external -+ javax.inject - javax.inject - - -- org.glassfish.hk2.external -- aopalliance-repackaged -+ aopalliance -+ aopalliance - - - org.glassfish.hk2 -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-metadata-generator/main/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-metadata-generator/main/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-metadata-generator/main/pom.xml 2015-08-07 00:36:23.000000000 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-metadata-generator/main/pom.xml 2015-08-19 15:23:34.539158438 +0200 -@@ -74,7 +74,7 @@ - - - -- org.glassfish.hk2.external -+ javax.inject - javax.inject - - -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-metadata-generator/test1/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-metadata-generator/test1/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-metadata-generator/test1/pom.xml 2015-08-07 00:36:23.000000000 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-metadata-generator/test1/pom.xml 2015-08-19 15:23:51.811233885 +0200 -@@ -68,7 +68,7 @@ - - - -- org.glassfish.hk2.external -+ javax.inject - javax.inject - - -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-junitrunner/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-junitrunner/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-junitrunner/pom.xml 2015-08-19 15:09:19.816763433 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-junitrunner/pom.xml 2015-08-19 15:24:47.184269836 +0200 -@@ -85,7 +85,7 @@ - hk2-api - - -- org.glassfish.hk2.external -+ javax.inject - javax.inject - - -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-locator-extras/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-locator-extras/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-locator-extras/pom.xml 2015-08-19 15:09:19.817763384 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-locator-extras/pom.xml 2015-08-19 15:25:09.863055869 +0200 -@@ -85,7 +85,7 @@ - hk2-api - - -- org.glassfish.hk2.external -+ javax.inject - javax.inject - - -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-locator-no-proxies/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-locator-no-proxies/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-locator-no-proxies/pom.xml 2015-08-07 00:36:23.000000000 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-locator-no-proxies/pom.xml 2015-08-19 15:25:55.208628577 +0200 -@@ -85,8 +85,8 @@ - javassist - - -- org.glassfish.hk2.external -- aopalliance-repackaged -+ aopalliance -+ aopalliance - - - -@@ -95,13 +95,13 @@ - hk2-api - - -- org.glassfish.hk2.external -- aopalliance-repackaged -+ aopalliance -+ aopalliance - - - - -- org.glassfish.hk2.external -+ javax.inject - javax.inject - - -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-locator-no-proxies2/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-locator-no-proxies2/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-locator-no-proxies2/pom.xml 2015-08-07 00:36:23.000000000 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-locator-no-proxies2/pom.xml 2015-08-19 15:26:14.847577329 +0200 -@@ -91,7 +91,7 @@ - hk2-api - - -- org.glassfish.hk2.external -+ javax.inject - javax.inject - - -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-mockito/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-mockito/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-mockito/pom.xml 2015-08-19 15:09:19.818763335 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-mockito/pom.xml 2015-08-19 15:26:35.748458531 +0200 -@@ -102,7 +102,7 @@ - hk2-api - - -- org.glassfish.hk2.external -+ javax.inject - javax.inject - - -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-runlevel-extras/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-runlevel-extras/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-runlevel-extras/pom.xml 2015-08-07 00:36:23.000000000 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-runlevel-extras/pom.xml 2015-08-19 15:27:01.592075155 +0200 -@@ -98,7 +98,7 @@ - hk2-api - - -- org.glassfish.hk2.external -+ javax.inject - javax.inject - - -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-testng/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-testng/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-testing/hk2-testng/pom.xml 2015-08-19 15:09:19.818763335 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/hk2-testng/pom.xml 2015-08-19 15:27:28.594629742 +0200 -@@ -100,7 +100,7 @@ - hk2-api - - -- org.glassfish.hk2.external -+ javax.inject - javax.inject - - -diff -Nru hk2-hk2-parent-2.4.0-b31/hk2-testing/interceptor-events/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/interceptor-events/pom.xml ---- hk2-hk2-parent-2.4.0-b31/hk2-testing/interceptor-events/pom.xml 2015-08-07 00:36:23.000000000 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/hk2-testing/interceptor-events/pom.xml 2015-08-19 15:27:44.632771240 +0200 -@@ -84,7 +84,7 @@ - hk2-api - - -- org.glassfish.hk2.external -+ javax.inject - javax.inject - - -diff -Nru hk2-hk2-parent-2.4.0-b31/osgi/adapter-tests/no-hk2-bundle/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/osgi/adapter-tests/no-hk2-bundle/pom.xml ---- hk2-hk2-parent-2.4.0-b31/osgi/adapter-tests/no-hk2-bundle/pom.xml 2015-08-07 00:36:23.000000000 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/osgi/adapter-tests/no-hk2-bundle/pom.xml 2015-08-19 15:28:57.048894896 +0200 -@@ -78,7 +78,7 @@ - - - -- org.glassfish.hk2.external -+ javax.inject - javax.inject - - -diff -Nru hk2-hk2-parent-2.4.0-b31/osgi/adapter-tests/osgi-adapter-test/pom.xml hk2-hk2-parent-2.4.0-b31.hk2_external/osgi/adapter-tests/osgi-adapter-test/pom.xml ---- hk2-hk2-parent-2.4.0-b31/osgi/adapter-tests/osgi-adapter-test/pom.xml 2015-08-07 00:36:23.000000000 +0200 -+++ hk2-hk2-parent-2.4.0-b31.hk2_external/osgi/adapter-tests/osgi-adapter-test/pom.xml 2015-08-19 15:29:47.207209985 +0200 -@@ -123,8 +123,8 @@ - sdp-management-bundle - - -- org.glassfish.hk2.external -- aopalliance-repackaged -+ aopalliance -+ aopalliance - - - javax.inject diff --git a/glassfish-hk2.spec b/glassfish-hk2.spec index 23f33b7..eb181be 100644 --- a/glassfish-hk2.spec +++ b/glassfish-hk2.spec @@ -1,9 +1,9 @@ -%global namedreltag -b32 +%global namedreltag %nil %global namedversion %{version}%{?namedreltag} Name: glassfish-hk2 Version: 2.4.0 -Release: 0.10.b32%{?dist} +Release: 1%{?dist} Summary: Hundred Kilobytes Kernel License: CDDL or GPLv2 with exceptions URL: http://hk2.java.net/ @@ -15,8 +15,6 @@ Source1: glassfish-LICENSE.txt Source2: hk2-inhabitant-generator-osgi.bundle Patch0: glassfish-hk2-2.3.0-hk2-utils-osgi_bundle.patch -Patch1: glassfish-hk2-2.4.0-b31-disable-asm-all-repackaged.patch -Patch2: glassfish-hk2-2.4.0-b31-remove-hk2_external.patch BuildRequires: maven-local BuildRequires: mvn(aopalliance:aopalliance) @@ -137,6 +135,24 @@ Summary: HK2 ServiceLocator Default Implementation %description locator Hundred Kilobytes Kernel ServiceLocator Default Implementation. +%package locator-extras +Summary: HK2 Locator unit tests + +%description locator-extras +Extra unit tests for the HK2 Locator implementation. + +%package locator-no-proxies +Summary: HK2 Locator No Proxy Unit tests + +%description locator-no-proxies +Tests the basic HK2 locator with no proxiable scopes. + +%package locator-no-proxies2 +Summary: HK2 Locator No Proxy Unit tests (2) + +%description locator-no-proxies2 +Tests the basic HK2 locator using AOP proxies. + %package maven Summary: HK2 Module system maven support @@ -164,6 +180,14 @@ Summary: HK2 OSGi Adapter %description osgi HK2 Maven plugin for developing. +%package osgi-resource-locator +Summary: HK2 OSGi resource locator bundle + +%description osgi-resource-locator +Hundred Kilobytes Kernel - OSGi resource locator bundle. Used by +various API providers that rely on META-INF/services mechanism to +locate providers. + %package runlevel Summary: HK2 Run Level Service @@ -176,36 +200,18 @@ Summary: HK2 Spring Bridge %description spring-bridge Hundred Kilobytes Kernel Spring Bridge. -%package testing -Summary: Utilities for testing with HK2 - -%description testing -Hundred Kilobytes Kernel Utilities for testing. - -%package locator-extras -Summary: HK2 Locator unit tests - -%description locator-extras -Extra unit tests for the HK2 Locator implementation. - -%package locator-no-proxies -Summary: HK2 Locator No Proxy Unit tests - -%description locator-no-proxies -Tests the basic HK2 locator with no proxiable scopes. - -%package locator-no-proxies2 -Summary: HK2 Locator No Proxy Unit tests (2) - -%description locator-no-proxies2 -Tests the basic HK2 locator using AOP proxies. - %package runlevel-extras Summary: HK2 RunLevel unit tests %description runlevel-extras Extra unit tests for the HK2 RunLevelService implementation. +%package testing +Summary: Utilities for testing with HK2 + +%description testing +Hundred Kilobytes Kernel Utilities for testing. + %package testng Summary: HK2 TestNG runner @@ -231,8 +237,17 @@ find . -name '*.jar' ! -name "gendir.jar" -type f -print -delete find . -name '*.class' -print -delete %patch0 -p0 -%patch1 -p1 -%patch2 -p1 +# Use system libraries +%pom_change_dep -r org.glassfish.hk2.external:asm-all-repackaged org.ow2.asm:asm-all:'${asm.version}' +%pom_change_dep -r org.glassfish.hk2.external:aopalliance-repackaged aopalliance:aopalliance:'${aopalliance.version}' +%pom_change_dep -r org.glassfish.hk2.external:javax.inject javax.inject::'${javax-inject.version}' +%pom_change_dep -r org.glassfish.hk2.external:bean-validator org.hibernate:hibernate-validator:'${hibernate-validator.version}' +%pom_change_dep -r org.glassfish.hk2.external:bean-validator-cdi org.hibernate:hibernate-validator-cdi:'${hibernate-validator.version}' +%pom_change_dep -r org.glassfish.hk2:tiger-types-osgi org.jvnet:tiger-types:'${tiger-types.version}' +# class-model +# hk2-inhabitant-generator +# hk2-testing/hk2-junitrunner +find ./ -name "*.java" -exec sed -i "s/org.glassfish.hk2.external.org.objectweb.asm/org.objectweb.asm/g" {} + %pom_remove_plugin :maven-resources-plugin # org.apache.maven.wagon:wagon-webdav-jackrabbit:2.0 @@ -384,6 +399,7 @@ 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 ":osgi-resource-locator" osgi-resource-locator %build @@ -433,43 +449,46 @@ sed -i 's/\r//' LICENSE.txt %files locator -f .mfiles-locator %license LICENSE.txt -%files maven -f .mfiles-maven -%license LICENSE.txt - -%files maven-plugins -f .mfiles-maven-plugins +%files locator-extras -f .mfiles-locator-extras +%doc hk2-testing/hk2-locator-extras/README.txt %license LICENSE.txt -%files metadata-generator -f .mfiles-metadata-generator +%files locator-no-proxies -f .mfiles-locator-no-proxies +%doc hk2-testing/hk2-locator-no-proxies/README.txt %license LICENSE.txt -%files osgi -f .mfiles-osgi +%files locator-no-proxies2 -f .mfiles-locator-no-proxies2 +%doc hk2-testing/hk2-locator-no-proxies2/README.txt %license LICENSE.txt -%files runlevel -f .mfiles-runlevel +%files maven -f .mfiles-maven %license LICENSE.txt -%files spring-bridge -f .mfiles-spring-bridge +%files maven-plugins -f .mfiles-maven-plugins %license LICENSE.txt -%files testing -f .mfiles-testing +%files metadata-generator -f .mfiles-metadata-generator %license LICENSE.txt -%files locator-extras -f .mfiles-locator-extras -%doc hk2-testing/hk2-locator-extras/README.txt +%files osgi -f .mfiles-osgi %license LICENSE.txt -%files locator-no-proxies -f .mfiles-locator-no-proxies -%doc hk2-testing/hk2-locator-no-proxies/README.txt +%files osgi-resource-locator -f .mfiles-osgi-resource-locator %license LICENSE.txt -%files locator-no-proxies2 -f .mfiles-locator-no-proxies2 -%doc hk2-testing/hk2-locator-no-proxies2/README.txt +%files runlevel -f .mfiles-runlevel %license LICENSE.txt %files runlevel-extras -f .mfiles-runlevel-extras %doc hk2-testing/hk2-runlevel-extras/README.txt %license LICENSE.txt +%files spring-bridge -f .mfiles-spring-bridge +%license LICENSE.txt + +%files testing -f .mfiles-testing +%license LICENSE.txt + %files testng -f .mfiles-testng %doc hk2-testing/hk2-testng/README.md %license LICENSE.txt @@ -481,6 +500,9 @@ sed -i 's/\r//' LICENSE.txt %license LICENSE.txt %changelog +* Fri Jan 15 2016 gil cattaneo 2.4.0-1 +- update to 2.4.0 + * Wed Oct 14 2015 gil cattaneo 2.4.0-0.10.b32 - update to 2.4.0-b32 diff --git a/sources b/sources index 9c33bf6..83272f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e893421273962f35cef558e3926986bf hk2-parent-2.4.0-b32.tar.gz +b615b7e6068806332fcba656517bd6cb hk2-parent-2.4.0.tar.gz