Upgrade asm to 7 and use Opcodes.ASM7

7 files changed, 8 insertions, 8 deletions

diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java
index c59f8559405..13a306a0c1c 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java
@@ -58,7 +58,7 @@ public class Analyze {
     }
 
     static AnnotationVisitor visitAnnotationDefault(ImportCollector collector) {
-        return new AnnotationVisitor(Opcodes.ASM6) {
+        return new AnnotationVisitor(Opcodes.ASM7) {
             @Override
             public void visit(String name, Object value) {
             }
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java
index d9519fd7986..0225c43e4b8 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java
@@ -28,7 +28,7 @@ class AnalyzeClassVisitor extends ClassVisitor implements ImportCollector {
     private Optional<ExportPackageAnnotation> exportPackageAnnotation = Optional.empty();
 
     AnalyzeClassVisitor() {
-        super(Opcodes.ASM6);
+        super(Opcodes.ASM7);
     }
 
     @Override
@@ -98,7 +98,7 @@ class AnalyzeClassVisitor extends ClassVisitor implements ImportCollector {
     }
 
     private AnnotationVisitor visitExportPackage() {
-        return new AnnotationVisitor(Opcodes.ASM6) {
+        return new AnnotationVisitor(Opcodes.ASM7) {
             private int major = defaultVersionValue("major");
             private int minor = defaultVersionValue("minor");
             private int micro = defaultVersionValue("micro");
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeFieldVisitor.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeFieldVisitor.java
index ea10b6ef0aa..1966c602479 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeFieldVisitor.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeFieldVisitor.java
@@ -18,7 +18,7 @@ public class AnalyzeFieldVisitor extends FieldVisitor implements ImportCollector
     private final Set<String> imports = new HashSet<>();
 
     public AnalyzeFieldVisitor(AnalyzeClassVisitor analyzeClassVisitor) {
-        super(Opcodes.ASM6);
+        super(Opcodes.ASM7);
         this.analyzeClassVisitor = analyzeClassVisitor;
     }
 
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.java
index b1a92f9c10b..6a769b26295 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.java
@@ -24,7 +24,7 @@ class AnalyzeMethodVisitor extends MethodVisitor implements ImportCollector {
     private final AnalyzeClassVisitor analyzeClassVisitor;
 
     AnalyzeMethodVisitor(AnalyzeClassVisitor analyzeClassVisitor) {
-        super(Opcodes.ASM6);
+        super(Opcodes.ASM7);
         this.analyzeClassVisitor = analyzeClassVisitor;
     }
 
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeSignatureVisitor.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeSignatureVisitor.java
index 0f5fcf89f6a..c20d7d47de0 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeSignatureVisitor.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeSignatureVisitor.java
@@ -18,7 +18,7 @@ class AnalyzeSignatureVisitor extends SignatureVisitor implements ImportCollecto
     private Set<String> imports = new HashSet<>();
 
     AnalyzeSignatureVisitor(AnalyzeClassVisitor analyzeClassVisitor) {
-        super(Opcodes.ASM6);
+        super(Opcodes.ASM7);
         this.analyzeClassVisitor = analyzeClassVisitor;
     }
 
diff --git a/container-jersey2/src/main/java/com/yahoo/container/servlet/jersey/ResourceOrProviderClassVisitor.java b/container-jersey2/src/main/java/com/yahoo/container/servlet/jersey/ResourceOrProviderClassVisitor.java
index 7cb47ac6118..bf53cec670e 100644
--- a/container-jersey2/src/main/java/com/yahoo/container/servlet/jersey/ResourceOrProviderClassVisitor.java
+++ b/container-jersey2/src/main/java/com/yahoo/container/servlet/jersey/ResourceOrProviderClassVisitor.java
@@ -29,7 +29,7 @@ public class ResourceOrProviderClassVisitor extends ClassVisitor {
     private boolean isAnnotated = false;
 
     public ResourceOrProviderClassVisitor() {
-        super(Opcodes.ASM6);
+        super(Opcodes.ASM7);
     }
 
     public Optional<String> getJerseyClassName() {
diff --git a/parent/pom.xml b/parent/pom.xml
index 9619c94d339..03df93e7672 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -726,7 +726,7 @@
     <properties>
         <antlr.version>3.5.2</antlr.version>
         <antlr4.version>4.5</antlr4.version>
-        <asm.version>6.2</asm.version>
+        <asm.version>7.0</asm.version>
         <jna.version>4.5.2</jna.version>
         <tensorflow.version>1.12.0</tensorflow.version>
         <!-- Athenz dependencies. Make sure these dependencies matches those in Vespa's internal repositories -->