Skip to content

Commit 0f2fe55

Browse files
committed
chore: routine dependency bumps
1 parent 31184aa commit 0f2fe55

7 files changed

Lines changed: 175 additions & 187 deletions

File tree

gradle/libs.versions.toml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[versions]
2-
google-java-format = "1.34.1"
2+
google-java-format = "1.36.1"
33
google-osdetector = "1.7.3"
4-
jackson = "2.17.2"
5-
jakarta-annotation-api = "2.0.0"
6-
jersey = "3.1.7"
7-
junit = "5.10.2"
8-
junit-platform-launcher = "1.14.3"
4+
jackson = "2.22.1"
5+
jackson-annotations = "2.22"
6+
jakarta-annotation-api = "2.1.1"
7+
jersey = "3.1.12"
8+
junit = "5.14.4"
9+
junit-platform-launcher = "1.14.4"
910
mockito = "3.12.4"
1011
openapi = "7.16.0"
11-
swagger-annotations = "2.2.22"
1212

1313
[libraries]
14-
jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
14+
jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson-annotations" }
1515
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }
1616
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
1717
jackson-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
@@ -25,7 +25,6 @@ junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.re
2525
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
2626
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform-launcher" }
2727
mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
28-
swagger-annotations = { module = "io.swagger.core.v3:swagger-annotations", version.ref = "swagger-annotations" }
2928

3029
[plugins]
3130
openapi-generator = { id = "org.openapi.generator", version.ref = "openapi" }

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "8.4.0",
44
"private": true,
55
"devDependencies": {
6-
"@changesets/cli": "^2.27.8",
6+
"@changesets/cli": "^2.31.1",
77
"@fingerprintjs/changesets-changelog-format": "^0.2.0",
88
"@fingerprintjs/commit-lint-dx-team": "^0.1.0"
99
},

pnpm-lock.yaml

Lines changed: 161 additions & 173 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/sdk.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ publishing {
3535
}
3636

3737
dependencies {
38-
implementation(libs.swagger.annotations)
3938
api(libs.jersey.client)
4039
api(libs.jersey.hk2)
4140
api(libs.jersey.media.json)

sdk/src/main/java/com/fingerprint/v4/sdk/JSON.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ public class JSON implements ContextResolver<ObjectMapper> {
3333
public JSON() {
3434
mapper =
3535
JsonMapper.builder()
36-
.serializationInclusion(JsonInclude.Include.NON_NULL)
36+
.defaultPropertyInclusion(
37+
JsonInclude.Value.construct(
38+
JsonInclude.Include.NON_NULL, JsonInclude.Include.NON_NULL))
3739
.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false)
3840
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
3941
.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true)

sdk/src/test/java/com/fingerprint/v4/api/FingerprintApiTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ public void deleteVisitorDataTest() throws ApiException {
400400
@Test
401401
public void webhookTest() throws Exception {
402402
ObjectMapper mapper = new ObjectMapper().registerModule(new JavaTimeModule());
403-
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
403+
mapper.setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL);
404404

405405
Event event =
406406
mapper.readValue(getFileAsIOStream("mocks/webhook/webhook_event.json"), Event.class);

template/libraries/jersey3/JSON.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
2828
2929
public JSON() {
3030
mapper = JsonMapper.builder()
31-
.serializationInclusion(JsonInclude.Include.NON_NULL)
31+
.defaultPropertyInclusion(JsonInclude.Value.construct(JsonInclude.Include.NON_NULL, JsonInclude.Include.NON_NULL))
3232
.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false)
3333
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, {{failOnUnknownProperties}})
3434
.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true)

0 commit comments

Comments
 (0)