Merge branch 'master' of github.com:BndyNet/web-framework-for-java

Author: bndynet

Jenkinsfile

@@ -18,6 +18,7 @@ pipeline {
                 //sh 'printenv'
                 sh 'java -version'
                 sh 'mvn -v'
+                sh 'mkdir -p ../../email-templates/ && \\cp ./jenkins/my-groovy-html.template ../../email-templates/my-groovy-html.template'
             }
         }
         stage('Build') {
@@ -98,9 +99,8 @@ def sendEmail(status) {
         to: "$EMAIL_RECIPIENTS",
         subject: "${subject}",
 	body: '''${SCRIPT, template="my-groovy-html.template"}''',
-	//body: '''${SCRIPT, template="jenkins-generic-matrix-email-html.template"}''',
         //body: "Changes:<ul>" + getChangeString() + "</ul><br />Check console output at: ${BUILD_URL}console" + "<br />",
-        recipientProviders: [[$class: 'DevelopersRecipientProvider']]
+	recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']]
     )
 }
 

jenkins/my-groovy-html.template

@@ -111,12 +111,13 @@
         cs_list -> cs_list.each() { 
           cs -> hadChanges = true %>
       <tr>
-        <td>
+        <td colspan="2">
           Revision
           <%= cs.metaClass.hasProperty('commitId') ? cs.commitId : cs.metaClass.hasProperty('revision') ? cs.revision : cs.metaClass.hasProperty('changeNumber') ? cs.changeNumber : "" %>
           by <B><%= cs.author %></B>
+          - 
+          ${cs.msgAnnotated}
         </td>
-        <td>${cs.msgAnnotated}</td>
       </tr>
           <% cs.affectedFiles.each() {
             p -> %>
@@ -285,4 +286,4 @@
 
     </div>
   </BODY>
-  
+