Skip to content

Commit

Permalink
Merge pull request #174 from BillFarber/task/updateDependencies
Browse files Browse the repository at this point in the history
Updating all dependencies
  • Loading branch information
BillFarber authored May 8, 2024
2 parents 8030aab + 5bef71b commit 4f99d29
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
20 changes: 11 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
id "com.github.jk1.dependency-license-report" version "1.19"

// Only used for testing
id 'com.marklogic.ml-gradle' version '4.6.0'
id 'com.marklogic.ml-gradle' version '4.7.0'
id 'jacoco'
id "org.sonarqube" version "4.4.1.3373"

Expand All @@ -31,20 +31,22 @@ configurations {
}

ext {
kafkaVersion = "3.5.1"
// Even though Kafka Connect 3.7.0 is out, we're staying with 3.6.1 in order to continue
// using the third-party Kafka JUnit tool. See https://github.com/mguenther/kafka-junit?tab=readme-ov-file
kafkaVersion = "3.6.1"
}

dependencies {
compileOnly "org.apache.kafka:connect-api:${kafkaVersion}"
compileOnly "org.apache.kafka:connect-json:${kafkaVersion}"
compileOnly "org.apache.kafka:connect-runtime:${kafkaVersion}"
compileOnly "org.slf4j:slf4j-api:1.7.36"
compileOnly "org.slf4j:slf4j-api:2.0.13"

implementation 'com.marklogic:ml-javaclient-util:4.7.0'
// Force DHF to use the latest version of ml-app-deployer, which minimizes security vulnerabilities
implementation "com.marklogic:ml-app-deployer:4.6.0"
implementation "com.marklogic:ml-app-deployer:4.7.0"

implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.15.2"
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.15.3"

// Note that in general, the version of the DHF jar must match that of the deployed DHF instance. Different versions
// may work together, but that behavior is not guaranteed.
Expand All @@ -63,13 +65,13 @@ dependencies {

testImplementation "org.apache.kafka:connect-api:${kafkaVersion}"
testImplementation "org.apache.kafka:connect-json:${kafkaVersion}"
testImplementation 'net.mguenther.kafka:kafka-junit:3.5.1'
testImplementation 'net.mguenther.kafka:kafka-junit:3.6.0'

testImplementation "org.apache.avro:avro-compiler:1.11.1"
testImplementation "org.apache.avro:avro-compiler:1.11.3"

// Forcing logback to be used for test logging
testImplementation "ch.qos.logback:logback-classic:1.3.5"
testImplementation "org.slf4j:jcl-over-slf4j:1.7.36"
testImplementation "ch.qos.logback:logback-classic:1.3.14"
testImplementation "org.slf4j:jcl-over-slf4j:2.0.13"

documentation files('LICENSE.txt')
documentation files('NOTICE.txt')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import com.marklogic.client.MarkLogicIOException;
import com.marklogic.client.document.JSONDocumentManager;
import com.marklogic.client.document.XMLDocumentManager;
import com.marklogic.client.ext.util.DefaultDocumentPermissionsParser;
import com.marklogic.client.io.DocumentMetadataHandle;
import com.marklogic.client.io.StringHandle;
import com.marklogic.junit5.PermissionsTester;
Expand Down Expand Up @@ -149,8 +148,7 @@ private void storeBadConstraintState() {

private void givenConstraintStoreWithoutPermissions() {
DocumentMetadataHandle metadataHandle = new DocumentMetadataHandle();
DefaultDocumentPermissionsParser permissionsParser = new DefaultDocumentPermissionsParser();
permissionsParser.parsePermissions("admin,read,admin,update", metadataHandle.getPermissions());
metadataHandle.getPermissions().addFromDelimitedString("admin,read,admin,update");
String badConstraintState = "{\"A\": \"a\"}";
JSONDocumentManager mgr = getDatabaseClient().newJSONDocumentManager();
StringHandle handle = new StringHandle(badConstraintState);
Expand Down

0 comments on commit 4f99d29

Please sign in to comment.