diff --git a/build.gradle b/build.gradle index ff6a8dc49..bb999ed4b 100644 --- a/build.gradle +++ b/build.gradle @@ -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, @@ -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 = [ diff --git a/gradle.properties b/gradle.properties index e19b9c3c5..f0f0c3c63 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/org.eclipse.buildship.core/META-INF/MANIFEST.MF b/org.eclipse.buildship.core/META-INF/MANIFEST.MF index d4d44c914..b5f313e64 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="[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 diff --git a/org.eclipse.buildship.oomph.test/META-INF/MANIFEST.MF b/org.eclipse.buildship.oomph.test/META-INF/MANIFEST.MF index 96ddc2d9c..c5693c110 100644 --- a/org.eclipse.buildship.oomph.test/META-INF/MANIFEST.MF +++ b/org.eclipse.buildship.oomph.test/META-INF/MANIFEST.MF @@ -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 diff --git a/org.eclipse.buildship.ui/META-INF/MANIFEST.MF b/org.eclipse.buildship.ui/META-INF/MANIFEST.MF index f7d748703..cf6a54657 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="[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 diff --git a/target-platforms/410-version.properties b/target-platforms/410-version.properties index 68d268743..d5f2d5708 100644 --- a/target-platforms/410-version.properties +++ b/target-platforms/410-version.properties @@ -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 diff --git a/target-platforms/410.target b/target-platforms/410.target index 7a8a12cfb..9dd8e6a3a 100644 --- a/target-platforms/410.target +++ b/target-platforms/410.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/411-version.properties b/target-platforms/411-version.properties index 250990cab..fc305b9e4 100644 --- a/target-platforms/411-version.properties +++ b/target-platforms/411-version.properties @@ -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 diff --git a/target-platforms/411.target b/target-platforms/411.target index 9b12bce9e..0101261b4 100644 --- a/target-platforms/411.target +++ b/target-platforms/411.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/412-version.properties b/target-platforms/412-version.properties index e047a3521..73fa51b34 100644 --- a/target-platforms/412-version.properties +++ b/target-platforms/412-version.properties @@ -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 diff --git a/target-platforms/412.target b/target-platforms/412.target index f2763b4c7..8071e237c 100644 --- a/target-platforms/412.target +++ b/target-platforms/412.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/413-version.properties b/target-platforms/413-version.properties index b95471e0a..f4e26f8c9 100644 --- a/target-platforms/413-version.properties +++ b/target-platforms/413-version.properties @@ -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 diff --git a/target-platforms/413.target b/target-platforms/413.target index a66a677c8..f254f8e25 100644 --- a/target-platforms/413.target +++ b/target-platforms/413.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/414-version.properties b/target-platforms/414-version.properties index 2b65246c3..da21cca5d 100644 --- a/target-platforms/414-version.properties +++ b/target-platforms/414-version.properties @@ -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 diff --git a/target-platforms/414.target b/target-platforms/414.target index a4fd8bd3a..ec3a644ac 100644 --- a/target-platforms/414.target +++ b/target-platforms/414.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/415-version.properties b/target-platforms/415-version.properties index 808936e3d..f199c1c8b 100644 --- a/target-platforms/415-version.properties +++ b/target-platforms/415-version.properties @@ -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 diff --git a/target-platforms/415.target b/target-platforms/415.target index 980dae65e..da13d969f 100644 --- a/target-platforms/415.target +++ b/target-platforms/415.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/416-version.properties b/target-platforms/416-version.properties index 887f5bac6..e1858c001 100644 --- a/target-platforms/416-version.properties +++ b/target-platforms/416-version.properties @@ -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 diff --git a/target-platforms/416.target b/target-platforms/416.target index 474423c8a..31d0bb0c9 100644 --- a/target-platforms/416.target +++ b/target-platforms/416.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/417-version.properties b/target-platforms/417-version.properties index 43cfb85a2..fe6e6c34d 100644 --- a/target-platforms/417-version.properties +++ b/target-platforms/417-version.properties @@ -1,6 +1,5 @@ $swtPluginId=3.115.0 com.ibm.icu=67.1.0 -org.apache.log4j=1.2.15 org.eclipse.core.expressions=3.7.0 org.eclipse.core.filesystem=1.7.700 org.eclipse.core.net=1.3.1000 diff --git a/target-platforms/417.target b/target-platforms/417.target index d18d537fa..5b9e441b4 100644 --- a/target-platforms/417.target +++ b/target-platforms/417.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/418-version.properties b/target-platforms/418-version.properties index 2811a2ab5..3b4bdeccd 100644 --- a/target-platforms/418-version.properties +++ b/target-platforms/418-version.properties @@ -1,6 +1,5 @@ $swtPluginId=3.115.100 com.ibm.icu=67.1.0 -org.apache.log4j=1.2.15 org.eclipse.core.expressions=3.7.0 org.eclipse.core.filesystem=1.7.700 org.eclipse.core.net=1.3.1000 diff --git a/target-platforms/418.target b/target-platforms/418.target index d3e132562..715c92d66 100644 --- a/target-platforms/418.target +++ b/target-platforms/418.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/419-version.properties b/target-platforms/419-version.properties index 11cf37f66..35e5bb16d 100644 --- a/target-platforms/419-version.properties +++ b/target-platforms/419-version.properties @@ -1,6 +1,5 @@ $swtPluginId=3.116.0 com.ibm.icu=67.1.0 -org.apache.log4j=1.2.15 org.eclipse.core.expressions=3.7.100 org.eclipse.core.filesystem=1.7.700 org.eclipse.core.net=1.3.1000 diff --git a/target-platforms/419.target b/target-platforms/419.target index f3d985b10..8de919da5 100644 --- a/target-platforms/419.target +++ b/target-platforms/419.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/420-version.properties b/target-platforms/420-version.properties index 3cb527e6e..26a7c7a22 100644 --- a/target-platforms/420-version.properties +++ b/target-platforms/420-version.properties @@ -1,6 +1,5 @@ $swtPluginId=3.116.100 com.ibm.icu=67.1.0 -org.apache.log4j=1.2.15 org.eclipse.core.expressions=3.7.100 org.eclipse.core.filesystem=1.9.0 org.eclipse.core.net=1.3.1100 diff --git a/target-platforms/420.target b/target-platforms/420.target index 648600eb4..de3c85863 100644 --- a/target-platforms/420.target +++ b/target-platforms/420.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/421-version.properties b/target-platforms/421-version.properties index bca95ea7f..facce4ba4 100644 --- a/target-platforms/421-version.properties +++ b/target-platforms/421-version.properties @@ -1,6 +1,5 @@ $swtPluginId=3.117.0 com.ibm.icu=67.1.0 -org.apache.log4j=1.2.15 org.eclipse.core.expressions=3.8.0 org.eclipse.core.filesystem=1.9.100 org.eclipse.core.net=1.3.1100 diff --git a/target-platforms/421.target b/target-platforms/421.target index 86e0ef58b..6772b247f 100644 --- a/target-platforms/421.target +++ b/target-platforms/421.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/422-version.properties b/target-platforms/422-version.properties index af8858138..83397e2aa 100644 --- a/target-platforms/422-version.properties +++ b/target-platforms/422-version.properties @@ -1,6 +1,5 @@ $swtPluginId=3.118.0 com.ibm.icu=67.1.0 -org.apache.log4j=1.2.15 org.eclipse.core.expressions=3.8.100 org.eclipse.core.filesystem=1.9.200 org.eclipse.core.net=1.3.1100 diff --git a/target-platforms/422.target b/target-platforms/422.target index e75e008ab..37dd21143 100644 --- a/target-platforms/422.target +++ b/target-platforms/422.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/423-version.properties b/target-platforms/423-version.properties index f8110a951..99e9420fa 100644 --- a/target-platforms/423-version.properties +++ b/target-platforms/423-version.properties @@ -1,6 +1,5 @@ $swtPluginId=3.119.0 com.ibm.icu=67.1.0 -org.apache.log4j=1.2.19 org.eclipse.core.expressions=3.8.100 org.eclipse.core.filesystem=1.9.300 org.eclipse.core.net=1.3.1100 diff --git a/target-platforms/423.target b/target-platforms/423.target index 4aeaff230..59cfdc934 100644 --- a/target-platforms/423.target +++ b/target-platforms/423.target @@ -13,20 +13,21 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/424-version.properties b/target-platforms/424-version.properties index 5cdf36b5c..3399572c8 100644 --- a/target-platforms/424-version.properties +++ b/target-platforms/424-version.properties @@ -1,6 +1,5 @@ $swtPluginId=3.120.0 com.ibm.icu=67.1.0 -org.apache.log4j=1.2.19 org.eclipse.core.expressions=3.8.100 org.eclipse.core.filesystem=1.9.400 org.eclipse.core.net=1.3.1200 diff --git a/target-platforms/424.target b/target-platforms/424.target index 51b12e3a2..9318e4c9e 100644 --- a/target-platforms/424.target +++ b/target-platforms/424.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/425-version.properties b/target-platforms/425-version.properties index 5112c5365..4c05e82b9 100644 --- a/target-platforms/425-version.properties +++ b/target-platforms/425-version.properties @@ -1,6 +1,5 @@ $swtPluginId=3.121.0 com.ibm.icu=67.1.0 -org.apache.log4j=1.2.19 org.eclipse.core.expressions=3.8.200 org.eclipse.core.filesystem=1.9.500 org.eclipse.core.net=1.4.0 diff --git a/target-platforms/425.target b/target-platforms/425.target index 7c057fa69..0dd8beaca 100644 --- a/target-platforms/425.target +++ b/target-platforms/425.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/426-version.properties b/target-platforms/426-version.properties index e227144fc..6a146ede5 100644 --- a/target-platforms/426-version.properties +++ b/target-platforms/426-version.properties @@ -1,6 +1,5 @@ $swtPluginId=3.122.0 com.ibm.icu=72.1.0 -org.apache.log4j=1.2.19 org.eclipse.core.expressions=3.8.200 org.eclipse.core.filesystem=1.9.500 org.eclipse.core.net=1.4.0 diff --git a/target-platforms/426.target b/target-platforms/426.target index c9bec8dbc..03ea31e5c 100644 --- a/target-platforms/426.target +++ b/target-platforms/426.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/427-version.properties b/target-platforms/427-version.properties index c3919eaa5..b45a75465 100644 --- a/target-platforms/427-version.properties +++ b/target-platforms/427-version.properties @@ -1,6 +1,5 @@ $swtPluginId=3.123.0 com.ibm.icu=72.1.0 -org.apache.log4j=1.2.24 org.eclipse.core.expressions=3.8.200 org.eclipse.core.filesystem=1.9.500 org.eclipse.core.net=1.4.0 diff --git a/target-platforms/427.target b/target-platforms/427.target index 83ee6490a..ec5f23ef3 100644 --- a/target-platforms/427.target +++ b/target-platforms/427.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/48-version.properties b/target-platforms/48-version.properties index 63d7259bb..068adf1cc 100644 --- a/target-platforms/48-version.properties +++ b/target-platforms/48-version.properties @@ -1,6 +1,5 @@ $swtPluginId=3.107.0 com.ibm.icu=58.2.0 -org.apache.log4j=1.2.15 org.eclipse.core.expressions=3.6.100 org.eclipse.core.filesystem=1.7.100 org.eclipse.core.net=1.3.200 diff --git a/target-platforms/48.target b/target-platforms/48.target index 13b736ccd..f1a8d4c68 100644 --- a/target-platforms/48.target +++ b/target-platforms/48.target @@ -13,21 +13,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/target-platforms/49-version.properties b/target-platforms/49-version.properties index 869aff27c..882aadb75 100644 --- a/target-platforms/49-version.properties +++ b/target-platforms/49-version.properties @@ -1,6 +1,5 @@ $swtPluginId=3.108.0 com.ibm.icu=62.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.300 diff --git a/target-platforms/49.target b/target-platforms/49.target index 1ca3a533f..958eaa374 100644 --- a/target-platforms/49.target +++ b/target-platforms/49.target @@ -13,20 +13,21 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + +