From f413ce47edd5e6a4c5c4ff5abec2548810c6341f Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Fri, 5 Mar 2021 11:50:05 +0100 Subject: [PATCH 1/3] Upgrade Gizmo to 1.0.7.Final --- bom/application/pom.xml | 2 +- independent-projects/arc/pom.xml | 2 +- independent-projects/qute/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index de524049adc80..824a982626b5f 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -84,7 +84,7 @@ 2.1.0 21.0.0 - 1.0.6.Final + 1.0.7.Final 2.12.1 1.0.0.Final 3.12.0 diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml index f82541203ba3f..04a1601a1556a 100644 --- a/independent-projects/arc/pom.xml +++ b/independent-projects/arc/pom.xml @@ -43,7 +43,7 @@ 3.19.0 3.3.2.Final 1.3.5 - 1.0.6.Final + 1.0.7.Final 2.2.3 3.0.0-M5 diff --git a/independent-projects/qute/pom.xml b/independent-projects/qute/pom.xml index 0ace7a4ef8a84..bca507c8f758f 100644 --- a/independent-projects/qute/pom.xml +++ b/independent-projects/qute/pom.xml @@ -36,7 +36,7 @@ 1.8 1.8 5.7.1 - 1.0.6.Final + 1.0.7.Final 3.3.2.Final 3.0.0-M5 1.6.8 From 3f2a40ad023dc0b568b7d0ac0d346468b40ac5ab Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Fri, 5 Mar 2021 12:08:42 +0100 Subject: [PATCH 2/3] Upgrade ASM to 9.1 --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 824a982626b5f..c7508a5bdf48b 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -72,7 +72,7 @@ 2.3.1 2.0.1.Final 2.0.0.Final - 9.0 + 9.1 2.8.0 11.0.0.Final 3.6.3 From c3458c623b30656ba435cb5dfdeda039aa09e4ec Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Fri, 5 Mar 2021 12:08:56 +0100 Subject: [PATCH 3/3] Use Gizmo.ASM_API_VERSION consistently in RESTEasy Reactive --- .../reactive/server/deployment/ClassInjectorTransformer.java | 3 ++- .../reactive/server/deployment/MultipartTransformer.java | 4 +++- .../server/test/simple/IllegalClassExceptionMapper.java | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ClassInjectorTransformer.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ClassInjectorTransformer.java index ba0925a3f0643..8fa2ef6742dc5 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ClassInjectorTransformer.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/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 { @@ -67,7 +68,7 @@ public ClassInjectorTransformer(Map 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/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartTransformer.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartTransformer.java index 56a1054e7fffa..461d0068d2be9 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartTransformer.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/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 { 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/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java index 53603b301a014..9948f486809a3 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/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 { @@ -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();