Skip to content

MLE-24747 Bumping ml-gradle to 6.1.0 #1850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: PDP-536: Adding copyright check
merged 1 commit into from
Oct 15, 2025
Merged

MLE-24747 Bumping ml-gradle to 6.1.0 #1850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions marklogic-client-api-functionaltests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 6 additions & 8 deletions marklogic-client-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Copy link

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment explaining why Mockito 4.x was used (Java 8 support requirement) has been removed, but there's no explanation for why it's now safe to upgrade to 5.x. Consider adding a comment explaining that Java 11+ is now the minimum requirement or that Java 8 support has been dropped.

Suggested change
// Mockito 5.x requires Java 11 or higher; Java 8 support has been dropped.
// It is now safe to use Mockito 5.x as Java 11+ is the minimum supported version for this project.

Copilot uses AI. Check for mistakes.
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'
Expand All @@ -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
Expand Down
17 changes: 0 additions & 17 deletions marklogic-client-api/src/test/java/com/marklogic/client/test/BitemporalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 = """
<test>
%s version1
Expand Down
2 changes: 1 addition & 1 deletion test-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down