From 743dedbd36be295bcc4952611cc89c577ec0a693 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Thu, 6 Dec 2018 09:49:35 +0000
Subject: [PATCH 2/2] Allow building with ASM6 on Fedora <= 29

---
 .../org/eclipse/jetty/annotations/AnnotationParser.java  | 9 ++-------
 .../eclipse/jetty/osgi/annotations/AnnotationParser.java | 2 +-
 2 files changed, 3 insertions(+), 8 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 a23b685..832ae20 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
@@ -69,8 +69,8 @@ import org.objectweb.asm.Opcodes;
 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.ASM6; //compatibility of api
+    private static final String ASM_OPCODE_VERSION_STR = "ASM6";
     
     /**
      * Map of classnames scanned and the first location from which scan occurred
@@ -115,11 +115,6 @@ public class AnnotationParser
                         asmVersion = Opcodes.ASM6;
                         break;
                     }
-                    case 7:
-                    {
-                        asmVersion = Opcodes.ASM7;
-                        break;
-                    }
                     default:
                     {
                         LOG.warn("Unrecognized ASM version, assuming {}", ASM_OPCODE_VERSION_STR);
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java
index 00f0919..1350eb4 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java
@@ -49,7 +49,7 @@ public class AnnotationParser extends org.eclipse.jetty.annotations.AnnotationPa
     
     public AnnotationParser(int javaPlatform)
     {
-        super(javaPlatform, Opcodes.ASM7);
+        super(javaPlatform, Opcodes.ASM6);
     }
     
     /**
-- 
2.19.1