Skip to content

Commit b3840f0

Browse files
svc-excavator-botsvc-excavator-bot
authored
Excavator: Upgrade dependencies (#649)
1 parent b2c49a0 commit b3840f0

File tree

5 files changed

+50
-43
lines changed

5 files changed

+50
-43
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public static ObjectMapper withDefaultModules(ObjectMapper mapper) {
104104
.registerModule(new AfterburnerModule())
105105
.registerModule(new JavaTimeModule())
106106
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
107+
.disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
107108
.disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)
108109
.disable(DeserializationFeature.WRAP_EXCEPTIONS)
109110
.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)

‎service-config/build.gradle‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ apply plugin: 'com.palantir.external-publish-jar'
44
apply plugin: 'com.palantir.revapi'
55

66
dependencies {
7-
compile project(":ssl-config")
8-
compile "com.palantir.safe-logging:safe-logging"
9-
compile "com.palantir.safe-logging:preconditions"
10-
compile "com.palantir.tokens:auth-tokens"
7+
api project(":ssl-config")
8+
api "com.palantir.safe-logging:safe-logging"
9+
api "com.palantir.safe-logging:preconditions"
10+
api "com.palantir.tokens:auth-tokens"
11+
implementation "com.palantir.safe-logging:logger"
1112

1213
testImplementation project(":extras:jackson-support")
1314
testImplementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"

‎service-config/src/main/java/com/palantir/conjure/java/api/config/service/UserAgents.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@
1919
import com.palantir.logsafe.Preconditions;
2020
import com.palantir.logsafe.SafeArg;
2121
import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
22+
import com.palantir.logsafe.logger.SafeLogger;
23+
import com.palantir.logsafe.logger.SafeLoggerFactory;
2224
import java.util.HashMap;
2325
import java.util.Map;
2426
import java.util.Optional;
2527
import java.util.regex.Matcher;
2628
import java.util.regex.Pattern;
27-
import org.slf4j.Logger;
28-
import org.slf4j.LoggerFactory;
2929

3030
public final class UserAgents {
3131

3232
/** The {@link UserAgent.Agent#name agent name} identifying the conjure-java library in a {@link UserAgent}. */
3333
public static final String CONJURE_AGENT_NAME = "conjure-java-runtime";
3434

35-
private static final Logger log = LoggerFactory.getLogger(UserAgents.class);
35+
private static final SafeLogger log = SafeLoggerFactory.get(UserAgents.class);
3636

3737
private static final Pattern NAME_REGEX = Pattern.compile("[a-zA-Z][a-zA-Z0-9\\-]*");
3838
private static final Pattern LENIENT_VERSION_REGEX = Pattern.compile("[0-9a-z.-]+");

‎versions.lock‎

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,41 @@
11
# Run ./gradlew --write-locks to regenerate this file
2-
com.fasterxml.jackson.core:jackson-annotations:2.9.9 (2 constraints: 9d283d9a)
3-
com.fasterxml.jackson.core:jackson-core:2.9.9 (7 constraints: a59b2aef)
4-
com.fasterxml.jackson.core:jackson-databind:2.9.9 (6 constraints: f46c3b2a)
5-
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.9 (1 constraints: 16051936)
6-
com.fasterxml.jackson.datatype:jackson-datatype-guava:2.9.9 (1 constraints: 16051936)
7-
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9 (1 constraints: 16051936)
8-
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9 (1 constraints: 16051936)
9-
com.fasterxml.jackson.module:jackson-module-afterburner:2.9.9 (1 constraints: 16051936)
2+
com.fasterxml.jackson:jackson-bom:2.12.3 (8 constraints: 18aa4413)
3+
com.fasterxml.jackson.core:jackson-annotations:2.12.3 (4 constraints: b3452532)
4+
com.fasterxml.jackson.core:jackson-core:2.12.3 (8 constraints: 58abd2b4)
5+
com.fasterxml.jackson.core:jackson-databind:2.12.3 (9 constraints: 0fac1629)
6+
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3 (2 constraints: f1137d82)
7+
com.fasterxml.jackson.datatype:jackson-datatype-guava:2.12.3 (2 constraints: f1137d82)
8+
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.3 (2 constraints: f1137d82)
9+
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)
1011
com.google.code.findbugs:jsr305:3.0.2 (1 constraints: 0705fc35)
11-
com.google.errorprone:error_prone_annotations:2.3.3 (1 constraints: 041129c0)
12-
com.google.guava:guava:18.0 (1 constraints: 441633de)
13-
com.palantir.safe-logging:preconditions:1.11.0 (3 constraints: 6427b612)
14-
com.palantir.safe-logging:safe-logging:1.11.0 (3 constraints: ba2a0481)
15-
com.palantir.tokens:auth-tokens:3.6.1 (1 constraints: 0c050d36)
16-
net.bytebuddy:byte-buddy:1.9.10 (1 constraints: 450b52de)
17-
net.bytebuddy:byte-buddy-agent:1.9.10 (1 constraints: 450b52de)
18-
org.assertj:assertj-core:3.14.0 (2 constraints: 971970de)
12+
com.google.errorprone:error_prone_annotations:2.5.1 (4 constraints: 933e1795)
13+
com.google.guava:guava:21.0 (1 constraints: 3e1622de)
14+
com.palantir.safe-logging:logger:1.18.0 (1 constraints: 3c05413b)
15+
com.palantir.safe-logging:logger-slf4j:1.18.0 (1 constraints: 350e9350)
16+
com.palantir.safe-logging:logger-spi:1.18.0 (2 constraints: 791e0cb1)
17+
com.palantir.safe-logging:preconditions:1.18.0 (3 constraints: a027353e)
18+
com.palantir.safe-logging:safe-logging:1.18.0 (5 constraints: b0485624)
19+
com.palantir.tokens:auth-tokens:3.10.0 (1 constraints: 3605353b)
20+
net.bytebuddy:byte-buddy:1.11.3 (1 constraints: 400b38de)
21+
net.bytebuddy:byte-buddy-agent:1.11.3 (1 constraints: 400b38de)
22+
org.assertj:assertj-core:3.20.2 (2 constraints: 94192cde)
1923
org.immutables:value:2.8.8 (1 constraints: 14051536)
20-
org.mockito:mockito-core:3.1.0 (1 constraints: 0605fd35)
21-
org.objenesis:objenesis:2.6 (1 constraints: b40a14bd)
22-
org.slf4j:slf4j-api:1.7.25 (1 constraints: 0e0e9345)
24+
org.mockito:mockito-core:3.11.2 (1 constraints: 39053a3b)
25+
org.objenesis:objenesis:3.2 (1 constraints: b10a13bd)
26+
org.slf4j:slf4j-api:1.7.31 (2 constraints: 511e8597)
2327

2428
[Test dependencies]
25-
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.9 (1 constraints: 16051936)
26-
com.palantir.safe-logging:preconditions-assertj:1.11.0 (1 constraints: 35052c3b)
27-
org.apache.commons:commons-lang3:3.9 (1 constraints: b004292c)
29+
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.3 (2 constraints: f1137d82)
30+
com.palantir.safe-logging:preconditions-assertj:1.18.0 (1 constraints: 3c05413b)
31+
org.apache.commons:commons-lang3:3.12.0 (1 constraints: 38053b3b)
2832
org.apiguardian:apiguardian-api:1.1.0 (5 constraints: 0654a8a8)
29-
org.junit.jupiter:junit-jupiter:5.5.2 (1 constraints: 0e051536)
30-
org.junit.jupiter:junit-jupiter-api:5.5.2 (3 constraints: 6d2fb5db)
31-
org.junit.jupiter:junit-jupiter-engine:5.5.2 (1 constraints: 090ed63b)
32-
org.junit.jupiter:junit-jupiter-params:5.5.2 (1 constraints: 090ed63b)
33-
org.junit.platform:junit-platform-commons:1.5.2 (2 constraints: d720664a)
34-
org.junit.platform:junit-platform-engine:1.5.2 (1 constraints: a8101eb4)
33+
org.junit:junit-bom:5.7.2 (6 constraints: 4c6225fc)
34+
org.junit.jupiter:junit-jupiter:5.7.2 (2 constraints: 240e5859)
35+
org.junit.jupiter:junit-jupiter-api:5.7.2 (4 constraints: 87383d33)
36+
org.junit.jupiter:junit-jupiter-engine:5.7.2 (2 constraints: 1f17a43c)
37+
org.junit.jupiter:junit-jupiter-params:5.7.2 (2 constraints: 1f17a43c)
38+
org.junit.platform:junit-platform-commons:1.7.2 (3 constraints: eb29562b)
39+
org.junit.platform:junit-platform-engine:1.7.2 (2 constraints: ba19a8f3)
3540
org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49)
36-
org.yaml:snakeyaml:1.23 (1 constraints: 6e17f627)
41+
org.yaml:snakeyaml:1.27 (1 constraints: 7217fa27)

‎versions.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
com.fasterxml.jackson.*:jackson-* = 2.9.9
1+
com.fasterxml.jackson.*:jackson-* = 2.12.3
22
com.google.code.findbugs:jsr305 = 3.0.2
3-
com.palantir.safe-logging:* = 1.11.0
4-
com.palantir.tokens:auth-tokens = 3.6.1
5-
org.apache.commons:commons-lang3 = 3.9
6-
org.assertj:assertj-core = 3.14.0
3+
com.palantir.safe-logging:* = 1.18.0
4+
com.palantir.tokens:auth-tokens = 3.10.0
5+
org.apache.commons:commons-lang3 = 3.12.0
6+
org.assertj:assertj-core = 3.20.2
77
org.immutables:* = 2.8.8
8-
org.junit.jupiter:* = 5.5.2
9-
org.mockito:mockito-core = 3.1.0
8+
org.junit.jupiter:* = 5.7.2
9+
org.mockito:mockito-core = 3.11.2

0 commit comments

Comments
 (0)