Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions geode-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')


Expand Down
11 changes: 11 additions & 0 deletions geode-core/src/test/resources/expected-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading