From 4ac89676f9fedd11fa590b2f9f60efc64dd27e3f Mon Sep 17 00:00:00 2001 From: Christian Dietrich <christian.dietrich@itemis.de> Date: Mon, 30 Mar 2020 15:20:15 +0200 Subject: [PATCH] [eclipse/xtext#1649] update to ASM 8.0 Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de> --- .../org.xtext.example.full.target.target | 4 ++-- .../org.xtext.example.lsMavenTychoApp.target.target | 4 ++-- .../org.xtext.example.lsMavenTychoFatjar.target.target | 4 ++-- .../org.xtext.example.mavenTycho.target.target | 4 ++-- .../org.xtext.example.mavenTychoJ9.target.target | 4 ++-- .../org.xtext.example.mavenTychoP2.target.target | 4 ++-- .../xtext/xtext/generator/types/TypesGeneratorFragment2.xtend | 4 ++-- .../xtext/xtext/generator/types/TypesGeneratorFragment2.java | 4 ++-- .../eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend | 4 ++-- .../org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java | 4 ++-- org.eclipse.xtext/META-INF/MANIFEST.MF | 2 +- .../xtext/generator/trace/TraceAsPrimarySourceInstaller.java | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.target/org.xtext.example.full.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.target/org.xtext.example.full.target.target index 31f0c602d..1a5051c43 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.target/org.xtext.example.full.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.target/org.xtext.example.full.target.target @@ -22,8 +22,8 @@ <unit id="com.google.gson" version="2.8.2.v20180104-1110"/> <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> <unit id="org.junit" version="4.12.0.v201504281640"/> - <unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/> - <unit id="org.objectweb.asm.tree" version="7.2.0.v20191010-1910"/> + <unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/> + <unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/> </location> diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/org.xtext.example.lsMavenTychoApp.target/org.xtext.example.lsMavenTychoApp.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/org.xtext.example.lsMavenTychoApp.target/org.xtext.example.lsMavenTychoApp.target.target index cf21a39f7..59b58c7d0 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/org.xtext.example.lsMavenTychoApp.target/org.xtext.example.lsMavenTychoApp.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/org.xtext.example.lsMavenTychoApp.target/org.xtext.example.lsMavenTychoApp.target.target @@ -22,8 +22,8 @@ <unit id="com.google.gson" version="2.8.2.v20180104-1110"/> <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> <unit id="org.junit" version="4.12.0.v201504281640"/> - <unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/> - <unit id="org.objectweb.asm.tree" version="7.2.0.v20191010-1910"/> + <unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/> + <unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/> </location> diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.target/org.xtext.example.lsMavenTychoFatjar.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.target/org.xtext.example.lsMavenTychoFatjar.target.target index 1b8ffb520..52e44b63d 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.target/org.xtext.example.lsMavenTychoFatjar.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.target/org.xtext.example.lsMavenTychoFatjar.target.target @@ -22,8 +22,8 @@ <unit id="com.google.gson" version="2.8.2.v20180104-1110"/> <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> <unit id="org.junit" version="4.12.0.v201504281640"/> - <unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/> - <unit id="org.objectweb.asm.tree" version="7.2.0.v20191010-1910"/> + <unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/> + <unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/> </location> diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.target/org.xtext.example.mavenTycho.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.target/org.xtext.example.mavenTycho.target.target index fab832589..75f812bd3 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.target/org.xtext.example.mavenTycho.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.target/org.xtext.example.mavenTycho.target.target @@ -22,8 +22,8 @@ <unit id="com.google.gson" version="2.8.2.v20180104-1110"/> <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> <unit id="org.junit" version="4.12.0.v201504281640"/> - <unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/> - <unit id="org.objectweb.asm.tree" version="7.2.0.v20191010-1910"/> + <unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/> + <unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/> </location> diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.target/org.xtext.example.mavenTychoJ9.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.target/org.xtext.example.mavenTychoJ9.target.target index 58dbf158d..04e2c9610 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.target/org.xtext.example.mavenTychoJ9.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.target/org.xtext.example.mavenTychoJ9.target.target @@ -22,8 +22,8 @@ <unit id="com.google.gson" version="2.8.2.v20180104-1110"/> <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> <unit id="org.junit" version="4.12.0.v201504281640"/> - <unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/> - <unit id="org.objectweb.asm.tree" version="7.2.0.v20191010-1910"/> + <unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/> + <unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/> </location> diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.target/org.xtext.example.mavenTychoP2.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.target/org.xtext.example.mavenTychoP2.target.target index e32019cec..add14924d 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.target/org.xtext.example.mavenTychoP2.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.target/org.xtext.example.mavenTychoP2.target.target @@ -22,8 +22,8 @@ <unit id="com.google.gson" version="2.8.2.v20180104-1110"/> <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> <unit id="org.junit" version="4.12.0.v201504281640"/> - <unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/> - <unit id="org.objectweb.asm.tree" version="7.2.0.v20191010-1910"/> + <unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/> + <unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/> </location> diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.xtend index 6ec7535aa..312b0bc48 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.xtend @@ -49,13 +49,13 @@ class TypesGeneratorFragment2 extends AbstractXtextGeneratorFragment { if (projectConfig.runtime.manifest !== null) { projectConfig.runtime.manifest.requiredBundles.addAll( 'org.eclipse.xtext.common.types', - 'org.objectweb.asm;bundle-version="[7.2.0,7.3.0)";resolution:=optional' + 'org.objectweb.asm;bundle-version="[8.0.1,8.1.0)";resolution:=optional' ) } if (projectConfig.runtimeTest.manifest !== null) { projectConfig.runtimeTest.manifest.requiredBundles.add( - 'org.objectweb.asm;bundle-version="[7.2.0,7.3.0)";resolution:=optional' + 'org.objectweb.asm;bundle-version="[8.0.1,8.1.0)";resolution:=optional' ) } diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.java index a319e6ee2..adc406de6 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.java @@ -51,13 +51,13 @@ public class TypesGeneratorFragment2 extends AbstractXtextGeneratorFragment { if (_tripleNotEquals) { CollectionExtensions.<String>addAll(this.getProjectConfig().getRuntime().getManifest().getRequiredBundles(), "org.eclipse.xtext.common.types", - "org.objectweb.asm;bundle-version=\"[7.2.0,7.3.0)\";resolution:=optional"); + "org.objectweb.asm;bundle-version=\"[8.0.1,8.1.0)\";resolution:=optional"); } ManifestAccess _manifest_1 = this.getProjectConfig().getRuntimeTest().getManifest(); boolean _tripleNotEquals_1 = (_manifest_1 != null); if (_tripleNotEquals_1) { this.getProjectConfig().getRuntimeTest().getManifest().getRequiredBundles().add( - "org.objectweb.asm;bundle-version=\"[7.2.0,7.3.0)\";resolution:=optional"); + "org.objectweb.asm;bundle-version=\"[8.0.1,8.1.0)\";resolution:=optional"); } ManifestAccess _manifest_2 = this.getProjectConfig().getEclipsePlugin().getManifest(); boolean _tripleNotEquals_2 = (_manifest_2 != null); diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend index 5e54f1df2..b5ab01fc2 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend @@ -89,8 +89,8 @@ class TargetPlatformProject extends ProjectDescriptor { <unit id="org.junit.platform.runner" version="1.6.0.v20200203-2009"/> <unit id="org.opentest4j" version="1.2.0.v20190826-0900"/> �ENDIF� - <unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/> - <unit id="org.objectweb.asm.tree" version="7.2.0.v20191010-1910"/> + <unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/> + <unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/> </location> diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java index 21b8088c4..97f036ea8 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java @@ -207,10 +207,10 @@ public class TargetPlatformProject extends ProjectDescriptor { } } _builder.append("\t\t\t"); - _builder.append("<unit id=\"org.objectweb.asm\" version=\"7.2.0.v20191010-1910\"/>"); + _builder.append("<unit id=\"org.objectweb.asm\" version=\"8.0.1.v20200420-1007\"/>"); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append("<unit id=\"org.objectweb.asm.tree\" version=\"7.2.0.v20191010-1910\"/>"); + _builder.append("<unit id=\"org.objectweb.asm.tree\" version=\"8.0.1.v20200420-1007\"/>"); _builder.newLine(); _builder.append("\t\t\t"); _builder.append("<unit id=\"io.github.classgraph\" version=\"4.8.35.v20190528-1517\"/>"); diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF index 475dd7fc9..eff998c6e 100644 --- a/org.eclipse.xtext/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext/META-INF/MANIFEST.MF @@ -236,7 +236,7 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.16.0";visibility:=re org.eclipse.emf.common;bundle-version="2.17.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)";visibility:=reexport, com.google.inject;bundle-version="3.0.0";visibility:=reexport, - org.objectweb.asm;bundle-version="[7.2.0,7.3.0)";resolution:=optional, + org.objectweb.asm;bundle-version="[8.0.1,8.1.0)";resolution:=optional, org.eclipse.emf.mwe.core;bundle-version="1.3.21";resolution:=optional;visibility:=reexport, org.eclipse.emf.mwe.utils;bundle-version="1.3.21";resolution:=optional;visibility:=reexport, org.eclipse.xtend;bundle-version="2.2.0";resolution:=optional, diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceAsPrimarySourceInstaller.java b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceAsPrimarySourceInstaller.java index 13e6e2b10..2e7c37466 100644 --- a/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceAsPrimarySourceInstaller.java +++ b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceAsPrimarySourceInstaller.java @@ -36,7 +36,7 @@ public class TraceAsPrimarySourceInstaller implements ITraceToBytecodeInstaller private final int[] target2source; public XtextClassAdapter(ClassVisitor cv, String sourceFile, int[] target2source, boolean hideSyntheticVariables) { - super(Opcodes.ASM7, cv); + super(Opcodes.ASM8, cv); this.sourceFile = sourceFile; this.target2source = target2source; this.hideSyntheticVariables = hideSyntheticVariables; @@ -70,7 +70,7 @@ public class TraceAsPrimarySourceInstaller implements ITraceToBytecodeInstaller private XtextClassAdapter context; public XtextMethodAdapter(XtextClassAdapter context, MethodVisitor delegate) { - super(Opcodes.ASM7, delegate); + super(Opcodes.ASM8, delegate); this.context = context; }