diff --git a/packages/java/fusion-endpoint/pom.xml b/packages/java/fusion-endpoint/pom.xml index 8a76e5ae8..4b83f4c91 100644 --- a/packages/java/fusion-endpoint/pom.xml +++ b/packages/java/fusion-endpoint/pom.xml @@ -12,8 +12,6 @@ jar - 2.0.1.Final - 2.10.2 5.3.0 2.2.0.RELEASE 1.3.2 @@ -111,6 +109,7 @@ jackson-datatype-jsr310 ${jackson.version} + javax.annotation diff --git a/packages/java/fusion-endpoint/src/test/java/com/vaadin/fusion/typeconversion/DateTimeConversionTest.java b/packages/java/fusion-endpoint/src/test/java/com/vaadin/fusion/typeconversion/DateTimeConversionTest.java index 29ad97c1e..e53bb5aab 100644 --- a/packages/java/fusion-endpoint/src/test/java/com/vaadin/fusion/typeconversion/DateTimeConversionTest.java +++ b/packages/java/fusion-endpoint/src/test/java/com/vaadin/fusion/typeconversion/DateTimeConversionTest.java @@ -23,7 +23,7 @@ public class DateTimeConversionTest extends BaseTypeConversionTest { @Test public void should_ConvertToDate_When_ReceiveATimeStampAsNumber() { String timeStamp = "1546300800000"; // 01-01-2019 00:00:00 - String expectedValue = "\"2019-01-02T00:00:00.000+0000\""; + String expectedValue = "\"2019-01-02T00:00:00.000+00:00\""; assertEqualExpectedValueWhenCallingMethod("addOneDayToDate", timeStamp, expectedValue); } @@ -31,7 +31,7 @@ public void should_ConvertToDate_When_ReceiveATimeStampAsNumber() { @Test public void should_ConvertToDate_When_ReceiveATimeStampAsString() { String timeStamp = "\"1546300800000\""; // 01-01-2019 00:00:00 - String expected = "\"2019-01-02T00:00:00.000+0000\""; + String expected = "\"2019-01-02T00:00:00.000+00:00\""; assertEqualExpectedValueWhenCallingMethod("addOneDayToDate", timeStamp, expected); } @@ -39,7 +39,7 @@ public void should_ConvertToDate_When_ReceiveATimeStampAsString() { @Test public void should_ConvertToDate_When_ReceiveADate() { String inputDate = "\"2019-01-01\""; - String expectedTimestamp = "\"2019-01-02T00:00:00.000+0000\""; + String expectedTimestamp = "\"2019-01-02T00:00:00.000+00:00\""; assertEqualExpectedValueWhenCallingMethod("addOneDayToDate", inputDate, expectedTimestamp); }