From 936cd465e7548c6ff2b3d02d9ce505acd4ad2b86 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Mon, 19 Oct 2020 17:58:20 +0200 Subject: [PATCH] Bump spifly from 1.2.4 to 1.3.2 (#5477) * Issue #5475 Update to spifly 1.3.2 Signed-off-by: Jan Bartel --- .../jetty/annotations/AnnotationParser.java | 14 ++++++++++++-- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- .../org/eclipse/jetty/osgi/test/TestOSGiUtil.java | 2 ++ 3 files changed, 15 insertions(+), 3 deletions(-) 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/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 175f5de3c9a0..a69012633eea 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -158,7 +158,7 @@ org.apache.aries.spifly org.apache.aries.spifly.dynamic.bundle - 1.2.4 + 1.3.2 test 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