Skip to content

Commit

Permalink
Merge pull request #3162 from merks/pr-guava-30.3.0.jre
Browse files Browse the repository at this point in the history 
Update to guava 30.3.0.jre
  • Loading branch information
@cdietrich
cdietrich authored Aug 17, 2024
2 parents 59ee406 + 1107fb2 commit 194de12
Show file tree
Hide file tree
Showing 23 changed files with 27 additions and 27 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 (33.2.1)
Google Guava (33.3.0)

* License: Apache License 2.0

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

* License: Apache License, 2.0

guava gwt (33.2.1)
guava gwt (33.3.0)

* License: Apache License, 2.0

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.36.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtend.lib,
com.google.guava;bundle-version="[33.2.1,34.0.0)",
com.google.guava;bundle-version="[33.3.0,34.0.0)",
org.eclipse.xtext.xbase.lib;bundle-version="2.36.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.36.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtend.lib,
com.google.guava;bundle-version="[33.2.1,34.0.0)",
com.google.guava;bundle-version="[33.3.0,34.0.0)",
org.eclipse.xtext.xbase.lib;bundle-version="2.36.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>33.2.1-jre</version>
<version>33.3.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
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.36.0" match="equivalent"/>
<import feature="org.eclipse.xtext.xbase.lib" version="2.36.0" match="equivalent"/>
<import plugin="com.google.guava" version="33.2.1" match="compatible"/>
<import plugin="com.google.guava" version="33.3.0" match="compatible"/>
<import plugin="org.apache.log4j" version="1.2.24" match="equivalent"/>
</requires>

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 @@ -153,17 +153,17 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-gwt</artifactId>
<version>33.2.1-jre</version>
<version>33.3.0-jre</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<version>33.2.1-jre</version>
<version>33.3.0-jre</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.1-jre</version>
<version>33.3.0-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 @@ -10,8 +10,8 @@
<category name="Xtext"/>
</feature>

<bundle id="com.google.guava" version="33.2.1.qualifier"/>
<bundle id="com.google.guava.source" version="33.2.1.qualifier"/>
<bundle id="com.google.guava" version="33.3.0.qualifier"/>
<bundle id="com.google.guava.source" version="33.3.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 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="33.2.1" match="compatible"/>
<import plugin="com.google.guava" version="33.3.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"/>
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="33.2.1" match="compatible"/>
<import plugin="com.google.guava" version="33.3.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"/>
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 @@ -46,7 +46,7 @@ Export-Package: org.eclipse.xtext.util;version="2.36.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.2.1,34.0.0)";visibility:=reexport,
com.google.guava;bundle-version="[33.3.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.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.36.0.qualifier
Export-Package: org.eclipse.xtend2.lib;version="2.36.0",
org.eclipse.xtext.xbase.lib;version="2.36.0"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: com.google.guava;bundle-version="[33.2.1,34.0.0)"
Require-Bundle: com.google.guava;bundle-version="[33.3.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
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.36.0",
org.eclipse.xtext.xbase.lib;version="2.36.0",
org.eclipse.xtext.xbase.lib.internal;version="2.36.0";x-internal:="true",
org.eclipse.xtext.xbase.lib.util;version="2.36.0"
Require-Bundle: com.google.guava;bundle-version="[33.2.1,34.0.0)";visibility:=reexport
Require-Bundle: com.google.guava;bundle-version="[33.3.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 xtext-latest.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0"/>
<unit id="com.google.guava" version="33.2.1.jre"/>
<unit id="com.google.guava" version="33.3.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"/>
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 @@ -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.11.0"/>
<unit id="com.google.guava" version="33.2.1.jre"/>
<unit id="com.google.guava" version="33.3.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"/>
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 @@ -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.11.0"/>
<unit id="com.google.guava" version="33.2.1.jre"/>
<unit id="com.google.guava" version="33.3.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"/>
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 @@ -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.11.0"/>
<unit id="com.google.guava" version="33.2.1.jre"/>
<unit id="com.google.guava" version="33.3.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"/>
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 @@ -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.11.0"/>
<unit id="com.google.guava" version="33.2.1.jre"/>
<unit id="com.google.guava" version="33.3.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"/>
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 @@ -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.11.0"/>
<unit id="com.google.guava" version="33.2.1.jre"/>
<unit id="com.google.guava" version="33.3.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"/>
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 @@ -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.11.0"/>
<unit id="com.google.guava" version="33.2.1.jre"/>
<unit id="com.google.guava" version="33.3.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"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202309.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0"/>
<unit id="com.google.guava" version="33.2.1.jre"/>
<unit id="com.google.guava" version="33.3.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"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202312.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0"/>
<unit id="com.google.guava" version="33.2.1.jre"/>
<unit id="com.google.guava" version="33.3.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"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202403.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0"/>
<unit id="com.google.guava" version="33.2.1.jre"/>
<unit id="com.google.guava" version="33.3.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"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202406.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0"/>
<unit id="com.google.guava" version="33.2.1.jre"/>
<unit id="com.google.guava" version="33.3.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"/>
Expand Down

0 comments on commit 194de12

Please sign in to comment.