From 404f055b65d6dd51da6fc9e44b2cc5e5770c6589 Mon Sep 17 00:00:00 2001
From: Michael Vorburger <mike@vorburger.ch>
Date: Sun, 3 May 2020 06:23:37 +0200
Subject: [PATCH] remove old spring-jms:4.0.7 & fix JMS dependencies
 (FINERACT-805)

---
 fineract-provider/build.gradle        | 3 ++-
 fineract-provider/dependencies.gradle | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index 0293682f1..f7662d1b4 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -100,7 +100,8 @@ dependencyManagement {
         dependency 'org.apache.tika:tika-core:1.9'
         dependency 'org.apache.httpcomponents:httpclient:+'
         dependency 'io.swagger:swagger-jersey-jaxrs:1.5.15'
-        dependency 'org.springframework:spring-jms:4.0.7.RELEASE'
+        dependency 'jakarta.management.j2ee:jakarta.management.j2ee-api:1.1.4'
+        dependency 'jakarta.jms:jakarta.jms-api:2.0.3'
         dependency 'org.apache.activemq:activemq-broker:+'
         dependency 'org.apache.bval:org.apache.bval.bundle:2.0.2'
         dependencySet(group: 'io.rest-assured', version: '3.3.0'){
diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle
index e653ea715..6bc4ac7d2 100644
--- a/fineract-provider/dependencies.gradle
+++ b/fineract-provider/dependencies.gradle
@@ -40,7 +40,9 @@ dependencies {
             'org.springframework:spring-context-support',
             'org.springframework.security.oauth:spring-security-oauth2',
             'com.sun.jersey:jersey-core',
-            'com.squareup.retrofit:retrofit'
+            'com.squareup.retrofit:retrofit',
+            'jakarta.jms:jakarta.jms-api',
+            'jakarta.management.j2ee:jakarta.management.j2ee-api'
     )
 	api ('org.apache.openjpa:openjpa') {
 		exclude group: 'org.eclipse.persistence'
@@ -102,12 +104,14 @@ dependencies {
             // Once we've switched to Java 8 this dep can be removed.
             //'com.google.code.findbugs:jsr305',
 
-            'org.apache.activemq:activemq-broker',
             'org.apache.bval:org.apache.bval.bundle'
     )
     implementation ('io.swagger:swagger-jersey-jaxrs') {
 		exclude group: 'javax.validation'
     }
+    implementation ('org.apache.activemq:activemq-broker') {
+    	exclude group: 'org.apache.geronimo.specs'
+    }
 
     testCompile 'junit:junit',
             //'junit:junit-dep',