diff --git a/build.gradle b/build.gradle
index 4f2da5dfa..89b54533f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
classpath 'com.github.jengelman.gradle.plugins:shadow:6.0.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
classpath 'com.netflix.nebula:nebula-publishing-plugin:17.3.2'
- classpath 'com.palantir.baseline:gradle-baseline-java:3.0.0'
+ classpath 'com.palantir.baseline:gradle-baseline-java:3.43.0'
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.25.0'
}
}
diff --git a/crypto-core/src/main/java/com/palantir/crypto2/cipher/SeekableCipherFactory.java b/crypto-core/src/main/java/com/palantir/crypto2/cipher/SeekableCipherFactory.java
index 0bdb93daa..b844d5f08 100644
--- a/crypto-core/src/main/java/com/palantir/crypto2/cipher/SeekableCipherFactory.java
+++ b/crypto-core/src/main/java/com/palantir/crypto2/cipher/SeekableCipherFactory.java
@@ -39,8 +39,10 @@ public static KeyMaterial generateKeyMaterial(String cipherAlgorithm) {
}
/**
- * @deprecated This method has been found to be error prone because consumers are not forced to handle the generated
- * {@link KeyMaterial} explicitly. Use {@link #generateKeyMaterial(String)} and {@link #getCipher(String,
+ * This method has been found to be error prone because consumers are not forced to handle the generated
+ * {@link KeyMaterial} explicitly.
+ *
+ * @deprecated Use {@link #generateKeyMaterial(String)} and {@link #getCipher(String,
* KeyMaterial)} directly.
*
* ex: https://github.com/palantir/hadoop-crypto/pull/77
diff --git a/crypto-keys/build.gradle b/crypto-keys/build.gradle
index ed6b2f8ed..b1ca838b4 100644
--- a/crypto-keys/build.gradle
+++ b/crypto-keys/build.gradle
@@ -4,6 +4,6 @@ dependencies {
testCompile "junit:junit"
testCompile "org.assertj:assertj-core"
- testCompile "org.jmock:jmock-junit4"
+ testCompile "org.jmock:jmock"
testCompile "org.mockito:mockito-core"
}
diff --git a/crypto-keys/src/main/java/com/palantir/crypto2/keys/serialization/SymmetricKeySerializerV3.java b/crypto-keys/src/main/java/com/palantir/crypto2/keys/serialization/SymmetricKeySerializerV3.java
index 773208cc5..0a6927f0d 100644
--- a/crypto-keys/src/main/java/com/palantir/crypto2/keys/serialization/SymmetricKeySerializerV3.java
+++ b/crypto-keys/src/main/java/com/palantir/crypto2/keys/serialization/SymmetricKeySerializerV3.java
@@ -27,6 +27,8 @@
import javax.crypto.spec.GCMParameterSpec;
/**
+ * This serialization format has been deprecated.
+ *
* @deprecated As per the NIST recommendation in section 8.3 [1] the same key should not be used with AES GCM more than
* 2^32 times. An alternative method should be used as the current implementation does not guard against this
* limitation.
diff --git a/hadoop-crypto/src/main/java/com/palantir/crypto2/hadoop/EncryptedFileSystem.java b/hadoop-crypto/src/main/java/com/palantir/crypto2/hadoop/EncryptedFileSystem.java
index 96e60ffa5..3d73509bf 100644
--- a/hadoop-crypto/src/main/java/com/palantir/crypto2/hadoop/EncryptedFileSystem.java
+++ b/hadoop-crypto/src/main/java/com/palantir/crypto2/hadoop/EncryptedFileSystem.java
@@ -54,6 +54,8 @@ public final class EncryptedFileSystem extends DelegatingFileSystem {
private static final String DEFAULT_CIPHER_ALGORITHM = AesCtrCipher.ALGORITHM;
/**
+ * This key has been deprecated.
+ *
* @deprecated use {@link #CIPHER_ALGORITHM_KEY}.
*/
@Deprecated
diff --git a/hadoop-crypto/src/main/java/com/palantir/crypto2/hadoop/cipher/FsCipherInputStream.java b/hadoop-crypto/src/main/java/com/palantir/crypto2/hadoop/cipher/FsCipherInputStream.java
index 8d0e05afd..b5f008337 100644
--- a/hadoop-crypto/src/main/java/com/palantir/crypto2/hadoop/cipher/FsCipherInputStream.java
+++ b/hadoop-crypto/src/main/java/com/palantir/crypto2/hadoop/cipher/FsCipherInputStream.java
@@ -35,6 +35,9 @@ public final class FsCipherInputStream extends FSInputStream {
private final DefaultSeekableInputStream delegate;
/**
+ * Deprecated as this constructor will always use the JCE crypto implementations which can be significantly
+ * slower in many cases.
+ *
* @deprecated use {@link FsCipherInputStream#FsCipherInputStream(FSDataInputStream, KeyMaterial, String)} instead.
*/
@Deprecated
diff --git a/hadoop-crypto/src/test/java/com/palantir/crypto2/hadoop/PathConvertingFileSystemTest.java b/hadoop-crypto/src/test/java/com/palantir/crypto2/hadoop/PathConvertingFileSystemTest.java
index 233c1af26..54285b99b 100644
--- a/hadoop-crypto/src/test/java/com/palantir/crypto2/hadoop/PathConvertingFileSystemTest.java
+++ b/hadoop-crypto/src/test/java/com/palantir/crypto2/hadoop/PathConvertingFileSystemTest.java
@@ -54,7 +54,7 @@ public void before() {
fileChecksum = mock(FileChecksum.class);
when(delegate.getConf()).thenReturn(new Configuration());
when(delegate.getUri()).thenReturn(URI.create("foo://bar"));
- convertingFs = new PathConvertingFileSystem(delegate, p -> DELEGATE_PATH, p -> RETURN_PATH, u -> RETURN_URI);
+ convertingFs = new PathConvertingFileSystem(delegate, _p -> DELEGATE_PATH, _p -> RETURN_PATH, _u -> RETURN_URI);
}
@Test
diff --git a/versions.lock b/versions.lock
index bdf01676b..5a8fdbb3e 100644
--- a/versions.lock
+++ b/versions.lock
@@ -71,7 +71,7 @@ xmlenc:xmlenc:0.52 (1 constraints: 5d0db521)
[Test dependencies]
cglib:cglib:3.2.0 (1 constraints: 7507ff6a)
-junit:junit:4.13 (3 constraints: f7156a1b)
+junit:junit:4.13 (2 constraints: 240c4c04)
net.bytebuddy:byte-buddy:1.10.10 (1 constraints: 6d0ba0e9)
net.bytebuddy:byte-buddy-agent:1.10.10 (1 constraints: 6d0ba0e9)
org.apache.ant:ant:1.9.4 (1 constraints: e2057a47)
@@ -80,8 +80,7 @@ org.assertj:assertj-core:3.16.1 (1 constraints: 3d05483b)
org.beanshell:bsh:1.3.0 (1 constraints: 7407f86a)
org.hamcrest:hamcrest-core:1.3 (2 constraints: 89126d10)
org.hamcrest:hamcrest-library:1.3 (1 constraints: 1607405c)
-org.jmock:jmock:2.8.2 (1 constraints: 070aefb4)
-org.jmock:jmock-junit4:2.8.2 (1 constraints: 0e050f36)
+org.jmock:jmock:2.8.2 (1 constraints: 0e050f36)
org.jmock:jmock-testjar:2.8.2 (1 constraints: 7c070e6b)
org.mockito:mockito-core:3.4.0 (1 constraints: 09050636)
org.objenesis:objenesis:2.6 (1 constraints: b40a14bd)
diff --git a/versions.props b/versions.props
index e64012f26..1b5e8dec5 100644
--- a/versions.props
+++ b/versions.props
@@ -7,7 +7,7 @@ org.apache.hadoop:hadoop-common = 2.7.3
org.assertj:assertj-* = 3.16.1
org.hamcrest:hamcrest-* = 1.3
org.immutables:value = 2.8.8
-org.jmock:jmock-junit4 = 2.8.2
+org.jmock:jmock = 2.8.2
org.mockito:mockito-core = 3.4.0
org.openjdk.jmh:* = 1.22
org.ow2.asm:asm = 8.0.1