Merge pull request #24 from kalinchan/FISH-5751

FISH-5751 Upgrade ASM to version 9.1
payara · Oct 1, 2021 · e41e7ec · e41e7ec
2 parents 81d4b40 + c39ad78
commit e41e7ec
Show file tree

Hide file tree

Showing 79 changed files with 85 additions and 85 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -27,7 +27,7 @@
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>hk2-bom</artifactId>
-    <version>2.6.1.payara-p6</version>
+    <version>2.6.1.payara-p7</version>
     <packaging>pom</packaging>
 
     <name>HK2 Bom Pom</name>

diff --git a/class-model/pom.xml b/class-model/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
 
     <groupId>org.glassfish.hk2</groupId>

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
@@ -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/...s-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java b/...s-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/SignatureVisitorImpl.java
@@ -36,7 +36,7 @@ public class SignatureVisitorImpl extends SignatureVisitor {
     private final List<ParameterizedInterfaceModelImpl> parameterizedIntf = new ArrayList<>();
 
     public SignatureVisitorImpl(TypeBuilder typeBuilder) {
-        super(Opcodes.ASM7);
+        super(Opcodes.ASM9);
         this.typeBuilder = typeBuilder;
     }
 

diff --git a/examples/caching/pom.xml b/examples/caching/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/caching/runner/pom.xml b/examples/caching/runner/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>caching-aop-example</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
 
     <artifactId>caching-aop-example-runner</artifactId>

diff --git a/examples/caching/system/pom.xml b/examples/caching/system/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>caching-aop-example</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
 
     <artifactId>caching-aop-example-system</artifactId>

diff --git a/examples/configuration/pom.xml b/examples/configuration/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/configuration/webserver/pom.xml b/examples/configuration/webserver/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>configuration-examples</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
 
     <artifactId>webserver-configuration-example</artifactId>

diff --git a/examples/configuration/xml/pom.xml b/examples/configuration/xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>configuration-examples</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
 
     <artifactId>xml-configuration-example</artifactId>

diff --git a/examples/custom-resolver/pom.xml b/examples/custom-resolver/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <artifactId>custom-resolver-example</artifactId>
     <name>Custom Resolver Example</name>

diff --git a/examples/events/pom.xml b/examples/events/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/events/threaded/pom.xml b/examples/events/threaded/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>event-examples</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
 
     <artifactId>threading-event-example</artifactId>

diff --git a/examples/operations/pom.xml b/examples/operations/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <artifactId>operations-example</artifactId>
     <name>Operations Example</name>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/security-lockdown/alice/pom.xml b/examples/security-lockdown/alice/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
 
     <artifactId>security-lockdown-example-alice</artifactId>

diff --git a/examples/security-lockdown/mallory/pom.xml b/examples/security-lockdown/mallory/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
 
     <artifactId>security-lockdown-example-mallory</artifactId>

diff --git a/examples/security-lockdown/pom.xml b/examples/security-lockdown/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>examples</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/examples/security-lockdown/runner/pom.xml b/examples/security-lockdown/runner/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
 
     <artifactId>security-lockdown-example-runner</artifactId>

diff --git a/examples/security-lockdown/system/pom.xml b/examples/security-lockdown/system/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>security-lockdown-example</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
 
     <artifactId>security-lockdown-example-system</artifactId>

diff --git a/external/aopalliance/pom.xml b/external/aopalliance/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>external</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <groupId>org.glassfish.hk2.external</groupId>
     <artifactId>aopalliance-repackaged</artifactId>

diff --git a/external/jsr330/pom.xml b/external/jsr330/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>external</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <groupId>org.glassfish.hk2.external</groupId>
     <artifactId>jakarta.inject</artifactId>

diff --git a/external/pom.xml b/external/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/guice-bridge/pom.xml b/guice-bridge/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>guice-bridge</artifactId>

diff --git a/hk2-api/pom.xml b/hk2-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>hk2-api</artifactId>

diff --git a/hk2-configuration/hk2-integration/pom.xml b/hk2-configuration/hk2-integration/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-configuration</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
 
     <artifactId>hk2-configuration-integration</artifactId>

diff --git a/hk2-configuration/manager/pom.xml b/hk2-configuration/manager/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-configuration</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
 
     <artifactId>hk2-configuration-hub</artifactId>

diff --git a/hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml b/hk2-configuration/persistence/hk2-xml/hk2-json/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <artifactId>hk2-json</artifactId>
 

diff --git a/hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml b/hk2-configuration/persistence/hk2-xml/hk2-pbuf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <artifactId>hk2-pbuf</artifactId>
 

diff --git a/hk2-configuration/persistence/hk2-xml/integration-test/pom.xml b/hk2-configuration/persistence/hk2-xml/integration-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <artifactId>hk2-xml-integration-test</artifactId>
 

diff --git a/hk2-configuration/persistence/hk2-xml/main/pom.xml b/hk2-configuration/persistence/hk2-xml/main/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <artifactId>hk2-xml</artifactId>
 

diff --git a/hk2-configuration/persistence/hk2-xml/pom.xml b/hk2-configuration/persistence/hk2-xml/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-configuration-persistence</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hk2-configuration/persistence/hk2-xml/schema/pom.xml b/hk2-configuration/persistence/hk2-xml/schema/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <artifactId>hk2-xml-schema</artifactId>
 

diff --git a/hk2-configuration/persistence/hk2-xml/test1/pom.xml b/hk2-configuration/persistence/hk2-xml/test1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-xml-parent</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <artifactId>hk2-xml-test</artifactId>
 

diff --git a/hk2-configuration/persistence/pom.xml b/hk2-configuration/persistence/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-configuration</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hk2-configuration/persistence/property-file/pom.xml b/hk2-configuration/persistence/property-file/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-configuration-persistence</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <artifactId>hk2-property-file</artifactId>
 

diff --git a/hk2-configuration/pom.xml b/hk2-configuration/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/hk2-core/pom.xml b/hk2-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <artifactId>hk2-core</artifactId>
     <name>HK2 core module</name>

diff --git a/hk2-extras/pom.xml b/hk2-extras/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-parent</artifactId>
-        <version>2.6.1.payara-p6</version>
+        <version>2.6.1.payara-p7</version>
     </parent>
     <groupId>org.glassfish.hk2</groupId>
     <artifactId>hk2-extras</artifactId>