From 004b91bec9e3cadef04ff5751d57855b574cc985 Mon Sep 17 00:00:00 2001
From: Jinwoo Hwang <jinwoo@apache.org>
Date: Fri, 12 Dec 2025 15:36:45 -0500
Subject: [PATCH 1/2] Add explicit jakarta.annotation-api dependency to fix
 version conflict

jakarta.resource-api:2.1.0 declares a transitive dependency on
jakarta.annotation-api:2.1.0, but Spring Boot 3.3.4 (used by geode-gfsh)
requires jakarta.annotation-api:2.1.1. This causes Maven enforcer to
fail with a version conflict error.

By explicitly declaring jakarta.annotation-api as an api dependency
in geode-core, the published POM will include it with version 2.1.1
(from DependencyConstraints), which takes precedence over the
transitive 2.1.0 dependency from jakarta.resource-api.

Reported-by: Leon Finker
---
 geode-core/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 5ffa6f7d125..ee5ac51b11b 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -274,6 +274,10 @@ dependencies {
 
   //The resource-API is used by the JCA support.
   api('jakarta.resource:jakarta.resource-api')
+  // Explicitly declare jakarta.annotation-api to override the 2.1.0 version
+  // transitively brought by jakarta.resource-api:2.1.0, ensuring consistency
+  // with Spring Boot 3.3.4 which requires 2.1.1
+  api('jakarta.annotation:jakarta.annotation-api')
   api('jakarta.transaction:jakarta.transaction-api')
 
 

From 69909fec05d605967c8173933be13ed64e897274 Mon Sep 17 00:00:00 2001
From: Jinwoo Hwang <jinwoo@apache.org>
Date: Fri, 12 Dec 2025 15:52:08 -0500
Subject: [PATCH 2/2] Update expected POM to include jakarta.annotation-api
 dependency

---
 geode-core/src/test/resources/expected-pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml
index 4b0caecf260..dac4131b0ae 100644
--- a/geode-core/src/test/resources/expected-pom.xml
+++ b/geode-core/src/test/resources/expected-pom.xml
@@ -79,6 +79,17 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>log4j-to-slf4j</artifactId>
+          <groupId>org.apache.logging.log4j</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>jakarta.transaction</groupId>
       <artifactId>jakarta.transaction-api</artifactId>