diff --git a/marklogic-client-api-functionaltests/build.gradle b/marklogic-client-api-functionaltests/build.gradle index e8d18b2c3..4a4d2e029 100755 --- a/marklogic-client-api-functionaltests/build.gradle +++ b/marklogic-client-api-functionaltests/build.gradle @@ -15,18 +15,15 @@ dependencies { testImplementation 'org.apache.commons:commons-lang3:3.19.0' - // Allows talking to the Manage API. - testImplementation("com.marklogic:ml-app-deployer:6.0.1") { - exclude module: "marklogic-client-api" - } + testImplementation "com.marklogic:ml-app-deployer:6.1.0" testImplementation 'ch.qos.logback:logback-classic:1.5.19' - testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4' + testImplementation 'org.junit.jupiter:junit-jupiter:5.14.0' testImplementation 'org.xmlunit:xmlunit-legacy:2.10.4' // Without this, once using JUnit 5.12 or higher, Gradle will not find any tests and report an error of: // org.junit.platform.commons.JUnitException: TestEngine with ID 'junit-jupiter' failed to discover tests - testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.14.0" } tasks.withType(Test).configureEach { diff --git a/marklogic-client-api/build.gradle b/marklogic-client-api/build.gradle index cd3ace4a0..46b724103 100644 --- a/marklogic-client-api/build.gradle +++ b/marklogic-client-api/build.gradle @@ -46,14 +46,12 @@ dependencies { testImplementation 'org.apache.commons:commons-lang3:3.19.0' // Allows talking to the Manage API. - testImplementation("com.marklogic:ml-app-deployer:6.0.1") { - exclude module: "marklogic-client-api" - } + testImplementation "com.marklogic:ml-app-deployer:6.1.0" + + testImplementation "org.mockito:mockito-core:5.20.0" + testImplementation "org.mockito:mockito-inline:5.20.0" - // Starting with mockito 5.x, Java 11 is required, so sticking with 4.x as we have to support Java 8. - testImplementation "org.mockito:mockito-core:4.11.0" - testImplementation "org.mockito:mockito-inline:4.11.0" - testImplementation "com.squareup.okhttp3:mockwebserver3:5.1.0" + testImplementation "com.squareup.okhttp3:mockwebserver3:5.2.0" testImplementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jacksonVersion}" testImplementation 'ch.qos.logback:logback-classic:1.5.19' @@ -73,7 +71,7 @@ dependencies { // https://docs.gradle.org/current/userguide/upgrading_version_8.html#test_framework_implementation_dependencies // Without this, once using JUnit 5.12 or higher, Gradle will not find any tests and report an error of: // org.junit.platform.commons.JUnitException: TestEngine with ID 'junit-jupiter' failed to discover tests - testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4" + testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.14.0" } // Ensure that mlHost and mlPassword can override the defaults of localhost/admin if they've been modified diff --git a/marklogic-client-api/src/test/java/com/marklogic/client/test/BitemporalTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/BitemporalTest.java index 9d447d098..97bb22d9d 100644 --- a/marklogic-client-api/src/test/java/com/marklogic/client/test/BitemporalTest.java +++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/BitemporalTest.java @@ -15,8 +15,6 @@ import com.marklogic.client.io.StringHandle; import com.marklogic.client.query.*; import com.marklogic.client.query.StructuredQueryBuilder.TemporalOperator; -import com.marklogic.mgmt.ManageClient; -import com.marklogic.mgmt.resource.temporal.TemporalCollectionLSQTManager; import jakarta.xml.bind.DatatypeConverter; import org.custommonkey.xmlunit.exceptions.XpathException; import org.junit.jupiter.api.AfterEach; @@ -163,21 +161,6 @@ void writeTwoVersionsOfFourDocuments() throws XpathException { @Test void lsqtTest() { - // Due to bug MLE-24511 where LSQT properties aren't updated correctly in ml-gradle 6.0.0, we need to manually - // deploy them for this test. - ManageClient manageClient = Common.newManageClient(); - TemporalCollectionLSQTManager mgr = new TemporalCollectionLSQTManager(manageClient, "java-unittest", "temporal-collection"); - String payload = """ - { - "lsqt-enabled": true, - "automation": { - "enabled": true, - "period": 5000 - } - } - """; - mgr.save(payload); - String version1 = """ %s version1 diff --git a/test-app/build.gradle b/test-app/build.gradle index 284d12d64..d9dc86e10 100644 --- a/test-app/build.gradle +++ b/test-app/build.gradle @@ -4,7 +4,7 @@ plugins { id "net.saliman.properties" version "1.5.2" - id 'com.marklogic.ml-gradle' version '6.0.1' + id 'com.marklogic.ml-gradle' version '6.1.0' id "com.github.psxpaul.execfork" version "0.2.2" }