Merge pull request #15491 from gsmet/gizmo-1.0.7

quarkusio · Mar 5, 2021 · c315109 · c315109
2 parents b6ffa56 + c3458c6
commit c315109
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -72,7 +72,7 @@
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <jboss-jaxrs-api_2.1_spec.version>2.0.1.Final</jboss-jaxrs-api_2.1_spec.version>
         <jboss-jaxb-api_2.3_spec.version>2.0.0.Final</jboss-jaxb-api_2.3_spec.version>
-        <asm.version>9.0</asm.version>
+        <asm.version>9.1</asm.version>
         <commons-io.version>2.8.0</commons-io.version>
         <jboss-metadata-web.version>11.0.0.Final</jboss-metadata-web.version>
         <maven-core.version>3.6.3</maven-core.version>
@@ -84,7 +84,7 @@
         <plexus-component-annotations.version>2.1.0</plexus-component-annotations.version>
         <!-- What we actually depend on for the annotations, as latest Graal is not available in Maven fast enough: -->
         <graal-sdk.version>21.0.0</graal-sdk.version>
-        <gizmo.version>1.0.6.Final</gizmo.version>
+        <gizmo.version>1.0.7.Final</gizmo.version>
         <jackson.version>2.12.1</jackson.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>

diff --git a/...rc/main/java/io/quarkus/resteasy/reactive/server/deployment/ClassInjectorTransformer.java b/...rc/main/java/io/quarkus/resteasy/reactive/server/deployment/ClassInjectorTransformer.java
@@ -28,6 +28,7 @@
 import org.objectweb.asm.Type;
 
 import io.quarkus.deployment.util.AsmUtil;
+import io.quarkus.gizmo.Gizmo;
 
 public class ClassInjectorTransformer implements BiFunction<String, ClassVisitor, ClassVisitor> {
 
@@ -67,7 +68,7 @@ public ClassInjectorTransformer(Map<FieldInfo, ServerIndexedParameter> fieldExtr
 
     @Override
     public ClassVisitor apply(String classname, ClassVisitor visitor) {
-        return new ClassInjectorVisitor(Opcodes.ASM8, visitor, fieldExtractors, superTypeIsInjectable);
+        return new ClassInjectorVisitor(Gizmo.ASM_API_VERSION, visitor, fieldExtractors, superTypeIsInjectable);
     }
 
     static class ClassInjectorVisitor extends ClassVisitor {

diff --git a/...nt/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartTransformer.java b/...nt/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartTransformer.java
@@ -9,6 +9,8 @@
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 
+import io.quarkus.gizmo.Gizmo;
+
 class MultipartTransformer implements BiFunction<String, ClassVisitor, ClassVisitor> {
 
     private static final String INJECTION_TARGET_BINARY_NAME = ResteasyReactiveInjectionTarget.class.getName()
@@ -28,7 +30,7 @@ public MultipartTransformer(String populatorName) {
 
     @Override
     public ClassVisitor apply(String s, ClassVisitor visitor) {
-        return new MultipartClassVisitor(Opcodes.ASM8, visitor, populatorName);
+        return new MultipartClassVisitor(Gizmo.ASM_API_VERSION, visitor, populatorName);
     }
 
     static class MultipartClassVisitor extends ClassVisitor {

diff --git a/...est/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java b/...est/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java
@@ -13,12 +13,13 @@
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.util.Printer;
 import org.objectweb.asm.util.Textifier;
 import org.objectweb.asm.util.TraceClassVisitor;
 import org.objectweb.asm.util.TraceMethodVisitor;
 
+import io.quarkus.gizmo.Gizmo;
+
 @Provider
 public class IllegalClassExceptionMapper implements ExceptionMapper<IncompatibleClassChangeError> {
 
@@ -29,7 +30,7 @@ public static class MethodFindingClassVisitor extends ClassVisitor {
         private PrintWriter writer;
 
         public MethodFindingClassVisitor(String method, PrintWriter writer) {
-            super(Opcodes.ASM8);
+            super(Gizmo.ASM_API_VERSION);
             this.method = method;
             this.writer = writer;
             textifier = new Textifier();

diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml
@@ -43,7 +43,7 @@
         <version.assertj>3.19.0</version.assertj>
         <version.jboss-logging>3.3.2.Final</version.jboss-logging>
         <version.jakarta-annotation>1.3.5</version.jakarta-annotation>
-        <version.gizmo>1.0.6.Final</version.gizmo>
+        <version.gizmo>1.0.7.Final</version.gizmo>
         <version.jpa>2.2.3</version.jpa>
 
         <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>

diff --git a/independent-projects/qute/pom.xml b/independent-projects/qute/pom.xml
@@ -36,7 +36,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <version.junit>5.7.1</version.junit>
-        <version.gizmo>1.0.6.Final</version.gizmo>
+        <version.gizmo>1.0.7.Final</version.gizmo>
         <version.jboss-logging>3.3.2.Final</version.jboss-logging>
         <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
         <version.nexus-staging-maven-plugin>1.6.8</version.nexus-staging-maven-plugin>