From afdcfd4f94f74299f36559584f7f0bba7ea940c1 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Wed, 20 Dec 2023 06:27:45 +0100 Subject: [PATCH 1/5] [#2876] update to guava 33 --- NOTICE.md | 4 ++-- org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF | 2 +- .../xtend-annotation-examples-client/META-INF/MANIFEST.MF | 2 +- .../xtend-annotation-examples/META-INF/MANIFEST.MF | 2 +- .../src/test/resources/it/pom.xml | 2 +- org.eclipse.xtend.sdk.feature/feature.xml | 2 +- org.eclipse.xtext.builder/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.common.types/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.dev-bom/pom.xml | 8 ++++---- org.eclipse.xtext.p2repository/category.xml | 4 ++-- org.eclipse.xtext.redist.feature/feature.xml | 2 +- org.eclipse.xtext.runtime.feature/feature.xml | 2 +- org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.util/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF | 2 +- xtext-latest.target | 4 ++-- xtext-r202203.target | 4 ++-- xtext-r202206.target | 4 ++-- xtext-r202209.target | 4 ++-- xtext-r202212.target | 4 ++-- xtext-r202303.target | 4 ++-- xtext-r202306.target | 4 ++-- xtext-r202309.target | 4 ++-- xtext-r202312.target | 4 ++-- 28 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NOTICE.md b/NOTICE.md index 14720e948bc..d11d647f34b 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -70,7 +70,7 @@ Google Gson (2.9.x) * License: Apache License, 2.0 -Google Guava (32.1.3) +Google Guava (33.0.0) * License: Apache License 2.0 @@ -82,7 +82,7 @@ Gradle Wrapper (8) * License: Apache License, 2.0 -guava gwt (32.1.3) +guava gwt (33.0.0) * License: Apache License, 2.0 diff --git a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF index c0152b5e743..7cefba822f7 100644 --- a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.xtend.core, org.eclipse.core.runtime;bundle-version="3.24.100", org.eclipse.equinox.common;bundle-version="3.16.0", org.eclipse.emf.codegen.ecore;bundle-version="2.29.0", - com.google.guava;bundle-version="[32.1.2,33.0.0)", + com.google.guava;bundle-version="[33.0.0,34.0.0)", com.google.inject;bundle-version="7.0.0", org.eclipse.core.resources;bundle-version="3.16.100", org.eclipse.emf.ecore, diff --git a/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF b/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF index cb1c63ab2d0..c919dc16559 100644 --- a/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF +++ b/org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: xtend-annotation-examples-client Bundle-Version: 2.34.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.xtend.lib, - com.google.guava;bundle-version="[32.1.2,33.0.0)", + com.google.guava;bundle-version="[33.0.0,34.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="2.34.0", xtend-annotation-examples;bundle-version="2.4.3" Bundle-Vendor: Eclipse Xtext 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 dfd1a1061d7..c7cbf91d1b7 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 @@ -5,7 +5,7 @@ Bundle-SymbolicName: xtend-annotation-examples Bundle-Version: 2.34.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.xtend.lib, - com.google.guava;bundle-version="[32.1.2,33.0.0)", + com.google.guava;bundle-version="[33.0.0,34.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="2.34.0", org.junit;bundle-version="4.13.2", org.eclipse.xtend.core, diff --git a/org.eclipse.xtend.maven.plugin/src/test/resources/it/pom.xml b/org.eclipse.xtend.maven.plugin/src/test/resources/it/pom.xml index 5b2c1e8be1f..4f2967eb045 100644 --- a/org.eclipse.xtend.maven.plugin/src/test/resources/it/pom.xml +++ b/org.eclipse.xtend.maven.plugin/src/test/resources/it/pom.xml @@ -16,7 +16,7 @@ com.google.guava guava - 32.1.3-jre + 33.0.0-jre org.eclipse.xtext diff --git a/org.eclipse.xtend.sdk.feature/feature.xml b/org.eclipse.xtend.sdk.feature/feature.xml index a07abd56908..b21c9acee33 100644 --- a/org.eclipse.xtend.sdk.feature/feature.xml +++ b/org.eclipse.xtend.sdk.feature/feature.xml @@ -33,7 +33,7 @@ SPDX-License-Identifier: EPL-2.0 - + diff --git a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF index 2af296940d8..6c99f33b358 100644 --- a/org.eclipse.xtext.builder/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.builder/META-INF/MANIFEST.MF @@ -48,7 +48,7 @@ Export-Package: org.eclipse.xtext.builder, Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.util, org.eclipse.emf.ecore;bundle-version="2.26.0";visibility:=reexport, - com.google.guava;bundle-version="[32.1.2,33.0.0)", + com.google.guava;bundle-version="[33.0.0,34.0.0)", com.google.inject;bundle-version="7.0.0", org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;x-installation:=greedy, org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy, diff --git a/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF index 61f991d6e97..863bf671421 100644 --- a/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.xtext.common.types;visibility:=reexport, org.eclipse.jdt.core.manipulation;bundle-version="1.16.0", org.eclipse.xtext.smap;resolution:=optional;x-installation:=greedy, org.eclipse.xtext.common.types.edit;resolution:=optional;visibility:=reexport;x-installation:=greedy, - com.google.guava;bundle-version="[32.1.2,33.0.0)", + com.google.guava;bundle-version="[33.0.0,34.0.0)", org.eclipse.ui.ide;bundle-version="3.13.1";resolution:=optional Import-Package: org.apache.log4j;version="1.2.24" Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF index 34346f47e19..7102681e68b 100644 --- a/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.common.types/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtext, org.objectweb.asm;bundle-version="[9.6.0,9.7.0)", org.eclipse.xtend.lib, - com.google.guava;bundle-version="[32.1.2,33.0.0)" + com.google.guava;bundle-version="[33.0.0,34.0.0)" Import-Package: io.github.classgraph;version="4.8.165", org.apache.commons.logging;version="1.0.4";resolution:=optional, org.apache.log4j;version="1.2.24" diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml index 5cac2490a93..7cc9b048e9d 100644 --- a/org.eclipse.xtext.dev-bom/pom.xml +++ b/org.eclipse.xtext.dev-bom/pom.xml @@ -147,22 +147,22 @@ com.google.errorprone error_prone_annotations - 2.18.0 + 2.23.0 com.google.guava guava-gwt - 32.1.3-jre + 33.0.0-jre com.google.guava guava-testlib - 32.1.3-jre + 33.0.0-jre com.google.guava guava - 32.1.3-jre + 33.0.0-jre com.google.inject diff --git a/org.eclipse.xtext.p2repository/category.xml b/org.eclipse.xtext.p2repository/category.xml index 03a3f4d73b7..4904302121b 100644 --- a/org.eclipse.xtext.p2repository/category.xml +++ b/org.eclipse.xtext.p2repository/category.xml @@ -10,8 +10,8 @@ - - + + diff --git a/org.eclipse.xtext.redist.feature/feature.xml b/org.eclipse.xtext.redist.feature/feature.xml index dfa9dfe89a3..f353127812a 100644 --- a/org.eclipse.xtext.redist.feature/feature.xml +++ b/org.eclipse.xtext.redist.feature/feature.xml @@ -28,7 +28,7 @@ SPDX-License-Identifier: EPL-2.0 version="0.0.0"/> - + diff --git a/org.eclipse.xtext.runtime.feature/feature.xml b/org.eclipse.xtext.runtime.feature/feature.xml index 3741b0cd032..4a8e14c315a 100644 --- a/org.eclipse.xtext.runtime.feature/feature.xml +++ b/org.eclipse.xtext.runtime.feature/feature.xml @@ -24,7 +24,7 @@ SPDX-License-Identifier: EPL-2.0 %license - + diff --git a/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF index 673f2e6ff22..9c9c095f71d 100644 --- a/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.xtext.testlanguages;visibility:=reexport, org.eclipse.xtext.ui.codetemplates.ui, org.eclipse.compare;bundle-version="3.8.300", org.eclipse.xtend.lib;resolution:=optional, - com.google.guava;bundle-version="[32.1.2,33.0.0)", + com.google.guava;bundle-version="[33.0.0,34.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.core.runtime;bundle-version="3.24.100", org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional, diff --git a/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/org.eclipse.xtext.util/META-INF/MANIFEST.MF index e66903ee977..adababa32be 100644 --- a/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -47,7 +47,7 @@ Export-Package: org.eclipse.xtext.util; 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="[32.1.2,33.0.0)";visibility:=reexport, + com.google.guava;bundle-version="[33.0.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";visibility:=reexport, jakarta.inject.jakarta.inject-api;bundle-version="2.0.1";resolution:=optional;visibility:=reexport;x-installation:=greedy, diff --git a/org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF index 512cb5dc45f..0a30380b13f 100644 --- a/org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Version: 2.34.0.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.xtext.xbase.lib;visibility:=reexport, - com.google.guava;bundle-version="[32.1.2,33.0.0)", + com.google.guava;bundle-version="[33.0.0,34.0.0)", com.google.inject;bundle-version="7.0.0";visibility:=reexport, org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.emf.ecore;bundle-version="2.26.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, diff --git a/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF index 173ba00d4c5..3e846f6872b 100644 --- a/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.34.0.qualifier Export-Package: org.eclipse.xtend2.lib, org.eclipse.xtext.xbase.lib Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[32.1.2,33.0.0)" +Require-Bundle: com.google.guava;bundle-version="[33.0.0,34.0.0)" Bundle-Vendor: %Vendor-Name Automatic-Module-Name: org.eclipse.xtext.xbase.lib.gwt Eclipse-SourceReferences: eclipseSourceReferences diff --git a/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF index 15c18845802..d02c3574e4d 100644 --- a/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Export-Package: org.eclipse.xtend2.lib;version="2.34.0", org.eclipse.xtext.xbase.lib;version="2.34.0", org.eclipse.xtext.xbase.lib.internal;x-internal:="true", org.eclipse.xtext.xbase.lib.util;version="2.34.0" -Require-Bundle: com.google.guava;bundle-version="[32.1.2,33.0.0)";visibility:=reexport +Require-Bundle: com.google.guava;bundle-version="[33.0.0,34.0.0)";visibility:=reexport Bundle-Vendor: Eclipse Xtext Automatic-Module-Name: org.eclipse.xtext.xbase.lib Eclipse-SourceReferences: eclipseSourceReferences diff --git a/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF index 877ee063445..f9c9abdcdf5 100644 --- a/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Version: 2.34.0.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.xtext.xbase.lib;visibility:=reexport, - com.google.guava;bundle-version="[32.1.2,33.0.0)", + com.google.guava;bundle-version="[33.0.0,34.0.0)", com.google.inject;bundle-version="7.0.0";visibility:=reexport, org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.xtext.ui;resolution:=optional;visibility:=reexport;x-installation:=greedy, diff --git a/xtext-latest.target b/xtext-latest.target index 1e0186c0b3f..be49969fa7f 100644 --- a/xtext-latest.target +++ b/xtext-latest.target @@ -1,6 +1,6 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/xtext-r202203.target b/xtext-r202203.target index 1ef0658fd2c..5f9a0090ce9 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -1,6 +1,6 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/xtext-r202206.target b/xtext-r202206.target index 6aac6559559..f4a83c72160 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -1,6 +1,6 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/xtext-r202209.target b/xtext-r202209.target index 9f896fa0c2b..cc129cccde6 100644 --- a/xtext-r202209.target +++ b/xtext-r202209.target @@ -1,6 +1,6 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/xtext-r202212.target b/xtext-r202212.target index 0b99c5078e7..7a96eb38613 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -1,6 +1,6 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/xtext-r202303.target b/xtext-r202303.target index 5b6e182e55b..5bd5ab42efe 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -1,6 +1,6 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/xtext-r202306.target b/xtext-r202306.target index 430af936fc6..c28b5d58fc2 100644 --- a/xtext-r202306.target +++ b/xtext-r202306.target @@ -1,6 +1,6 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/xtext-r202309.target b/xtext-r202309.target index c6cce065f94..15f7470023a 100644 --- a/xtext-r202309.target +++ b/xtext-r202309.target @@ -1,6 +1,6 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/xtext-r202312.target b/xtext-r202312.target index 6902b048c9c..79f5b82c039 100644 --- a/xtext-r202312.target +++ b/xtext-r202312.target @@ -1,6 +1,6 @@ - + @@ -48,7 +48,7 @@ - + From f4af5c40dbccc29326dd5f734fc2a4e656ee8b1e Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Wed, 20 Dec 2023 09:57:01 +0100 Subject: [PATCH 2/5] fix ant test Signed-off-by: Christian Dietrich --- org.eclipse.xtend.ide.tests/batch-compiler-data/ant/test.ant | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.xtend.ide.tests/batch-compiler-data/ant/test.ant b/org.eclipse.xtend.ide.tests/batch-compiler-data/ant/test.ant index 80e96ab92cc..7a2717eaef3 100644 --- a/org.eclipse.xtend.ide.tests/batch-compiler-data/ant/test.ant +++ b/org.eclipse.xtend.ide.tests/batch-compiler-data/ant/test.ant @@ -35,7 +35,7 @@ - + From 92097038110409331ffa3130105b82ad5b710b01 Mon Sep 17 00:00:00 2001 From: Sebastian Zarnekow Date: Thu, 21 Dec 2023 17:01:52 +0100 Subject: [PATCH 3/5] Add missing version constraints to some require-bundles for Guava Signed-off-by: Sebastian Zarnekow --- org.eclipse.xtext.ide/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ui.codemining/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.util/META-INF/MANIFEST.MF | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF index 01da02ef79b..b3f9bd53270 100644 --- a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.eclipse.lsp4j;bundle-version="[0.21.1,0.22.0)";resolution:=optional, org.eclipse.lsp4j.jsonrpc;bundle-version="[0.21.1,0.22.0)";resolution:=optional, org.eclipse.emf.ecore.change;bundle-version="[2.14.0,3)", - com.google.guava + com.google.guava;bundle-version="[33.0.0,34.0.0)" Import-Package: org.apache.log4j;version="1.2.24" Export-Package: org.eclipse.xtext.ide; x-friends:="org.eclipse.xtend.ide, diff --git a/org.eclipse.xtext.ui.codemining/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codemining/META-INF/MANIFEST.MF index 5c6ea7c29eb..dddbf2771d5 100644 --- a/org.eclipse.xtext.ui.codemining/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ui.codemining/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: Eclipse Xtext Automatic-Module-Name: org.eclipse.xtext.ui.codemining Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.xtext.ui.codemining;x-internal:=true -Require-Bundle: com.google.guava, +Require-Bundle: com.google.guava;bundle-version="[33.0.0,34.0.0)", org.eclipse.equinox.common, org.eclipse.xtext, org.eclipse.xtext.ui diff --git a/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/org.eclipse.xtext.util/META-INF/MANIFEST.MF index adababa32be..bc2ac8a1dcd 100644 --- a/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -49,7 +49,7 @@ Export-Package: org.eclipse.xtext.util; 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.inject;bundle-version="7.0.0";visibility:=reexport, - com.google.guava.failureaccess;bundle-version="1.0.2";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, org.eclipse.xtend.lib Import-Package: org.apache.log4j;version="1.2.24" From a0bdf30c467b510577732b99e75e606624bb0614 Mon Sep 17 00:00:00 2001 From: Sebastian Zarnekow Date: Thu, 21 Dec 2023 22:54:09 +0100 Subject: [PATCH 4/5] Attempt without failureaccess Signed-off-by: Sebastian Zarnekow --- org.eclipse.xtext.util/META-INF/MANIFEST.MF | 1 - 1 file changed, 1 deletion(-) diff --git a/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/org.eclipse.xtext.util/META-INF/MANIFEST.MF index bc2ac8a1dcd..82ab04ff381 100644 --- a/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -49,7 +49,6 @@ Export-Package: org.eclipse.xtext.util; 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.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, org.eclipse.xtend.lib Import-Package: org.apache.log4j;version="1.2.24" From 9ee860cce6ea001ee12f8b8c71bb433fdc5b762b Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Fri, 22 Dec 2023 09:26:02 +0100 Subject: [PATCH 5/5] Revert "Attempt without failureaccess" This reverts commit a0bdf30c467b510577732b99e75e606624bb0614. --- org.eclipse.xtext.util/META-INF/MANIFEST.MF | 1 + 1 file changed, 1 insertion(+) diff --git a/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/org.eclipse.xtext.util/META-INF/MANIFEST.MF index 82ab04ff381..bc2ac8a1dcd 100644 --- a/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -49,6 +49,7 @@ Export-Package: org.eclipse.xtext.util; 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.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, org.eclipse.xtend.lib Import-Package: org.apache.log4j;version="1.2.24"