Upgrade assertj 3.20.1 & safe-logging 1.15.0 (#5511)

.java-version

@@ -1 +1 @@
-1.8
+11

timelock-server/src/integTest/java/com/palantir/atlasdb/timelock/LockWatchValueIntegrationTest.java

@@ -159,7 +159,15 @@ public void readWriteTransactionsPublishValuesToCentralCache() {
 
         assertThat(result).containsEntry(CELL_1, DATA_1);
         assertThat(result).containsEntry(CELL_4, DATA_2);
-        assertThat(result).containsExactlyInAnyOrderEntriesOf(result2);
+
+        // Cannot use containsExactlyInAnyOrderEntriesOf assertj regression in 3.20.0 with map entry comparisons,
+        // see https://github.com/assertj/assertj-core/issues/2264 & https://github.com/assertj/assertj-core/pull/2265
+        // assertThat(result).containsExactlyInAnyOrderEntriesOf(result2);
+        assertThat(result.keySet()).isEqualTo(result2.keySet());
+        assertThat(result.values()).hasSameElementsAs(result2.values());
+        assertThat(result).hasSize(result2.size()).containsAllEntriesOf(result2);
+        assertThat(result).containsAllEntriesOf(result2);
+        assertThat(result2).containsAllEntriesOf(result);
     }
 
     @Test

versions.lock

@@ -45,7 +45,7 @@ com.google.dagger:dagger:2.35 (4 constraints: d42ece4b)
 com.google.dagger:dagger-compiler:2.29.1 (1 constraints: 40054f3b)
 com.google.dagger:dagger-producers:2.29.1 (2 constraints: f81a6f92)
 com.google.dagger:dagger-spi:2.29.1 (1 constraints: 840e3d5d)
-com.google.errorprone:error_prone_annotations:2.7.1 (19 constraints: d5351c36)
+com.google.errorprone:error_prone_annotations:2.7.1 (19 constraints: d5352036)
 com.google.errorprone:javac-shaded:9-dev-r4023-3 (1 constraints: 151671fc)
 com.google.googlejavaformat:google-java-format:1.5 (1 constraints: ee0d4132)
 com.google.guava:failureaccess:1.0.1 (4 constraints: 563320fd)
@@ -100,8 +100,8 @@ com.palantir.refreshable:refreshable:1.2.0 (3 constraints: 6629eaf1)
 com.palantir.remoting2:error-handling:2.6.3 (2 constraints: 3f15c2ba)
 com.palantir.remoting2:jackson-support:2.6.3 (2 constraints: 571dfe30)
 com.palantir.ri:resource-identifier:1.2.0 (3 constraints: 992fff33)
-com.palantir.safe-logging:preconditions:1.14.0 (28 constraints: aeddf40d)
-com.palantir.safe-logging:safe-logging:1.14.0 (23 constraints: 3e7f3e3c)
+com.palantir.safe-logging:preconditions:1.15.0 (28 constraints: b0ddf714)
+com.palantir.safe-logging:safe-logging:1.15.0 (23 constraints: 417fd943)
 com.palantir.safethreadlocalrandom:safe-thread-local-random:0.1.0 (3 constraints: 933225f9)
 com.palantir.sls.versions:sls-versions:0.14.0 (1 constraints: 37052f3b)
 com.palantir.tokens:auth-tokens:3.8.1 (5 constraints: 5c5bc41a)
@@ -203,7 +203,7 @@ org.apache.httpcomponents.client5:httpclient5:5.0.3 (1 constraints: cc13926e)
 org.apache.httpcomponents.core5:httpcore5:5.1 (3 constraints: fb38c8bc)
 org.apache.httpcomponents.core5:httpcore5-h2:5.0.2 (1 constraints: 3b13053c)
 org.apache.thrift:libthrift:0.9.2 (3 constraints: 6d318be9)
-org.assertj:assertj-core:3.19.0 (4 constraints: b039e80a)
+org.assertj:assertj-core:3.20.1 (4 constraints: a339b205)
 org.awaitility:awaitility:4.0.3 (2 constraints: c81ac33b)
 org.caffinitas.ohc:ohc-core:0.3.4 (1 constraints: 950f6988)
 org.checkerframework:checker-compat-qual:2.5.3 (2 constraints: 1b1dbd16)
@@ -309,7 +309,7 @@ com.h2database:h2:1.4.190 (1 constraints: 7105af40)
 com.palantir.conjure.java.api:test-utils:2.18.0 (1 constraints: 3c05443b)
 com.palantir.remoting2:jersey-servers:2.6.3 (1 constraints: 0d050a36)
 com.palantir.remoting2:tracing:2.6.3 (1 constraints: 3310819c)
-com.palantir.safe-logging:preconditions-assertj:1.14.0 (1 constraints: 3805353b)
+com.palantir.safe-logging:preconditions-assertj:1.15.0 (1 constraints: 3905383b)
 com.palantir.tracing:tracing-test-utils:4.21.0 (1 constraints: 3905423b)
 com.spotify.dataenum:dataenum:1.3.2 (1 constraints: e91058c1)
 com.thoughtworks.qdox:qdox:1.12.1 (1 constraints: 6d11f7d9)

versions.props

@@ -25,7 +25,7 @@ com.palantir.dialogue:* = 1.118.1
 com.palantir.docker.compose:docker-compose-rule* = 1.5.0
 com.palantir.docker.proxy:docker-proxy-rule* = 1.1.1
 com.palantir.remoting2:* = 2.6.3
-com.palantir.safe-logging:* = 1.14.0
+com.palantir.safe-logging:* = 1.15.0
 com.palantir.sls.versions:* = 0.14.0
 com.palantir.tracing:* = 4.21.0
 com.palantir.tritium:* = 0.18.8
@@ -40,7 +40,7 @@ net.jcip:jcip-annotations = 1.0
 one.util:streamex = 0.7.3
 org.apache.commons:commons-pool2 = 2.9.0
 org.apache.commons:commons-lang3 = 3.12.0
-org.assertj:assertj-* = 3.19.0
+org.assertj:assertj-* = 3.20.1
 org.awaitility:awaitility = 4.0.3
 org.clojure:clojure = 1.8.0
 org.derive4j:* = 1.1.1