Skip to content

Commit

Permalink
update to asm 9.7 and guava 33.1.0
Browse files Browse the repository at this point in the history
fixes #2971
  • Loading branch information
cdietrich committed Apr 4, 2024
1 parent 1d83f89 commit 2bfb729
Show file tree
Hide file tree
Showing 52 changed files with 74 additions and 74 deletions.
6 changes: 3 additions & 3 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ args4j (2.33)

* License: MIT License

ASM (9.6)
ASM (9.7)

* License: BSD-3-Clause

Expand All @@ -70,7 +70,7 @@ Google Gson (2.9.x)

* License: Apache License, 2.0

Google Guava (33.0.0)
Google Guava (33.1.0)

* License: Apache License 2.0

Expand All @@ -82,7 +82,7 @@ Gradle Wrapper (8)

* License: Apache License, 2.0

guava gwt (33.0.0)
guava gwt (33.1.0)

* License: Apache License, 2.0

Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.xtend.core;bundle-version="2.35.0",
org.eclipse.emf.ecore,
org.eclipse.xtext.builder;bundle-version="2.35.0",
org.eclipse.xtend.lib;bundle-version="2.35.0",
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)",
org.objectweb.asm;bundle-version="[9.7.0,9.8.0)",
org.eclipse.jdt.core;bundle-version="3.29.0",
org.eclipse.xtext.builder.standalone;bundle-version="2.35.0",
org.eclipse.xtext.java;bundle-version="2.35.0"
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.24.100",
org.eclipse.xtend.lib;bundle-version="2.35.0",
org.eclipse.xtext.smap;bundle-version="2.35.0",
org.apache.ant;bundle-version="1.7.1";resolution:=optional;x-installation:=greedy,
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)";resolution:=optional,
org.objectweb.asm;bundle-version="[9.7.0,9.8.0)";resolution:=optional,
org.eclipse.xtext.xbase.testing;bundle-version="2.35.0";resolution:=optional
Bundle-ActivationPolicy: lazy
Import-Package: org.apache.log4j;version="1.2.24"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-SymbolicName: xtend-annotation-examples-client
Bundle-Version: 2.35.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtend.lib,
com.google.guava;bundle-version="[33.0.0,34.0.0)",
com.google.guava;bundle-version="[33.1.0,34.0.0)",
org.eclipse.xtext.xbase.lib;bundle-version="2.35.0",
xtend-annotation-examples;bundle-version="2.4.3"
Bundle-Vendor: Eclipse Xtext
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ Bundle-SymbolicName: xtend-annotation-examples
Bundle-Version: 2.35.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtend.lib,
com.google.guava;bundle-version="[33.0.0,34.0.0)",
com.google.guava;bundle-version="[33.1.0,34.0.0)",
org.eclipse.xtext.xbase.lib;bundle-version="2.35.0",
org.junit;bundle-version="4.13.2",
org.eclipse.xtend.core,
org.eclipse.xtext,
org.eclipse.xtext.xbase.testing,
org.eclipse.jdt.core,
org.eclipse.emf.codegen;bundle-version="2.22.0",
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)";resolution:=optional,
org.objectweb.asm;bundle-version="[9.7.0,9.8.0)";resolution:=optional,
org.eclipse.equinox.common
Export-Package: extract,
i18n,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.0.0-jre</version>
<version>33.1.0-jre</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.sdk.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ SPDX-License-Identifier: EPL-2.0
<requires>
<import feature="org.eclipse.xtext.ui" version="2.35.0" match="equivalent"/>
<import feature="org.eclipse.xtext.xbase.lib" version="2.35.0" match="equivalent"/>
<import plugin="com.google.guava" version="33.0.0" match="compatible"/>
<import plugin="com.google.guava" version="33.1.0" match="compatible"/>
<import plugin="org.apache.log4j" version="1.2.24" match="equivalent"/>
</requires>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.35.0",
org.eclipse.xtext.ui.testing;bundle-version="2.35.0",
org.eclipse.xtext.xbase.lib;bundle-version="2.35.0",
org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.35.0",
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)";resolution:=optional,
org.objectweb.asm;bundle-version="[9.7.0,9.8.0)";resolution:=optional,
org.eclipse.compare,
org.eclipse.xtext.xbase.testing;bundle-version="2.35.0",
org.eclipse.ui.workbench;resolution:=optional,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.0,9.7.0)";resolution:=optional,
Require-Bundle: org.objectweb.asm;bundle-version="[9.7.0,9.8.0)";resolution:=optional,
org.eclipse.xtext.common.types.eclipse.tests,
org.eclipse.xtext.xbase.lib,
org.eclipse.xtext.common.types.eclipse.tests.ui,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.common.types/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.eclipse.xtext;bundle-version="2.35.0",
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)",
org.objectweb.asm;bundle-version="[9.7.0,9.8.0)",
org.eclipse.xtend.lib;bundle-version="2.35.0"
Import-Package: io.github.classgraph;version="4.8.168",
org.apache.commons.logging;version="1.0.4";resolution:=optional,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.0 or better (Maven group id: org.ow2.asm).");
logger.warn("It's recommended to use org.objectweb.asm 9.7.0 or better (Maven group id: org.ow2.asm).");
logger.warn("--------------------------------------------------------------------------");
return false;
}
Expand Down
8 changes: 4 additions & 4 deletions org.eclipse.xtext.dev-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -152,17 +152,17 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-gwt</artifactId>
<version>33.0.0-jre</version>
<version>33.1.0-jre</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<version>33.0.0-jre</version>
<version>33.1.0-jre</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.0.0-jre</version>
<version>33.1.0-jre</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
Expand Down Expand Up @@ -452,7 +452,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.6</version>
<version>9.7</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
8 changes: 4 additions & 4 deletions org.eclipse.xtext.p2repository/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<category name="Xtext"/>
</feature>

<bundle id="com.google.guava" version="33.0.0.qualifier"/>
<bundle id="com.google.guava.source" version="33.0.0.qualifier"/>
<bundle id="com.google.guava" version="33.1.0.qualifier"/>
<bundle id="com.google.guava.source" version="33.1.0.qualifier"/>
<bundle id="com.google.guava.failureaccess" version="1.0.2.qualifier"/>
<bundle id="com.google.guava.failureaccess.source" version="1.0.2.qualifier"/>
<bundle id="com.google.inject" version="7.0.0.qualifier"/>
Expand All @@ -32,8 +32,8 @@
<bundle id="org.hamcrest.core.source" version="2.2.0.qualifier"/>
<bundle id="org.kohsuke.args4j" version="0.0.0"/>
<bundle id="org.kohsuke.args4j.source" version="0.0.0"/>
<bundle id="org.objectweb.asm" version="9.6.0.qualifier"/>
<bundle id="org.objectweb.asm.source" version="9.6.0.qualifier"/>
<bundle id="org.objectweb.asm" version="9.7.0.qualifier"/>
<bundle id="org.objectweb.asm.source" version="9.7.0.qualifier"/>
<bundle id="io.github.classgraph.classgraph" version="4.8.168.qualifier"/>
<bundle id="io.github.classgraph.classgraph.source" version="4.8.168.qualifier"/>
<category-def name="Xtext" label="Xtext" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.35.0",
org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional;x-installation:=greedy,
org.eclipse.xtext.builder;bundle-version="2.35.0",
org.eclipse.jdt.core;bundle-version="3.29.0",
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)";resolution:=optional,
org.objectweb.asm;bundle-version="[9.7.0,9.8.0)";resolution:=optional,
org.eclipse.xtext.xbase.lib;bundle-version="2.35.0",
org.eclipse.xtext.testing;bundle-version="2.35.0",
org.eclipse.xtext.xbase.testing;bundle-version="2.35.0",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.purexbase.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.35.0",
org.eclipse.xtext;bundle-version="2.35.0",
org.eclipse.xtext.testing;bundle-version="2.35.0",
org.eclipse.jdt.core;bundle-version="3.29.0",
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)";resolution:=optional,
org.objectweb.asm;bundle-version="[9.7.0,9.8.0)";resolution:=optional,
org.eclipse.xtext.xbase.lib;bundle-version="2.35.0",
org.eclipse.xtext.xbase.testing;bundle-version="2.35.0",
org.junit;bundle-version="4.13.2"
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.35.0",
org.eclipse.xtend.lib;bundle-version="2.35.0",
org.eclipse.emf.common,
org.eclipse.xtext.common.types;bundle-version="2.35.0",
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)";resolution:=optional
org.objectweb.asm;bundle-version="[9.7.0,9.8.0)";resolution:=optional
Import-Package: org.apache.commons.logging,
org.apache.log4j;version="1.2.24"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.xtext.redist.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ SPDX-License-Identifier: EPL-2.0
version="0.0.0"/>

<requires>
<import plugin="com.google.guava" version="33.0.0" match="compatible"/>
<import plugin="com.google.guava" version="33.1.0" match="compatible"/>
<import plugin="com.google.inject" version="7.0.0" match="compatible"/>
<import plugin="org.apache.log4j" version="1.2.24" match="equivalent"/>
<import plugin="org.objectweb.asm" version="9.6.0" match="compatible"/>
<import plugin="org.objectweb.asm" version="9.7.0" match="compatible"/>
</requires>

<plugin
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.xtext.runtime.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ SPDX-License-Identifier: EPL-2.0
%license
</license>
<requires>
<import plugin="com.google.guava" version="33.0.0" match="compatible"/>
<import plugin="com.google.guava" version="33.1.0" match="compatible"/>
<import plugin="com.google.inject" version="7.0.0" match="compatible"/>
<import plugin="org.apache.log4j" version="1.2.24" match="equivalent"/>
<import plugin="org.objectweb.asm" version="9.6.0" match="compatible"/>
<import plugin="org.objectweb.asm" version="9.7.0" match="compatible"/>
</requires>

<plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.apache.commons.logging" version="1.2.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="org.objectweb.asm" version="9.7.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.168"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
</location>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.apache.commons.logging" version="1.2.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="org.objectweb.asm" version="9.7.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.168"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
</location>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.apache.commons.logging" version="1.2.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="org.objectweb.asm" version="9.7.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.168"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
</location>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.apache.commons.logging" version="1.2.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="org.objectweb.asm" version="9.7.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.168"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
</location>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<unit id="junit-platform-suite-commons" version="0.0.0"/>
<unit id="junit-vintage-engine" version="0.0.0"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="org.objectweb.asm" version="9.7.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.168"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
</location>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.apache.commons.logging" version="1.2.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="org.objectweb.asm" version="9.7.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.168"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
</location>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.apache.commons.logging" version="1.2.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="org.objectweb.asm" version="9.7.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.168"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
</location>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.util/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Export-Package: org.eclipse.xtext.util;version="2.35.0";
org.eclipse.xtext.xbase,
org.eclipse.xtext.xbase.tests"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0",
com.google.guava;bundle-version="[33.0.0,34.0.0)";visibility:=reexport,
com.google.guava;bundle-version="[33.1.0,34.0.0)";visibility:=reexport,
com.google.inject;bundle-version="7.0.0";visibility:=reexport,
com.google.guava.failureaccess;bundle-version="[1.0.2,2.0.0)";visibility:=reexport,
jakarta.inject.jakarta.inject-api;bundle-version="2.0.1";resolution:=optional;visibility:=reexport;x-installation:=greedy,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.35.0",
org.eclipse.xtext.xbase;bundle-version="2.35.0";visibility:=reexport,
org.eclipse.xtext.xbase.lib;bundle-version="2.35.0",
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)",
org.objectweb.asm;bundle-version="[9.7.0,9.8.0)",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
Export-Package: org.eclipse.xtext.xbase.annotations.ide.contentassist.antlr;version="2.35.0";x-friends:="org.eclipse.xtext.xbase.ui",
org.eclipse.xtext.xbase.annotations.ide.contentassist.antlr.internal;version="2.35.0";x-friends:="org.eclipse.xtext.xbase.ui",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Bundle-Version: 2.35.0.qualifier
Export-Package: org.eclipse.xtend2.lib;version="2.35.0",
org.eclipse.xtext.xbase.lib;version="2.35.0"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: com.google.guava;bundle-version="[33.0.0,34.0.0)"
Require-Bundle: com.google.guava;bundle-version="[33.1.0,34.0.0)"
Bundle-Vendor: %Vendor-Name
Automatic-Module-Name: org.eclipse.xtext.xbase.lib.gwt
Eclipse-SourceReferences: eclipseSourceReferences
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Export-Package: org.eclipse.xtend2.lib;version="2.35.0",
org.eclipse.xtext.xbase.lib;version="2.35.0",
org.eclipse.xtext.xbase.lib.internal;version="2.35.0";x-internal:="true",
org.eclipse.xtext.xbase.lib.util;version="2.35.0"
Require-Bundle: com.google.guava;bundle-version="[33.0.0,34.0.0)";visibility:=reexport
Require-Bundle: com.google.guava;bundle-version="[33.1.0,34.0.0)";visibility:=reexport
Bundle-Vendor: Eclipse Xtext
Automatic-Module-Name: org.eclipse.xtext.xbase.lib
Eclipse-SourceReferences: eclipseSourceReferences
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xbase.testdata/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.35.0",
org.eclipse.xtext.xbase;bundle-version="2.35.0";visibility:=reexport,
org.eclipse.xtext.xbase.lib;bundle-version="2.35.0",
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)",
org.objectweb.asm;bundle-version="[9.7.0,9.8.0)",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
Automatic-Module-Name: org.eclipse.xtext.xbase.ide
Export-Package: .;version="2.35.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.xtext.xbase.testlanguages;bundle-version="2.35.0";vi
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.6.0,9.7.0)";resolution:=optional,
org.objectweb.asm;bundle-version="[9.7.0,9.8.0)";resolution:=optional,
org.eclipse.xtext.xbase.lib;bundle-version="2.35.0",
org.eclipse.xtend.lib;bundle-version="2.35.0";resolution:=optional
Import-Package: org.apache.log4j,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.35.0";visibility:=reexport,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.common.types;bundle-version="2.35.0",
org.eclipse.xtext.xbase.lib;bundle-version="2.35.0",
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)";resolution:=optional,
org.objectweb.asm;bundle-version="[9.7.0,9.8.0)";resolution:=optional,
org.eclipse.xtext.xbase.testing;bundle-version="2.35.0",
org.eclipse.xtext.testing;bundle-version="2.35.0"
Import-Package: org.apache.log4j,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xbase/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.35.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.xbase.lib;bundle-version="2.35.0",
org.eclipse.xtend.lib;bundle-version="2.35.0";visibility:=reexport,
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)";resolution:=optional
org.objectweb.asm;bundle-version="[9.7.0,9.8.0)";resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.xtext.xbase;version="2.35.0",
org.eclipse.xtext.xbase.annotations;version="2.35.0";x-friends:="org.eclipse.xtext.xbase.ide,org.eclipse.xtext.xbase.tests",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ public void generate() {
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.6.0,9.7.0)\";resolution:=optional");
requiredBundles.add("org.objectweb.asm;bundle-version=\"[9.7.0,9.8.0)\";resolution:=optional");
}
if (getProjectConfig().getRuntimeTest().getManifest() != null) {
Set<String> requiredBundles = getProjectConfig().getRuntimeTest().getManifest().getRequiredBundles();
requiredBundles.add("org.objectweb.asm;bundle-version=\"[9.6.0,9.7.0)\";resolution:=optional");
requiredBundles.add("org.objectweb.asm;bundle-version=\"[9.7.0,9.8.0)\";resolution:=optional");
}
if (getProjectConfig().getEclipsePlugin().getManifest() != null) {
Set<String> requiredBundles = getProjectConfig().getEclipsePlugin().getManifest().getRequiredBundles();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.0,9.7.0)";resolution:=optional
org.objectweb.asm;bundle-version="[9.7.0,9.8.0)";resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.xtext.example.domainmodel.tests;x-internal=true
Import-Package: org.hamcrest.core,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.common.types,
org.eclipse.xtext.xbase,
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)";resolution:=optional
org.objectweb.asm;bundle-version="[9.7.0,9.8.0)";resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.xtext.example.domainmodel,
org.eclipse.xtext.example.domainmodel.domainmodel,
Expand Down

0 comments on commit 2bfb729

Please sign in to comment.