diff --git a/org.springframework.context/.classpath b/org.springframework.context/.classpath
index d44de9b52d..26698a5540 100644
--- a/org.springframework.context/.classpath
+++ b/org.springframework.context/.classpath
@@ -39,5 +39,6 @@
+
diff --git a/org.springframework.context/src/test/java/org/springframework/mapping/support/MappingTests.java b/org.springframework.context/src/test/java/org/springframework/mapping/support/MappingTests.java
index 080e6412de..1949e8de91 100644
--- a/org.springframework.context/src/test/java/org/springframework/mapping/support/MappingTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/mapping/support/MappingTests.java
@@ -8,9 +8,11 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
import org.joda.time.MutableDateTime;
import org.joda.time.format.ISODateTimeFormat;
import org.junit.Test;
@@ -325,7 +327,7 @@ public class MappingTests {
// field to multiple fields
.addAssemblerMapping("activationDateTime", new Converter