Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Organize dependency versions and update vulnerable jackson-databind version for fusion-endpoint #11659

Merged
merged 4 commits into from
Sep 3, 2021
Merged

Organize dependency versions and update vulnerable jackson-databind version for fusion-endpoint #11659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
656e86e
Organize dependency versions
fluorumlabs Aug 27, 2021
e6b097b
Retrigger validation
fluorumlabs Aug 31, 2021
1275b09
Merge branch 'master' into dep-versions
fluorumlabs Sep 3, 2021
c62da41
Update tests to reflect changes in FasterXML/jackson-databind#2643
fluorumlabs Sep 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions flow-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
3 changes: 1 addition & 2 deletions fusion-endpoint/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -111,6 +109,7 @@
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>

<!-- Needed for security annotations -->
<dependency>
<groupId>javax.annotation</groupId>
Expand Down
6 changes: 3 additions & 3 deletions fusion-endpoint/src/test/java/com/vaadin/fusion/typeconversion/DateTimeConversionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ 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);
}

@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);
}

@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);
}
Expand Down
3 changes: 3 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down