From d984082b22f19c0bd04cb5ead7fbea37a8189fac Mon Sep 17 00:00:00 2001
From: Artem Godin <fluorumlabs@users.noreply.github.com>
Date: Fri, 3 Sep 2021 12:07:35 +0300
Subject: [PATCH] chore: organize dependency versions and update vulnerable
 jackson-databind version for fusion-endpoint (#11659)

* Organize dependency versions

* Retrigger validation

* Update tests to reflect changes in FasterXML/jackson-databind#2643
---
 flow-server/pom.xml                                   | 11 -----------
 fusion-endpoint/pom.xml                               |  3 +--
 .../fusion/typeconversion/DateTimeConversionTest.java |  6 +++---
 pom.xml                                               |  3 +++
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/flow-server/pom.xml b/flow-server/pom.xml
index 9dfd984c634..690c86dff2c 100644
--- a/flow-server/pom.xml
+++ b/flow-server/pom.xml
@@ -11,17 +11,6 @@
     <name>Flow Server</name>
     <packaging>jar</packaging>
 
-    <properties>
-        <validation.api.version>2.0.1.Final</validation.api.version>
-        <jackson.version>2.11.2</jackson.version>
-        <spring.version>5.2.0.RELEASE</spring.version>
-        <spring.autoconfigure.version>2.2.0.RELEASE</spring.autoconfigure.version>
-        <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
-        <javaparser.version>3.15.1</javaparser.version>
-        <swagger.codegen.version>3.0.2</swagger.codegen.version>
-        <swagger.codegen.generators.version>1.0.2</swagger.codegen.generators.version>
-    </properties>
-
     <dependencies>
 
         <!-- Project dependencies -->
diff --git a/fusion-endpoint/pom.xml b/fusion-endpoint/pom.xml
index ba475476ee0..74312ab82b5 100644
--- a/fusion-endpoint/pom.xml
+++ b/fusion-endpoint/pom.xml
@@ -12,8 +12,6 @@
     <packaging>jar</packaging>
 
     <properties>
-        <validation.api.version>2.0.1.Final</validation.api.version>
-        <jackson.version>2.10.2</jackson.version>
         <spring.version>5.3.0</spring.version>
         <spring.autoconfigure.version>2.2.0.RELEASE</spring.autoconfigure.version>
         <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
@@ -111,6 +109,7 @@
             <artifactId>jackson-datatype-jsr310</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        
         <!-- Needed for security annotations -->
         <dependency>
             <groupId>javax.annotation</groupId>
diff --git a/fusion-endpoint/src/test/java/com/vaadin/fusion/typeconversion/DateTimeConversionTest.java b/fusion-endpoint/src/test/java/com/vaadin/fusion/typeconversion/DateTimeConversionTest.java
index 29ad97c1ecd..e53bb5aabca 100644
--- a/fusion-endpoint/src/test/java/com/vaadin/fusion/typeconversion/DateTimeConversionTest.java
+++ b/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);
     }
diff --git a/pom.xml b/pom.xml
index 1847e625d35..dc1c27f7aa9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,9 @@
         <hibernate.validator.version>6.0.1.Final</hibernate.validator.version>
         <slf4j.version>1.7.32</slf4j.version>
         <polymer.version>2.6.1</polymer.version>
+        <jackson.version>2.11.2</jackson.version>
+        <validation.api.version>2.0.1.Final</validation.api.version>
+        <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
 
         <!-- Plugins -->
         <driver.binary.downloader.maven.plugin.version>1.0.17