port steps 10 & 11 to the ATR

Author: meonkeys

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

@@ -196,36 +196,10 @@ fineract {
         step10: [
             order: 10,
             description: 'Start voting on the dev mailing list',
-            email: [
-                from: "${findProperty('fineract.config.email')}",
-                name: "${findProperty('fineract.config.name')}",
-                to: "${findProperty('fineract.config.email')}",
-                // to: '[email protected]',
-                mime: 'text/plain',
-                subjectTemplate: [
-                    templateFile: "${projectDir}/buildSrc/src/main/resources/email/release.step10.vote.subject.ftl"
-                ],
-                messageTemplate: [
-                    templateFile: "${projectDir}/buildSrc/src/main/resources/email/release.step10.vote.message.ftl"
-                ]
-            ]
         ],
         step11: [
             order: 11,
             description: 'Conclude the vote and announce results',
-            email: [
-                from: "${findProperty('fineract.config.email')}",
-                name: "${findProperty('fineract.config.name')}",
-                to: "${findProperty('fineract.config.email')}",
-                // to: '[email protected]',
-                mime: 'text/plain',
-                subjectTemplate: [
-                    templateFile: "${projectDir}/buildSrc/src/main/resources/email/release.step11.vote.subject.ftl"
-                ],
-                messageTemplate: [
-                    templateFile: "${projectDir}/buildSrc/src/main/resources/email/release.step11.vote.message.ftl"
-                ]
-            ]
         ],
         step12: [
             order: 12,

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

@@ -18,7 +18,6 @@
  */
 package org.apache.fineract.gradle
 
-import groovy.json.JsonSlurper
 import org.apache.commons.io.FileUtils
 import org.apache.commons.io.filefilter.NotFileFilter
 import org.apache.commons.io.filefilter.PrefixFileFilter
@@ -384,23 +383,7 @@ class FineractPlugin implements Plugin<Project> {
             doFirst {
                 FineractPluginExtension.FineractPluginStep step = step(extension, "step10")
 
-                String version = project.properties?['fineract.release.version']
-
-                if(!version) {
-                    TextIO textIO = TextIoFactory.getTextIO();
-
-                    version = textIO.newStringInputReader()
-                            .withPattern("\\d+.\\d+.\\d+")
-                            .read("Release Version");
-                }
-
-                // TODO: input validation, see FINERACT-1610
-
-                this.context?.project?['fineract.release.version'] = version
-
-                if(step.email) {
-                    emailService.send( processEmailParams(step.email, this.context) )
-                }
+                printInstructions(project, "step10")
             }
         }
 
@@ -409,28 +392,7 @@ class FineractPlugin implements Plugin<Project> {
             doFirst {
                 FineractPluginExtension.FineractPluginStep step = step(extension, "step11")
 
-                String version = project.properties?['fineract.release.version']
-
-                if(!version) {
-                    TextIO textIO = TextIoFactory.getTextIO()
-
-                    version = textIO.newStringInputReader()
-                            .withPattern("\\d+.\\d+.\\d+")
-                            .read("Release Version");
-                }
-
-                // TODO: input validation, see FINERACT-1610
-
-                this.context?.project?['fineract.release.version'] = version
-
-                def jsonSlurper = new JsonSlurper()
-                def data = jsonSlurper.parse(new File("buildSrc/src/main/resources/vote/result.${version}.json"))
-
-                this.context?.project?['fineract.vote'] = data
-
-                if(step.email) {
-                    emailService.send( processEmailParams(step.email, this.context) )
-                }
+                printInstructions(project, "step11")
             }
         }
 

buildSrc/src/main/resources/email/release.step10.vote.message.ftl

@@ -18,4 +18,12 @@
     under the License.
 
 -->
-[FINERACT] [VOTE] 🗳️ ${project['fineract.release.version']} for release
+
+
+[INSTRUCTIONS:START]
+
+Initiate voting with the ATR (ASF Trusted Releases) tool.
+
+https://release-test.apache.org
+
+[INSTRUCTIONS:END]

buildSrc/src/main/resources/email/release.step11.vote.message.ftl

@@ -18,4 +18,12 @@
     under the License.
 
 -->
-[FINERACT] [VOTE] [RESULT] 🧾️ ${project['fineract.release.version']} for release
+
+
+[INSTRUCTIONS:START]
+
+Conclude voting with the ATR (ASF Trusted Releases) tool.
+
+https://release-test.apache.org
+
+[INSTRUCTIONS:END]

…es/email/release.step10.vote.subject.ftl …in/resources/instructions/step10.txt.ftlbuildSrc/src/main/resources/email/release.step10.vote.subject.ftl renamed to buildSrc/src/main/resources/instructions/step10.txt.ftl buildSrc/src/main/resources/email/release.step10.vote.subject.ftl renamed to buildSrc/src/main/resources/instructions/step10.txt.ftl

@@ -2,19 +2,14 @@
 
 == Description
 
-Voting has to be done on [email protected]. You can close the vote after voting period expires (72 hours) and you accumulate sufficient votes (minimum 3 x +1 PMC votes).
-
-[source,text]
-----
-include::{rootdir}/buildSrc/src/main/resources/email/release.step10.vote.subject.ftl[lines=21..]
-
-include::{rootdir}/buildSrc/src/main/resources/email/release.step10.vote.message.ftl[lines=21..]
-----
+Initiate voting with https://release-test.apache.org[the ATR (ASF Trusted Releases) tool].
 
 == Gradle Task
 
 .Command
 [source,bash,subs="attributes+,+macros"]
 ----
-./gradlew fineractReleaseStep10 -Pfineract.release.version={revnumber}
+./gradlew fineractReleaseStep10
 ----
+
+INFO: Use the ATR for this task.

…es/email/release.step11.vote.subject.ftl …in/resources/instructions/step11.txt.ftlbuildSrc/src/main/resources/email/release.step11.vote.subject.ftl renamed to buildSrc/src/main/resources/instructions/step11.txt.ftl buildSrc/src/main/resources/email/release.step11.vote.subject.ftl renamed to buildSrc/src/main/resources/instructions/step11.txt.ftl

@@ -2,19 +2,14 @@
 
 == Description
 
-Upon receiving 3 x +1 from the PMC, or after 72 hours (whichever one comes first), reply to the voting thread and add the prefix "[RESULT]" to the subject line with the results, as follows:
-
-[source,text]
-----
-include::{rootdir}/buildSrc/src/main/resources/email/release.step11.vote.subject.ftl[lines=21..]
-
-include::{rootdir}/buildSrc/src/main/resources/email/release.step11.vote.message.ftl[lines=21..]
-----
+Conclude voting with https://release-test.apache.org[the ATR (ASF Trusted Releases) tool].
 
 == Gradle Task
 
 .Command
 [source,text,subs="attributes+,+macros"]
 ----
-./gradlew fineractReleaseStep11 -Pfineract.release.version={revnumber}
+./gradlew fineractReleaseStep11
 ----
+
+INFO: Use the ATR for this task.