diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java index a3d5af5cf85e..0ba214d44c33 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java @@ -71,8 +71,8 @@ public class AnnotationParser { private static final Logger LOG = Log.getLogger(AnnotationParser.class); - private static final int ASM_OPCODE_VERSION = Opcodes.ASM7; //compatibility of api - private static final String ASM_OPCODE_VERSION_STR = "ASM7"; + private static final int ASM_OPCODE_VERSION = Opcodes.ASM9; //compatibility of api + private static final String ASM_OPCODE_VERSION_STR = "ASM9"; /** * Map of classnames scanned and the first location from which scan occurred @@ -123,6 +123,16 @@ public static int asmVersion() asmVersion = Opcodes.ASM7; break; } + case 8: + { + asmVersion = Opcodes.ASM8; + break; + } + case 9: + { + asmVersion = Opcodes.ASM9; + break; + } default: { LOG.warn("Unrecognized ASM version, assuming {}", ASM_OPCODE_VERSION_STR); diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java index 6d0c7fe7ec08..ebfdf527f7e0 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java @@ -126,6 +126,8 @@ public static List