XCOMMONS-1296: Upgrade to Velocity 2.2

  * Workaround for regression related with macro parameter names
    (https://issues.apache.org/jira/browse/VELOCITY-904?focusedCommentId=17019513&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-17019513)

xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-ui/src/main/resources/Invitation/InvitationMemberActions.xml

@@ -172,7 +172,8 @@
     #set($myMail = [])
     #getMessagesBySender($mail.values(), $xcontext.getUser(), $myMail)
     #set($myMailInGroup = [])
-    #getMessagesInGroup($myMail, $mail.get($messageID).getProperty('messageGroupID').getValue(), $myMailInGroup)
+    #set ($groupId = $mail.get($messageID).getProperty('messageGroupID').getValue())
+    #getMessagesInGroup($myMail, $groupId, $myMailInGroup)
     ## If any messages are pending then we add the cancel button.
     #set($showCancelButton = false)
     #foreach($message in $myMailInGroup)
@@ -200,7 +201,8 @@
   #elseif($inspect == 'groupAsAdmin' && $isAdmin)
     ## Inspect a single message group as admin
     #set($mailInGroup = [])
-    #getMessagesInGroup($mail.values(), $mail.get($messageID).getProperty('messageGroupID').getValue(), $mailInGroup)
+    #set ($groupId = $mail.get($messageID).getProperty('messageGroupID').getValue())
+    #getMessagesInGroup($mail.values(), $groupId, $mailInGroup)
     #if($mailInGroup.size() == 1)
       #displayStatusAndMemo($mailInGroup.get(0))
     #end

xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-ui/src/test/it/org/xwiki/test/ui/invitation/InvitationTest.java

@@ -364,9 +364,8 @@ public void testSpamReporting() throws Exception
             // Prove that the memo left by spam reported is shown.
             String expectedMessage = "Reported as spam with message: It's the email lottery, they have taken over "
                 + "your server!";
-            Assert.assertTrue("The message by the spam reporter is not shown to the admin.\nExpecting:"
-                + expectedMessage + "\n      Got:" + inspect.getStatusAndMemo(),
-                inspect.getStatusAndMemo().equals(expectedMessage));
+            Assert.assertEquals("The message by the spam reporter is not shown to the admin.",
+                expectedMessage, inspect.getStatusAndMemo());
 
             String memo = "Actually the email lottery is quite legitimate.";
             String expectedSuccessMessage = "Invitation successfully marked as not spam. Log entry: " + memo;