From 9de2856ae6550a0445c01961caea5b433bc5d127 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Tue, 2 May 2017 17:31:20 -0400
Subject: [PATCH] Groovy test: Fix format for `MM` instead of `mm`

https://build.spring.io/browse/INT-AT42SIO-498/

**Cherry-pick to 4.3.x and 4.2.x**
---
 .../groovy/config/GroovyServiceActivatorTests-context.xml   | 4 ++--
 .../groovy/config/GroovyServiceActivatorTests.java          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml
index fdd49b3c43..badb3aaca7 100644
--- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml
+++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests-context.xml
@@ -33,7 +33,7 @@
 	<service-activator input-channel="inlineScriptInput">
 		<groovy:script customizer="groovyCustomizer" variables="date-ref=date">
 			<![CDATA[
-				return "inline-$payload : ${date.format('dd.mm.yyyy')}"
+				return "inline-$payload : ${date.format('dd.MM.yyyy')}"
 			]]>
 		</groovy:script>
 	</service-activator>
@@ -41,7 +41,7 @@
 	<service-activator input-channel="scriptWithoutVariablesInput">
 		<groovy:script>
 			<![CDATA[
-				return "withoutVariables-$payload : ${date.format('dd.mm.yyyy')}"
+				return "withoutVariables-$payload : ${date.format('dd.MM.yyyy')}"
 			]]>
 		</groovy:script>
 	</service-activator>
diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
index 9bd626bb9e..c2252de1cc 100644
--- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
+++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -148,7 +148,7 @@ public class GroovyServiceActivatorTests {
 			this.inlineScriptInput.send(message);
 		}
 
-		DateFormat format = new SimpleDateFormat("dd.mm.yyyy");
+		DateFormat format = new SimpleDateFormat("dd.MM.yyyy");
 
 		String now = format.format(new Date());
 
@@ -168,7 +168,7 @@ public class GroovyServiceActivatorTests {
 			this.scriptWithoutVariablesInput.send(message);
 		}
 
-		DateFormat format = new SimpleDateFormat("dd.mm.yyyy");
+		DateFormat format = new SimpleDateFormat("dd.MM.yyyy");
 
 		String now = format.format(new Date());