This is an automated email from the ASF dual-hosted git repository.
zstan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 213f3afa596 IGNITE-27872: Normalize Guava/SLF4J versions (#12795)
213f3afa596 is described below
commit 213f3afa5962323681f14628e9153d7506c0bb24
Author: Kirill Anisimov <[email protected]>
AuthorDate: Tue Mar 3 20:19:39 2026 +0700
IGNITE-27872: Normalize Guava/SLF4J versions (#12795)
---
modules/benchmarks/pom.xml | 1 -
modules/bom/pom.xml | 15 +++++++++++++++
modules/calcite/pom.xml | 5 +----
modules/clients/pom.xml | 1 -
modules/compatibility/pom.xml | 1 -
modules/compress/pom.xml | 1 -
modules/control-utility/pom.xml | 2 +-
modules/core/pom.xml | 1 -
modules/direct-io/pom.xml | 1 -
modules/ducktests/pom.xml | 1 -
modules/indexing/pom.xml | 1 -
modules/json/pom.xml | 1 -
modules/opencensus/pom.xml | 1 -
modules/rest-http/pom.xml | 1 -
modules/slf4j/pom.xml | 3 +--
modules/tools/pom.xml | 12 ++++++++++++
modules/urideploy/pom.xml | 1 -
modules/yardstick/pom.xml | 1 -
modules/zookeeper/pom.xml | 3 +--
parent/pom.xml | 5 +++--
20 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml
index b16f287e01e..b7c15dab10e 100644
--- a/modules/benchmarks/pom.xml
+++ b/modules/benchmarks/pom.xml
@@ -98,7 +98,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
</dependency>
</dependencies>
diff --git a/modules/bom/pom.xml b/modules/bom/pom.xml
index 25f8124d03f..0ba1c236d12 100644
--- a/modules/bom/pom.xml
+++ b/modules/bom/pom.xml
@@ -235,6 +235,21 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ <version>${failureaccess.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/modules/calcite/pom.xml b/modules/calcite/pom.xml
index 4e5201048da..ab1b0d90f7f 100644
--- a/modules/calcite/pom.xml
+++ b/modules/calcite/pom.xml
@@ -87,13 +87,11 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
- <version>${failureaccess.version}</version>
</dependency>
<dependency>
@@ -159,7 +157,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
@@ -221,7 +218,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index 15b806af5fe..851c763fd32 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -136,7 +136,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/modules/compatibility/pom.xml b/modules/compatibility/pom.xml
index daf2c7b8a4c..b1b95ec960c 100644
--- a/modules/compatibility/pom.xml
+++ b/modules/compatibility/pom.xml
@@ -55,7 +55,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
</dependency>
<dependency>
diff --git a/modules/compress/pom.xml b/modules/compress/pom.xml
index 23709aa105c..b9250b7dc8d 100644
--- a/modules/compress/pom.xml
+++ b/modules/compress/pom.xml
@@ -128,7 +128,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
<scope>test</scope>
</dependency>
diff --git a/modules/control-utility/pom.xml b/modules/control-utility/pom.xml
index 378e376bd90..51b9abc8123 100644
--- a/modules/control-utility/pom.xml
+++ b/modules/control-utility/pom.xml
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 4fa445535da..5ebf5ee4628 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -200,7 +200,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
<scope>test</scope>
</dependency>
diff --git a/modules/direct-io/pom.xml b/modules/direct-io/pom.xml
index 8ab5ff6886f..9700fe802ec 100644
--- a/modules/direct-io/pom.xml
+++ b/modules/direct-io/pom.xml
@@ -91,7 +91,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
<scope>test</scope>
</dependency>
diff --git a/modules/ducktests/pom.xml b/modules/ducktests/pom.xml
index b323561ad49..416191fb47c 100644
--- a/modules/ducktests/pom.xml
+++ b/modules/ducktests/pom.xml
@@ -89,7 +89,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index a24ab2bc3a2..e6a2554d56e 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -140,7 +140,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
<scope>test</scope>
</dependency>
diff --git a/modules/json/pom.xml b/modules/json/pom.xml
index 4cf92c4b842..b3813f98e3b 100644
--- a/modules/json/pom.xml
+++ b/modules/json/pom.xml
@@ -67,7 +67,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
diff --git a/modules/opencensus/pom.xml b/modules/opencensus/pom.xml
index 185444c6fc3..9c0abe958e1 100644
--- a/modules/opencensus/pom.xml
+++ b/modules/opencensus/pom.xml
@@ -80,7 +80,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
</dependency>
<dependency>
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index a84766d463e..1f108ed2b5a 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -97,7 +97,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 6565160d270..69e4917ee75 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -43,7 +43,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
@@ -61,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index d0060dd01ec..a6225e3cc3a 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -149,6 +149,18 @@
<groupId>org.jodd</groupId>
<artifactId>jodd-lagarto</artifactId>
<version>6.0.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index 2d3af25d136..8927c9d5b4b 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -139,7 +139,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
<scope>test</scope>
</dependency>
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index acf80280c51..d6818b52eef 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -117,7 +117,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
</dependency>
</dependencies>
diff --git a/modules/zookeeper/pom.xml b/modules/zookeeper/pom.xml
index 4c414a12848..d49dfd14b4e 100644
--- a/modules/zookeeper/pom.xml
+++ b/modules/zookeeper/pom.xml
@@ -73,12 +73,11 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 41ef2b3f492..c3489257607 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -73,7 +73,8 @@
<commons.dbcp.version>1.4</commons.dbcp.version>
<cron4j.version>2.2.5</cron4j.version>
<curator.version>5.9.0</curator.version>
- <guava.version>32.1.2-jre</guava.version>
+ <guava.version>33.5.0-jre</guava.version>
+ <failureaccess.version>1.0.1</failureaccess.version>
<grpc-context.version>1.62.2</grpc-context.version>
<h2.version>1.4.197</h2.version>
<hamcrest.version>2.2</hamcrest.version>
@@ -104,7 +105,7 @@
<mockito.version>5.21.0</mockito.version>
<mysql.connector.version>8.0.30</mysql.connector.version>
<postgres.connector.version>42.7.3</postgres.connector.version>
- <slf4j.version>1.7.36</slf4j.version>
+ <slf4j.version>2.0.17</slf4j.version>
<snappy.version>1.1.10.7</snappy.version>
<spring.version>5.3.39</spring.version>
<surefire.version>3.1.2</surefire.version>
