Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package com.palantir.crypto2.hadoop;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

Expand All @@ -44,7 +44,7 @@
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;

@RunWith(MockitoJUnitRunner.class)
public final class DelegatingFileSystemTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.palantir.crypto2.hadoop.cipher;

import static org.mockito.Matchers.anyInt;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
Expand Down
20 changes: 10 additions & 10 deletions versions.lock
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
# Run ./gradlew --write-locks to regenerate this file
com.google.code.findbugs:jsr305:3.0.2 (3 constraints: 7c2a16b0)
com.google.errorprone:error_prone_annotations:2.7.1 (1 constraints: 1c0afbb4)
com.google.errorprone:error_prone_annotations:2.11.0 (1 constraints: 460a32bf)
com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
com.google.guava:guava:31.0.1-jre (1 constraints: a5065053)
com.google.guava:guava:31.1-jre (1 constraints: 47069c47)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
com.google.j2objc:j2objc-annotations:1.3 (1 constraints: b809eda0)
com.palantir.seek-io:seek-io:1.3.0 (1 constraints: 0605f935)
commons-logging:commons-logging:1.1.3 (1 constraints: b0102eb8)
net.java.dev.jna:jna:5.5.0 (1 constraints: a80ee955)
net.sf.jopt-simple:jopt-simple:4.6 (1 constraints: 610a91b7)
net.sf.jopt-simple:jopt-simple:5.0.4 (1 constraints: be0ad6cc)
org.apache.commons:commons-crypto:1.1.0 (1 constraints: 0405f335)
org.apache.commons:commons-math3:3.6.1 (2 constraints: 670ffb89)
org.apache.hadoop:hadoop-client-api:3.3.4 (2 constraints: c01565e0)
org.apache.hadoop:hadoop-client-runtime:3.3.4 (1 constraints: 0c050736)
org.checkerframework:checker-qual:3.12.0 (1 constraints: 480a3bbf)
org.immutables:value:2.8.8 (1 constraints: 14051536)
org.openjdk.jmh:jmh-core:1.33 (2 constraints: ef158fd8)
org.openjdk.jmh:jmh-generator-annprocess:1.33 (1 constraints: db04f830)
org.openjdk.jmh:jmh-core:1.35 (2 constraints: f315f3d8)
org.openjdk.jmh:jmh-generator-annprocess:1.35 (1 constraints: dd04fa30)
org.slf4j:slf4j-api:1.7.36 (2 constraints: 2e163706)
org.xerial.snappy:snappy-java:1.1.8.2 (2 constraints: 5f203863)

[Test dependencies]
com.google.code.findbugs:annotations:3.0.1 (1 constraints: 9e0aafc3)
junit:junit:4.13.2 (1 constraints: 3c05463b)
net.bytebuddy:byte-buddy:1.11.13 (1 constraints: 710ba7e9)
net.bytebuddy:byte-buddy-agent:1.11.13 (1 constraints: 710ba7e9)
net.bytebuddy:byte-buddy:1.12.14 (2 constraints: ed164366)
net.bytebuddy:byte-buddy-agent:1.12.14 (1 constraints: 730bace9)
net.jcip:jcip-annotations:1.0 (1 constraints: 560ff165)
org.apache-extras.beanshell:bsh:2.0b6 (1 constraints: ac07626b)
org.assertj:assertj-core:3.21.0 (1 constraints: 38053c3b)
org.assertj:assertj-core:3.23.1 (1 constraints: 3b05433b)
org.hamcrest:hamcrest:2.1 (2 constraints: 8512932d)
org.hamcrest:hamcrest-core:2.1 (2 constraints: 88126e10)
org.hamcrest:hamcrest-library:2.1 (1 constraints: 1507415c)
org.jmock:jmock:2.12.0 (1 constraints: 3705353b)
org.jmock:jmock-testjar:2.12.0 (1 constraints: a507a272)
org.mockito:mockito-core:3.12.4 (1 constraints: 3c053f3b)
org.mockito:mockito-core:4.8.0 (1 constraints: 0e051736)
org.objenesis:objenesis:3.2 (1 constraints: b10a13bd)
org.ow2.asm:asm:9.2 (2 constraints: c80b78ef)
org.ow2.asm:asm:9.4 (2 constraints: ca0ba6ef)
10 changes: 5 additions & 5 deletions versions.props
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
com.google.guava:guava = 31.0.1-jre
com.google.guava:guava = 31.1-jre
com.palantir.seek-io:seek-io = 1.3.0
junit:junit = 4.13.2
org.apache.commons:commons-crypto = 1.1.0
org.apache.commons:commons-math3 = 3.6.1
org.apache.hadoop:hadoop-* = 3.3.4
org.assertj:assertj-* = 3.21.0
org.assertj:assertj-* = 3.23.1
org.hamcrest:hamcrest-* = 1.3
org.immutables:value = 2.8.8
org.jmock:jmock = 2.12.0
org.mockito:mockito-core = 3.12.4
org.openjdk.jmh:* = 1.33
org.ow2.asm:asm = 9.2
org.mockito:mockito-core = 4.8.0
org.openjdk.jmh:* = 1.35
org.ow2.asm:asm = 9.4
org.slf4j:* = 1.7.36