update to guava 33.2.0

Signed-off-by: Christian Dietrich <christian.dietrich.opensource@gmail.com>
eclipse · May 8, 2024 · e4976a7 · e4976a7
1 parent bc7f169
commit e4976a7
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 35 deletions.
diff --git a/NOTICE.md b/NOTICE.md
@@ -70,7 +70,7 @@ Google Gson (2.9.x)
 
 * License: Apache License, 2.0
 
-Google Guava (33.1.0)
+Google Guava (33.2.0)
 
 * License: Apache License 2.0
 
@@ -82,7 +82,7 @@ Gradle Wrapper (8)
 
 * License: Apache License, 2.0
 
-guava gwt (33.1.0)
+guava gwt (33.2.0)
 
 * License: Apache License, 2.0
 

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
@@ -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.1.0,34.0.0)",
+ com.google.guava;bundle-version="[33.2.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

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
@@ -5,7 +5,7 @@ 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.1.0,34.0.0)",
+ com.google.guava;bundle-version="[33.2.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,

diff --git 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
    <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.1.0" match="compatible"/>
+      <import plugin="com.google.guava" version="33.2.0" match="compatible"/>
       <import plugin="org.apache.log4j" version="1.2.24" match="equivalent"/>
    </requires>
 

diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml
@@ -152,17 +152,17 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava-gwt</artifactId>
-				<version>33.1.0-jre</version>
+				<version>33.2.0-jre</version>
 			</dependency>
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava-testlib</artifactId>
-				<version>33.1.0-jre</version>
+				<version>33.2.0-jre</version>
 			</dependency>
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>33.1.0-jre</version>
+				<version>33.2.0-jre</version>
 			</dependency>
 			<dependency>
 				<groupId>com.google.inject</groupId>

diff --git a/org.eclipse.xtext.p2repository/category.xml b/org.eclipse.xtext.p2repository/category.xml
@@ -10,8 +10,8 @@
       <category name="Xtext"/>
    </feature>
 
-   <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" version="33.2.0.qualifier"/>
+   <bundle id="com.google.guava.source" version="33.2.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"/>

diff --git 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"/>
 
    <requires>
-      <import plugin="com.google.guava" version="33.1.0" match="compatible"/>
+      <import plugin="com.google.guava" version="33.2.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.7.0" match="compatible"/>

diff --git 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
    </license>
    <requires>
-      <import plugin="com.google.guava" version="33.1.0" match="compatible"/>
+      <import plugin="com.google.guava" version="33.2.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.7.0" match="compatible"/>

diff --git 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;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.1.0,34.0.0)";visibility:=reexport,
+ com.google.guava;bundle-version="[33.2.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,

diff --git 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.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.1.0,34.0.0)"
+Require-Bundle: com.google.guava;bundle-version="[33.2.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
@@ -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.1.0,34.0.0)";visibility:=reexport
+Require-Bundle: com.google.guava;bundle-version="[33.2.0,34.0.0)";visibility:=reexport
 Bundle-Vendor: Eclipse Xtext
 Automatic-Module-Name: org.eclipse.xtext.xbase.lib
 Eclipse-SourceReferences: eclipseSourceReferences
diff --git a/xtext-latest.target b/xtext-latest.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-latest" sequenceNumber="26">
+<target name="xtext-latest" sequenceNumber="27">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/nightly/latest" />
@@ -46,7 +46,7 @@
 			<unit id="org.apache.log4j" version="1.2.25"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1"/>
-			<unit id="com.google.guava" version="33.1.0.jre"/>
+			<unit id="com.google.guava" version="33.2.0.jre"/>
 			<unit id="com.google.guava.failureaccess" version="1.0.2"/>
 			<unit id="com.google.inject" version="7.0.0"/>
 			<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>

diff --git a/xtext-r202203.target b/xtext-r202203.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202203" sequenceNumber="26">
+<target name="xtext-r202203" sequenceNumber="27">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.29"/>
@@ -49,7 +49,7 @@
 			<unit id="org.apache.log4j" version="1.2.25"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1"/>
-			<unit id="com.google.guava" version="33.1.0.jre"/>
+			<unit id="com.google.guava" version="33.2.0.jre"/>
 			<unit id="com.google.guava.failureaccess" version="1.0.2"/>
 			<unit id="com.google.inject" version="7.0.0"/>
 			<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>

diff --git a/xtext-r202206.target b/xtext-r202206.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202206" sequenceNumber="26">
+<target name="xtext-r202206" sequenceNumber="27">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.30"/>
@@ -48,7 +48,7 @@
 			<unit id="org.apache.log4j" version="1.2.25"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1"/>
-			<unit id="com.google.guava" version="33.1.0.jre"/>
+			<unit id="com.google.guava" version="33.2.0.jre"/>
 			<unit id="com.google.guava.failureaccess" version="1.0.2"/>
 			<unit id="com.google.inject" version="7.0.0"/>
 			<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>

diff --git a/xtext-r202209.target b/xtext-r202209.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202209" sequenceNumber="26">
+<target name="xtext-r202209" sequenceNumber="27">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.31"/>
@@ -48,7 +48,7 @@
 			<unit id="org.apache.log4j" version="1.2.25"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1"/>
-			<unit id="com.google.guava" version="33.1.0.jre"/>
+			<unit id="com.google.guava" version="33.2.0.jre"/>
 			<unit id="com.google.guava.failureaccess" version="1.0.2"/>
 			<unit id="com.google.inject" version="7.0.0"/>
 			<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>

diff --git a/xtext-r202212.target b/xtext-r202212.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202212" sequenceNumber="26">
+<target name="xtext-r202212" sequenceNumber="27">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.32"/>
@@ -48,7 +48,7 @@
 			<unit id="org.apache.log4j" version="1.2.25"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1"/>
-			<unit id="com.google.guava" version="33.1.0.jre"/>
+			<unit id="com.google.guava" version="33.2.0.jre"/>
 			<unit id="com.google.guava.failureaccess" version="1.0.2"/>
 			<unit id="com.google.inject" version="7.0.0"/>
 			<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>

diff --git a/xtext-r202303.target b/xtext-r202303.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202303" sequenceNumber="26">
+<target name="xtext-r202303" sequenceNumber="27">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.33.0"/>
@@ -48,7 +48,7 @@
 			<unit id="org.apache.log4j" version="1.2.25"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1"/>
-			<unit id="com.google.guava" version="33.1.0.jre"/>
+			<unit id="com.google.guava" version="33.2.0.jre"/>
 			<unit id="com.google.guava.failureaccess" version="1.0.2"/>
 			<unit id="com.google.inject" version="7.0.0"/>
 			<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>

diff --git a/xtext-r202306.target b/xtext-r202306.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202306" sequenceNumber="26">
+<target name="xtext-r202306" sequenceNumber="27">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.34.0"/>
@@ -48,7 +48,7 @@
 			<unit id="org.apache.log4j" version="1.2.25"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1"/>
-			<unit id="com.google.guava" version="33.1.0.jre"/>
+			<unit id="com.google.guava" version="33.2.0.jre"/>
 			<unit id="com.google.guava.failureaccess" version="1.0.2"/>
 			<unit id="com.google.inject" version="7.0.0"/>
 			<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>

diff --git a/xtext-r202309.target b/xtext-r202309.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202309" sequenceNumber="26">
+<target name="xtext-r202309" sequenceNumber="27">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.35.0"/>
@@ -48,7 +48,7 @@
 			<unit id="org.apache.log4j" version="1.2.25"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1"/>
-			<unit id="com.google.guava" version="33.1.0.jre"/>
+			<unit id="com.google.guava" version="33.2.0.jre"/>
 			<unit id="com.google.guava.failureaccess" version="1.0.2"/>
 			<unit id="com.google.inject" version="7.0.0"/>
 			<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>

diff --git a/xtext-r202312.target b/xtext-r202312.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202312" sequenceNumber="26">
+<target name="xtext-r202312" sequenceNumber="27">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/>
@@ -48,7 +48,7 @@
 			<unit id="org.apache.log4j" version="1.2.25"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1"/>
-			<unit id="com.google.guava" version="33.1.0.jre"/>
+			<unit id="com.google.guava" version="33.2.0.jre"/>
 			<unit id="com.google.guava.failureaccess" version="1.0.2"/>
 			<unit id="com.google.inject" version="7.0.0"/>
 			<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>

diff --git a/xtext-r202403.target b/xtext-r202403.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202403" sequenceNumber="26">
+<target name="xtext-r202403" sequenceNumber="27">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.37.0"/>
@@ -43,7 +43,7 @@
 			<unit id="org.apache.log4j" version="1.2.25"/>
 			<unit id="org.kohsuke.args4j" version="0.0.0"/>
 			<unit id="com.google.gson" version="2.10.1"/>
-			<unit id="com.google.guava" version="33.1.0.jre"/>
+			<unit id="com.google.guava" version="33.2.0.jre"/>
 			<unit id="com.google.guava.failureaccess" version="1.0.2"/>
 			<unit id="com.google.inject" version="7.0.0"/>
 			<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>