Issue #5475 Fix update to asm and make spifly update work

Signed-off-by: Jan Bartel <janb@webtide.com>
jetty · Oct 19, 2020 · 9c069ff · 9c069ff
1 parent ece302d
commit 9c069ff
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 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
@@ -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
@@ -126,6 +126,8 @@ public static List<Option> coreJettyDependencies()
         res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm-commons").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm-tree").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm-analysis").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm-util").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.apache.aries.spifly").artifactId("org.apache.aries.spifly.dynamic.bundle").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.toolchain").artifactId("jetty-osgi-servlet-api").versionAsInProject().noStart());
         res.add(mavenBundle().groupId("javax.annotation").artifactId("javax.annotation-api").versionAsInProject().start());