Skip to content

Commit d984082

Browse files
committed
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
1 parent c8b333f commit d984082

File tree

4 files changed

+7
-16
lines changed

4 files changed

+7
-16
lines changed

flow-server/pom.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,6 @@
1111
<name>Flow Server</name>
1212
<packaging>jar</packaging>
1313

14-
<properties>
15-
<validation.api.version>2.0.1.Final</validation.api.version>
16-
<jackson.version>2.11.2</jackson.version>
17-
<spring.version>5.2.0.RELEASE</spring.version>
18-
<spring.autoconfigure.version>2.2.0.RELEASE</spring.autoconfigure.version>
19-
<javax.annotation.api.version>1.3.2</javax.annotation.api.version>
20-
<javaparser.version>3.15.1</javaparser.version>
21-
<swagger.codegen.version>3.0.2</swagger.codegen.version>
22-
<swagger.codegen.generators.version>1.0.2</swagger.codegen.generators.version>
23-
</properties>
24-
2514
<dependencies>
2615

2716
<!-- Project dependencies -->

fusion-endpoint/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
<packaging>jar</packaging>
1313

1414
<properties>
15-
<validation.api.version>2.0.1.Final</validation.api.version>
16-
<jackson.version>2.10.2</jackson.version>
1715
<spring.version>5.3.0</spring.version>
1816
<spring.autoconfigure.version>2.2.0.RELEASE</spring.autoconfigure.version>
1917
<javax.annotation.api.version>1.3.2</javax.annotation.api.version>
@@ -111,6 +109,7 @@
111109
<artifactId>jackson-datatype-jsr310</artifactId>
112110
<version>${jackson.version}</version>
113111
</dependency>
112+
114113
<!-- Needed for security annotations -->
115114
<dependency>
116115
<groupId>javax.annotation</groupId>

fusion-endpoint/src/test/java/com/vaadin/fusion/typeconversion/DateTimeConversionTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@ public class DateTimeConversionTest extends BaseTypeConversionTest {
2323
@Test
2424
public void should_ConvertToDate_When_ReceiveATimeStampAsNumber() {
2525
String timeStamp = "1546300800000"; // 01-01-2019 00:00:00
26-
String expectedValue = "\"2019-01-02T00:00:00.000+0000\"";
26+
String expectedValue = "\"2019-01-02T00:00:00.000+00:00\"";
2727
assertEqualExpectedValueWhenCallingMethod("addOneDayToDate", timeStamp,
2828
expectedValue);
2929
}
3030

3131
@Test
3232
public void should_ConvertToDate_When_ReceiveATimeStampAsString() {
3333
String timeStamp = "\"1546300800000\""; // 01-01-2019 00:00:00
34-
String expected = "\"2019-01-02T00:00:00.000+0000\"";
34+
String expected = "\"2019-01-02T00:00:00.000+00:00\"";
3535
assertEqualExpectedValueWhenCallingMethod("addOneDayToDate", timeStamp,
3636
expected);
3737
}
3838

3939
@Test
4040
public void should_ConvertToDate_When_ReceiveADate() {
4141
String inputDate = "\"2019-01-01\"";
42-
String expectedTimestamp = "\"2019-01-02T00:00:00.000+0000\"";
42+
String expectedTimestamp = "\"2019-01-02T00:00:00.000+00:00\"";
4343
assertEqualExpectedValueWhenCallingMethod("addOneDayToDate", inputDate,
4444
expectedTimestamp);
4545
}

pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@
8989
<hibernate.validator.version>6.0.1.Final</hibernate.validator.version>
9090
<slf4j.version>1.7.32</slf4j.version>
9191
<polymer.version>2.6.1</polymer.version>
92+
<jackson.version>2.11.2</jackson.version>
93+
<validation.api.version>2.0.1.Final</validation.api.version>
94+
<javax.annotation.api.version>1.3.2</javax.annotation.api.version>
9295

9396
<!-- Plugins -->
9497
<driver.binary.downloader.maven.plugin.version>1.0.17

0 commit comments

Comments
 (0)