From 405d94a53030cbaff2935bc710622155d93d8d98 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Thu, 13 Jul 2023 16:23:00 +0200 Subject: [PATCH] update to guava 32.1.1 Signed-off-by: Christian Dietrich --- NOTICE.md | 4 ++-- org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF | 2 +- .../xtend-annotation-examples-client/META-INF/MANIFEST.MF | 2 +- .../projects/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 | 6 +++--- 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 | 2 +- xtext-r202203.target | 2 +- xtext-r202206.target | 2 +- xtext-r202209.target | 2 +- xtext-r202212.target | 2 +- xtext-r202303.target | 2 +- xtext-r202306.target | 2 +- 26 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NOTICE.md b/NOTICE.md index 9068862cf48..cf6ffd8d174 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.0) +Google Guava (32.1.1) * License: Apache License 2.0 @@ -82,7 +82,7 @@ Gradle Wrapper (8) * License: Apache License, 2.0 -guava gwt (32.1.0) +guava gwt (32.1.1) * 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 cb903f1564d..e20b51653f0 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.0,33.0.0)", + com.google.guava;bundle-version="[32.1.1,33.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 a04065427ef..e2312be5839 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.32.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.xtend.lib, - com.google.guava;bundle-version="[32.1.0,33.0.0)", + com.google.guava;bundle-version="[32.1.1,33.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="2.32.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 95eccb80ed2..fd71a9f6121 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.32.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.xtend.lib, - com.google.guava;bundle-version="[32.1.0,33.0.0)", + com.google.guava;bundle-version="[32.1.1,33.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="2.32.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 843fca69707..180f30bc5db 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.0-jre + 32.1.1-jre org.eclipse.xtext diff --git a/org.eclipse.xtend.sdk.feature/feature.xml b/org.eclipse.xtend.sdk.feature/feature.xml index 1e0d0d56012..3add07a0cc7 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 cff28a96f49..c1de16d6a4e 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.0,33.0.0)", + com.google.guava;bundle-version="[32.1.1,33.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 742a03d6364..38ecb5fa9cd 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.0,33.0.0)", + com.google.guava;bundle-version="[32.1.1,33.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 b1be4507954..fc549871dc3 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.5.0,9.6.0)", org.eclipse.xtend.lib, - com.google.guava;bundle-version="[32.1.0,33.0.0)", + com.google.guava;bundle-version="[32.1.1,33.0.0)", io.github.classgraph;bundle-version="4.8.149" Import-Package: 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 ca21792a528..e97e5bb67ba 100644 --- a/org.eclipse.xtext.dev-bom/pom.xml +++ b/org.eclipse.xtext.dev-bom/pom.xml @@ -152,17 +152,17 @@ com.google.guava guava-gwt - 32.1.0-jre + 32.1.1-jre com.google.guava guava-testlib - 32.1.0-jre + 32.1.1-jre com.google.guava guava - 32.1.0-jre + 32.1.1-jre com.google.inject diff --git a/org.eclipse.xtext.p2repository/category.xml b/org.eclipse.xtext.p2repository/category.xml index 25223564023..831f4943bd6 100644 --- a/org.eclipse.xtext.p2repository/category.xml +++ b/org.eclipse.xtext.p2repository/category.xml @@ -20,8 +20,8 @@ - - + + diff --git a/org.eclipse.xtext.redist.feature/feature.xml b/org.eclipse.xtext.redist.feature/feature.xml index f813c2458d8..44bdced5c9b 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 134d57f1678..d855388a061 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 be6c339ae9d..4e737d1625e 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.0,33.0.0)", + com.google.guava;bundle-version="[32.1.1,33.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 e1d38df911a..cfcec17a3ce 100644 --- a/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -48,7 +48,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.0,33.0.0)";visibility:=reexport, + com.google.guava;bundle-version="[32.1.1,33.0.0)";visibility:=reexport, com.google.inject;bundle-version="7.0.0";visibility:=reexport, com.google.guava.failureaccess;bundle-version="1.0.1";visibility:=reexport, javax.inject;bundle-version="1.0.0";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 f648df0d0e6..ebdea9774a4 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.32.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.0,33.0.0)", + com.google.guava;bundle-version="[32.1.1,33.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 af1d8f4b387..1657721860c 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.32.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.0,33.0.0)" +Require-Bundle: com.google.guava;bundle-version="[32.1.1,33.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 fdedd644ea6..90a528dcf4f 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.32.0", org.eclipse.xtext.xbase.lib;version="2.32.0", org.eclipse.xtext.xbase.lib.internal;x-internal:="true", org.eclipse.xtext.xbase.lib.util;version="2.32.0" -Require-Bundle: com.google.guava;bundle-version="[32.1.0,33.0.0)";visibility:=reexport +Require-Bundle: com.google.guava;bundle-version="[32.1.1,33.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 3e44f64da4e..8babcdcb3f7 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.32.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.0,33.0.0)", + com.google.guava;bundle-version="[32.1.1,33.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 f2778fecaed..919d9255358 100644 --- a/xtext-latest.target +++ b/xtext-latest.target @@ -53,7 +53,7 @@ - + diff --git a/xtext-r202203.target b/xtext-r202203.target index d4c751435f1..337c7f49234 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -55,7 +55,7 @@ - + diff --git a/xtext-r202206.target b/xtext-r202206.target index c939e288f5e..1d4c3a5e7cc 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -54,7 +54,7 @@ - + diff --git a/xtext-r202209.target b/xtext-r202209.target index bd654b98bb7..d847d114c95 100644 --- a/xtext-r202209.target +++ b/xtext-r202209.target @@ -54,7 +54,7 @@ - + diff --git a/xtext-r202212.target b/xtext-r202212.target index 3c2afef907b..d781d130776 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -49,7 +49,7 @@ - + diff --git a/xtext-r202303.target b/xtext-r202303.target index 9f1a680751c..03c5982aa33 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -50,7 +50,7 @@ - + diff --git a/xtext-r202306.target b/xtext-r202306.target index c7865573bc5..6b3fd4e158a 100644 --- a/xtext-r202306.target +++ b/xtext-r202306.target @@ -50,7 +50,7 @@ - +