From 5bef71bc3bc42d66f3e2b2030b293d3dcb7d9672 Mon Sep 17 00:00:00 2001
From: Phil Barber <Phil.Barber@marklogic.com>
Date: Wed, 8 May 2024 17:32:18 -0400
Subject: [PATCH] Updating all dependencies

Still need to update DH
---
 build.gradle                                  | 20 ++++++++++---------
 .../StoreConstraintValueInMarkLogicTest.java  |  4 +---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index bd1ee85..4f438db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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"
 
@@ -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.
@@ -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')
diff --git a/src/test/java/com/marklogic/kafka/connect/source/StoreConstraintValueInMarkLogicTest.java b/src/test/java/com/marklogic/kafka/connect/source/StoreConstraintValueInMarkLogicTest.java
index 3077333..d97b88a 100644
--- a/src/test/java/com/marklogic/kafka/connect/source/StoreConstraintValueInMarkLogicTest.java
+++ b/src/test/java/com/marklogic/kafka/connect/source/StoreConstraintValueInMarkLogicTest.java
@@ -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;
@@ -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);