Merge pull request #1572 from brendandburns/release-11-fix

Fix the build for JODA time
kubernetes-client · Mar 3, 2021 · 321440e · 321440e
2 parents c6915b7 + 3f3d278
commit 321440e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventLogger.java b/extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventLogger.java
@@ -68,7 +68,7 @@ private static class EventLog {
     private String resourceVersion;
   }
 
-  static V1Patch buildEventPatch(int count, String message, OffsetDateTime now) {
+  static V1Patch buildEventPatch(int count, String message, DateTime now) {
     return new V1Patch(
         String.format(
             "{\"message\":\"%s\",\"count\":%d,\"lastTimestamp\":%s}",

diff --git a/extended/src/test/java/io/kubernetes/client/extended/event/legacy/EventLoggerTest.java b/extended/src/test/java/io/kubernetes/client/extended/event/legacy/EventLoggerTest.java
@@ -15,15 +15,15 @@
 import static org.junit.Assert.*;
 
 import io.kubernetes.client.custom.V1Patch;
-import java.time.OffsetDateTime;
 import org.junit.Test;
+import org.joda.time.DateTime;
 
 public class EventLoggerTest {
 
   @Test
   public void buildEventPatch() {
-    String expectedStr = "2021-03-02T15:02:48.179000Z";
-    OffsetDateTime expected = OffsetDateTime.parse("2021-03-02T15:02:48.179000Z");
+    String expectedStr = "2021-03-02T15:02:48.179Z";
+    DateTime expected = DateTime.parse("2021-03-02T15:02:48.179Z");
     V1Patch patch = EventLogger.buildEventPatch(1, "foo", expected);
     assertEquals(
         "{\"message\":\"foo\",\"count\":1,\"lastTimestamp\":\"" + expectedStr + "\"}",