From 0f8559fc75cd19525b89d369f1051356938fbc47 Mon Sep 17 00:00:00 2001
From: timis1 <12120641+timis1@users.noreply.github.com>
Date: Fri, 19 Apr 2024 14:56:37 +0300
Subject: [PATCH] JAVA-30186 Upgrade assertj library in the main pom.xml
 (#16404)

Co-authored-by: timis1 <noreplay@yahoo.com>
---
 apache-httpclient-2/pom.xml                            | 1 -
 core-java-modules/core-java-collections-list-4/pom.xml | 1 -
 core-java-modules/core-java-function/pom.xml           | 1 -
 core-java-modules/core-java-functional/pom.xml         | 1 -
 core-java-modules/core-java-methods/pom.xml            | 4 ----
 core-java-modules/core-java-streams-4/pom.xml          | 1 -
 core-java-modules/core-java-streams-collect/pom.xml    | 4 ----
 libraries-files/pom.xml                                | 3 +--
 pom.xml                                                | 2 +-
 testing-modules/junit-5-advanced-2/pom.xml             | 1 -
 testing-modules/junit-5-advanced/pom.xml               | 1 -
 testing-modules/testing-libraries-2/pom.xml            | 1 -
 12 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/apache-httpclient-2/pom.xml b/apache-httpclient-2/pom.xml
index 92b10a0992..9e845d2ea5 100644
--- a/apache-httpclient-2/pom.xml
+++ b/apache-httpclient-2/pom.xml
@@ -78,7 +78,6 @@
     </build>
 
     <properties>
-        <assertj.version>3.22.0</assertj.version>
         <mockserver.version>5.11.2</mockserver.version>
         <httpclient5.version>5.2.1</httpclient5.version>
         <spring-boot.version>2.1.7.RELEASE</spring-boot.version>
diff --git a/core-java-modules/core-java-collections-list-4/pom.xml b/core-java-modules/core-java-collections-list-4/pom.xml
index 067808d2d1..fe4d450257 100644
--- a/core-java-modules/core-java-collections-list-4/pom.xml
+++ b/core-java-modules/core-java-collections-list-4/pom.xml
@@ -84,7 +84,6 @@
         <fastutil.version>8.1.0</fastutil.version>
         <colt.version>1.2.0</colt.version>
         <apache-commons.version>3.0</apache-commons.version>
-        <assertj.version>3.22.0</assertj.version>
         <spring.version>5.3.22</spring.version>
     </properties>
 
diff --git a/core-java-modules/core-java-function/pom.xml b/core-java-modules/core-java-function/pom.xml
index 3da113da6a..a85350d35a 100644
--- a/core-java-modules/core-java-function/pom.xml
+++ b/core-java-modules/core-java-function/pom.xml
@@ -50,7 +50,6 @@
 
     <properties>
         <mockito-inline.version>3.8.0</mockito-inline.version>
-        <assertj.version>3.22.0</assertj.version>
         <vavr.version>0.10.4</vavr.version>
     </properties>
 
diff --git a/core-java-modules/core-java-functional/pom.xml b/core-java-modules/core-java-functional/pom.xml
index ae912cee1f..6ee4a95b64 100644
--- a/core-java-modules/core-java-functional/pom.xml
+++ b/core-java-modules/core-java-functional/pom.xml
@@ -34,7 +34,6 @@
 
     <properties>
         <mockito-inline.version>3.8.0</mockito-inline.version>
-        <assertj.version>3.22.0</assertj.version>
         <vavr.version>0.10.4</vavr.version>
     </properties>
 
diff --git a/core-java-modules/core-java-methods/pom.xml b/core-java-modules/core-java-methods/pom.xml
index 58b2ad6ebe..f7fa08a266 100644
--- a/core-java-modules/core-java-methods/pom.xml
+++ b/core-java-modules/core-java-methods/pom.xml
@@ -33,8 +33,4 @@
         </resources>
     </build>
 
-    <properties>
-        <assertj.version>3.22.0</assertj.version>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-streams-4/pom.xml b/core-java-modules/core-java-streams-4/pom.xml
index 972b47ce80..27842c0db3 100644
--- a/core-java-modules/core-java-streams-4/pom.xml
+++ b/core-java-modules/core-java-streams-4/pom.xml
@@ -101,7 +101,6 @@
 
     <properties>
         <!-- testing -->
-        <assertj.version>3.23.1</assertj.version>
         <rx.java.version>1.2.5</rx.java.version>
         <rx.java2.version>2.2.2</rx.java2.version>
         <rx.java3.version>3.1.5</rx.java3.version>
diff --git a/core-java-modules/core-java-streams-collect/pom.xml b/core-java-modules/core-java-streams-collect/pom.xml
index a73789d499..01024a9611 100644
--- a/core-java-modules/core-java-streams-collect/pom.xml
+++ b/core-java-modules/core-java-streams-collect/pom.xml
@@ -29,8 +29,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <assertj.version>3.23.1</assertj.version>
-    </properties>
-
 </project>
diff --git a/libraries-files/pom.xml b/libraries-files/pom.xml
index e4b3ffcdb2..16cbd3b29d 100644
--- a/libraries-files/pom.xml
+++ b/libraries-files/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>${assertj-core.version}</version>
+            <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -55,7 +55,6 @@
         <org.ini4j.version>0.5.4</org.ini4j.version>
         <commons-configuration2>2.8.0</commons-configuration2>
         <itext7-core.version>7.2.4</itext7-core.version>
-        <assertj-core.version>3.23.1</assertj-core.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4a8f18d02e..ad13f97cbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1144,7 +1144,7 @@
 
         <!-- used only in dependency management to force this version, not included as a direct dependency -->
         <junit.version>4.13.2</junit.version>
-        <assertj.version>3.21.0</assertj.version>
+        <assertj.version>3.25.3</assertj.version>
         <hamcrest.version>2.2</hamcrest.version>
         <hamcrest-all.version>1.3</hamcrest-all.version>
         <mockito.version>5.11.0</mockito.version>
diff --git a/testing-modules/junit-5-advanced-2/pom.xml b/testing-modules/junit-5-advanced-2/pom.xml
index d2aab09c5a..7b82a765da 100644
--- a/testing-modules/junit-5-advanced-2/pom.xml
+++ b/testing-modules/junit-5-advanced-2/pom.xml
@@ -74,7 +74,6 @@
 
     <properties>
         <jmockit.version>1.49</jmockit.version>
-        <assertj.version>3.24.2</assertj.version>
         <junit-platform.version>1.10.1</junit-platform.version>
         <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
     </properties>
diff --git a/testing-modules/junit-5-advanced/pom.xml b/testing-modules/junit-5-advanced/pom.xml
index fc0349ff8e..e86a25e054 100644
--- a/testing-modules/junit-5-advanced/pom.xml
+++ b/testing-modules/junit-5-advanced/pom.xml
@@ -81,7 +81,6 @@
     <properties>
         <system-lambda.version>1.2.1</system-lambda.version>
         <jmockit.version>1.49</jmockit.version>
-        <assertj.version>3.24.2</assertj.version>
         <junit-platform.version>1.10.1</junit-platform.version>
         <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
     </properties>
diff --git a/testing-modules/testing-libraries-2/pom.xml b/testing-modules/testing-libraries-2/pom.xml
index 075e26aefa..1489f477f5 100644
--- a/testing-modules/testing-libraries-2/pom.xml
+++ b/testing-modules/testing-libraries-2/pom.xml
@@ -171,7 +171,6 @@
         <system-lambda.version>1.0.0</system-lambda.version>
         <system-stubs.version>2.1.3</system-stubs.version>
         <testng.version>7.8.0</testng.version>
-        <assertj.version>3.24.2</assertj.version>
         <junit.pioneer.version>2.1.0</junit.pioneer.version>
     </properties>