Merge pull request #52 from slonopotamus/release-0.13.2

Release 0.13.2

Author: slonopotamus

README.md

@@ -56,9 +56,14 @@ See https://github.com/bozaro/git-lfs-java/blob/master/gitlfs-server/src/test/ja
 
 Version 0.14.0 (Unreleased)
 
+Version 0.13.2
+
+ * Fix ISO 8601 date formatting again
+
 Version 0.13.1
 
  * LFS locking API fixes
+ * Drop dependency on Guava
 
 Version 0.13.0
 

gitlfs-common/src/main/java/ru/bozaro/gitlfs/common/JsonHelper.java

@@ -6,26 +6,37 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.util.StdDateFormat;
+import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
 import org.jetbrains.annotations.NotNull;
 
+import java.text.DateFormat;
+
 import static com.fasterxml.jackson.core.util.DefaultPrettyPrinter.DEFAULT_ROOT_VALUE_SEPARATOR;
 
 /**
  * Json utility class.
  *
  * @author Artem V. Navrotskiy
+ * @author Marat Radchenko <[email protected]>
  */
 public final class JsonHelper {
 
+  /**
+   * git-lfs is broken and doesn't properly parse output of {@link com.fasterxml.jackson.databind.util.StdDateFormat}.
+   * <p/>
+   * See https://github.com/git-lfs/git-lfs/issues/3660
+   */
+  @NotNull
+  public static final DateFormat dateFormat = new ISO8601DateFormat();
+
   @NotNull
   public static final ObjectMapper mapper = new ObjectMapper();
 
   static {
     mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
     mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
     mapper.enable(SerializationFeature.INDENT_OUTPUT);
-    mapper.setDateFormat(new StdDateFormat());
+    mapper.setDateFormat(dateFormat);
 
     // By default, pretty printer uses system newline. Explicitly configure it to use \n
     mapper.setDefaultPrettyPrinter(

gitlfs-common/src/test/java/ru/bozaro/gitlfs/common/data/DateTest.java

@@ -0,0 +1,16 @@
+package ru.bozaro.gitlfs.common.data;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import ru.bozaro.gitlfs.common.JsonHelper;
+
+import java.text.ParseException;
+
+public final class DateTest {
+
+  @Test
+  public void format() throws ParseException {
+    final String str = "2006-01-02T15:04:05Z";
+    Assert.assertEquals(JsonHelper.dateFormat.format(JsonHelper.dateFormat.parse(str)), str);
+  }
+}