From 735f93b1af09d0f8fb762e810c19e28d87585d80 Mon Sep 17 00:00:00 2001
From: Ryan Moore <ryan.moore@greyrocksoft.com>
Date: Wed, 18 Dec 2019 14:29:16 -0700
Subject: [PATCH 1/2] Updating ds3 sdk to latest 5.1.2 and updating gradle to
 6.0.1

---
 build.gradle                             |   6 +-----
 gradle/wrapper/gradle-wrapper.jar        | Bin 54413 -> 54413 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6703776..46be780 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,7 +57,7 @@ subprojects {
         compile 'ch.qos.logback:logback-core:1.2.3'
         compile 'ch.qos.logback:logback-classic:1.2.3'
         compile 'com.google.guava:guava:23.0-jre'
-        compile 'com.spectralogic.ds3:ds3-sdk:5.0.5'
+        compile 'com.spectralogic.ds3:ds3-sdk:5.1.2'
         compile 'com.google.inject:guice:4.2.0'
         compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2'
 
@@ -92,7 +92,3 @@ project(':ds3-cli-certification') {
         testCompile project(path: ':ds3-cli-helpers', configuration: 'testOutput')
     }
 }
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.8'
-}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 91ca28c8b802289c3a438766657a5e98f20eff03..1948b9074f1016d15d505d185bc3f73deb82d8c8 100644
GIT binary patch
delta 66
zcmeBO$=th=d4f5M=jU(k6RjiIB0m&;EMlB|FjacvmcT>Yn;94ayxBS43G0YV7C7t=
RR<=3$@I3(*u#oE&4*;7X8z%q&

delta 66
zcmeBO$=th=d4f61jFe?ZCt63a&HP;Sv50Z<!BpvuTLKSp8?!S6c(ZfV^G$A<EO6K#
RtZZ}g;d=rsU?JBl9srwD8<PM4

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d2c45a4..9492014 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From d1c700fbdd21e89417faaa118ea50406cee160e5 Mon Sep 17 00:00:00 2001
From: Ryan Moore <ryan.moore@greyrocksoft.com>
Date: Wed, 18 Dec 2019 15:18:56 -0700
Subject: [PATCH 2/2] attempting to fix the failing posix metadata failure

---
 .../com/spectralogic/ds3cli/metadata/PosixFileMetadata.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ds3_java_cli/src/main/java/com/spectralogic/ds3cli/metadata/PosixFileMetadata.java b/ds3_java_cli/src/main/java/com/spectralogic/ds3cli/metadata/PosixFileMetadata.java
index c1101a7..e3fa7d6 100644
--- a/ds3_java_cli/src/main/java/com/spectralogic/ds3cli/metadata/PosixFileMetadata.java
+++ b/ds3_java_cli/src/main/java/com/spectralogic/ds3cli/metadata/PosixFileMetadata.java
@@ -51,8 +51,7 @@ public class PosixFileMetadata implements FileMetadata {
     private static FileTime makeLocalFileTime(final String metadataValue) {
         final Instant timeReadBack = LocalDateTime.parse(metadataValue, DATE_TIME_FORMATTER).toInstant(ZoneOffset.UTC);
         final LocalDateTime localDateTime = LocalDateTime.ofInstant(timeReadBack, ZoneId.systemDefault());
-        final Date localDate = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
-        return FileTime.fromMillis(localDate.getTime());
+        return FileTime.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
     }
 
     private static UserPrincipalLookupService userPrincipalLookupService(final Path filePath) {