From 2e3216607905b6d881b7ec4448e090691badb6b5 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Wed, 1 Jul 2020 22:24:19 +0200 Subject: [PATCH] Make Google's Guava library an explicit dependency Instead of only transitively inheriting it through activemq-broker, so that the upcoming next major upgrade of activemq-broker doesn't break the build. Note that Fineract code already extensively uses Guava, this just makes it explicit. --- fineract-provider/build.gradle | 8 +++++--- fineract-provider/dependencies.gradle | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index 08fa5dc73..33be5c66c 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -80,14 +80,16 @@ dependencyManagement { } 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?) + // We use fixed versions, instead of inheriting them from the Spring BOM, to be able to be on more recent ones. + // We do not use :+ to get the latest available version available on Maven Central, as that could suddenly break things. + // We use the Renovate Bot to automatically propose Pull Requests (PRs) when upgrades for all of these versions are available. dependency 'org.springframework.security.oauth:spring-security-oauth2:2.5.0.RELEASE' - dependency "org.apache.openjpa:openjpa:3.1.1" // when upgrading, also change OpenJPA version repeated above in buildscript! + dependency 'org.apache.openjpa:openjpa:3.1.1' // when upgrading, also change OpenJPA version repeated above in buildscript! dependency 'com.squareup.retrofit:retrofit:1.9.0' dependency 'com.squareup.okhttp:okhttp:2.7.5' dependency 'com.squareup.okhttp:okhttp-urlconnection:2.7.5' + dependency 'com.google.guava:guava:28.2-jre' dependency 'com.google.code.gson:gson:2.8.6' dependency 'org.apache.commons:commons-email:1.5' dependency 'commons-io:commons-io:2.7' diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle index 85829ed63..c8b8d0c36 100644 --- a/fineract-provider/dependencies.gradle +++ b/fineract-provider/dependencies.gradle @@ -46,6 +46,7 @@ dependencies { 'com.sun.jersey.contribs:jersey-multipart', 'joda-time:joda-time', + 'com.google.guava:guava', 'com.google.code.gson:gson', 'com.sun.jersey:jersey-core', 'com.squareup.retrofit:retrofit',