[karaf] branch karaf-4.3.x updated: [KARAF-7564] Upgrade to ASM 9.4

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch karaf-4.3.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.3.x by this push:
     new c5969a6485 [KARAF-7564] Upgrade to ASM 9.4
c5969a6485 is described below

commit c5969a648584cb812debe4618415158f8ef29e17
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Mon Oct 10 14:23:09 2022 +0200

    [KARAF-7564] Upgrade to ASM 9.4
    
    (cherry picked from commit e01fa17b4d292a26edbb68157e4bd29afd5155b0)
---
 pom.xml                                            |  2 +-
 .../impl/runtime/proxy/AsmProxyFactory.java        | 64 +++++-----------------
 2 files changed, 14 insertions(+), 52 deletions(-)

diff --git a/pom.xml b/pom.xml
index 36b27e1e73..1026c29aa9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,7 +166,7 @@
         <activemq.version>5.17.1</activemq.version>
         <aopalliance.bundle.version>1.0_6</aopalliance.bundle.version>
         <aspectj.bundle.version>1.9.5_1</aspectj.bundle.version>
-        <asm.version>9.3</asm.version>
+        <asm.version>9.4</asm.version>
         <javax.annotation.version>1.3.2</javax.annotation.version>
         <awaitility.version>3.1.6</awaitility.version>
         <bouncycastle.version>1.70</bouncycastle.version>
diff --git a/services/interceptor/impl/src/main/java/org/apache/karaf/service/interceptor/impl/runtime/proxy/AsmProxyFactory.java b/services/interceptor/impl/src/main/java/org/apache/karaf/service/interceptor/impl/runtime/proxy/AsmProxyFactory.java
index ff07fd636d..9346f3d6d7 100644
--- a/services/interceptor/impl/src/main/java/org/apache/karaf/service/interceptor/impl/runtime/proxy/AsmProxyFactory.java
+++ b/services/interceptor/impl/src/main/java/org/apache/karaf/service/interceptor/impl/runtime/proxy/AsmProxyFactory.java
@@ -19,57 +19,7 @@ package org.apache.karaf.service.interceptor.impl.runtime.proxy;
 import static org.objectweb.asm.ClassReader.SKIP_CODE;
 import static org.objectweb.asm.ClassReader.SKIP_DEBUG;
 import static org.objectweb.asm.ClassReader.SKIP_FRAMES;
-import static org.objectweb.asm.Opcodes.AALOAD;
-import static org.objectweb.asm.Opcodes.AASTORE;
-import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
-import static org.objectweb.asm.Opcodes.ACC_PROTECTED;
-import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static org.objectweb.asm.Opcodes.ACC_STATIC;
-import static org.objectweb.asm.Opcodes.ACC_SUPER;
-import static org.objectweb.asm.Opcodes.ACC_SYNTHETIC;
-import static org.objectweb.asm.Opcodes.ACC_VARARGS;
-import static org.objectweb.asm.Opcodes.ACONST_NULL;
-import static org.objectweb.asm.Opcodes.ALOAD;
-import static org.objectweb.asm.Opcodes.ANEWARRAY;
-import static org.objectweb.asm.Opcodes.ARETURN;
-import static org.objectweb.asm.Opcodes.ASM7;
-import static org.objectweb.asm.Opcodes.ASTORE;
-import static org.objectweb.asm.Opcodes.ATHROW;
-import static org.objectweb.asm.Opcodes.BIPUSH;
-import static org.objectweb.asm.Opcodes.CHECKCAST;
-import static org.objectweb.asm.Opcodes.DLOAD;
-import static org.objectweb.asm.Opcodes.DRETURN;
-import static org.objectweb.asm.Opcodes.DUP;
-import static org.objectweb.asm.Opcodes.FLOAD;
-import static org.objectweb.asm.Opcodes.FRETURN;
-import static org.objectweb.asm.Opcodes.GETFIELD;
-import static org.objectweb.asm.Opcodes.GETSTATIC;
-import static org.objectweb.asm.Opcodes.ICONST_0;
-import static org.objectweb.asm.Opcodes.ICONST_1;
-import static org.objectweb.asm.Opcodes.ICONST_2;
-import static org.objectweb.asm.Opcodes.ICONST_3;
-import static org.objectweb.asm.Opcodes.ICONST_4;
-import static org.objectweb.asm.Opcodes.ICONST_5;
-import static org.objectweb.asm.Opcodes.IFEQ;
-import static org.objectweb.asm.Opcodes.ILOAD;
-import static org.objectweb.asm.Opcodes.INVOKEINTERFACE;
-import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
-import static org.objectweb.asm.Opcodes.INVOKESTATIC;
-import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
-import static org.objectweb.asm.Opcodes.IRETURN;
-import static org.objectweb.asm.Opcodes.LLOAD;
-import static org.objectweb.asm.Opcodes.LRETURN;
-import static org.objectweb.asm.Opcodes.NEW;
-import static org.objectweb.asm.Opcodes.POP;
-import static org.objectweb.asm.Opcodes.PUTFIELD;
-import static org.objectweb.asm.Opcodes.RETURN;
-import static org.objectweb.asm.Opcodes.SIPUSH;
-import static org.objectweb.asm.Opcodes.V10;
-import static org.objectweb.asm.Opcodes.V11;
-import static org.objectweb.asm.Opcodes.V12;
-import static org.objectweb.asm.Opcodes.V13;
-import static org.objectweb.asm.Opcodes.V1_8;
-import static org.objectweb.asm.Opcodes.V9;
+import static org.objectweb.asm.Opcodes.*;
 
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
@@ -414,6 +364,18 @@ public class AsmProxyFactory {
             return V12;
         } else if (javaVersionProp.startsWith("13")) {
             return V13;
+        } else if (javaVersionProp.startsWith("14")) {
+            return V14;
+        } else if (javaVersionProp.startsWith("15")) {
+            return V15;
+        } else if (javaVersionProp.startsWith("16")) {
+            return V16;
+        } else if (javaVersionProp.startsWith("17")) {
+            return V17;
+        } else if (javaVersionProp.startsWith("18")) {
+            return V18;
+        } else if (javaVersionProp.startsWith("19")) {
+            return V19;
         }
         try {
             final int i = Integer.parseInt(javaVersionProp);