From 12269b35507305b1f887da818af14b8249ccb648 Mon Sep 17 00:00:00 2001 From: David Schlosnagle Date: Wed, 27 Mar 2024 10:01:06 -0400 Subject: [PATCH 1/3] Remove unused jackson-datatype-guava dependency --- human-readable-types/build.gradle | 1 - versions.lock | 13 +++---------- versions.props | 1 - 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/human-readable-types/build.gradle b/human-readable-types/build.gradle index 367a4d98..cd3320ce 100644 --- a/human-readable-types/build.gradle +++ b/human-readable-types/build.gradle @@ -18,7 +18,6 @@ apply plugin: 'com.palantir.external-publish-jar' dependencies { api 'com.fasterxml.jackson.core:jackson-databind' - api 'com.fasterxml.jackson.datatype:jackson-datatype-guava' implementation 'com.palantir.safe-logging:preconditions' testImplementation 'org.assertj:assertj-core' diff --git a/versions.lock b/versions.lock index bedd7b88..3a61c865 100644 --- a/versions.lock +++ b/versions.lock @@ -1,17 +1,10 @@ # Run ./gradlew writeVersionsLock to regenerate this file com.fasterxml.jackson.core:jackson-annotations:2.15.3 (1 constraints: 8b123e21) -com.fasterxml.jackson.core:jackson-core:2.15.3 (2 constraints: 2e29b8bc) -com.fasterxml.jackson.core:jackson-databind:2.15.3 (2 constraints: e01b5c90) -com.fasterxml.jackson.datatype:jackson-datatype-guava:2.15.3 (1 constraints: 3d05413b) -com.google.code.findbugs:jsr305:3.0.2 (2 constraints: 1d0fb186) -com.google.errorprone:error_prone_annotations:2.26.1 (2 constraints: 7f1b5d89) -com.google.guava:failureaccess:1.0.2 (1 constraints: 150ae2b4) -com.google.guava:guava:33.1.0-jre (2 constraints: b91e197a) -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) -com.google.j2objc:j2objc-annotations:3.0.0 (1 constraints: 150aeab4) +com.fasterxml.jackson.core:jackson-core:2.15.3 (1 constraints: 8b123e21) +com.fasterxml.jackson.core:jackson-databind:2.15.3 (1 constraints: 3d05413b) +com.google.errorprone:error_prone_annotations:2.23.0 (1 constraints: 33115ed1) com.palantir.safe-logging:preconditions:3.7.0 (1 constraints: 0c050f36) com.palantir.safe-logging:safe-logging:3.7.0 (1 constraints: 061137c0) -org.checkerframework:checker-qual:3.42.0 (2 constraints: 850fdda1) org.jetbrains:annotations:24.1.0 (1 constraints: 331166d1) [Test dependencies] diff --git a/versions.props b/versions.props index 5acdb361..af36d2e4 100644 --- a/versions.props +++ b/versions.props @@ -2,7 +2,6 @@ com.fasterxml.jackson.*:jackson-* = 2.15.3 com.fasterxml.jackson.core:jackson-databind = 2.15.3 com.google.code.findbugs:jsr305 = 3.0.2 com.google.errorprone:* = 2.10.0 -com.google.guava:guava = 33.1.0-jre com.palantir.safe-logging:* = 3.7.0 org.assertj:* = 3.25.3 org.checkerframework:checker-qual = 3.42.0 From 598889c0b0a78b32bc6bc05636dfcaa15e3e1af3 Mon Sep 17 00:00:00 2001 From: svc-changelog Date: Wed, 27 Mar 2024 14:05:08 +0000 Subject: [PATCH 2/3] Add generated changelog entries --- changelog/@unreleased/pr-601.v2.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/@unreleased/pr-601.v2.yml diff --git a/changelog/@unreleased/pr-601.v2.yml b/changelog/@unreleased/pr-601.v2.yml new file mode 100644 index 00000000..886753ca --- /dev/null +++ b/changelog/@unreleased/pr-601.v2.yml @@ -0,0 +1,5 @@ +type: improvement +improvement: + description: Remove unused jackson-datatype-guava dependency + links: + - https://github.com/palantir/human-readable-types/pull/601 From 191f1bdaf3b40160ff0a15348308b45be56cf837 Mon Sep 17 00:00:00 2001 From: David Schlosnagle Date: Wed, 27 Mar 2024 12:24:54 -0400 Subject: [PATCH 3/3] Depend on jackson-annotations instead of databind --- human-readable-types/build.gradle | 3 ++- versions.lock | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/human-readable-types/build.gradle b/human-readable-types/build.gradle index cd3320ce..cef20f9c 100644 --- a/human-readable-types/build.gradle +++ b/human-readable-types/build.gradle @@ -17,9 +17,10 @@ apply plugin: 'com.palantir.external-publish-jar' dependencies { - api 'com.fasterxml.jackson.core:jackson-databind' + api 'com.fasterxml.jackson.core:jackson-annotations' implementation 'com.palantir.safe-logging:preconditions' + testImplementation 'com.fasterxml.jackson.core:jackson-databind' testImplementation 'org.assertj:assertj-core' testImplementation 'org.junit.jupiter:junit-jupiter' testImplementation 'org.junit.jupiter:junit-jupiter-api' diff --git a/versions.lock b/versions.lock index 3a61c865..86b81a21 100644 --- a/versions.lock +++ b/versions.lock @@ -1,13 +1,13 @@ # Run ./gradlew writeVersionsLock to regenerate this file -com.fasterxml.jackson.core:jackson-annotations:2.15.3 (1 constraints: 8b123e21) -com.fasterxml.jackson.core:jackson-core:2.15.3 (1 constraints: 8b123e21) -com.fasterxml.jackson.core:jackson-databind:2.15.3 (1 constraints: 3d05413b) +com.fasterxml.jackson.core:jackson-annotations:2.15.3 (2 constraints: c717fa71) com.google.errorprone:error_prone_annotations:2.23.0 (1 constraints: 33115ed1) com.palantir.safe-logging:preconditions:3.7.0 (1 constraints: 0c050f36) com.palantir.safe-logging:safe-logging:3.7.0 (1 constraints: 061137c0) org.jetbrains:annotations:24.1.0 (1 constraints: 331166d1) [Test dependencies] +com.fasterxml.jackson.core:jackson-core:2.15.3 (1 constraints: 8b123e21) +com.fasterxml.jackson.core:jackson-databind:2.15.3 (1 constraints: 3d05413b) net.bytebuddy:byte-buddy:1.14.11 (1 constraints: 7e0bc5ea) org.apiguardian:apiguardian-api:1.1.2 (5 constraints: 105480ac) org.assertj:assertj-core:3.25.3 (1 constraints: 3f054b3b)