From ec51de6cb03bb6fa11120aefd3c25fa3230f817b Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Tue, 1 Oct 2024 09:10:46 +0200
Subject: [PATCH] Clean up the jspecify dependency addressing log4j2 issue with
 JPMS

see https://github.com/apache/logging-log4j2/issues/2929
---
 build/parents/build/pom.xml                            |  3 ---
 integrationtest/java/modules/orm-elasticsearch/pom.xml |  9 ---------
 .../modules/orm-outbox-polling-elasticsearch/pom.xml   | 10 ----------
 .../java/modules/pojo-standalone-elasticsearch/pom.xml | 10 ----------
 4 files changed, 32 deletions(-)

diff --git a/build/parents/build/pom.xml b/build/parents/build/pom.xml
index d033dd7580f..0d5c88fbe70 100644
--- a/build/parents/build/pom.xml
+++ b/build/parents/build/pom.xml
@@ -126,9 +126,6 @@
         <!-- Test dependencies -->
 
         <!-- >>> Common -->
-        <!--
-            NOTE: with the next upgrade of the log4j (to 2.24.1+) *REMOVE* the additional jspecify dependency added to the JPMS tests
-        -->
         <version.log4j>2.24.1</version.log4j>
         <version.junit>4.13.2</version.junit>
         <version.junit-jupiter>5.11.1</version.junit-jupiter>
diff --git a/integrationtest/java/modules/orm-elasticsearch/pom.xml b/integrationtest/java/modules/orm-elasticsearch/pom.xml
index 16c05cd7323..5645609dd2a 100644
--- a/integrationtest/java/modules/orm-elasticsearch/pom.xml
+++ b/integrationtest/java/modules/orm-elasticsearch/pom.xml
@@ -72,15 +72,6 @@
             <version>${version.jakarta.enterprise}</version>
             <scope>test</scope>
         </dependency>
-        <!--
-            NOTE: Remove this dependency once the Log4j2 is updated to 2.24.1+
-        -->
-        <dependency>
-            <groupId>org.jspecify</groupId>
-            <artifactId>jspecify</artifactId>
-            <version>1.0.0</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/integrationtest/java/modules/orm-outbox-polling-elasticsearch/pom.xml b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/pom.xml
index 268f9f8297f..34181332a73 100644
--- a/integrationtest/java/modules/orm-outbox-polling-elasticsearch/pom.xml
+++ b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/pom.xml
@@ -90,16 +90,6 @@
             <version>${version.jakarta.enterprise}</version>
             <scope>test</scope>
         </dependency>
-
-        <!--
-            NOTE: Remove this dependency once the Log4j2 is updated to 2.24.1+
-        -->
-        <dependency>
-            <groupId>org.jspecify</groupId>
-            <artifactId>jspecify</artifactId>
-            <version>1.0.0</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/integrationtest/java/modules/pojo-standalone-elasticsearch/pom.xml b/integrationtest/java/modules/pojo-standalone-elasticsearch/pom.xml
index fa231f695ad..420fe31941d 100644
--- a/integrationtest/java/modules/pojo-standalone-elasticsearch/pom.xml
+++ b/integrationtest/java/modules/pojo-standalone-elasticsearch/pom.xml
@@ -54,16 +54,6 @@
             <artifactId>hibernate-search-util-internal-integrationtest-mapper-pojo-standalone</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <!--
-            NOTE: Remove this dependency once the Log4j2 is updated to 2.24.1+
-        -->
-        <dependency>
-            <groupId>org.jspecify</groupId>
-            <artifactId>jspecify</artifactId>
-            <version>1.0.0</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>