From b7f9f773f548738a4b73158f830ddf728ec89982 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Mon, 3 Apr 2023 13:38:49 +0200 Subject: [PATCH] [#2147] update to asm 9.5 Signed-off-by: Christian Dietrich --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtend.core/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF_gen | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../access/impl/DeclaredTypeFactory.java | 2 +- org.eclipse.xtext.dev-bom/pom.xml | 2 +- .../types/TypesGeneratorFragment.java | 4 ++-- org.eclipse.xtext.p2repository/category.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.redist.feature/feature.xml | 2 +- org.eclipse.xtext.runtime.feature/feature.xml | 2 +- .../full.target/full.target.target | 5 ++++- .../lsMavenTychoApp.target.target | 5 ++++- .../lsMavenTychoFatjar.target.target | 5 ++++- .../mavenTycho.target.target | 5 ++++- .../mavenTychoJ17.target.target | 5 ++++- .../mavenTychoP2.target.target | 5 ++++- .../mavenTychoP2J17.target.target | 5 ++++- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase/META-INF/MANIFEST.MF | 2 +- .../types/TypesGeneratorFragment2.java | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../xtext/wizard/TargetPlatformProject.xtend | 5 ++++- .../xtext/wizard/TargetPlatformProject.java | 15 +++++++++++--- org.eclipse.xtext/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.xtext.contributor/Xtext.setup | 20 +++++++++++++++++-- xtext-latest.target | 5 ++++- xtext-r202203.target | 5 ++++- xtext-r202206.target | 5 ++++- xtext-r202209.target | 5 ++++- xtext-r202212.target | 5 ++++- xtext-r202303.target | 5 ++++- 43 files changed, 116 insertions(+), 49 deletions(-) diff --git a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF index 0c99380267b..303a3bf43c2 100644 --- a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.xtend.core, org.eclipse.emf.ecore, org.eclipse.xtext.builder, org.eclipse.xtend.lib, - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)", + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)", org.eclipse.jdt.core;bundle-version="3.29.0", org.eclipse.xtext.builder.standalone, org.eclipse.xtext.java diff --git a/org.eclipse.xtend.core/META-INF/MANIFEST.MF b/org.eclipse.xtend.core/META-INF/MANIFEST.MF index e5a702cf866..00e5ade3886 100644 --- a/org.eclipse.xtend.core/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.core/META-INF/MANIFEST.MF @@ -61,7 +61,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100", org.eclipse.xtend.lib;bundle-version="2.31.0", org.eclipse.xtext.smap, org.apache.ant;bundle-version="1.7.1";resolution:=optional;x-installation:=greedy, - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional, + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional, org.eclipse.xtext.xbase.testing;resolution:=optional Bundle-ActivationPolicy: lazy Import-Package: org.apache.log4j;version="1.2.24" diff --git a/org.eclipse.xtend.examples/projects/xtend-annotation-examples/META-INF/MANIFEST.MF b/org.eclipse.xtend.examples/projects/xtend-annotation-examples/META-INF/MANIFEST.MF index 009244235d2..b5cd5f6817c 100644 --- a/org.eclipse.xtend.examples/projects/xtend-annotation-examples/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.examples/projects/xtend-annotation-examples/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtend.lib, org.eclipse.xtext.xbase.testing, org.eclipse.jdt.core, org.eclipse.emf.codegen;bundle-version="2.22.0", - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional, + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional, org.eclipse.equinox.common Export-Package: extract, i18n, diff --git a/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF index 7aa615cd68e..80f91681784 100644 --- a/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF @@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.xtext.util, org.eclipse.xtext.ui.testing, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtext.ui.codetemplates.ui, - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional, + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional, org.eclipse.compare, org.eclipse.xtext.xbase.testing, org.eclipse.ui.workbench;resolution:=optional, diff --git a/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF_gen index a3e9e15a6a9..940d1d8cefc 100644 --- a/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF_gen +++ b/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF_gen @@ -6,7 +6,7 @@ Bundle-Version: 0.0.1 Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.xtext.common.types.xtext.ui -Require-Bundle: org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional, +Require-Bundle: org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional, org.eclipse.xtext.common.types.eclipse.tests, org.eclipse.xtext.xbase.lib, org.eclipse.xtext.common.types.eclipse.tests.ui, diff --git a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF index c8b62734298..01a561dc337 100644 --- a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.emf.common;bundle-version="2.24.0", com.google.inject;bundle-version="5.0.1", org.eclipse.xtext, - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)", + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)", org.eclipse.xtend.lib, com.google.guava;bundle-version="[30.1.0,31.0.0)", io.github.classgraph;bundle-version="4.8.149" diff --git a/org.eclipse.xtext.common.types/src/org/eclipse/xtext/common/types/access/impl/DeclaredTypeFactory.java b/org.eclipse.xtext.common.types/src/org/eclipse/xtext/common/types/access/impl/DeclaredTypeFactory.java index aa410661383..18e708ca2bf 100644 --- a/org.eclipse.xtext.common.types/src/org/eclipse/xtext/common/types/access/impl/DeclaredTypeFactory.java +++ b/org.eclipse.xtext.common.types/src/org/eclipse/xtext/common/types/access/impl/DeclaredTypeFactory.java @@ -79,7 +79,7 @@ private static boolean isAsm8Available() { logger.warn("ASM library is too old. Falling back to java.lang.reflect API."); } logger.warn("Please note that no information about compile time constants is available."); - logger.warn("It's recommended to use org.objectweb.asm 9.4.0 or better (Maven group id: org.ow2.asm)."); + logger.warn("It's recommended to use org.objectweb.asm 9.5.0 or better (Maven group id: org.ow2.asm)."); logger.warn("--------------------------------------------------------------------------"); return false; } diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml index ddc3063c812..7ae7d5a1c7e 100644 --- a/org.eclipse.xtext.dev-bom/pom.xml +++ b/org.eclipse.xtext.dev-bom/pom.xml @@ -462,7 +462,7 @@ org.ow2.asm asm - 9.4 + 9.5 diff --git a/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/types/TypesGeneratorFragment.java b/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/types/TypesGeneratorFragment.java index a69900c470c..b925cea1db1 100644 --- a/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/types/TypesGeneratorFragment.java +++ b/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/types/TypesGeneratorFragment.java @@ -46,12 +46,12 @@ public Set getGuiceBindingsUi(Grammar grammar) { @Override public String[] getRequiredBundlesRt(Grammar grammar) { - return new String[] { "org.eclipse.xtext.common.types","org.objectweb.asm;bundle-version=\"[9.4.0,9.5.0)\";resolution:=optional" }; + return new String[] { "org.eclipse.xtext.common.types","org.objectweb.asm;bundle-version=\"[9.5.0,9.6.0)\";resolution:=optional" }; } @Override public String[] getRequiredBundlesTests(Grammar grammar) { - return new String[] { "org.objectweb.asm;bundle-version=\"[9.4.0,9.5.0)\";resolution:=optional" }; + return new String[] { "org.objectweb.asm;bundle-version=\"[9.5.0,9.6.0)\";resolution:=optional" }; } @Override diff --git a/org.eclipse.xtext.p2repository/category.xml b/org.eclipse.xtext.p2repository/category.xml index cf3a47ed396..2ddec61c648 100644 --- a/org.eclipse.xtext.p2repository/category.xml +++ b/org.eclipse.xtext.p2repository/category.xml @@ -31,8 +31,8 @@ - - + + diff --git a/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF index 9e8f675261f..a63ffe4a440 100644 --- a/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase.eclipse.tests/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtext.purexbase, org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtext.builder, org.eclipse.jdt.core;bundle-version="3.29.0", - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional, + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing, diff --git a/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF index 061bb8522ae..5270b588734 100644 --- a/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext.purexbase, org.eclipse.xtext, org.eclipse.xtext.testing, org.eclipse.jdt.core;bundle-version="3.29.0", - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional, + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.31.0", org.eclipse.xtext.xbase.testing, org.junit;bundle-version="4.13.2" diff --git a/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF index 590c6eb6909..fe03431e5fc 100644 --- a/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtend.lib;bundle-version="2.31.0", org.eclipse.emf.common, org.eclipse.xtext.common.types, - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional Import-Package: org.apache.commons.logging, org.apache.log4j;version="1.2.24" Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.xtext.redist.feature/feature.xml b/org.eclipse.xtext.redist.feature/feature.xml index 40c3a1d0eb5..4206ef7cd97 100644 --- a/org.eclipse.xtext.redist.feature/feature.xml +++ b/org.eclipse.xtext.redist.feature/feature.xml @@ -31,7 +31,7 @@ SPDX-License-Identifier: EPL-2.0 - + diff --git a/org.eclipse.xtext.runtime.feature/feature.xml b/org.eclipse.xtext.runtime.feature/feature.xml index c4b7a1b9bcf..4a8931ed3da 100644 --- a/org.eclipse.xtext.runtime.feature/feature.xml +++ b/org.eclipse.xtext.runtime.feature/feature.xml @@ -28,7 +28,7 @@ SPDX-License-Identifier: EPL-2.0 - + 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 4c1b1c9c1e3..fa1935371cd 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 @@ -24,9 +24,12 @@ - + + + + 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 d67da8cbef5..778e84f3089 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 @@ -24,9 +24,12 @@ - + + + + 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 5db0d1d5c8c..706ab4f1126 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 @@ -24,9 +24,12 @@ - + + + + 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 5c8f1474347..13b16285a47 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 @@ -24,9 +24,12 @@ - + + + + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target index 634467edb1a..01ec626f167 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target @@ -36,9 +36,12 @@ - + + + + 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 ebcbac8b30f..92678493d8d 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 @@ -24,9 +24,12 @@ - + + + + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target index bbceaf2d364..761cbff1d36 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target @@ -24,9 +24,12 @@ - + + + + diff --git a/org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF index 93830c8eca4..bee3b1f0f75 100644 --- a/org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.ide, org.eclipse.xtext.xbase;visibility:=reexport, org.eclipse.xtext.xbase.lib;bundle-version="2.31.0", - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)", + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)" Export-Package: org.eclipse.xtext.xbase.annotations.ide.contentassist.antlr;x-friends:="org.eclipse.xtext.xbase.ui", org.eclipse.xtext.xbase.annotations.ide.contentassist.antlr.internal;x-friends:="org.eclipse.xtext.xbase.ui", diff --git a/org.eclipse.xtext.xbase.testdata/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testdata/META-INF/MANIFEST.MF index 8d82f135e01..b44c50fef91 100644 --- a/org.eclipse.xtext.xbase.testdata/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.testdata/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext.ide, org.eclipse.xtext.xbase;visibility:=reexport, org.eclipse.xtext.xbase.lib;bundle-version="2.31.0", - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)", + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)" Automatic-Module-Name: org.eclipse.xtext.xbase.ide Export-Package: ., diff --git a/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF index 04a134a20e6..ae5b6be1e5f 100644 --- a/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.xtext.xbase.testlanguages;visibility:=reexport, org.eclipse.compare;bundle-version="3.8.300", org.eclipse.core.runtime;bundle-version="3.24.100", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional, + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtend.lib;resolution:=optional Import-Package: org.apache.log4j, diff --git a/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF index cd601cf2dc5..500c86ab432 100644 --- a/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.common.types, org.eclipse.xtext.xbase.lib;bundle-version="2.31.0", - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional, + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.testing Import-Package: org.apache.log4j, diff --git a/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF index 5045ea550ef..48f085adac2 100644 --- a/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.xbase.lib;bundle-version="2.31.0", org.eclipse.xtend.lib;bundle-version="2.14.0";visibility:=reexport, - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.xtext.xbase, org.eclipse.xtext.xbase.annotations;x-friends:="org.eclipse.xtext.xbase.ide,org.eclipse.xtext.xbase.tests", 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 76d08db4d1a..6d3e7ee172c 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 void generate() { if (getProjectConfig().getRuntime().getManifest() != null) { Set requiredBundles = getProjectConfig().getRuntime().getManifest().getRequiredBundles(); requiredBundles.add("org.eclipse.xtext.common.types"); - requiredBundles.add("org.objectweb.asm;bundle-version=\"[9.4.0,9.5.0)\";resolution:=optional"); + requiredBundles.add("org.objectweb.asm;bundle-version=\"[9.5.0,9.6.0)\";resolution:=optional"); } if (getProjectConfig().getRuntimeTest().getManifest() != null) { Set requiredBundles = getProjectConfig().getRuntimeTest().getManifest().getRequiredBundles(); - requiredBundles.add("org.objectweb.asm;bundle-version=\"[9.4.0,9.5.0)\";resolution:=optional"); + requiredBundles.add("org.objectweb.asm;bundle-version=\"[9.5.0,9.6.0)\";resolution:=optional"); } if (getProjectConfig().getEclipsePlugin().getManifest() != null) { Set requiredBundles = getProjectConfig().getEclipsePlugin().getManifest().getRequiredBundles(); diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/META-INF/MANIFEST.MF index c45d55dcb40..cb10a5f8ee4 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.tests/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.xtext.example.domainmodel, org.eclipse.xtext.testing, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtext.xbase.testing, - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.xtext.example.domainmodel.tests;x-internal=true Import-Package: org.hamcrest.core, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF index 08fd76f9044..748b2015297 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.util, org.eclipse.xtext.xbase, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.xtext.example.domainmodel, org.eclipse.xtext.example.domainmodel.domainmodel, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/META-INF/MANIFEST.MF index bde02206371..0d3b206271d 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.tests/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.xtext.example.fowlerdsl, org.eclipse.xtext.testing, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.junit, - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.xtext.example.fowlerdsl.tests;x-internal=true Import-Package: org.hamcrest.core, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/META-INF/MANIFEST.MF index f6ed065f4a0..0c30a943b8b 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.tests/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext.example.homeautomation, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtext.xbase.testing, org.junit;bundle-version="4.13.2", - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.xtext.example.homeautomation.tests;x-internal=true Import-Package: org.hamcrest.core, diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF index 2333a1964f2..2b1a4b2010d 100644 --- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.util, org.eclipse.xtext.xbase, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", - org.objectweb.asm;bundle-version="[9.4.0,9.5.0)";resolution:=optional + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.xtext.example.homeautomation, org.eclipse.xtext.example.homeautomation.formatting2, 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 e066e957e6e..5dd81e5ed8d 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 @@ -105,10 +105,13 @@ class TargetPlatformProject extends ProjectDescriptor { �ENDIF� - + + + + ''' 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 54a2c30c1fa..996140e0010 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 @@ -242,9 +242,6 @@ public CharSequence target() { } } _builder.append("\t\t\t"); - _builder.append(""); - _builder.newLine(); - _builder.append("\t\t\t"); _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); @@ -253,6 +250,18 @@ public CharSequence target() { _builder.append("\t\t"); _builder.append(""); _builder.newLine(); + _builder.append("\t\t"); + _builder.append(""); + _builder.newLine(); + _builder.append("\t\t\t"); + _builder.append(""); + _builder.newLine(); + _builder.append("\t\t\t"); + _builder.append(""); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append(""); + _builder.newLine(); _builder.append("\t"); _builder.append(""); _builder.newLine(); diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF index ae59ac3c252..16c34bb2ae8 100644 --- a/org.eclipse.xtext/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext/META-INF/MANIFEST.MF @@ -219,7 +219,7 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.16.0";visibility:=re org.eclipse.emf.common;bundle-version="2.24.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.4.0,9.5.0)";resolution:=optional, + org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional, org.eclipse.emf.mwe.core;bundle-version="1.8.0";resolution:=optional;visibility:=reexport, org.eclipse.emf.mwe.utils;bundle-version="1.8.0";resolution:=optional;visibility:=reexport, org.eclipse.xtend;bundle-version="2.2.0";resolution:=optional, diff --git a/releng/org.eclipse.xtext.contributor/Xtext.setup b/releng/org.eclipse.xtext.contributor/Xtext.setup index ce914e79dfb..ef1a9af16cd 100644 --- a/releng/org.eclipse.xtext.contributor/Xtext.setup +++ b/releng/org.eclipse.xtext.contributor/Xtext.setup @@ -94,7 +94,11 @@ + value="https://download.eclipse.org/tools/orbit/downloads/2023-03"/> + + versionRange="[9.5.0,9.6.0)"/> @@ -486,6 +490,8 @@ url="${p2.swtbot}"/> + + + + + + - @@ -75,6 +74,10 @@ + + + + diff --git a/xtext-r202203.target b/xtext-r202203.target index 20f3922008a..fc2c1c10f25 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -63,7 +63,6 @@ - @@ -79,6 +78,10 @@ + + + + diff --git a/xtext-r202206.target b/xtext-r202206.target index 64856fa3a1a..90e7ed86589 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -62,7 +62,6 @@ - @@ -78,6 +77,10 @@ + + + + diff --git a/xtext-r202209.target b/xtext-r202209.target index 48690a75333..8a728770b27 100644 --- a/xtext-r202209.target +++ b/xtext-r202209.target @@ -60,7 +60,6 @@ - @@ -76,6 +75,10 @@ + + + + diff --git a/xtext-r202212.target b/xtext-r202212.target index 2f7b68c1110..75dfa9cb1b9 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -55,7 +55,6 @@ - @@ -71,6 +70,10 @@ + + + + diff --git a/xtext-r202303.target b/xtext-r202303.target index 9628a227153..6220f7da2b9 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -56,7 +56,6 @@ - @@ -72,6 +71,10 @@ + + + +