Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Excavator: Upgrade dependencies #649

Merged
merged 3 commits into from
Jul 23, 2021
Merged

Excavator: Upgrade dependencies #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4e6526
Excavator: Upgrade dependencies
svc-excavator-bot Jul 22, 2021
5fcc521
deps
carterkozak Jul 23, 2021
3e7aead
Fix java8 duration serialization
carterkozak Jul 23, 2021
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
1 change: 1 addition & 0 deletions ...ackson-support/src/main/java/com/palantir/conjure/java/api/ext/jackson/ObjectMappers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public static ObjectMapper withDefaultModules(ObjectMapper mapper) {
.registerModule(new AfterburnerModule())
.registerModule(new JavaTimeModule())
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
.disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
.disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)
.disable(DeserializationFeature.WRAP_EXCEPTIONS)
.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
Expand Down
9 changes: 5 additions & 4 deletions service-config/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ apply plugin: 'com.palantir.external-publish-jar'
apply plugin: 'com.palantir.revapi'

dependencies {
compile project(":ssl-config")
compile "com.palantir.safe-logging:safe-logging"
compile "com.palantir.safe-logging:preconditions"
compile "com.palantir.tokens:auth-tokens"
api project(":ssl-config")
api "com.palantir.safe-logging:safe-logging"
api "com.palantir.safe-logging:preconditions"
api "com.palantir.tokens:auth-tokens"
Comment on lines -7 to +10
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opted against risking breaking consumers that rely on exposed dependencies here.

implementation "com.palantir.safe-logging:logger"

testImplementation project(":extras:jackson-support")
testImplementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
Expand Down
6 changes: 3 additions & 3 deletions service-config/src/main/java/com/palantir/conjure/java/api/config/service/UserAgents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
import com.palantir.logsafe.Preconditions;
import com.palantir.logsafe.SafeArg;
import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
import com.palantir.logsafe.logger.SafeLogger;
import com.palantir.logsafe.logger.SafeLoggerFactory;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public final class UserAgents {

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

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

private static final Pattern NAME_REGEX = Pattern.compile("[a-zA-Z][a-zA-Z0-9\\-]*");
private static final Pattern LENIENT_VERSION_REGEX = Pattern.compile("[0-9a-z.-]+");
Expand Down
63 changes: 34 additions & 29 deletions versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,41 @@
# Run ./gradlew --write-locks to regenerate this file
com.fasterxml.jackson.core:jackson-annotations:2.9.9 (2 constraints: 9d283d9a)
com.fasterxml.jackson.core:jackson-core:2.9.9 (7 constraints: a59b2aef)
com.fasterxml.jackson.core:jackson-databind:2.9.9 (6 constraints: f46c3b2a)
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.9 (1 constraints: 16051936)
com.fasterxml.jackson.datatype:jackson-datatype-guava:2.9.9 (1 constraints: 16051936)
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9 (1 constraints: 16051936)
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9 (1 constraints: 16051936)
com.fasterxml.jackson.module:jackson-module-afterburner:2.9.9 (1 constraints: 16051936)
com.fasterxml.jackson:jackson-bom:2.12.3 (8 constraints: 18aa4413)
com.fasterxml.jackson.core:jackson-annotations:2.12.3 (4 constraints: b3452532)
com.fasterxml.jackson.core:jackson-core:2.12.3 (8 constraints: 58abd2b4)
com.fasterxml.jackson.core:jackson-databind:2.12.3 (9 constraints: 0fac1629)
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3 (2 constraints: f1137d82)
com.fasterxml.jackson.datatype:jackson-datatype-guava:2.12.3 (2 constraints: f1137d82)
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.3 (2 constraints: f1137d82)
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.3 (2 constraints: f1137d82)
com.fasterxml.jackson.module:jackson-module-afterburner:2.12.3 (2 constraints: f1137d82)
com.google.code.findbugs:jsr305:3.0.2 (1 constraints: 0705fc35)
com.google.errorprone:error_prone_annotations:2.3.3 (1 constraints: 041129c0)
com.google.guava:guava:18.0 (1 constraints: 441633de)
com.palantir.safe-logging:preconditions:1.11.0 (3 constraints: 6427b612)
com.palantir.safe-logging:safe-logging:1.11.0 (3 constraints: ba2a0481)
com.palantir.tokens:auth-tokens:3.6.1 (1 constraints: 0c050d36)
net.bytebuddy:byte-buddy:1.9.10 (1 constraints: 450b52de)
net.bytebuddy:byte-buddy-agent:1.9.10 (1 constraints: 450b52de)
org.assertj:assertj-core:3.14.0 (2 constraints: 971970de)
com.google.errorprone:error_prone_annotations:2.5.1 (4 constraints: 933e1795)
com.google.guava:guava:21.0 (1 constraints: 3e1622de)
com.palantir.safe-logging:logger:1.18.0 (1 constraints: 3c05413b)
com.palantir.safe-logging:logger-slf4j:1.18.0 (1 constraints: 350e9350)
com.palantir.safe-logging:logger-spi:1.18.0 (2 constraints: 791e0cb1)
com.palantir.safe-logging:preconditions:1.18.0 (3 constraints: a027353e)
com.palantir.safe-logging:safe-logging:1.18.0 (5 constraints: b0485624)
com.palantir.tokens:auth-tokens:3.10.0 (1 constraints: 3605353b)
net.bytebuddy:byte-buddy:1.11.3 (1 constraints: 400b38de)
net.bytebuddy:byte-buddy-agent:1.11.3 (1 constraints: 400b38de)
org.assertj:assertj-core:3.20.2 (2 constraints: 94192cde)
org.immutables:value:2.8.8 (1 constraints: 14051536)
org.mockito:mockito-core:3.1.0 (1 constraints: 0605fd35)
org.objenesis:objenesis:2.6 (1 constraints: b40a14bd)
org.slf4j:slf4j-api:1.7.25 (1 constraints: 0e0e9345)
org.mockito:mockito-core:3.11.2 (1 constraints: 39053a3b)
org.objenesis:objenesis:3.2 (1 constraints: b10a13bd)
org.slf4j:slf4j-api:1.7.31 (2 constraints: 511e8597)

[Test dependencies]
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.9 (1 constraints: 16051936)
com.palantir.safe-logging:preconditions-assertj:1.11.0 (1 constraints: 35052c3b)
org.apache.commons:commons-lang3:3.9 (1 constraints: b004292c)
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.3 (2 constraints: f1137d82)
com.palantir.safe-logging:preconditions-assertj:1.18.0 (1 constraints: 3c05413b)
org.apache.commons:commons-lang3:3.12.0 (1 constraints: 38053b3b)
org.apiguardian:apiguardian-api:1.1.0 (5 constraints: 0654a8a8)
org.junit.jupiter:junit-jupiter:5.5.2 (1 constraints: 0e051536)
org.junit.jupiter:junit-jupiter-api:5.5.2 (3 constraints: 6d2fb5db)
org.junit.jupiter:junit-jupiter-engine:5.5.2 (1 constraints: 090ed63b)
org.junit.jupiter:junit-jupiter-params:5.5.2 (1 constraints: 090ed63b)
org.junit.platform:junit-platform-commons:1.5.2 (2 constraints: d720664a)
org.junit.platform:junit-platform-engine:1.5.2 (1 constraints: a8101eb4)
org.junit:junit-bom:5.7.2 (6 constraints: 4c6225fc)
org.junit.jupiter:junit-jupiter:5.7.2 (2 constraints: 240e5859)
org.junit.jupiter:junit-jupiter-api:5.7.2 (4 constraints: 87383d33)
org.junit.jupiter:junit-jupiter-engine:5.7.2 (2 constraints: 1f17a43c)
org.junit.jupiter:junit-jupiter-params:5.7.2 (2 constraints: 1f17a43c)
org.junit.platform:junit-platform-commons:1.7.2 (3 constraints: eb29562b)
org.junit.platform:junit-platform-engine:1.7.2 (2 constraints: ba19a8f3)
org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49)
org.yaml:snakeyaml:1.23 (1 constraints: 6e17f627)
org.yaml:snakeyaml:1.27 (1 constraints: 7217fa27)
14 changes: 7 additions & 7 deletions versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
com.fasterxml.jackson.*:jackson-* = 2.9.9
com.fasterxml.jackson.*:jackson-* = 2.12.3
com.google.code.findbugs:jsr305 = 3.0.2
com.palantir.safe-logging:* = 1.11.0
com.palantir.tokens:auth-tokens = 3.6.1
org.apache.commons:commons-lang3 = 3.9
org.assertj:assertj-core = 3.14.0
com.palantir.safe-logging:* = 1.18.0
com.palantir.tokens:auth-tokens = 3.10.0
org.apache.commons:commons-lang3 = 3.12.0
org.assertj:assertj-core = 3.20.2
org.immutables:* = 2.8.8
org.junit.jupiter:* = 5.5.2
org.mockito:mockito-core = 3.1.0
org.junit.jupiter:* = 5.7.2
org.mockito:mockito-core = 3.11.2