From b6c6d50501a374ad2a3d54b96944dfacd1306468 Mon Sep 17 00:00:00 2001
From: Michael Vorburger <mike@vorburger.ch>
Date: Sun, 3 May 2020 06:03:13 +0200
Subject: [PATCH] fix moar 3rd-party versions in build.gradle (see
 FINERACT-805)

---
 fineract-provider/build.gradle        | 16 ++++++----------
 fineract-provider/dependencies.gradle | 15 ---------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index f7662d1b4..ef5abdcd0 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -73,10 +73,13 @@ apply plugin: "com.gorylenko.gradle-git-properties"
 
 dependencyManagement {
     imports {
-        mavenBom 'org.springframework:spring-framework-bom:5.2.3.RELEASE'
+        mavenBom 'org.springframework:spring-framework-bom:5.2.6.RELEASE'
     }
 
     dependencies {
+        // As much as possible, we avoid fixed versions, and prefer inheriting them from the Spring BOM, thus NOT listing versions here.
+        // (The :+ seems to mean latest available version available on Maven Central, which we should also avoid, as it's not isolated?)
+
         dependency 'org.springframework.security.oauth:spring-security-oauth2:2.3.6.RELEASE'
         dependency "org.apache.openjpa:openjpa:3.1.1" // when upgrading, also change OpenJPA version repeated above in buildscript!
         dependency 'com.squareup.retrofit:retrofit:1.6.1'
@@ -84,13 +87,11 @@ dependencyManagement {
         dependency 'com.squareup.okhttp:okhttp-urlconnection:2.0.0'
         dependency 'com.google.code.gson:gson:+'
         dependency 'com.google.guava:guava:28.1-jre'
-        dependency 'joda-time:joda-time:+'
-        dependency 'org.apache.commons:commons-email:1.3.3'
-        dependency 'org.apache.commons:commons-lang3:+'
+        dependency 'org.apache.commons:commons-email:1.5'
         dependency 'org.drizzle.jdbc:drizzle-jdbc:1.4'
         dependency 'com.lowagie:itext:2.1.7'
         dependency 'com.lowagie:itext-rtf:2.1.7'
-        dependency 'org.mnode.ical4j:ical4j:1.0.4'
+        dependency 'org.mnode.ical4j:ical4j:1.0.7'
         dependency 'com.googlecode.flyway:flyway-core:2.1.1'
         dependency 'org.quartz-scheduler:quartz:+'
         dependency 'com.amazonaws:aws-java-sdk-s3:1.11.80'
@@ -104,15 +105,10 @@ dependencyManagement {
         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'){
-            entry 'rest-assured'
-        }
         dependency 'junit:junit:+'
-        //dependency 'junit:junit-dep:4.11'
         dependency 'org.mockito:mockito-core:+'
         dependency 'org.slf4j:slf4j-simple:1.7.30'
         dependency 'com.mockrunner:mockrunner-jms:2.0.1'
-        dependency 'com.mockrunner:mockrunner-jdbc:2.0.1'
 
         dependencySet(group: 'com.sun.jersey', version: jerseyVersion) {
             entry 'jersey-core'
diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle
index 6bc4ac7d2..664e6911b 100644
--- a/fineract-provider/dependencies.gradle
+++ b/fineract-provider/dependencies.gradle
@@ -59,12 +59,8 @@ dependencies {
             'org.springframework.boot:spring-boot-starter-security',
             'org.springframework.boot:spring-boot-starter-actuator',
 
-            //'org.eclipse.persistence:javax.persistence',
-
             'org.springframework.security.oauth:spring-security-oauth2',
 
-            //'javax.ws.rs:jsr311-api',
-
             'com.sun.jersey:jersey-servlet',
             'com.sun.jersey:jersey-server',
             'com.sun.jersey:jersey-json',
@@ -75,13 +71,9 @@ dependencies {
             'com.squareup.okhttp:okhttp',
             'com.squareup.okhttp:okhttp-urlconnection',
 
-            //'net.sourceforge.javacsvjavacsv',
             'org.apache.commons:commons-email',
             'org.apache.commons:commons-lang3',
 
-            // no slf4j & logback here (anymore), as spring-boot-starter-logging already brings this now, better assembled (log4j-over-slf4j was originally forgotten here)
-
-            //'mysql:mysql-connector-java',
             'org.drizzle.jdbc:drizzle-jdbc',
 
             'org.apache.poi:poi',
@@ -89,7 +81,6 @@ dependencies {
             'org.apache.poi:poi-ooxml-schemas',
 
             'com.lowagie:itext',
-            //'com.lowagie:itext-rtf',
 
             'com.googlecode.flyway:flyway-core',
 
@@ -101,8 +92,6 @@ dependencies {
             // Although fineract (at the time of writing) doesn't have any compile time dep. on this,
             // it's useful to have this for the Spring Boot TestRestTemplate http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#boot-features-rest-templates-test-utility
             'org.apache.httpcomponents:httpclient',
-            // Once we've switched to Java 8 this dep can be removed.
-            //'com.google.code.findbugs:jsr305',
 
             'org.apache.bval:org.apache.bval.bundle'
     )
@@ -114,7 +103,6 @@ dependencies {
     }
 
     testCompile 'junit:junit',
-            //'junit:junit-dep',
             'org.mockito:mockito-core',
             'io.github.classgraph:classgraph:4.8.43',
             'com.google.code.gson:gson',
@@ -125,9 +113,6 @@ dependencies {
             'org.apache.poi:poi-ooxml',
             'org.springframework:spring-context-support',
             'com.sun.jersey:jersey-core'
-	testCompile ('com.mockrunner:mockrunner-jdbc' ) {
-        exclude group: 'regexp'
-    }
     testCompile ('com.mockrunner:mockrunner-jms') {
         exclude group: 'regexp'
     }