diff --git a/NOTICE.md b/NOTICE.md index 6bfc91a5eaa..703c0284a02 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -70,7 +70,7 @@ Google Gson (2.9.x) * License: Apache License, 2.0 -Google Guava (33.3.0) +Google Guava (33.3.1) * License: Apache License 2.0 @@ -82,7 +82,7 @@ Gradle Wrapper (8) * License: Apache License, 2.0 -guava gwt (33.3.0) +guava gwt (33.3.1) * 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 index 5eedf7d4984..1dfeb235e8c 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.37.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.xtend.lib, - com.google.guava;bundle-version="[33.3.0,34.0.0)", + com.google.guava;bundle-version="[33.3.1,34.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="2.37.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 79b3347324f..18cf8abff2f 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.37.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.xtend.lib, - com.google.guava;bundle-version="[33.3.0,34.0.0)", + com.google.guava;bundle-version="[33.3.1,34.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="2.37.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 591554b0ab2..907430bcc6a 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 - 33.3.0-jre + 33.3.1-jre org.eclipse.xtext diff --git a/org.eclipse.xtend.sdk.feature/feature.xml b/org.eclipse.xtend.sdk.feature/feature.xml index ac29a5235ed..97de7a5e8f9 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.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml index b73c9a11b2b..20d67657333 100644 --- a/org.eclipse.xtext.dev-bom/pom.xml +++ b/org.eclipse.xtext.dev-bom/pom.xml @@ -153,17 +153,17 @@ com.google.guava guava-gwt - 33.3.0-jre + 33.3.1-jre com.google.guava guava-testlib - 33.3.0-jre + 33.3.1-jre com.google.guava guava - 33.3.0-jre + 33.3.1-jre com.google.inject diff --git a/org.eclipse.xtext.p2repository/category.xml b/org.eclipse.xtext.p2repository/category.xml index c4ada5b6214..4a19d6bcfea 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 80552cd2ca2..4dbbfad51a0 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 698a6688ff5..8f4419f442e 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.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target index 1dd008899fb..8c5aff18aba 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target @@ -23,7 +23,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target index c843729b3b3..90d99c17454 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target @@ -23,7 +23,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target index 5844eb4e5f6..0745a86f931 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target @@ -23,7 +23,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target index c58470c9be8..d87056b5557 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target @@ -23,7 +23,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target index 1ee8b0d1683..aca54193918 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target @@ -23,7 +23,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target index 2275029b56f..f7b0ddc3c72 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target @@ -23,7 +23,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target index d7811951948..284cc41fef7 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target @@ -23,7 +23,7 @@ - + diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target index cdc138f78e9..0cafb191485 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target @@ -23,7 +23,7 @@ - + diff --git a/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/org.eclipse.xtext.util/META-INF/MANIFEST.MF index 795fe2a9679..3698c1e9a24 100644 --- a/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -46,7 +46,7 @@ Export-Package: org.eclipse.xtext.util;version="2.37.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.3.0,34.0.0)";visibility:=reexport, + com.google.guava;bundle-version="[33.3.1,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 index 0db04ef8b7f..d7dc6f2e96d 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.37.0.qualifier Export-Package: org.eclipse.xtend2.lib;version="2.37.0", org.eclipse.xtext.xbase.lib;version="2.37.0" Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[33.3.0,34.0.0)" +Require-Bundle: com.google.guava;bundle-version="[33.3.1,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 19ec069c0e8..945ae6a0a50 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.37.0", org.eclipse.xtext.xbase.lib;version="2.37.0", org.eclipse.xtext.xbase.lib.internal;version="2.37.0";x-internal:="true", org.eclipse.xtext.xbase.lib.util;version="2.37.0" -Require-Bundle: com.google.guava;bundle-version="[33.3.0,34.0.0)";visibility:=reexport +Require-Bundle: com.google.guava;bundle-version="[33.3.1,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.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend index caf9474bfb4..27a79fa0d6b 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend @@ -90,7 +90,7 @@ class TargetPlatformProject extends ProjectDescriptor { - + diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java index 6ba8e414b42..1ff93798319 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java @@ -197,7 +197,7 @@ public CharSequence target() { _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append(""); + _builder.append(""); _builder.newLine(); _builder.append("\t\t\t"); _builder.append(""); diff --git a/xtext-latest.target b/xtext-latest.target index 72964eea4b8..2a1f73f2168 100644 --- a/xtext-latest.target +++ b/xtext-latest.target @@ -46,7 +46,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/xtext-r202203.target b/xtext-r202203.target index 274b517249a..a3a9d051c68 100644 --- a/xtext-r202203.target +++ b/xtext-r202203.target @@ -49,7 +49,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/xtext-r202206.target b/xtext-r202206.target index 56bcda764ee..1d31f585860 100644 --- a/xtext-r202206.target +++ b/xtext-r202206.target @@ -48,7 +48,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/xtext-r202209.target b/xtext-r202209.target index 73acb6f3b84..ee7c7900b47 100644 --- a/xtext-r202209.target +++ b/xtext-r202209.target @@ -48,7 +48,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/xtext-r202212.target b/xtext-r202212.target index 15af5136d73..beb15f7ea4c 100644 --- a/xtext-r202212.target +++ b/xtext-r202212.target @@ -48,7 +48,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/xtext-r202303.target b/xtext-r202303.target index d92135d8b79..03b7186d066 100644 --- a/xtext-r202303.target +++ b/xtext-r202303.target @@ -48,7 +48,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/xtext-r202306.target b/xtext-r202306.target index 579c1ef487b..c27ba658855 100644 --- a/xtext-r202306.target +++ b/xtext-r202306.target @@ -48,7 +48,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/xtext-r202309.target b/xtext-r202309.target index 5e45a0c82e1..ccf0386e3a8 100644 --- a/xtext-r202309.target +++ b/xtext-r202309.target @@ -48,7 +48,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/xtext-r202312.target b/xtext-r202312.target index 8d0c63e2d09..b43afb06a0a 100644 --- a/xtext-r202312.target +++ b/xtext-r202312.target @@ -48,7 +48,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/xtext-r202403.target b/xtext-r202403.target index 440b444ce4a..f8b3e6af8ed 100644 --- a/xtext-r202403.target +++ b/xtext-r202403.target @@ -43,7 +43,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/xtext-r202406.target b/xtext-r202406.target index 60758c55210..68460a1304a 100644 --- a/xtext-r202406.target +++ b/xtext-r202406.target @@ -43,7 +43,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/xtext-r202409.target b/xtext-r202409.target index b3d4c2f25cc..cac8709b432 100644 --- a/xtext-r202409.target +++ b/xtext-r202409.target @@ -43,7 +43,7 @@ - + @@ -55,7 +55,7 @@ - +