Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Guava version and dependency infrastructure #1292

Merged
merged 4 commits into from
Jan 9, 2024
Merged

Update Guava version and dependency infrastructure #1292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
589a6e4
Remove upper bound from Guava dependency
donat Jan 9, 2024
d6075bd
Bump lower bound for Guava dependency
donat Jan 9, 2024
92fba03
Use the latest orbit update site in target platforms
donat Jan 9, 2024
25924de
Adjust log4j dependency for integration tests
donat Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ 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,
Expand All @@ -21,7 +20,8 @@ def eclipseVersionAgnosticDependencies = [
'org.eclipse.swtbot.eclipse.finder' : "$swtBotVersion",
'org.eclipse.swtbot.junit5_x' : "$swtBotVersion",
'org.jetbrains.kotlin.bundled-compiler': '0.8.7',
'org.jetbrains.kotlin.core' : '0.8.7'
'org.jetbrains.kotlin.core' : '0.8.7',
'org.apache.log4j' : '1.2.25'
]

def targetPlatformIds = [
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
toolingApiVersion=8.1.1

# testing library version numbers
guavaVersion=32.1.2
guavaVersion=33.0.0
slf4jLibVersion=1.7.2
cglibLibVersion=2.2
groovyLibVersion=3.0.19
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.buildship.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="[32.1.2,33.0.0)",
com.google.guava;bundle-version="33.0.0",
com.google.gson;bundle-version="[2.7.0,3.0.0)",
org.eclipse.buildship.compat;visibility:=reexport
Bundle-ActivationPolicy: lazy
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.buildship.oomph.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.oomph.setup.core,
junit-platform-suite-api,
junit-platform-suite-commons,
junit-platform-suite-engine,
com.google.guava;bundle-version="[32.1.2,33.0.0)",
com.google.guava;bundle-version="33.0.0",
org.eclipse.debug.core,
org.eclipse.jdt.core,
org.eclipse.jdt.launching
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.buildship.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="[32.1.2,33.0.0)",
com.google.guava;bundle-version="33.0.0",
org.gradle.toolingapi;bundle-version="[8.1.1,8.2.0)",
org.eclipse.ui.workbench.texteditor
Bundle-ActivationPolicy: lazy
Expand Down
1 change: 0 additions & 1 deletion target-platforms/410-version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
$swtPluginId=3.109.0
com.ibm.icu=63.1.0
org.apache.log4j=1.2.15
org.eclipse.core.expressions=3.6.200
org.eclipse.core.filesystem=1.7.200
org.eclipse.core.net=1.3.400
Expand Down
28 changes: 14 additions & 14 deletions target-platforms/410.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@
<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"/>
<unit id="com.google.guava" version="33.0.0.jre"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="junit-jupiter-api" version="5.10.0"/>
<unit id="junit-jupiter-engine" version="5.10.0"/>
<unit id="junit-jupiter-migrationsupport" version="5.10.0"/>
<unit id="junit-jupiter-params" version="5.10.0"/>
<unit id="junit-platform-commons" version="1.10.0"/>
<unit id="junit-platform-engine" version="1.10.0"/>
<unit id="junit-platform-launcher" version="1.10.0"/>
<unit id="junit-platform-runner" version="1.10.0"/>
<unit id="junit-platform-suite-api" version="1.10.0"/>
<unit id="junit-platform-suite-commons" version="1.10.0"/>
<unit id="junit-platform-suite-engine" version="1.10.0"/>
<unit id="junit-vintage-engine" version="5.10.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
<unit id="junit-jupiter-api" version="5.10.1"/>
<unit id="junit-jupiter-engine" version="5.10.1"/>
<unit id="junit-jupiter-migrationsupport" version="5.10.1"/>
<unit id="junit-jupiter-params" version="5.10.1"/>
<unit id="junit-platform-commons" version="1.10.1"/>
<unit id="junit-platform-engine" version="1.10.1"/>
<unit id="junit-platform-launcher" version="1.10.1"/>
<unit id="junit-platform-runner" version="1.10.1"/>
<unit id="junit-platform-suite-api" version="1.10.1"/>
<unit id="junit-platform-suite-commons" version="1.10.1"/>
<unit id="junit-platform-suite-engine" version="1.10.1"/>
<unit id="junit-vintage-engine" version="5.10.1"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2024-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="3.1.0.202106041005"/>
Expand Down
1 change: 0 additions & 1 deletion target-platforms/411-version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
$swtPluginId=3.110.0
com.ibm.icu=63.1.0
org.apache.log4j=1.2.15
org.eclipse.core.expressions=3.6.300
org.eclipse.core.filesystem=1.7.300
org.eclipse.core.net=1.3.400
Expand Down
28 changes: 14 additions & 14 deletions target-platforms/411.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@
<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"/>
<unit id="com.google.guava" version="33.0.0.jre"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="junit-jupiter-api" version="5.10.0"/>
<unit id="junit-jupiter-engine" version="5.10.0"/>
<unit id="junit-jupiter-migrationsupport" version="5.10.0"/>
<unit id="junit-jupiter-params" version="5.10.0"/>
<unit id="junit-platform-commons" version="1.10.0"/>
<unit id="junit-platform-engine" version="1.10.0"/>
<unit id="junit-platform-launcher" version="1.10.0"/>
<unit id="junit-platform-runner" version="1.10.0"/>
<unit id="junit-platform-suite-api" version="1.10.0"/>
<unit id="junit-platform-suite-commons" version="1.10.0"/>
<unit id="junit-platform-suite-engine" version="1.10.0"/>
<unit id="junit-vintage-engine" version="5.10.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
<unit id="junit-jupiter-api" version="5.10.1"/>
<unit id="junit-jupiter-engine" version="5.10.1"/>
<unit id="junit-jupiter-migrationsupport" version="5.10.1"/>
<unit id="junit-jupiter-params" version="5.10.1"/>
<unit id="junit-platform-commons" version="1.10.1"/>
<unit id="junit-platform-engine" version="1.10.1"/>
<unit id="junit-platform-launcher" version="1.10.1"/>
<unit id="junit-platform-runner" version="1.10.1"/>
<unit id="junit-platform-suite-api" version="1.10.1"/>
<unit id="junit-platform-suite-commons" version="1.10.1"/>
<unit id="junit-platform-suite-engine" version="1.10.1"/>
<unit id="junit-vintage-engine" version="5.10.1"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2024-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="3.1.0.202106041005"/>
Expand Down
1 change: 0 additions & 1 deletion target-platforms/412-version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
$swtPluginId=3.111.0
com.ibm.icu=64.2.0
org.apache.log4j=1.2.15
org.eclipse.core.expressions=3.6.400
org.eclipse.core.filesystem=1.7.400
org.eclipse.core.net=1.3.500
Expand Down
28 changes: 14 additions & 14 deletions target-platforms/412.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@
<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"/>
<unit id="com.google.guava" version="33.0.0.jre"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="junit-jupiter-api" version="5.10.0"/>
<unit id="junit-jupiter-engine" version="5.10.0"/>
<unit id="junit-jupiter-migrationsupport" version="5.10.0"/>
<unit id="junit-jupiter-params" version="5.10.0"/>
<unit id="junit-platform-commons" version="1.10.0"/>
<unit id="junit-platform-engine" version="1.10.0"/>
<unit id="junit-platform-launcher" version="1.10.0"/>
<unit id="junit-platform-runner" version="1.10.0"/>
<unit id="junit-platform-suite-api" version="1.10.0"/>
<unit id="junit-platform-suite-commons" version="1.10.0"/>
<unit id="junit-platform-suite-engine" version="1.10.0"/>
<unit id="junit-vintage-engine" version="5.10.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
<unit id="junit-jupiter-api" version="5.10.1"/>
<unit id="junit-jupiter-engine" version="5.10.1"/>
<unit id="junit-jupiter-migrationsupport" version="5.10.1"/>
<unit id="junit-jupiter-params" version="5.10.1"/>
<unit id="junit-platform-commons" version="1.10.1"/>
<unit id="junit-platform-engine" version="1.10.1"/>
<unit id="junit-platform-launcher" version="1.10.1"/>
<unit id="junit-platform-runner" version="1.10.1"/>
<unit id="junit-platform-suite-api" version="1.10.1"/>
<unit id="junit-platform-suite-commons" version="1.10.1"/>
<unit id="junit-platform-suite-engine" version="1.10.1"/>
<unit id="junit-vintage-engine" version="5.10.1"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2024-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="3.1.0.202106041005"/>
Expand Down
1 change: 0 additions & 1 deletion target-platforms/413-version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
$swtPluginId=3.112.0
com.ibm.icu=64.2.0
org.apache.log4j=1.2.15
org.eclipse.core.expressions=3.6.500
org.eclipse.core.filesystem=1.7.500
org.eclipse.core.net=1.3.600
Expand Down
28 changes: 14 additions & 14 deletions target-platforms/413.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@
<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"/>
<unit id="com.google.guava" version="33.0.0.jre"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="junit-jupiter-api" version="5.10.0"/>
<unit id="junit-jupiter-engine" version="5.10.0"/>
<unit id="junit-jupiter-migrationsupport" version="5.10.0"/>
<unit id="junit-jupiter-params" version="5.10.0"/>
<unit id="junit-platform-commons" version="1.10.0"/>
<unit id="junit-platform-engine" version="1.10.0"/>
<unit id="junit-platform-launcher" version="1.10.0"/>
<unit id="junit-platform-runner" version="1.10.0"/>
<unit id="junit-platform-suite-api" version="1.10.0"/>
<unit id="junit-platform-suite-commons" version="1.10.0"/>
<unit id="junit-platform-suite-engine" version="1.10.0"/>
<unit id="junit-vintage-engine" version="5.10.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
<unit id="junit-jupiter-api" version="5.10.1"/>
<unit id="junit-jupiter-engine" version="5.10.1"/>
<unit id="junit-jupiter-migrationsupport" version="5.10.1"/>
<unit id="junit-jupiter-params" version="5.10.1"/>
<unit id="junit-platform-commons" version="1.10.1"/>
<unit id="junit-platform-engine" version="1.10.1"/>
<unit id="junit-platform-launcher" version="1.10.1"/>
<unit id="junit-platform-runner" version="1.10.1"/>
<unit id="junit-platform-suite-api" version="1.10.1"/>
<unit id="junit-platform-suite-commons" version="1.10.1"/>
<unit id="junit-platform-suite-engine" version="1.10.1"/>
<unit id="junit-vintage-engine" version="5.10.1"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2024-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="3.1.0.202106041005"/>
Expand Down
1 change: 0 additions & 1 deletion target-platforms/414-version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
$swtPluginId=3.113.0
com.ibm.icu=64.2.0
org.apache.log4j=1.2.15
org.eclipse.core.expressions=3.6.600
org.eclipse.core.filesystem=1.7.600
org.eclipse.core.net=1.3.700
Expand Down
28 changes: 14 additions & 14 deletions target-platforms/414.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@
<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"/>
<unit id="com.google.guava" version="33.0.0.jre"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="junit-jupiter-api" version="5.10.0"/>
<unit id="junit-jupiter-engine" version="5.10.0"/>
<unit id="junit-jupiter-migrationsupport" version="5.10.0"/>
<unit id="junit-jupiter-params" version="5.10.0"/>
<unit id="junit-platform-commons" version="1.10.0"/>
<unit id="junit-platform-engine" version="1.10.0"/>
<unit id="junit-platform-launcher" version="1.10.0"/>
<unit id="junit-platform-runner" version="1.10.0"/>
<unit id="junit-platform-suite-api" version="1.10.0"/>
<unit id="junit-platform-suite-commons" version="1.10.0"/>
<unit id="junit-platform-suite-engine" version="1.10.0"/>
<unit id="junit-vintage-engine" version="5.10.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
<unit id="junit-jupiter-api" version="5.10.1"/>
<unit id="junit-jupiter-engine" version="5.10.1"/>
<unit id="junit-jupiter-migrationsupport" version="5.10.1"/>
<unit id="junit-jupiter-params" version="5.10.1"/>
<unit id="junit-platform-commons" version="1.10.1"/>
<unit id="junit-platform-engine" version="1.10.1"/>
<unit id="junit-platform-launcher" version="1.10.1"/>
<unit id="junit-platform-runner" version="1.10.1"/>
<unit id="junit-platform-suite-api" version="1.10.1"/>
<unit id="junit-platform-suite-commons" version="1.10.1"/>
<unit id="junit-platform-suite-engine" version="1.10.1"/>
<unit id="junit-vintage-engine" version="5.10.1"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2024-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="3.1.0.202106041005"/>
Expand Down
1 change: 0 additions & 1 deletion target-platforms/415-version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
$swtPluginId=3.114.0
com.ibm.icu=64.2.0
org.apache.log4j=1.2.15
org.eclipse.core.expressions=3.6.700
org.eclipse.core.filesystem=1.7.700
org.eclipse.core.net=1.3.800
Expand Down
28 changes: 14 additions & 14 deletions target-platforms/415.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@
<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"/>
<unit id="com.google.guava" version="33.0.0.jre"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="junit-jupiter-api" version="5.10.0"/>
<unit id="junit-jupiter-engine" version="5.10.0"/>
<unit id="junit-jupiter-migrationsupport" version="5.10.0"/>
<unit id="junit-jupiter-params" version="5.10.0"/>
<unit id="junit-platform-commons" version="1.10.0"/>
<unit id="junit-platform-engine" version="1.10.0"/>
<unit id="junit-platform-launcher" version="1.10.0"/>
<unit id="junit-platform-runner" version="1.10.0"/>
<unit id="junit-platform-suite-api" version="1.10.0"/>
<unit id="junit-platform-suite-commons" version="1.10.0"/>
<unit id="junit-platform-suite-engine" version="1.10.0"/>
<unit id="junit-vintage-engine" version="5.10.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/release/4.29.0"/>
<unit id="junit-jupiter-api" version="5.10.1"/>
<unit id="junit-jupiter-engine" version="5.10.1"/>
<unit id="junit-jupiter-migrationsupport" version="5.10.1"/>
<unit id="junit-jupiter-params" version="5.10.1"/>
<unit id="junit-platform-commons" version="1.10.1"/>
<unit id="junit-platform-engine" version="1.10.1"/>
<unit id="junit-platform-launcher" version="1.10.1"/>
<unit id="junit-platform-runner" version="1.10.1"/>
<unit id="junit-platform-suite-api" version="1.10.1"/>
<unit id="junit-platform-suite-commons" version="1.10.1"/>
<unit id="junit-platform-suite-engine" version="1.10.1"/>
<unit id="junit-vintage-engine" version="5.10.1"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/2024-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="3.1.0.202106041005"/>
Expand Down
1 change: 0 additions & 1 deletion target-platforms/416-version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
$swtPluginId=3.114.100
com.ibm.icu=64.2.0
org.apache.log4j=1.2.15
org.eclipse.core.expressions=3.6.800
org.eclipse.core.filesystem=1.7.700
org.eclipse.core.net=1.3.900
Expand Down
Loading