Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/plenty-bumps-glow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'java-sdk': patch
---

**dependencies**: Bump Jersey, Jackson, and jakarta-annotation-api to their latest compatible versions
19 changes: 9 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[versions]
google-java-format = "1.34.1"
google-java-format = "1.36.1"
google-osdetector = "1.7.3"
jackson = "2.17.2"
jakarta-annotation-api = "2.0.0"
jersey = "3.1.7"
junit = "5.10.2"
junit-platform-launcher = "1.14.3"
mockito = "3.12.4"
jackson = "2.22.1"
jackson-annotations = "2.22"
jakarta-annotation-api = "2.1.1"
jersey = "3.1.12"
junit = "5.14.4"
junit-platform-launcher = "1.14.4"
mockito = "5.23.0"
openapi = "7.16.0"
swagger-annotations = "2.2.22"

[libraries]
jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson-annotations" }
Comment thread
kevinmia marked this conversation as resolved.
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
jackson-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
Expand All @@ -25,7 +25,6 @@ junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.re
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform-launcher" }
mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
swagger-annotations = { module = "io.swagger.core.v3:swagger-annotations", version.ref = "swagger-annotations" }

[plugins]
openapi-generator = { id = "org.openapi.generator", version.ref = "openapi" }
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "8.4.0",
"private": true,
"devDependencies": {
"@changesets/cli": "^2.27.8",
"@changesets/cli": "^2.31.1",
"@fingerprintjs/changesets-changelog-format": "^0.2.0",
"@fingerprintjs/commit-lint-dx-team": "^0.1.0"
},
Expand Down
334 changes: 161 additions & 173 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion sdk/sdk.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ publishing {
}

dependencies {
implementation(libs.swagger.annotations)
api(libs.jersey.client)
api(libs.jersey.hk2)
api(libs.jersey.media.json)
Expand Down
4 changes: 3 additions & 1 deletion sdk/src/main/java/com/fingerprint/v4/sdk/JSON.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ public class JSON implements ContextResolver<ObjectMapper> {
public JSON() {
mapper =
JsonMapper.builder()
.serializationInclusion(JsonInclude.Include.NON_NULL)
Comment thread
kevinmia marked this conversation as resolved.
.defaultPropertyInclusion(
JsonInclude.Value.construct(
JsonInclude.Include.NON_NULL, JsonInclude.Include.NON_NULL))
.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false)
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ public void deleteVisitorDataTest() throws ApiException {
@Test
public void webhookTest() throws Exception {
ObjectMapper mapper = new ObjectMapper().registerModule(new JavaTimeModule());
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
mapper.setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL);

Event event =
mapper.readValue(getFileAsIOStream("mocks/webhook/webhook_event.json"), Event.class);
Expand Down
2 changes: 1 addition & 1 deletion template/libraries/jersey3/JSON.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class JSON implements ContextResolver<ObjectMapper> {

public JSON() {
mapper = JsonMapper.builder()
.serializationInclusion(JsonInclude.Include.NON_NULL)
.defaultPropertyInclusion(JsonInclude.Value.construct(JsonInclude.Include.NON_NULL, JsonInclude.Include.NON_NULL))
.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false)
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, {{failOnUnknownProperties}})
.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true)
Expand Down
Loading