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 @@ -19,13 +19,13 @@
import com.mongodb.AutoEncryptionSettings;
import com.mongodb.ClientEncryptionSettings;
import com.mongodb.MongoClientSettings;
import com.mongodb.MongoCommandException;
import com.mongodb.MongoNamespace;
import com.mongodb.WriteConcern;
import com.mongodb.client.model.CreateCollectionOptions;
import com.mongodb.client.model.ValidationOptions;
import com.mongodb.client.vault.ClientEncryption;
import com.mongodb.client.vault.ClientEncryptions;
import com.mongodb.crypt.capi.MongoCryptException;
import com.mongodb.fixture.EncryptionFixture;
import org.bson.BsonArray;
import org.bson.BsonDocument;
Expand Down Expand Up @@ -216,8 +216,8 @@ void testCase8() {
+ "]").stream().map(stage -> stage.asDocument()).collect(Collectors.toList());

assertCause(
MongoCryptException.class,
"not supported",
MongoCommandException.class,
"Cannot specify both encryptionInformation and csfleEncryptionSchemas",
() -> client.getDatabase("db").getCollection("csfle").aggregate(pipeline).first());
}

Expand Down
2 changes: 1 addition & 1 deletion mongodb-crypt/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ val jnaLibsPath: String = System.getProperty("jnaLibsPath", "${jnaResourcesDir}$
val jnaResources: String = System.getProperty("jna.library.path", jnaLibsPath)

// Download jnaLibs that match the git tag or revision to jnaResourcesBuildDir
val downloadRevision = "1.15.1"
val downloadRevision = "1.17.3"
val binariesArchiveName = "libmongocrypt-java.tar.gz"

/**
Expand Down