diff --git a/sls-versions/build.gradle b/sls-versions/build.gradle index 28ae1466..b6fbaa80 100644 --- a/sls-versions/build.gradle +++ b/sls-versions/build.gradle @@ -6,7 +6,7 @@ dependencies { compile 'com.fasterxml.jackson.core:jackson-annotations' compile 'com.palantir.safe-logging:preconditions' compile 'com.palantir.safe-logging:safe-logging' - compile 'org.slf4j:slf4j-api' + implementation 'com.palantir.safe-logging:logger' annotationProcessor 'org.immutables:value' compileOnly 'org.immutables:value::annotations' diff --git a/sls-versions/src/main/java/com/palantir/sls/versions/SlsVersionMatcher.java b/sls-versions/src/main/java/com/palantir/sls/versions/SlsVersionMatcher.java index b87ac73f..bef24950 100644 --- a/sls-versions/src/main/java/com/palantir/sls/versions/SlsVersionMatcher.java +++ b/sls-versions/src/main/java/com/palantir/sls/versions/SlsVersionMatcher.java @@ -23,12 +23,12 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; +import com.palantir.logsafe.logger.SafeLogger; +import com.palantir.logsafe.logger.SafeLoggerFactory; import java.util.Comparator; import java.util.Optional; import java.util.OptionalInt; import org.immutables.value.Value; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * An SLS version matcher as defined by the [SLS @@ -38,7 +38,7 @@ @ImmutablesStyle public abstract class SlsVersionMatcher { - private static final Logger log = LoggerFactory.getLogger(SlsVersionMatcher.class); + private static final SafeLogger log = SafeLoggerFactory.get(SlsVersionMatcher.class); private static final Comparator EMPTY_IS_GREATER = Comparator.comparingInt(num -> num.isPresent() ? num.getAsInt() : Integer.MAX_VALUE); diff --git a/versions.lock b/versions.lock index 40234435..f24cf507 100644 --- a/versions.lock +++ b/versions.lock @@ -1,15 +1,18 @@ # Run ./gradlew --write-locks to regenerate this file com.fasterxml.jackson.core:jackson-annotations:2.11.1 (2 constraints: bb17a070) com.google.code.findbugs:jsr305:3.0.2 (1 constraints: 170aecb4) -com.google.errorprone:error_prone_annotations:2.5.1 (2 constraints: 1b1bf559) -com.palantir.safe-logging:preconditions:1.4.0 (1 constraints: 0705fc35) -com.palantir.safe-logging:safe-logging:1.18.0 (2 constraints: 3c1684f6) +com.google.errorprone:error_prone_annotations:2.5.1 (5 constraints: ac48316e) +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 (1 constraints: 3c05413b) +com.palantir.safe-logging:safe-logging:1.18.0 (4 constraints: 52342904) net.sf.jopt-simple:jopt-simple:4.6 (1 constraints: 610a91b7) org.apache.commons:commons-math3:3.2 (1 constraints: 5c0a8ab7) org.immutables:value:2.8.8 (1 constraints: 14051536) org.openjdk.jmh:jmh-core:1.32 (1 constraints: 1411a7be) org.openjdk.jmh:jmh-generator-annprocess:1.32 (1 constraints: da04f730) -org.slf4j:slf4j-api:1.7.32 (1 constraints: 3f05473b) +org.slf4j:slf4j-api:1.7.31 (1 constraints: 471091b6) [Test dependencies] com.fasterxml.jackson.core:jackson-core:2.11.1 (1 constraints: 85123021) diff --git a/versions.props b/versions.props index a8e405b9..6f5eb1d5 100644 --- a/versions.props +++ b/versions.props @@ -1,8 +1,6 @@ com.fasterxml.jackson.core:* = 2.11.1 org.immutables:* = 2.8.8 -org.slf4j:slf4j-api = 1.7.32 -com.palantir.safe-logging:preconditions = 1.4.0 -com.palantir.safe-logging:safe-logging = 1.18.0 +com.palantir.safe-logging:* = 1.18.0 com.google.guava:guava = 30.1.1-jre com.uber.nullaway:nullaway = 0.9.2