diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target index 43ab414b7..0fcdcef5d 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target @@ -25,8 +25,8 @@ <unit id="javax.inject" version="1.0.0.v20091030"/> <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="9.1.0.v20210209-1849"/> - <unit id="org.objectweb.asm.tree" version="9.1.0.v20210209-1849"/> + <unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/> + <unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/> </location> diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target index b044c5f6b..6bd0bc123 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target @@ -25,8 +25,8 @@ <unit id="javax.inject" version="1.0.0.v20091030"/> <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="9.1.0.v20210209-1849"/> - <unit id="org.objectweb.asm.tree" version="9.1.0.v20210209-1849"/> + <unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/> + <unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/> </location> diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target index 6146a08de..074963be3 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target @@ -25,8 +25,8 @@ <unit id="javax.inject" version="1.0.0.v20091030"/> <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="9.1.0.v20210209-1849"/> - <unit id="org.objectweb.asm.tree" version="9.1.0.v20210209-1849"/> + <unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/> + <unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/> </location> diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target index fd773eb49..38bfec442 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target @@ -25,8 +25,8 @@ <unit id="javax.inject" version="1.0.0.v20091030"/> <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="9.1.0.v20210209-1849"/> - <unit id="org.objectweb.asm.tree" version="9.1.0.v20210209-1849"/> + <unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/> + <unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/> </location> diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.target/mavenTychoJ11.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.target/mavenTychoJ11.target.target index 43dbaf610..983c4a7e3 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.target/mavenTychoJ11.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.target/mavenTychoJ11.target.target @@ -31,8 +31,8 @@ <unit id="org.junit.platform.launcher" version="1.7.1.v20210222-1948"/> <unit id="org.junit.platform.runner" version="1.7.1.v20210222-1948"/> <unit id="org.opentest4j" version="1.2.0.v20190826-0900"/> - <unit id="org.objectweb.asm" version="9.1.0.v20210209-1849"/> - <unit id="org.objectweb.asm.tree" version="9.1.0.v20210209-1849"/> + <unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/> + <unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/> </location> diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target index 186e0bbef..7c1146073 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target @@ -25,8 +25,8 @@ <unit id="javax.inject" version="1.0.0.v20091030"/> <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="9.1.0.v20210209-1849"/> - <unit id="org.objectweb.asm.tree" version="9.1.0.v20210209-1849"/> + <unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/> + <unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/> </location> diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.java index 6cdd69d75..fa6ea90e6 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.java +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.java @@ -53,11 +53,11 @@ public class TypesGeneratorFragment2 extends AbstractXtextGeneratorFragment { if (getProjectConfig().getRuntime().getManifest() != null) { Set<String> requiredBundles = getProjectConfig().getRuntime().getManifest().getRequiredBundles(); requiredBundles.add("org.eclipse.xtext.common.types"); - requiredBundles.add("org.objectweb.asm;bundle-version=\"[9.1.0,9.2.0)\";resolution:=optional"); + requiredBundles.add("org.objectweb.asm;bundle-version=\"[9.2.0,9.3.0)\";resolution:=optional"); } if (getProjectConfig().getRuntimeTest().getManifest() != null) { Set<String> requiredBundles = getProjectConfig().getRuntimeTest().getManifest().getRequiredBundles(); - requiredBundles.add("org.objectweb.asm;bundle-version=\"[9.1.0,9.2.0)\";resolution:=optional"); + requiredBundles.add("org.objectweb.asm;bundle-version=\"[9.2.0,9.3.0)\";resolution:=optional"); } if (getProjectConfig().getEclipsePlugin().getManifest() != null) { Set<String> requiredBundles = getProjectConfig().getEclipsePlugin().getManifest().getRequiredBundles(); 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 9b523a426..9e08cba85 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 @@ -101,8 +101,8 @@ class TargetPlatformProject extends ProjectDescriptor { <unit id="org.junit.platform.runner" version="1.7.1.v20210222-1948"/> <unit id="org.opentest4j" version="1.2.0.v20190826-0900"/> �ENDIF� - <unit id="org.objectweb.asm" version="9.1.0.v20210209-1849"/> - <unit id="org.objectweb.asm.tree" version="9.1.0.v20210209-1849"/> + <unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/> + <unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09"/> </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 067024efa..ec29b5bed 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 @@ -230,10 +230,10 @@ public class TargetPlatformProject extends ProjectDescriptor { } } _builder.append("\t\t\t"); - _builder.append("<unit id=\"org.objectweb.asm\" version=\"9.1.0.v20210209-1849\"/>"); + _builder.append("<unit id=\"org.objectweb.asm\" version=\"9.2.0.v20210813-1119\"/>"); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append("<unit id=\"org.objectweb.asm.tree\" version=\"9.1.0.v20210209-1849\"/>"); + _builder.append("<unit id=\"org.objectweb.asm.tree\" version=\"9.2.0.v20210813-1119\"/>"); _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 d9a0cbbaa..d08763011 100644 --- a/org.eclipse.xtext/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext/META-INF/MANIFEST.MF @@ -194,7 +194,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="5.0.1";visibility:=reexport, - org.objectweb.asm;bundle-version="[9.1.0,9.2.0)";resolution:=optional, + org.objectweb.asm;bundle-version="[9.2.0,9.3.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,