diff options
Diffstat (limited to 'bundle-plugin/src')
7 files changed, 10 insertions, 10 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/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.java index b2abf13695f..4d5b0e327d5 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.java @@ -45,15 +45,15 @@ public class GenerateBundleClassPathMappingsMojo extends AbstractMojo { "bundleSymbolicName": "bundle-plugin-test", "classPathElements": [ "/Users/tonyv/Repos/vespa/bundle-plugin-test/target/classes", - "/Users/tonyv/.m2/repository/com/yahoo/vespa/jrt/6-SNAPSHOT/jrt-6-SNAPSHOT.jar", - "/Users/tonyv/.m2/repository/com/yahoo/vespa/annotations/6-SNAPSHOT/annotations-6-SNAPSHOT.jar" + "/Users/tonyv/.m2/repository/com/yahoo/vespa/jrt/7-SNAPSHOT/jrt-7-SNAPSHOT.jar", + "/Users/tonyv/.m2/repository/com/yahoo/vespa/annotations/7-SNAPSHOT/annotations-7-SNAPSHOT.jar" ] }, "providedDependencies": [ { "bundleSymbolicName": "jrt", "classPathElements": [ - "/Users/tonyv/.m2/repository/com/yahoo/vespa/jrt/6-SNAPSHOT/jrt-6-SNAPSHOT.jar" + "/Users/tonyv/.m2/repository/com/yahoo/vespa/jrt/7-SNAPSHOT/jrt-7-SNAPSHOT.jar" ] } ] diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java index 973854aa59a..9c9957ae718 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java @@ -65,7 +65,7 @@ public class GenerateOsgiManifestMojo extends AbstractMojo { @Parameter(alias = "Bundle-Version", defaultValue = "${project.version}") private String bundleVersion = null; - // TODO Vespa 7: default should be ${project.groupId}.${project.artifactId} + // TODO: default should include groupId, but that will require a lot of changes both by us and users. @Parameter(alias = "Bundle-SymbolicName", defaultValue = "${project.artifactId}") private String bundleSymbolicName = null; |