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') 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 @@ + + jakarta.annotation + jakarta.annotation-api + compile + + + log4j-to-slf4j + org.apache.logging.log4j + + + jakarta.transaction jakarta.transaction-api