Merge pull request #53 from slonopotamus/update-deps

Update deps

Author: slonopotamus

build.gradle.kts

@@ -15,7 +15,7 @@ tasks.wrapper {
 plugins {
     id("com.github.ben-manes.versions") version "0.21.0"
     id("de.marcphilipp.nexus-publish") version "0.2.0" apply false
-    id("io.codearte.nexus-staging") version "0.20.0"
+    id("io.codearte.nexus-staging") version "0.21.0"
     idea
 }
 

gitlfs-common/build.gradle.kts

@@ -1,5 +1,5 @@
 description = "Java Git-LFS common structures"
 
 dependencies {
-    compile("com.fasterxml.jackson.core:jackson-databind:2.9.8")
+    compile("com.fasterxml.jackson.core:jackson-databind:2.9.9")
 }

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

@@ -6,7 +6,7 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
 import org.jetbrains.annotations.NotNull;
 
 import java.text.DateFormat;
@@ -17,17 +17,17 @@
  * Json utility class.
  *
  * @author Artem V. Navrotskiy
- * @author Marat Radchenko <marat@slonopootamus.org>
+ * @author Marat Radchenko <marat@slonopotamus.org>
  */
 public final class JsonHelper {
 
   /**
-   * git-lfs is broken and doesn't properly parse output of {@link com.fasterxml.jackson.databind.util.StdDateFormat}.
+   * git-lfs cannot parse timezone without colon: {@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();
+  public static final DateFormat dateFormat = StdDateFormat.instance.withColonInTimeZone(true);
 
   @NotNull
   public static final ObjectMapper mapper = new ObjectMapper();

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

@@ -10,7 +10,7 @@ public final class DateTest {
 
   @Test
   public void format() throws ParseException {
-    final String str = "2006-01-02T15:04:05Z";
+    final String str = "2006-01-02T15:04:05.123+00:00";
     Assert.assertEquals(JsonHelper.dateFormat.format(JsonHelper.dateFormat.parse(str)), str);
   }
 }

gitlfs-server/build.gradle.kts

@@ -5,6 +5,6 @@ dependencies {
     compile("javax.servlet:javax.servlet-api:4.0.1")
 
     testCompile(project(":gitlfs-client"))
-    testCompile("org.eclipse.jetty:jetty-servlet:9.4.15.v20190215")
+    testCompile("org.eclipse.jetty:jetty-servlet:9.4.18.v20190429")
     testRuntimeOnly("org.slf4j:slf4j-simple:1.7.26")
 }