Last minute release plugin fixes

Author: vidakovic

buildSrc/src/main/groovy/org.apache.fineract.release.gradle

@@ -111,7 +111,9 @@ fineract {
                 templateFile: "${projectDir}/buildSrc/src/main/resources/jira/changelog.txt.ftl"
             ],
             gpg: [
-                file: "${projectDir}/buildSrc/build/libs/buildSrc.jar"
+                files: [
+                    "${projectDir}/buildSrc/build/libs/buildSrc.jar"
+                ]
             ]
         ],
         step1: [
@@ -173,7 +175,10 @@ fineract {
             order: 7,
             description: 'Sign the distribution artifacts',
             gpg: [
-                file: "${rootDir}/fineract-war/build/distributions/apache-fineract-binary-${project.version}.tar.gz"
+                files: [
+                    "${rootDir}/fineract-war/build/distributions/apache-fineract-${project.version}-src.tar.gz",
+                    "${rootDir}/fineract-war/build/distributions/apache-fineract-${project.version}-binary.tar.gz"
+                ]
             ]
         ],
         step8: [

buildSrc/src/main/groovy/org/apache/fineract/gradle/FineractPlugin.groovy

@@ -324,7 +324,7 @@ class FineractPlugin implements Plugin<Project> {
 
         // step 6
         project.tasks.register("fineractReleaseStep6") {
-            dependsOn(":fineract-war:binaryDistTar")
+            dependsOn(":fineract-war:distTar")
         }
 
         // step 7
@@ -334,13 +334,11 @@ class FineractPlugin implements Plugin<Project> {
 
                 gpgService.sign(step.gpg)
 
-                def md5 = gpgService.md5(step.gpg)
-                def md5File = new File("${step.gpg.file}.md5")
-                md5File.write md5
+                step.gpg.files.findAll {
+                    gpgService.md5(step.gpg)
 
-                def sha512 = gpgService.sha512(step.gpg)
-                def sha512File = new File("${step.gpg.file}.sha512")
-                sha512File.write sha512
+                    gpgService.sha512(step.gpg)
+                }
             }
         }
 

buildSrc/src/main/groovy/org/apache/fineract/gradle/FineractPluginExtension.groovy

@@ -159,6 +159,6 @@ class FineractPluginExtension {
     }
 
     static class FineractPluginGpgParams {
-        String file
+        List<String> files
     }
 }

buildSrc/src/main/groovy/org/apache/fineract/gradle/service/GpgService.groovy

@@ -92,11 +92,13 @@ class GpgService {
     }
 
     void sign(FineractPluginExtension.FineractPluginGpgParams params) {
-        InputStream is = new FileInputStream(params.file)
+        params.files.findAll {
+            InputStream is = new FileInputStream(it)
 
-        BCPGOutputStream os = new BCPGOutputStream(new ArmoredOutputStream(new FileOutputStream(params.file + ".asc")))
-        sign(is).encode(os)
-        os.close();
+            BCPGOutputStream os = new BCPGOutputStream(new ArmoredOutputStream(new FileOutputStream(it + ".asc")))
+            sign(is).encode(os)
+            os.close();
+        }
     }
 
     PGPSignature sign(InputStream is) throws IOException, PGPException, GeneralSecurityException {
@@ -115,12 +117,20 @@ class GpgService {
     }
 
 
-    String md5(FineractPluginExtension.FineractPluginGpgParams params) {
-        return calc(new FileInputStream(params.file), MessageDigest.getInstance("MD5", BouncyCastleProvider.PROVIDER_NAME))
+    void md5(FineractPluginExtension.FineractPluginGpgParams params) {
+        params.files.findAll {
+            def result = calc(new FileInputStream(it), MessageDigest.getInstance("MD5", BouncyCastleProvider.PROVIDER_NAME))
+            def file = new File("${it}.md5")
+            file.write result
+        }
     }
 
-    String sha512(FineractPluginExtension.FineractPluginGpgParams params) {
-        return calc(new FileInputStream(params.file), MessageDigest.getInstance("SHA-512", BouncyCastleProvider.PROVIDER_NAME))
+    void sha512(FineractPluginExtension.FineractPluginGpgParams params) {
+        params.files.findAll {
+            def result = calc(new FileInputStream(it), MessageDigest.getInstance("SHA-512", BouncyCastleProvider.PROVIDER_NAME))
+            def file = new File("${it}.sha512")
+            file.write result
+        }
     }
 
     private static String calc(InputStream is, MessageDigest digest) {

fineract-war/build.gradle

@@ -58,11 +58,7 @@ tasks.withType(Tar) {
 
 distributions {
     binary {
-        if(project.hasProperty("distVersion")) {
-            distributionBaseName = "apache-fineract-$distVersion-binary"
-        } else {
-            distributionBaseName = "apache-fineract-binary"
-        }
+        distributionBaseName = 'apache-fineract-binary'
         contents {
             from ("$rootDir/fineract-client/build/libs/") {
                 include 'fineract-client-*.jar'
@@ -88,19 +84,18 @@ distributions {
         }
     }
     src {
-        if(project.hasProperty("distVersion")) {
-            distributionBaseName = "apache-fineract-$distVersion-src"
-        } else {
-            distributionBaseName = "apache-fineract-src"
-        }
-
+        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', '*.class', '**/bin', '*.log', '.dockerignore', '**/.gitkeep'
             rename ('LICENSE_SOURCE', 'LICENSE')
             rename ('NOTICE_SOURCE', 'NOTICE')
         }
     }
+    doLast {
+        file("${buildDir}/distributions/apache-fineract-binary-${version}.tar.gz").renameTo("${buildDir}/distributions/apache-fineract-${version}-binary.tar.gz")
+        file("${buildDir}/distributions/apache-fineract-src-${version}.tar.gz").renameTo("${buildDir}/distributions/apache-fineract-${version}-src.tar.gz")
+    }
 }
 
 binaryDistZip.enabled false