Skip to content

Commit 4f99d29

Browse files
authored
Merge pull request #174 from BillFarber/task/updateDependencies
Updating all dependencies
2 parents 8030aab + 5bef71b commit 4f99d29

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

build.gradle

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
id "com.github.jk1.dependency-license-report" version "1.19"
66

77
// Only used for testing
8-
id 'com.marklogic.ml-gradle' version '4.6.0'
8+
id 'com.marklogic.ml-gradle' version '4.7.0'
99
id 'jacoco'
1010
id "org.sonarqube" version "4.4.1.3373"
1111

@@ -31,20 +31,22 @@ configurations {
3131
}
3232

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

3739
dependencies {
3840
compileOnly "org.apache.kafka:connect-api:${kafkaVersion}"
3941
compileOnly "org.apache.kafka:connect-json:${kafkaVersion}"
4042
compileOnly "org.apache.kafka:connect-runtime:${kafkaVersion}"
41-
compileOnly "org.slf4j:slf4j-api:1.7.36"
43+
compileOnly "org.slf4j:slf4j-api:2.0.13"
4244

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

47-
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.15.2"
49+
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.15.3"
4850

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

6466
testImplementation "org.apache.kafka:connect-api:${kafkaVersion}"
6567
testImplementation "org.apache.kafka:connect-json:${kafkaVersion}"
66-
testImplementation 'net.mguenther.kafka:kafka-junit:3.5.1'
68+
testImplementation 'net.mguenther.kafka:kafka-junit:3.6.0'
6769

68-
testImplementation "org.apache.avro:avro-compiler:1.11.1"
70+
testImplementation "org.apache.avro:avro-compiler:1.11.3"
6971

7072
// Forcing logback to be used for test logging
71-
testImplementation "ch.qos.logback:logback-classic:1.3.5"
72-
testImplementation "org.slf4j:jcl-over-slf4j:1.7.36"
73+
testImplementation "ch.qos.logback:logback-classic:1.3.14"
74+
testImplementation "org.slf4j:jcl-over-slf4j:2.0.13"
7375

7476
documentation files('LICENSE.txt')
7577
documentation files('NOTICE.txt')

src/test/java/com/marklogic/kafka/connect/source/StoreConstraintValueInMarkLogicTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.marklogic.client.MarkLogicIOException;
1919
import com.marklogic.client.document.JSONDocumentManager;
2020
import com.marklogic.client.document.XMLDocumentManager;
21-
import com.marklogic.client.ext.util.DefaultDocumentPermissionsParser;
2221
import com.marklogic.client.io.DocumentMetadataHandle;
2322
import com.marklogic.client.io.StringHandle;
2423
import com.marklogic.junit5.PermissionsTester;
@@ -149,8 +148,7 @@ private void storeBadConstraintState() {
149148

150149
private void givenConstraintStoreWithoutPermissions() {
151150
DocumentMetadataHandle metadataHandle = new DocumentMetadataHandle();
152-
DefaultDocumentPermissionsParser permissionsParser = new DefaultDocumentPermissionsParser();
153-
permissionsParser.parsePermissions("admin,read,admin,update", metadataHandle.getPermissions());
151+
metadataHandle.getPermissions().addFromDelimitedString("admin,read,admin,update");
154152
String badConstraintState = "{\"A\": \"a\"}";
155153
JSONDocumentManager mgr = getDatabaseClient().newJSONDocumentManager();
156154
StringHandle handle = new StringHandle(badConstraintState);

0 commit comments

Comments
 (0)