Skip to content

Bump jackson to 2.9.10 #4

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

Merged
olivergondza merged 4 commits into from
Nov 20, 2019
Merged

Bump jackson to 2.9.10 #4

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
8a372bf
Bump jackson.version from 2.7.3 to 2.10.1
dependabot[bot] Nov 19, 2019
ba70432
Merge pull request #1 from openstack4j/dependabot/maven/jackson.versi…
olivergondza Nov 20, 2019
02c3002
Fix breakage after jackson update
olivergondza Nov 20, 2019
96f4638
Fix test that was verifying _incorrect_ result based on Jackson bug t…
olivergondza Nov 20, 2019
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
2 changes: 1 addition & 1 deletion core-test/src/main/java/org/openstack4j/api/barbican/SecretTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class SecretTests extends AbstractTest {
private final String secretName = "test_secret";
private final String content_type = "application/octet-stream";

private final Date expiration = new Date(1451330264394l);
private final Date expiration = new Date(1451330084180L);

public void testListSecretsByName() throws IOException {
respondWith(SECRETS_JSON);
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/openstack4j/core/transport/internal/OSBadBooleanDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public Boolean deserialize(JsonParser jp, DeserializationContext ctxt) throws IO
return Boolean.valueOf(_parseBooleanFromNumber(jp, ctxt));
}
if (t == JsonToken.VALUE_NULL) {
return getNullValue();
return getNullValue(ctxt);
}
// And finally, let's allow Strings to be converted too
if (t == JsonToken.VALUE_STRING) {
Expand All @@ -51,7 +51,7 @@ public Boolean deserialize(JsonParser jp, DeserializationContext ctxt) throws IO
return Boolean.FALSE;
}
if (text.length() == 0) {
return getEmptyValue();
return getNullValue(ctxt);
}
throw ctxt.weirdStringException(text, Boolean.class, "only \"true\" or \"false\" recognized");
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<release.version>2.0.0</release.version>
<aries.spifly.version>1.0.0</aries.spifly.version>
<slf4j.version>1.7.21</slf4j.version>
<jackson.version>2.7.3</jackson.version>
<jackson.version>2.9.10</jackson.version>
<maven.jar.plugin.version>2.6</maven.jar.plugin.version>
<additionalparam>-Xdoclint:none</additionalparam>
</properties>
Expand Down