Merge pull request #1261 from gradle/upgrade-guava

upgrade guava to 32.1.2
eclipse-buildship · Sep 13, 2023 · 3a8aa25 · 3a8aa25
2 parents 7040f04 + 1552f3e
commit 3a8aa25
Show file tree

Hide file tree

Showing 29 changed files with 90 additions and 27 deletions.
diff --git 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
@@ -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
@@ -1 +1,2 @@
 gradleRemoteRepositoryUrl = https://repo.gradle.org/gradle/remote-repos
+guavaVersion=32.1.2
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -9,11 +9,14 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-            <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
             <unit id="org.junit" version="4.13.0.v20200204-1500"/>
             <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
             <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
         </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.google.guava" version="32.1.2.jre"/>
+            <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
+        </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
             <unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>

diff --git a/target-platforms/411.target b/target-platforms/411.target
@@ -9,11 +9,14 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-            <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
             <unit id="org.junit" version="4.13.0.v20200204-1500"/>
             <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
             <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
         </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.google.guava" version="32.1.2.jre"/>
+            <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
+        </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
             <unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>

diff --git a/target-platforms/412.target b/target-platforms/412.target
@@ -9,11 +9,14 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-            <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
             <unit id="org.junit" version="4.13.0.v20200204-1500"/>
             <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
             <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
         </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.google.guava" version="32.1.2.jre"/>
+            <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
+        </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
             <unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>

diff --git a/target-platforms/413.target b/target-platforms/413.target
@@ -9,11 +9,14 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-            <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
             <unit id="org.junit" version="4.13.0.v20200204-1500"/>
             <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
             <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
         </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.google.guava" version="32.1.2.jre"/>
+            <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
+        </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
             <unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>

diff --git a/target-platforms/414.target b/target-platforms/414.target
@@ -9,11 +9,14 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-            <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
             <unit id="org.junit" version="4.13.0.v20200204-1500"/>
             <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
             <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
         </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.google.guava" version="32.1.2.jre"/>
+            <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
+        </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
             <unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>

diff --git a/target-platforms/415.target b/target-platforms/415.target
@@ -9,11 +9,14 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-            <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
             <unit id="org.junit" version="4.13.0.v20200204-1500"/>
             <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
             <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
         </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.google.guava" version="32.1.2.jre"/>
+            <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
+        </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
             <unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>

diff --git a/target-platforms/416.target b/target-platforms/416.target
@@ -9,11 +9,14 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-            <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
             <unit id="org.junit" version="4.13.0.v20200204-1500"/>
             <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
             <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
         </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.google.guava" version="32.1.2.jre"/>
+            <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
+        </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
             <unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>

diff --git a/target-platforms/417.target b/target-platforms/417.target
@@ -9,11 +9,14 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-            <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
             <unit id="org.junit" version="4.13.0.v20200204-1500"/>
             <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
             <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
         </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.google.guava" version="32.1.2.jre"/>
+            <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
+        </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
             <unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>

diff --git a/target-platforms/418.target b/target-platforms/418.target
@@ -9,11 +9,14 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-            <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
             <unit id="org.junit" version="4.13.0.v20200204-1500"/>
             <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
             <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
         </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.google.guava" version="32.1.2.jre"/>
+            <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
+        </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
             <unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>

diff --git a/target-platforms/419.target b/target-platforms/419.target
@@ -9,11 +9,14 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-            <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
             <unit id="org.junit" version="4.13.0.v20200204-1500"/>
             <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
             <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
         </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.google.guava" version="32.1.2.jre"/>
+            <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
+        </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
             <unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>

diff --git a/target-platforms/420.target b/target-platforms/420.target
@@ -9,11 +9,14 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-            <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
             <unit id="org.junit" version="4.13.0.v20200204-1500"/>
             <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
             <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
         </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.google.guava" version="32.1.2.jre"/>
+            <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
+        </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
             <unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>

diff --git a/target-platforms/421.target b/target-platforms/421.target
@@ -9,11 +9,14 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-            <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
             <unit id="org.junit" version="4.13.0.v20200204-1500"/>
             <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
             <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
         </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.google.guava" version="32.1.2.jre"/>
+            <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
+        </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
             <unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>

diff --git a/target-platforms/422.target b/target-platforms/422.target
@@ -9,11 +9,14 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
-            <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
             <unit id="org.junit" version="4.13.0.v20200204-1500"/>
             <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
             <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
         </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.google.guava" version="32.1.2.jre"/>
+            <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
+        </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
             <unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		gradleRemoteRepositoryUrl = https://repo.gradle.org/gradle/remote-repos
		guavaVersion=32.1.2