From 568abf93115b2d224dc24823ab2906d18b6f8b86 Mon Sep 17 00:00:00 2001 From: Kalin Chan Date: Wed, 29 Sep 2021 10:55:39 +0100 Subject: [PATCH 1/3] FISH-5751 Upgrade ASM to version 9.1 --- .../classmodel/reflect/impl/ModelClassVisitor.java | 12 ++++++------ .../reflect/impl/SignatureVisitorImpl.java | 2 +- .../hk2/testing/junit/internal/ClassVisitorImpl.java | 2 +- .../internal/AbstractAnnotationVisitorImpl.java | 2 +- .../internal/AbstractMethodVisitorImpl.java | 2 +- pom.xml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java index e19422ba51..8225278bdc 100755 --- a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java +++ b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java @@ -58,7 +58,7 @@ public class ModelClassVisitor extends ClassVisitor { public ModelClassVisitor(ParsingContext ctx, URI definingURI, String entryName, boolean isApplicationClass) { - super(Opcodes.ASM7); + super(Opcodes.ASM9); this.ctx = ctx; this.definingURI = definingURI; @@ -353,7 +353,7 @@ private class ModelMethodVisitor extends MethodVisitor { private final MethodVisitingContext context; private ModelMethodVisitor(MemberVisitingContext context) { - super(Opcodes.ASM7); + super(Opcodes.ASM9); this.context = new MethodVisitingContext(context.modelUnAnnotatedMembers); } @@ -422,7 +422,7 @@ private class ModelDefaultAnnotationVisitor extends AnnotationVisitor { private final MethodVisitingContext context; public ModelDefaultAnnotationVisitor(MethodVisitingContext visitingContext) { - super(Opcodes.ASM7); + super(Opcodes.ASM9); this.context = visitingContext; } @@ -438,7 +438,7 @@ private class ModelFieldVisitor extends FieldVisitor { private final FieldVisitingContext context; private ModelFieldVisitor(MemberVisitingContext context) { - super(Opcodes.ASM7); + super(Opcodes.ASM9); this.context = new FieldVisitingContext(context.modelUnAnnotatedMembers); } @@ -491,7 +491,7 @@ private class ModelAnnotationVisitor extends AnnotationVisitor { private final AnnotationVisitingContext context; private ModelAnnotationVisitor() { - super(Opcodes.ASM7); + super(Opcodes.ASM9); this.context = new AnnotationVisitingContext(); } @@ -566,7 +566,7 @@ private class ArrayVisitor extends AnnotationVisitor { protected List values = new ArrayList(); public ArrayVisitor(AnnotationVisitor av) { - super(Opcodes.ASM7, av); + super(Opcodes.ASM9, av); } @Override diff --git a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java index bf4958a34a..c6a7faee20 100755 --- a/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java +++ b/class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java @@ -36,7 +36,7 @@ public class SignatureVisitorImpl extends SignatureVisitor { private final List parameterizedIntf = new ArrayList<>(); public SignatureVisitorImpl(TypeBuilder typeBuilder) { - super(Opcodes.ASM7); + super(Opcodes.ASM9); this.typeBuilder = typeBuilder; } diff --git a/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java b/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java index b74ccdf04c..a339b609c6 100755 --- a/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java +++ b/hk2-testing/hk2-junitrunner/src/main/java/org/jvnet/hk2/testing/junit/internal/ClassVisitorImpl.java @@ -47,7 +47,7 @@ public class ClassVisitorImpl extends ClassVisitor { * @param excludes The set of implementations to NOT add to the locator */ public ClassVisitorImpl(ServiceLocator locator, boolean verbose, Set excludes) { - super(Opcodes.ASM7); + super(Opcodes.ASM9); this.locator = locator; this.verbose = verbose; diff --git a/maven-plugins/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java b/maven-plugins/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java index 834ed3dfb2..114c3f0a26 100755 --- a/maven-plugins/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java +++ b/maven-plugins/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractAnnotationVisitorImpl.java @@ -30,7 +30,7 @@ public abstract class AbstractAnnotationVisitorImpl extends AnnotationVisitor { * Gives the version implemented to the superclass */ public AbstractAnnotationVisitorImpl() { - super(Opcodes.ASM7); + super(Opcodes.ASM9); } /* (non-Javadoc) diff --git a/maven-plugins/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java b/maven-plugins/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java index 30e84a1bea..2612b0b2ce 100755 --- a/maven-plugins/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java +++ b/maven-plugins/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/internal/AbstractMethodVisitorImpl.java @@ -33,7 +33,7 @@ public abstract class AbstractMethodVisitorImpl extends MethodVisitor { * The constructor that gives the implemented version to the superclass */ public AbstractMethodVisitorImpl() { - super(Opcodes.ASM7); + super(Opcodes.ASM9); } /* (non-Javadoc) diff --git a/pom.xml b/pom.xml index e004388fef..35905c127c 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ 0.1.0 3.22.0-CR2 4.12 - 7.1 + 9.1 4.1.2 1.0-2 1.0 From 6885b1e0edcf233070bcdcd406282c1cac19ada2 Mon Sep 17 00:00:00 2001 From: Kalin Chan Date: Wed, 29 Sep 2021 10:56:24 +0100 Subject: [PATCH 2/3] FISH-5751 Increment hk2 version to 2.6.1.payara-p7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 35905c127c..78e301b3b1 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 pom GlassFish HK2 From c39ad78c438fcef82706a6457d4d85ef2c63ec07 Mon Sep 17 00:00:00 2001 From: Kalin Chan Date: Wed, 29 Sep 2021 11:15:06 +0100 Subject: [PATCH 3/3] FISH-5751 Upgrade all modules to 2.6.1.payara-p7 --- bom/pom.xml | 2 +- class-model/pom.xml | 2 +- examples/caching/pom.xml | 2 +- examples/caching/runner/pom.xml | 2 +- examples/caching/system/pom.xml | 2 +- examples/configuration/pom.xml | 2 +- examples/configuration/webserver/pom.xml | 2 +- examples/configuration/xml/pom.xml | 2 +- examples/custom-resolver/pom.xml | 2 +- examples/events/pom.xml | 2 +- examples/events/threaded/pom.xml | 2 +- examples/operations/pom.xml | 2 +- examples/pom.xml | 2 +- examples/security-lockdown/alice/pom.xml | 2 +- examples/security-lockdown/mallory/pom.xml | 2 +- examples/security-lockdown/pom.xml | 2 +- examples/security-lockdown/runner/pom.xml | 2 +- examples/security-lockdown/system/pom.xml | 2 +- external/aopalliance/pom.xml | 2 +- external/jsr330/pom.xml | 2 +- external/pom.xml | 2 +- guice-bridge/pom.xml | 2 +- hk2-api/pom.xml | 2 +- hk2-configuration/hk2-integration/pom.xml | 2 +- hk2-configuration/manager/pom.xml | 2 +- hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml | 2 +- hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml | 2 +- hk2-configuration/persistence/hk2-xml/integration-test/pom.xml | 2 +- hk2-configuration/persistence/hk2-xml/main/pom.xml | 2 +- hk2-configuration/persistence/hk2-xml/pom.xml | 2 +- hk2-configuration/persistence/hk2-xml/schema/pom.xml | 2 +- hk2-configuration/persistence/hk2-xml/test1/pom.xml | 2 +- hk2-configuration/persistence/pom.xml | 2 +- hk2-configuration/persistence/property-file/pom.xml | 2 +- hk2-configuration/pom.xml | 2 +- hk2-core/pom.xml | 2 +- hk2-extras/pom.xml | 2 +- hk2-jmx/pom.xml | 2 +- hk2-locator/pom.xml | 2 +- hk2-metadata-generator/main/pom.xml | 2 +- hk2-metadata-generator/pom.xml | 2 +- hk2-metadata-generator/test1/pom.xml | 2 +- hk2-runlevel/pom.xml | 2 +- hk2-testing/ant/pom.xml | 2 +- hk2-testing/collections/pom.xml | 2 +- hk2-testing/hk2-junitrunner/pom.xml | 2 +- hk2-testing/hk2-locator-extras/pom.xml | 2 +- hk2-testing/hk2-locator-no-proxies/pom.xml | 2 +- hk2-testing/hk2-locator-no-proxies2/pom.xml | 2 +- hk2-testing/hk2-mockito/pom.xml | 2 +- hk2-testing/hk2-runlevel-extras/pom.xml | 2 +- hk2-testing/hk2-testng/pom.xml | 2 +- hk2-testing/interceptor-events/pom.xml | 2 +- hk2-testing/jersey/jersey-guice/form-param/pom.xml | 2 +- hk2-testing/jersey/jersey-guice/pom.xml | 2 +- hk2-testing/jersey/pom.xml | 2 +- hk2-testing/pom.xml | 2 +- hk2-utils/pom.xml | 2 +- hk2/pom.xml | 2 +- maven-plugins/consolidatedbundle-maven-plugin/pom.xml | 2 +- maven-plugins/hk2-inhabitant-generator/pom.xml | 2 +- maven-plugins/osgiversion-maven-plugin/pom.xml | 2 +- maven-plugins/pom.xml | 2 +- osgi/adapter-tests/contract-bundle/pom.xml | 2 +- osgi/adapter-tests/faux-sdp-bundle/pom.xml | 2 +- osgi/adapter-tests/no-hk2-bundle/pom.xml | 2 +- osgi/adapter-tests/osgi-adapter-test/pom.xml | 2 +- osgi/adapter-tests/pom.xml | 2 +- osgi/adapter-tests/sdp-management-bundle/pom.xml | 2 +- osgi/adapter-tests/test-module-startup/pom.xml | 2 +- osgi/adapter/pom.xml | 2 +- osgi/pom.xml | 2 +- spring-bridge/pom.xml | 2 +- 73 files changed, 73 insertions(+), 73 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index babcee37a3..9790670641 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -27,7 +27,7 @@ org.glassfish.hk2 hk2-bom - 2.6.1.payara-p6 + 2.6.1.payara-p7 pom HK2 Bom Pom diff --git a/class-model/pom.xml b/class-model/pom.xml index 2ed70a93be..51e508a68f 100644 --- a/class-model/pom.xml +++ b/class-model/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 org.glassfish.hk2 diff --git a/examples/caching/pom.xml b/examples/caching/pom.xml index 994cddd83d..1cbd331ef2 100644 --- a/examples/caching/pom.xml +++ b/examples/caching/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 examples - 2.6.1.payara-p6 + 2.6.1.payara-p7 4.0.0 diff --git a/examples/caching/runner/pom.xml b/examples/caching/runner/pom.xml index 908495a5fd..89869e81ce 100644 --- a/examples/caching/runner/pom.xml +++ b/examples/caching/runner/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 caching-aop-example - 2.6.1.payara-p6 + 2.6.1.payara-p7 caching-aop-example-runner diff --git a/examples/caching/system/pom.xml b/examples/caching/system/pom.xml index 93dcf8759f..e186cc8f94 100644 --- a/examples/caching/system/pom.xml +++ b/examples/caching/system/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 caching-aop-example - 2.6.1.payara-p6 + 2.6.1.payara-p7 caching-aop-example-system diff --git a/examples/configuration/pom.xml b/examples/configuration/pom.xml index 6e671c63a6..9618fe2a36 100644 --- a/examples/configuration/pom.xml +++ b/examples/configuration/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 examples - 2.6.1.payara-p6 + 2.6.1.payara-p7 4.0.0 diff --git a/examples/configuration/webserver/pom.xml b/examples/configuration/webserver/pom.xml index 335961c0c3..bebe393a8e 100644 --- a/examples/configuration/webserver/pom.xml +++ b/examples/configuration/webserver/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 configuration-examples - 2.6.1.payara-p6 + 2.6.1.payara-p7 webserver-configuration-example diff --git a/examples/configuration/xml/pom.xml b/examples/configuration/xml/pom.xml index 676c43a7df..098a19ac2d 100644 --- a/examples/configuration/xml/pom.xml +++ b/examples/configuration/xml/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 configuration-examples - 2.6.1.payara-p6 + 2.6.1.payara-p7 xml-configuration-example diff --git a/examples/custom-resolver/pom.xml b/examples/custom-resolver/pom.xml index 6c6e74b266..c2e5719ab6 100644 --- a/examples/custom-resolver/pom.xml +++ b/examples/custom-resolver/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 examples - 2.6.1.payara-p6 + 2.6.1.payara-p7 custom-resolver-example Custom Resolver Example diff --git a/examples/events/pom.xml b/examples/events/pom.xml index 0e07741787..4a2f60f05d 100644 --- a/examples/events/pom.xml +++ b/examples/events/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 examples - 2.6.1.payara-p6 + 2.6.1.payara-p7 4.0.0 diff --git a/examples/events/threaded/pom.xml b/examples/events/threaded/pom.xml index b982caa096..15ad8af68f 100644 --- a/examples/events/threaded/pom.xml +++ b/examples/events/threaded/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 event-examples - 2.6.1.payara-p6 + 2.6.1.payara-p7 threading-event-example diff --git a/examples/operations/pom.xml b/examples/operations/pom.xml index ae15bb8667..5cd90cd434 100644 --- a/examples/operations/pom.xml +++ b/examples/operations/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 examples - 2.6.1.payara-p6 + 2.6.1.payara-p7 operations-example Operations Example diff --git a/examples/pom.xml b/examples/pom.xml index 7b7468af5b..bc0040d0b0 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 4.0.0 diff --git a/examples/security-lockdown/alice/pom.xml b/examples/security-lockdown/alice/pom.xml index 6f8b781e77..6c884b8461 100644 --- a/examples/security-lockdown/alice/pom.xml +++ b/examples/security-lockdown/alice/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 security-lockdown-example - 2.6.1.payara-p6 + 2.6.1.payara-p7 security-lockdown-example-alice diff --git a/examples/security-lockdown/mallory/pom.xml b/examples/security-lockdown/mallory/pom.xml index 6b523793a7..b2020bc361 100644 --- a/examples/security-lockdown/mallory/pom.xml +++ b/examples/security-lockdown/mallory/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 security-lockdown-example - 2.6.1.payara-p6 + 2.6.1.payara-p7 security-lockdown-example-mallory diff --git a/examples/security-lockdown/pom.xml b/examples/security-lockdown/pom.xml index 1c8805663f..106189ec3c 100644 --- a/examples/security-lockdown/pom.xml +++ b/examples/security-lockdown/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 examples - 2.6.1.payara-p6 + 2.6.1.payara-p7 4.0.0 diff --git a/examples/security-lockdown/runner/pom.xml b/examples/security-lockdown/runner/pom.xml index 357a671f0a..21d5f0adb2 100644 --- a/examples/security-lockdown/runner/pom.xml +++ b/examples/security-lockdown/runner/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 security-lockdown-example - 2.6.1.payara-p6 + 2.6.1.payara-p7 security-lockdown-example-runner diff --git a/examples/security-lockdown/system/pom.xml b/examples/security-lockdown/system/pom.xml index 9dc43e7378..3db18164ae 100644 --- a/examples/security-lockdown/system/pom.xml +++ b/examples/security-lockdown/system/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 security-lockdown-example - 2.6.1.payara-p6 + 2.6.1.payara-p7 security-lockdown-example-system diff --git a/external/aopalliance/pom.xml b/external/aopalliance/pom.xml index 274a0256ee..4ffd328ff2 100644 --- a/external/aopalliance/pom.xml +++ b/external/aopalliance/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 external - 2.6.1.payara-p6 + 2.6.1.payara-p7 org.glassfish.hk2.external aopalliance-repackaged diff --git a/external/jsr330/pom.xml b/external/jsr330/pom.xml index 99bb07d668..bba6b1c22a 100644 --- a/external/jsr330/pom.xml +++ b/external/jsr330/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 external - 2.6.1.payara-p6 + 2.6.1.payara-p7 org.glassfish.hk2.external jakarta.inject diff --git a/external/pom.xml b/external/pom.xml index da42884987..381691e2aa 100644 --- a/external/pom.xml +++ b/external/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 4.0.0 diff --git a/guice-bridge/pom.xml b/guice-bridge/pom.xml index 2093be3672..1438805b99 100644 --- a/guice-bridge/pom.xml +++ b/guice-bridge/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 org.glassfish.hk2 guice-bridge diff --git a/hk2-api/pom.xml b/hk2-api/pom.xml index d5f0c83b1d..2e01352da1 100644 --- a/hk2-api/pom.xml +++ b/hk2-api/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 org.glassfish.hk2 hk2-api diff --git a/hk2-configuration/hk2-integration/pom.xml b/hk2-configuration/hk2-integration/pom.xml index f8d0d4c2da..662a8bbe0d 100644 --- a/hk2-configuration/hk2-integration/pom.xml +++ b/hk2-configuration/hk2-integration/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-configuration - 2.6.1.payara-p6 + 2.6.1.payara-p7 hk2-configuration-integration diff --git a/hk2-configuration/manager/pom.xml b/hk2-configuration/manager/pom.xml index 6cde20b5df..3a020c6cff 100644 --- a/hk2-configuration/manager/pom.xml +++ b/hk2-configuration/manager/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-configuration - 2.6.1.payara-p6 + 2.6.1.payara-p7 hk2-configuration-hub diff --git a/hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml b/hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml index d231698b68..3a86921f09 100644 --- a/hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml +++ b/hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-xml-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 hk2-json diff --git a/hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml b/hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml index 57376b5fa3..c9f321b4b6 100644 --- a/hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml +++ b/hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-xml-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 hk2-pbuf diff --git a/hk2-configuration/persistence/hk2-xml/integration-test/pom.xml b/hk2-configuration/persistence/hk2-xml/integration-test/pom.xml index 0cf2844850..f8463655d4 100644 --- a/hk2-configuration/persistence/hk2-xml/integration-test/pom.xml +++ b/hk2-configuration/persistence/hk2-xml/integration-test/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-xml-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 hk2-xml-integration-test diff --git a/hk2-configuration/persistence/hk2-xml/main/pom.xml b/hk2-configuration/persistence/hk2-xml/main/pom.xml index fbdf53d0dd..611820bc16 100644 --- a/hk2-configuration/persistence/hk2-xml/main/pom.xml +++ b/hk2-configuration/persistence/hk2-xml/main/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-xml-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 hk2-xml diff --git a/hk2-configuration/persistence/hk2-xml/pom.xml b/hk2-configuration/persistence/hk2-xml/pom.xml index ef618bba86..8686cf25d8 100644 --- a/hk2-configuration/persistence/hk2-xml/pom.xml +++ b/hk2-configuration/persistence/hk2-xml/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 hk2-configuration-persistence - 2.6.1.payara-p6 + 2.6.1.payara-p7 4.0.0 diff --git a/hk2-configuration/persistence/hk2-xml/schema/pom.xml b/hk2-configuration/persistence/hk2-xml/schema/pom.xml index 8f662a0a35..69dd8d233d 100644 --- a/hk2-configuration/persistence/hk2-xml/schema/pom.xml +++ b/hk2-configuration/persistence/hk2-xml/schema/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-xml-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 hk2-xml-schema diff --git a/hk2-configuration/persistence/hk2-xml/test1/pom.xml b/hk2-configuration/persistence/hk2-xml/test1/pom.xml index ec7f43e49b..7bd89e0245 100644 --- a/hk2-configuration/persistence/hk2-xml/test1/pom.xml +++ b/hk2-configuration/persistence/hk2-xml/test1/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-xml-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 hk2-xml-test diff --git a/hk2-configuration/persistence/pom.xml b/hk2-configuration/persistence/pom.xml index e5b3b77bc2..020dcc0b7e 100644 --- a/hk2-configuration/persistence/pom.xml +++ b/hk2-configuration/persistence/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 hk2-configuration - 2.6.1.payara-p6 + 2.6.1.payara-p7 4.0.0 diff --git a/hk2-configuration/persistence/property-file/pom.xml b/hk2-configuration/persistence/property-file/pom.xml index 229bf960b5..05a143be7d 100644 --- a/hk2-configuration/persistence/property-file/pom.xml +++ b/hk2-configuration/persistence/property-file/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-configuration-persistence - 2.6.1.payara-p6 + 2.6.1.payara-p7 hk2-property-file diff --git a/hk2-configuration/pom.xml b/hk2-configuration/pom.xml index 1b6bbf0fb6..e5015eb6ff 100644 --- a/hk2-configuration/pom.xml +++ b/hk2-configuration/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 4.0.0 diff --git a/hk2-core/pom.xml b/hk2-core/pom.xml index e7aa0072c7..657708b683 100644 --- a/hk2-core/pom.xml +++ b/hk2-core/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 hk2-core HK2 core module diff --git a/hk2-extras/pom.xml b/hk2-extras/pom.xml index 7e964367f8..fa22b49a47 100644 --- a/hk2-extras/pom.xml +++ b/hk2-extras/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 org.glassfish.hk2 hk2-extras diff --git a/hk2-jmx/pom.xml b/hk2-jmx/pom.xml index 9b51a41310..5a90967354 100644 --- a/hk2-jmx/pom.xml +++ b/hk2-jmx/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 org.glassfish.hk2 hk2-jmx diff --git a/hk2-locator/pom.xml b/hk2-locator/pom.xml index 74d37225ec..d648e6bc03 100644 --- a/hk2-locator/pom.xml +++ b/hk2-locator/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 hk2-locator ServiceLocator Default Implementation diff --git a/hk2-metadata-generator/main/pom.xml b/hk2-metadata-generator/main/pom.xml index fec01b0da1..b325c002c2 100644 --- a/hk2-metadata-generator/main/pom.xml +++ b/hk2-metadata-generator/main/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-metadata-generator-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 org.glassfish.hk2 diff --git a/hk2-metadata-generator/pom.xml b/hk2-metadata-generator/pom.xml index d2718b07b7..518edd9bfe 100644 --- a/hk2-metadata-generator/pom.xml +++ b/hk2-metadata-generator/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 4.0.0 diff --git a/hk2-metadata-generator/test1/pom.xml b/hk2-metadata-generator/test1/pom.xml index e9c6ddebb5..4c3b9acacd 100644 --- a/hk2-metadata-generator/test1/pom.xml +++ b/hk2-metadata-generator/test1/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-metadata-generator-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 org.glassfish.hk2 hk2-metadata-generator-test1 diff --git a/hk2-runlevel/pom.xml b/hk2-runlevel/pom.xml index d7bdc73423..db1bb5fb27 100644 --- a/hk2-runlevel/pom.xml +++ b/hk2-runlevel/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 hk2-runlevel diff --git a/hk2-testing/ant/pom.xml b/hk2-testing/ant/pom.xml index 7adb717cbc..cfef29e685 100644 --- a/hk2-testing/ant/pom.xml +++ b/hk2-testing/ant/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 ../../pom.xml diff --git a/hk2-testing/collections/pom.xml b/hk2-testing/collections/pom.xml index 3a063608e5..4fa6ba0e34 100644 --- a/hk2-testing/collections/pom.xml +++ b/hk2-testing/collections/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-testing - 2.6.1.payara-p6 + 2.6.1.payara-p7 hk2-collections-tests diff --git a/hk2-testing/hk2-junitrunner/pom.xml b/hk2-testing/hk2-junitrunner/pom.xml index a7490742a6..1ff891ad2e 100644 --- a/hk2-testing/hk2-junitrunner/pom.xml +++ b/hk2-testing/hk2-junitrunner/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 ../../pom.xml hk2-junitrunner diff --git a/hk2-testing/hk2-locator-extras/pom.xml b/hk2-testing/hk2-locator-extras/pom.xml index 09472ea4d0..d109cfca25 100644 --- a/hk2-testing/hk2-locator-extras/pom.xml +++ b/hk2-testing/hk2-locator-extras/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 ../../pom.xml hk2-locator-extras diff --git a/hk2-testing/hk2-locator-no-proxies/pom.xml b/hk2-testing/hk2-locator-no-proxies/pom.xml index 55e1bc5200..488bad52f7 100644 --- a/hk2-testing/hk2-locator-no-proxies/pom.xml +++ b/hk2-testing/hk2-locator-no-proxies/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 ../../pom.xml hk2-locator-no-proxies diff --git a/hk2-testing/hk2-locator-no-proxies2/pom.xml b/hk2-testing/hk2-locator-no-proxies2/pom.xml index a9de7cf864..75882cc14f 100644 --- a/hk2-testing/hk2-locator-no-proxies2/pom.xml +++ b/hk2-testing/hk2-locator-no-proxies2/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 ../../pom.xml diff --git a/hk2-testing/hk2-mockito/pom.xml b/hk2-testing/hk2-mockito/pom.xml index ddb8e943e6..be5c5c2428 100644 --- a/hk2-testing/hk2-mockito/pom.xml +++ b/hk2-testing/hk2-mockito/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-testing - 2.6.1.payara-p6 + 2.6.1.payara-p7 hk2-mockito HK2 Mockito diff --git a/hk2-testing/hk2-runlevel-extras/pom.xml b/hk2-testing/hk2-runlevel-extras/pom.xml index 4035ff8877..767c61298f 100644 --- a/hk2-testing/hk2-runlevel-extras/pom.xml +++ b/hk2-testing/hk2-runlevel-extras/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 ../../pom.xml hk2-runlevel-extras diff --git a/hk2-testing/hk2-testng/pom.xml b/hk2-testing/hk2-testng/pom.xml index c84b85412d..54784cd037 100644 --- a/hk2-testing/hk2-testng/pom.xml +++ b/hk2-testing/hk2-testng/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 ../../pom.xml hk2-testng diff --git a/hk2-testing/interceptor-events/pom.xml b/hk2-testing/interceptor-events/pom.xml index 5510979f89..07bec08df6 100644 --- a/hk2-testing/interceptor-events/pom.xml +++ b/hk2-testing/interceptor-events/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-testing - 2.6.1.payara-p6 + 2.6.1.payara-p7 interceptor-events diff --git a/hk2-testing/jersey/jersey-guice/form-param/pom.xml b/hk2-testing/jersey/jersey-guice/form-param/pom.xml index 0bdad82fa9..bfbbc60e92 100644 --- a/hk2-testing/jersey/jersey-guice/form-param/pom.xml +++ b/hk2-testing/jersey/jersey-guice/form-param/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 ../../../../pom.xml diff --git a/hk2-testing/jersey/jersey-guice/pom.xml b/hk2-testing/jersey/jersey-guice/pom.xml index 577c1aa21a..787e86552e 100644 --- a/hk2-testing/jersey/jersey-guice/pom.xml +++ b/hk2-testing/jersey/jersey-guice/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 ../../../pom.xml diff --git a/hk2-testing/jersey/pom.xml b/hk2-testing/jersey/pom.xml index b31a0b6ec5..62a4e80c50 100644 --- a/hk2-testing/jersey/pom.xml +++ b/hk2-testing/jersey/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 ../../pom.xml diff --git a/hk2-testing/pom.xml b/hk2-testing/pom.xml index 02028bab39..a57e97869d 100644 --- a/hk2-testing/pom.xml +++ b/hk2-testing/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 4.0.0 diff --git a/hk2-utils/pom.xml b/hk2-utils/pom.xml index 503aa70817..50f792b424 100644 --- a/hk2-utils/pom.xml +++ b/hk2-utils/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 org.glassfish.hk2 hk2-utils diff --git a/hk2/pom.xml b/hk2/pom.xml index 06973d6a52..e83dd43849 100644 --- a/hk2/pom.xml +++ b/hk2/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 4.0.0 hk2 diff --git a/maven-plugins/consolidatedbundle-maven-plugin/pom.xml b/maven-plugins/consolidatedbundle-maven-plugin/pom.xml index 1813792d7e..4823ca68c2 100644 --- a/maven-plugins/consolidatedbundle-maven-plugin/pom.xml +++ b/maven-plugins/consolidatedbundle-maven-plugin/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 maven-plugins - 2.6.1.payara-p6 + 2.6.1.payara-p7 consolidatedbundle-maven-plugin maven-plugin diff --git a/maven-plugins/hk2-inhabitant-generator/pom.xml b/maven-plugins/hk2-inhabitant-generator/pom.xml index 7cbe46c4cf..b3d62e46ff 100644 --- a/maven-plugins/hk2-inhabitant-generator/pom.xml +++ b/maven-plugins/hk2-inhabitant-generator/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 maven-plugins - 2.6.1.payara-p6 + 2.6.1.payara-p7 hk2-inhabitant-generator maven-plugin diff --git a/maven-plugins/osgiversion-maven-plugin/pom.xml b/maven-plugins/osgiversion-maven-plugin/pom.xml index d867b12ccd..5f08890a59 100644 --- a/maven-plugins/osgiversion-maven-plugin/pom.xml +++ b/maven-plugins/osgiversion-maven-plugin/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 maven-plugins - 2.6.1.payara-p6 + 2.6.1.payara-p7 osgiversion-maven-plugin maven-plugin diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml index 08ffd73991..8f1e408184 100644 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 maven-plugins pom diff --git a/osgi/adapter-tests/contract-bundle/pom.xml b/osgi/adapter-tests/contract-bundle/pom.xml index 3806ab7b0e..c2403231bf 100644 --- a/osgi/adapter-tests/contract-bundle/pom.xml +++ b/osgi/adapter-tests/contract-bundle/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 osgi-adapter-tests-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 contract-bundle diff --git a/osgi/adapter-tests/faux-sdp-bundle/pom.xml b/osgi/adapter-tests/faux-sdp-bundle/pom.xml index 25925a176e..d2c5db2d8a 100644 --- a/osgi/adapter-tests/faux-sdp-bundle/pom.xml +++ b/osgi/adapter-tests/faux-sdp-bundle/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 osgi-adapter-tests-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 faux-sdp-bundle diff --git a/osgi/adapter-tests/no-hk2-bundle/pom.xml b/osgi/adapter-tests/no-hk2-bundle/pom.xml index f220e5734c..0e7dd3ca34 100644 --- a/osgi/adapter-tests/no-hk2-bundle/pom.xml +++ b/osgi/adapter-tests/no-hk2-bundle/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 osgi-adapter-tests-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 no-hk2-bundle diff --git a/osgi/adapter-tests/osgi-adapter-test/pom.xml b/osgi/adapter-tests/osgi-adapter-test/pom.xml index 607829442e..4e9d0f31eb 100644 --- a/osgi/adapter-tests/osgi-adapter-test/pom.xml +++ b/osgi/adapter-tests/osgi-adapter-test/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 osgi-adapter-tests-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 org.glassfish.hk2 osgi-adapter-test diff --git a/osgi/adapter-tests/pom.xml b/osgi/adapter-tests/pom.xml index de0e3e3f42..941b64415f 100644 --- a/osgi/adapter-tests/pom.xml +++ b/osgi/adapter-tests/pom.xml @@ -23,7 +23,7 @@ org.glassfish.hk2 osgi - 2.6.1.payara-p6 + 2.6.1.payara-p7 org.glassfish.hk2 diff --git a/osgi/adapter-tests/sdp-management-bundle/pom.xml b/osgi/adapter-tests/sdp-management-bundle/pom.xml index 92fecd602b..9f99d892a4 100644 --- a/osgi/adapter-tests/sdp-management-bundle/pom.xml +++ b/osgi/adapter-tests/sdp-management-bundle/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 osgi-adapter-tests-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 sdp-management-bundle diff --git a/osgi/adapter-tests/test-module-startup/pom.xml b/osgi/adapter-tests/test-module-startup/pom.xml index c7137225b8..4e8c658593 100644 --- a/osgi/adapter-tests/test-module-startup/pom.xml +++ b/osgi/adapter-tests/test-module-startup/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 osgi-adapter-tests-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 test-module-startup diff --git a/osgi/adapter/pom.xml b/osgi/adapter/pom.xml index 0b147f8d71..b624cbc4f2 100644 --- a/osgi/adapter/pom.xml +++ b/osgi/adapter/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 osgi - 2.6.1.payara-p6 + 2.6.1.payara-p7 osgi-adapter HK2 OSGi Adapter diff --git a/osgi/pom.xml b/osgi/pom.xml index da63a2c4e8..b08d86a874 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -21,7 +21,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 4.0.0 osgi diff --git a/spring-bridge/pom.xml b/spring-bridge/pom.xml index 4714c8796a..d09292aae2 100644 --- a/spring-bridge/pom.xml +++ b/spring-bridge/pom.xml @@ -22,7 +22,7 @@ org.glassfish.hk2 hk2-parent - 2.6.1.payara-p6 + 2.6.1.payara-p7 org.glassfish.hk2 spring-bridge