Upgrading to Gradle 7.2

fineract-provider/build.gradle

@@ -253,6 +253,7 @@ bootJar {
     manifest {
         attributes 'Main-Class': 'org.springframework.boot.loader.PropertiesLauncher'
     }
+    dependsOn resolve
 }
 
 bootWar {
@@ -266,7 +267,8 @@ tasks.withType(Tar) {
 
 distributions {
     binary {
-        baseName "apache-fineract-$releaseVersion-binary"
+        // TODO: Add the version number before enabling this
+        distributionBaseName = "apache-fineract-binary"
         contents {
             from bootJar
             from war
@@ -284,7 +286,8 @@ distributions {
         }
     }
     src {
-        baseName "apache-fineract-$releaseVersion-src"
+        // TODO: Add the version number before enabling this
+        distributionBaseName = "apache-fineract-src"
         contents {
             from "$rootDir/"
             exclude '**/build' , '.git', '.gradle', '.github', '.settings', '.project', '.classpath', '.idea', 'out', '._.DS_Store', '.DS_Store', 'WebContent', '.externalToolbuilders', '.theia', '.gitpod.yml', '.travis.yml', 'LICENSE_RELEASE', 'NOTICE_RELEASE', '**/licenses/binary'
@@ -342,3 +345,12 @@ gitProperties {
 
 // make sure the generateGitProperties task always executes (even when git.properties is not changed)
 generateGitProperties.outputs.upToDateWhen { false }
+
+// Gradle 7.x asks for explicit dependencies between tasks
+processResources.dependsOn generateGitProperties
+checkstyleMain.dependsOn resolve
+checkstyleTest.dependsOn resolve
+licenseMain.dependsOn processResources, generateGitProperties
+war.dependsOn resolve
+spotbugsTest.dependsOn resolve
+test.dependsOn resolve

fineract-provider/dependencies.gradle

@@ -38,7 +38,6 @@ dependencies {
 
             'com.sun.jersey:jersey-servlet',
             'com.sun.jersey:jersey-server',
-            'com.sun.jersey:jersey-json',
             'com.sun.jersey.contribs:jersey-spring',
             'com.sun.jersey.contribs:jersey-multipart',
 
@@ -53,7 +52,6 @@ dependencies {
             'com.squareup.okhttp3:okhttp',
             'com.squareup.okhttp3:okhttp-urlconnection',
 
-            'org.apache.commons:commons-email',
             'org.apache.commons:commons-lang3',
             'commons-io:commons-io',
             'org.apache.poi:poi',
@@ -68,8 +66,6 @@ dependencies {
             'com.github.spullara.mustache.java:compiler',
             'com.jayway.jsonpath:json-path',
 
-            'org.dom4j:dom4j',
-
             'javax.cache:cache-api',
 
             'com.github.spotbugs:spotbugs-annotations',
@@ -80,9 +76,18 @@ dependencies {
             'com.squareup.retrofit2:converter-gson',
             'com.sun.activation:jakarta.activation:1.2.2'
             )
+    implementation('org.apache.commons:commons-email') {
+        exclude group: 'javax.activation'
+    }
+    implementation('org.dom4j:dom4j') {
+        exclude group: 'javax.xml.bind'
+    }
     implementation ('jakarta.xml.bind:jakarta.xml.bind-api') {
         exclude group: 'jakarta.activation'
     }
+    implementation ('com.sun.jersey:jersey-json') {
+        exclude group: 'com.sun.xml.bind'
+    }
     implementation ('org.apache.activemq:activemq-broker') {
         exclude group: 'org.apache.geronimo.specs'
     }
@@ -101,6 +106,7 @@ dependencies {
     }
     implementation ('org.mnode.ical4j:ical4j') {
         exclude group: 'commons-logging'
+        exclude group: 'javax.activation'
     }
 
     runtimeOnly('org.ehcache:ehcache') {