From 1552f3edaee501a8b4be6155fa651e37007a2907 Mon Sep 17 00:00:00 2001 From: Reinhold Degenfellner Date: Tue, 12 Sep 2023 13:54:22 +0200 Subject: [PATCH] upgrade guava to 32.1.2 --- build.gradle | 3 ++- buildSrc/build.gradle | 2 +- buildSrc/gradle.properties | 1 + gradle.properties | 1 + org.eclipse.buildship.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.buildship.gradleprop.ls/build.gradle | 2 +- org.eclipse.buildship.kotlin/META-INF/MANIFEST.MF | 2 +- org.eclipse.buildship.oomph.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.buildship.ui/META-INF/MANIFEST.MF | 2 +- target-platforms/410.target | 5 ++++- target-platforms/411.target | 5 ++++- target-platforms/412.target | 5 ++++- target-platforms/413.target | 5 ++++- target-platforms/414.target | 5 ++++- target-platforms/415.target | 5 ++++- target-platforms/416.target | 5 ++++- target-platforms/417.target | 5 ++++- target-platforms/418.target | 5 ++++- target-platforms/419.target | 5 ++++- target-platforms/420.target | 5 ++++- target-platforms/421.target | 5 ++++- target-platforms/422.target | 5 ++++- target-platforms/423.target | 5 ++++- target-platforms/424.target | 5 ++++- target-platforms/425.target | 5 ++++- target-platforms/426.target | 5 ++++- target-platforms/427.target | 5 ++++- target-platforms/48.target | 5 ++++- target-platforms/49.target | 5 ++++- 29 files changed, 90 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index 4bd499d606..da518640c4 100644 --- a/build.gradle +++ b/build.gradle @@ -10,12 +10,13 @@ apply plugin: eclipsebuild.BuildDefinitionPlugin ext.toolingApiBundleVersion = getBundleVersion(toolingApiVersion) +println "guava $groovyLibVersion $guavaVersion" // define version mapping for the 3rd-party dependencies that are not specific to a particular Eclipse version def eclipseVersionAgnosticDependencies = [ 'org.gradle.toolingapi' : toolingApiBundleVersion, 'org.slf4j.api' : '1.7.30', 'org.slf4j.simple' : '1.7.30', - 'com.google.guava' : '30.1.0', + 'com.google.guava' : "$guavaVersion", 'com.google.gson' : '2.7.0', 'org.eclipse.swtbot.eclipse.finder' : '2.2.1', 'org.eclipse.swtbot.junit4_x' : '2.2.1', diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 5b5aca928a..50de941c30 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -17,7 +17,7 @@ dependencies { implementation 'org.apache.maven:maven-artifact-manager:2.2.1' implementation 'org.apache.maven.wagon:wagon-file:3.5.1' implementation 'org.apache.bcel:bcel:6.5.0' - implementation 'com.google.guava:guava:30.1-jre' + implementation "com.google.guava:guava:$guavaVersion-jre" implementation 'commons-io:commons-io:2.11.0' implementation 'org.apache.commons:commons-compress:1.22' } diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties index e9d200c4b1..1766dc43dc 100644 --- a/buildSrc/gradle.properties +++ b/buildSrc/gradle.properties @@ -1 +1,2 @@ gradleRemoteRepositoryUrl = https://repo.gradle.org/gradle/remote-repos +guavaVersion=32.1.2 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 18f2b4a4ce..616cbcd36b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,6 +2,7 @@ toolingApiVersion=8.1.1 # testing library version numbers +guavaVersion=32.1.2 slf4jLibVersion=1.7.2 cglibLibVersion=2.2 groovyLibVersion=2.5.14 diff --git a/org.eclipse.buildship.core/META-INF/MANIFEST.MF b/org.eclipse.buildship.core/META-INF/MANIFEST.MF index 489d6da088..d4d44c914f 100644 --- a/org.eclipse.buildship.core/META-INF/MANIFEST.MF +++ b/org.eclipse.buildship.core/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.expressions, org.eclipse.jdt.launching, org.eclipse.debug.core, org.gradle.toolingapi;bundle-version="[8.1.1,8.2.0)";visibility:=reexport, - com.google.guava;bundle-version="[30.1.0,32.0.0)", + com.google.guava;bundle-version="[32.1.2,33.0.0)", com.google.gson;bundle-version="[2.7.0,3.0.0)", org.eclipse.buildship.compat;visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.buildship.gradleprop.ls/build.gradle b/org.eclipse.buildship.gradleprop.ls/build.gradle index 7a9a64412d..fe7c1a8d0a 100644 --- a/org.eclipse.buildship.gradleprop.ls/build.gradle +++ b/org.eclipse.buildship.gradleprop.ls/build.gradle @@ -14,7 +14,7 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.1' implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.21.0' implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.21.0' - implementation 'com.google.guava:guava:31.1-jre' + implementation "com.google.guava:guava:$guavaVersion-jre" } java { diff --git a/org.eclipse.buildship.kotlin/META-INF/MANIFEST.MF b/org.eclipse.buildship.kotlin/META-INF/MANIFEST.MF index 4de5acf96d..e758f1c176 100644 --- a/org.eclipse.buildship.kotlin/META-INF/MANIFEST.MF +++ b/org.eclipse.buildship.kotlin/META-INF/MANIFEST.MF @@ -15,6 +15,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.buildship.core, org.jetbrains.kotlin.bundled-compiler;bundle-version="[0.8.5,0.9.0)", org.jetbrains.kotlin.core;bundle-version="[0.8.5,0.9.0)", - com.google.guava;bundle-version="[30.1.0,32.0.0)", + com.google.guava;bundle-version="[32.1.2,33.0.0)", org.gradle.toolingapi;bundle-version="[5.5.0,5.6.0)" Import-Package: org.slf4j;version="1.7.2" diff --git a/org.eclipse.buildship.oomph.test/META-INF/MANIFEST.MF b/org.eclipse.buildship.oomph.test/META-INF/MANIFEST.MF index fbb191ea71..11f2f04938 100644 --- a/org.eclipse.buildship.oomph.test/META-INF/MANIFEST.MF +++ b/org.eclipse.buildship.oomph.test/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Fragment-Host: org.eclipse.buildship.oomph Automatic-Module-Name: org.eclipse.buildship.oomph.test Require-Bundle: org.junit, org.eclipse.oomph.setup.core, - com.google.guava;bundle-version="[30.1.0,32.0.0)", + com.google.guava;bundle-version="[32.1.2,33.0.0)", org.eclipse.debug.core, org.eclipse.jdt.core, org.eclipse.jdt.launching diff --git a/org.eclipse.buildship.ui/META-INF/MANIFEST.MF b/org.eclipse.buildship.ui/META-INF/MANIFEST.MF index 4c288eb4a5..f7d748703f 100644 --- a/org.eclipse.buildship.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.buildship.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.buildship.core, org.eclipse.jface.databinding, org.eclipse.jface.text, com.ibm.icu, - com.google.guava;bundle-version="[30.1.0,32.0.0)", + com.google.guava;bundle-version="[32.1.2,33.0.0)", org.gradle.toolingapi;bundle-version="[8.1.1,8.2.0)", org.eclipse.ui.workbench.texteditor Bundle-ActivationPolicy: lazy diff --git a/target-platforms/410.target b/target-platforms/410.target index 36e92290c9..541ff8f017 100644 --- a/target-platforms/410.target +++ b/target-platforms/410.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/411.target b/target-platforms/411.target index 4cafc1cb1b..64427373e9 100644 --- a/target-platforms/411.target +++ b/target-platforms/411.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/412.target b/target-platforms/412.target index 9aa7292357..1823e23dc6 100644 --- a/target-platforms/412.target +++ b/target-platforms/412.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/413.target b/target-platforms/413.target index cd911384a3..bec2cd64e8 100644 --- a/target-platforms/413.target +++ b/target-platforms/413.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/414.target b/target-platforms/414.target index 4e9d692d11..0224cd4b2c 100644 --- a/target-platforms/414.target +++ b/target-platforms/414.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/415.target b/target-platforms/415.target index 03d9b7e7ae..2ff40a3639 100644 --- a/target-platforms/415.target +++ b/target-platforms/415.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/416.target b/target-platforms/416.target index a6b13b8a55..2c2efd323a 100644 --- a/target-platforms/416.target +++ b/target-platforms/416.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/417.target b/target-platforms/417.target index d70efb84fb..f7246c44a5 100644 --- a/target-platforms/417.target +++ b/target-platforms/417.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/418.target b/target-platforms/418.target index 4c3774d763..b1c0e25067 100644 --- a/target-platforms/418.target +++ b/target-platforms/418.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/419.target b/target-platforms/419.target index 4fa7fccd25..1cb3a120b4 100644 --- a/target-platforms/419.target +++ b/target-platforms/419.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/420.target b/target-platforms/420.target index 7e6a7ec4ab..36bea9e676 100644 --- a/target-platforms/420.target +++ b/target-platforms/420.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/421.target b/target-platforms/421.target index 288cd5c054..9e93d21fe3 100644 --- a/target-platforms/421.target +++ b/target-platforms/421.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/422.target b/target-platforms/422.target index 00c5fd52cb..0cc9f31f5b 100644 --- a/target-platforms/422.target +++ b/target-platforms/422.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/423.target b/target-platforms/423.target index 8216a886c6..24e3b032f9 100644 --- a/target-platforms/423.target +++ b/target-platforms/423.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/424.target b/target-platforms/424.target index 0f81a0647e..b2aca64bd8 100644 --- a/target-platforms/424.target +++ b/target-platforms/424.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/425.target b/target-platforms/425.target index a3484b2f2c..7a72b1fcfe 100644 --- a/target-platforms/425.target +++ b/target-platforms/425.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/426.target b/target-platforms/426.target index 6e6cb23eeb..5071d8d4b5 100644 --- a/target-platforms/426.target +++ b/target-platforms/426.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/427.target b/target-platforms/427.target index d7595d6de9..0d3f38ab85 100644 --- a/target-platforms/427.target +++ b/target-platforms/427.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/48.target b/target-platforms/48.target index 34d09143ab..0612e3953c 100644 --- a/target-platforms/48.target +++ b/target-platforms/48.target @@ -9,11 +9,14 @@ - + + + + diff --git a/target-platforms/49.target b/target-platforms/49.target index ef3beccaf6..bc17274a7a 100644 --- a/target-platforms/49.target +++ b/target-platforms/49.target @@ -9,11 +9,14 @@ - + + + +