From e24160d6d721c03a0ee5c2a7caf327987089c4d6 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Sun, 3 Apr 2022 21:21:58 +0200
Subject: JDK 17: Use Opcodes.ASM9 for bundle-plugin

---
 .../main/java/com/yahoo/container/plugin/classanalysis/Analyze.java   | 2 +-
 .../com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java | 4 ++--
 .../com/yahoo/container/plugin/classanalysis/AnalyzeFieldVisitor.java | 2 +-
 .../yahoo/container/plugin/classanalysis/AnalyzeMethodVisitor.java    | 2 +-
 .../yahoo/container/plugin/classanalysis/AnalyzeSignatureVisitor.java | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis')

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 7c34539921b..a93f8cb87d5 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
@@ -65,7 +65,7 @@ public class Analyze {
     }
 
     static AnnotationVisitor visitAnnotationDefault(ImportCollector collector) {
-        return new AnnotationVisitor(Opcodes.ASM7) {
+        return new AnnotationVisitor(Opcodes.ASM9) {
             @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 c5522c4c96a..46a35b07ea7 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
@@ -32,7 +32,7 @@ class AnalyzeClassVisitor extends ClassVisitor implements ImportCollector {
     private final Optional<ArtifactVersion> defaultExportPackageVersion;
 
     AnalyzeClassVisitor(ArtifactVersion defaultExportPackageVersion) {
-        super(Opcodes.ASM7);
+        super(Opcodes.ASM9);
         this.defaultExportPackageVersion = Optional.ofNullable(defaultExportPackageVersion);
     }
 
@@ -103,7 +103,7 @@ class AnalyzeClassVisitor extends ClassVisitor implements ImportCollector {
     }
 
     private AnnotationVisitor visitExportPackage() {
-        return new AnnotationVisitor(Opcodes.ASM7) {
+        return new AnnotationVisitor(Opcodes.ASM9) {
             private int major = defaultExportPackageVersion.map(ArtifactVersion::getMajorVersion)
                     .orElse(defaultVersionValue("major"));
             private int minor = defaultExportPackageVersion.map(ArtifactVersion::getMinorVersion)
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 051df41d62b..87a2b2eb941 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
@@ -19,7 +19,7 @@ public class AnalyzeFieldVisitor extends FieldVisitor implements ImportCollector
     private final Set<String> imports = new HashSet<>();
 
     public AnalyzeFieldVisitor(AnalyzeClassVisitor analyzeClassVisitor) {
-        super(Opcodes.ASM7);
+        super(Opcodes.ASM9);
         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 7913f315cdd..cdf6e93abda 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
@@ -26,7 +26,7 @@ class AnalyzeMethodVisitor extends MethodVisitor implements ImportCollector {
     private final AnalyzeClassVisitor analyzeClassVisitor;
 
     AnalyzeMethodVisitor(AnalyzeClassVisitor analyzeClassVisitor) {
-        super(Opcodes.ASM7);
+        super(Opcodes.ASM9);
         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 61c37e99edf..deb08ee21fa 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 final Set<String> imports = new HashSet<>();
 
     AnalyzeSignatureVisitor(AnalyzeClassVisitor analyzeClassVisitor) {
-        super(Opcodes.ASM7);
+        super(Opcodes.ASM9);
         this.analyzeClassVisitor = analyzeClassVisitor;
     }
 
-- 
cgit v1.2.3