Skip to content

Commit

Permalink
update to guava 32.1.1
Browse files Browse the repository at this point in the history 
Signed-off-by: Christian Dietrich <christian.dietrich.opensource@gmail.com>
  • Loading branch information
@cdietrich
cdietrich committed Jul 18, 2023
1 parent 4cfe67f commit 405d94a
Show file tree
Hide file tree
Showing 26 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions NOTICE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.examples/projects/xtend-annotation-examples-client/META-INF/MANIFEST.MF
View file
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.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
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.examples/projects/xtend-annotation-examples/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.maven.plugin/src/test/resources/it/pom.xml
View file
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>32.1.0-jre</version>
<version>32.1.1-jre</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.sdk.feature/feature.xml
View file
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.32.0" match="equivalent"/>
<import feature="org.eclipse.xtext.xbase.lib" version="2.32.0" match="equivalent"/>
<import plugin="com.google.guava" version="32.1.0" match="compatible"/>
<import plugin="com.google.guava" version="32.1.1" match="compatible"/>
<import plugin="io.github.classgraph" version="4.8.149" match="compatible"/>
<import plugin="org.apache.log4j" version="1.2.24" match="equivalent"/>
</requires>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.builder/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.common.types/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions org.eclipse.xtext.dev-bom/pom.xml
View file
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>32.1.0-jre</version>
<version>32.1.1-jre</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<version>32.1.0-jre</version>
<version>32.1.1-jre</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.0-jre</version>
<version>32.1.1-jre</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.xtext.p2repository/category.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<bundle id="org.eclipse.xtend.typesystem.emf" version="2.2.0.qualifier"/>
<bundle id="org.eclipse.xtend.typesystem.emf.source" version="2.2.0.qualifier"/>

<bundle id="com.google.guava" version="32.1.0.qualifier"/>
<bundle id="com.google.guava.source" version="32.1.0.qualifier"/>
<bundle id="com.google.guava" version="32.1.1.qualifier"/>
<bundle id="com.google.guava.source" version="32.1.1.qualifier"/>
<bundle id="com.google.guava.failureaccess" version="1.0.1.qualifier"/>
<bundle id="com.google.guava.failureaccess.source" version="1.0.1.qualifier"/>
<bundle id="com.google.inject" version="7.0.0.qualifier"/>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.redist.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ SPDX-License-Identifier: EPL-2.0
version="0.0.0"/>

<requires>
<import plugin="com.google.guava" version="32.1.0" match="compatible"/>
<import plugin="com.google.guava" version="32.1.1" 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.5.0" match="compatible"/>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.runtime.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ SPDX-License-Identifier: EPL-2.0
%license
</license>
<requires>
<import plugin="com.google.guava" version="32.1.0" match="compatible"/>
<import plugin="com.google.guava" version="32.1.1" match="compatible"/>
<import plugin="javax.inject" version="1.0.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"/>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.util/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion xtext-latest.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.1.0.jre"/>
<unit id="com.google.guava" version="32.1.1.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202203.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.1.0.jre"/>
<unit id="com.google.guava" version="32.1.1.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202206.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.1.0.jre"/>
<unit id="com.google.guava" version="32.1.1.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202209.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.1.0.jre"/>
<unit id="com.google.guava" version="32.1.1.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202212.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.1.0.jre"/>
<unit id="com.google.guava" version="32.1.1.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202303.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.1.0.jre"/>
<unit id="com.google.guava" version="32.1.1.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202306.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.1.0.jre"/>
<unit id="com.google.guava" version="32.1.1.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
Expand Down

0 comments on commit 405d94a

Please sign in to comment.