Skip to content

Commit 10074a9

Browse files
Excavator: Upgrades Baseline to the latest version (#749)
1 parent d6d8859 commit 10074a9

File tree

4 files changed

+21
-42
lines changed

4 files changed

+21
-42
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ buildscript {
88
classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0'
99
classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.17.0'
1010
classpath 'com.palantir.gradle.revapi:gradle-revapi:1.6.0'
11-
classpath 'com.palantir.baseline:gradle-baseline-java:4.56.0'
12-
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.7.0'
11+
classpath 'com.palantir.baseline:gradle-baseline-java:4.71.0'
12+
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.8.0'
1313
}
1414
}
1515

extras/jackson-support/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
dependencies {
44
api "com.fasterxml.jackson.core:jackson-databind"
55
api "com.fasterxml.jackson.datatype:jackson-datatype-guava"
6-
api "com.fasterxml.jackson.module:jackson-module-afterburner"
76
api "com.fasterxml.jackson.datatype:jackson-datatype-jdk8"
87
api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
98
api "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor"

extras/jackson-support/src/main/java/com/palantir/conjure/java/api/ext/jackson/ObjectMappers.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.fasterxml.jackson.datatype.guava.GuavaModule;
2424
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
2525
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
26-
import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
2726

2827
public final class ObjectMappers {
2928

@@ -101,7 +100,6 @@ public static ObjectMapper withDefaultModules(ObjectMapper mapper) {
101100
return mapper.registerModule(new GuavaModule())
102101
.registerModule(new ShimJdk7Module())
103102
.registerModule(new Jdk8Module().configureAbsentsAsNulls(true))
104-
.registerModule(new AfterburnerModule())
105103
.registerModule(new JavaTimeModule())
106104
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
107105
.disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)

versions.lock

Lines changed: 19 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,37 @@
11
# Run ./gradlew --write-locks to regenerate this file
22
com.fasterxml.jackson:jackson-bom:2.12.3 (8 constraints: 18aa4413)
33
com.fasterxml.jackson.core:jackson-annotations:2.12.3 (4 constraints: b3452532)
4-
com.fasterxml.jackson.core:jackson-core:2.12.3 (9 constraints: 5db9e56c)
5-
com.fasterxml.jackson.core:jackson-databind:2.12.3 (9 constraints: 0fac1629)
4+
com.fasterxml.jackson.core:jackson-core:2.12.3 (8 constraints: dda1dcdf)
5+
com.fasterxml.jackson.core:jackson-databind:2.12.3 (8 constraints: 8f9408fd)
66
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3 (2 constraints: f1137d82)
77
com.fasterxml.jackson.datatype:jackson-datatype-guava:2.12.3 (2 constraints: f1137d82)
88
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.3 (2 constraints: f1137d82)
99
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.3 (2 constraints: f1137d82)
10-
com.fasterxml.jackson.module:jackson-module-afterburner:2.12.3 (2 constraints: f1137d82)
11-
com.github.ben-manes.caffeine:caffeine:2.8.8 (2 constraints: f4240dda)
12-
com.github.kevinstern:software-and-algorithms:1.0 (2 constraints: 16246655)
13-
com.google.auto:auto-common:1.2 (2 constraints: 8b227dcb)
14-
com.google.auto.service:auto-service-annotations:1.0.1 (8 constraints: 8e868b7a)
15-
com.google.auto.value:auto-value-annotations:1.7.4 (3 constraints: 1c3595c5)
16-
com.google.code.findbugs:jFormatString:3.0.0 (2 constraints: e8220411)
17-
com.google.code.findbugs:jsr305:3.0.2 (12 constraints: 97b50090)
18-
com.google.errorprone:error_prone_annotation:2.10.0 (3 constraints: 553624ef)
19-
com.google.errorprone:error_prone_annotations:2.10.0 (12 constraints: 42c1ef35)
20-
com.google.errorprone:error_prone_check_api:2.10.0 (2 constraints: 4823fc4e)
21-
com.google.errorprone:error_prone_core:2.10.0 (2 constraints: 0a20b11c)
22-
com.google.errorprone:error_prone_type_annotations:2.10.0 (2 constraints: 4823fc4e)
23-
com.google.guava:failureaccess:1.0.1 (3 constraints: db291249)
24-
com.google.guava:guava:31.0.1-jre (6 constraints: ed6db8cc)
25-
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (3 constraints: d6525735)
26-
com.google.j2objc:j2objc-annotations:1.3 (3 constraints: c728bf7c)
27-
com.google.protobuf:protobuf-java:3.4.0 (2 constraints: f022e811)
28-
com.palantir.baseline:baseline-error-prone:4.56.0 (1 constraints: 41055d3b)
10+
com.google.code.findbugs:jsr305:3.0.2 (9 constraints: d17f96cd)
11+
com.google.errorprone:error_prone_annotations:2.7.1 (8 constraints: f37acfb9)
12+
com.google.guava:failureaccess:1.0.1 (2 constraints: e417667f)
13+
com.google.guava:guava:31.0.1-jre (2 constraints: af25f547)
14+
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (2 constraints: 3633ed46)
15+
com.google.j2objc:j2objc-annotations:1.3 (2 constraints: 2c17362e)
2916
com.palantir.safe-logging:logger:1.21.0 (2 constraints: 37133456)
3017
com.palantir.safe-logging:logger-slf4j:1.21.0 (2 constraints: 301c76db)
3118
com.palantir.safe-logging:logger-spi:1.21.0 (3 constraints: 6e2cd9d4)
32-
com.palantir.safe-logging:preconditions:1.21.0 (4 constraints: b7397f48)
33-
com.palantir.safe-logging:safe-logging:1.21.0 (7 constraints: bb6823c3)
19+
com.palantir.safe-logging:preconditions:1.21.0 (3 constraints: 8f27c33a)
20+
com.palantir.safe-logging:safe-logging:1.21.0 (6 constraints: 935669fd)
3421
com.palantir.tokens:auth-tokens:3.11.0 (1 constraints: 3705383b)
35-
io.github.java-diff-utils:java-diff-utils:4.0 (2 constraints: 1c240b56)
36-
net.bytebuddy:byte-buddy:1.12.7 (2 constraints: 6f1d3353)
37-
net.bytebuddy:byte-buddy-agent:1.12.7 (2 constraints: 6f1d3353)
38-
org.assertj:assertj-core:3.22.0 (3 constraints: bf2bc004)
39-
org.checkerframework:checker-qual:3.12.0 (4 constraints: 773a1325)
40-
org.checkerframework:dataflow-errorprone:3.15.0 (3 constraints: 6736f3f2)
41-
org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r (2 constraints: b1299390)
42-
org.immutables:value:2.8.8 (3 constraints: fb24f005)
43-
org.mockito:mockito-core:4.3.1 (3 constraints: b724cede)
44-
org.mockito:mockito-errorprone:4.1.0 (1 constraints: fb1102f9)
45-
org.objenesis:objenesis:3.2 (2 constraints: 4d1c5eb4)
46-
org.pcollections:pcollections:2.1.2 (2 constraints: ec226a11)
47-
org.slf4j:slf4j-api:1.7.33 (8 constraints: 6a841851)
22+
net.bytebuddy:byte-buddy:1.12.7 (1 constraints: 450b3fde)
23+
net.bytebuddy:byte-buddy-agent:1.12.7 (1 constraints: 450b3fde)
24+
org.assertj:assertj-core:3.22.0 (2 constraints: 941934de)
25+
org.checkerframework:checker-qual:3.12.0 (2 constraints: 4c183eaa)
26+
org.immutables:value:2.8.8 (2 constraints: f412af38)
27+
org.mockito:mockito-core:4.3.1 (1 constraints: 0a050936)
28+
org.objenesis:objenesis:3.2 (1 constraints: b10a13bd)
29+
org.slf4j:slf4j-api:1.7.33 (7 constraints: 3872c0bd)
4830

4931
[Test dependencies]
5032
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.3 (2 constraints: f1137d82)
5133
com.palantir.safe-logging:preconditions-assertj:1.21.0 (1 constraints: 3605303b)
52-
org.apache.commons:commons-lang3:3.12.0 (2 constraints: 6317b455)
34+
org.apache.commons:commons-lang3:3.12.0 (1 constraints: 38053b3b)
5335
org.junit:junit-bom:5.8.2 (6 constraints: 52620bff)
5436
org.junit.jupiter:junit-jupiter:5.8.2 (2 constraints: 260e7a59)
5537
org.junit.jupiter:junit-jupiter-api:5.8.2 (4 constraints: 8b385c34)

0 commit comments

Comments
 (0)