From c7fa14155eabdbd770a7fe7c5fb95595898ed4b4 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 20 Nov 2023 01:29:45 +0000 Subject: [PATCH 1/2] Update dependency org.apache.activemq:activemq-client-jakarta to v6 --- .../src/main/groovy/org.apache.fineract.dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle index e205b6d9828..c2dc054d40a 100644 --- a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle +++ b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle @@ -181,7 +181,7 @@ dependencyManagement { dependency 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.12.0' - dependency ('org.apache.activemq:activemq-client-jakarta:5.18.2') { + dependency ('org.apache.activemq:activemq-client-jakarta:6.0.0') { exclude 'javax.annotation:javax.annotation-api' } From 86e0cb7071fa808068a4abd9520a07ac25b3c595 Mon Sep 17 00:00:00 2001 From: Arnold Galovics Date: Wed, 22 Nov 2023 18:50:23 +0100 Subject: [PATCH 2/2] Switched over to plain activemq client instead of the intermediary jakarta one --- .../src/main/groovy/org.apache.fineract.dependencies.gradle | 2 +- fineract-provider/dependencies.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle index c2dc054d40a..28d09f0ba22 100644 --- a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle +++ b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle @@ -181,7 +181,7 @@ dependencyManagement { dependency 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.12.0' - dependency ('org.apache.activemq:activemq-client-jakarta:6.0.0') { + dependency ('org.apache.activemq:activemq-client:6.0.0') { exclude 'javax.annotation:javax.annotation-api' } diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle index b2ca76fc8c1..4cc742503ac 100644 --- a/fineract-provider/dependencies.gradle +++ b/fineract-provider/dependencies.gradle @@ -122,7 +122,7 @@ dependencies { implementation ('jakarta.xml.bind:jakarta.xml.bind-api') { exclude group: 'jakarta.activation' } - implementation ('org.apache.activemq:activemq-client-jakarta') { + implementation ('org.apache.activemq:activemq-client') { exclude group: 'org.apache.geronimo.specs' exclude group: 'javax.annotation', module: 'javax.annotation-api' }