Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
41 changes: 26 additions & 15 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

185 changes: 94 additions & 91 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion marklogic-client-api-functionaltests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,12 @@ dependencies {
}

testImplementation 'ch.qos.logback:logback-classic:1.3.15'
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
testImplementation 'org.xmlunit:xmlunit-legacy:2.10.0'

// 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"
}

tasks.register("runFragileTests", Test) {
Expand Down
10 changes: 6 additions & 4 deletions marklogic-client-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ dependencies {
compileOnly 'org.dom4j:dom4j:2.1.4'
compileOnly 'com.google.code.gson:gson:2.10.1'

testImplementation 'org.junit.jupiter:junit-jupiter:5.11.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'

// Forcing junit version to avoid vulnerability with older version in xmlunit
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.xmlunit:xmlunit-legacy:2.10.0'
Expand All @@ -64,17 +65,18 @@ dependencies {
// Using this to avoid a schema validation issue with the regular xercesImpl
testImplementation 'org.opengis.cite.xerces:xercesImpl-xsd11:2.12-beta-r1667115'

testImplementation ('com.opencsv:opencsv:5.11.2') {
testImplementation('com.opencsv:opencsv:5.11.2') {
// Excluding this due to a security vulnerability, and the test for the example that uses this library
// passes without this on the classpath.
exclude module: "commons-beanutils"
}
testImplementation 'org.skyscreamer:jsonassert:1.5.3'

// Commenting out for now as it prevents tests from being runnable in Intellij.
// Automatic loading of test framework implementation dependencies is deprecated.
// https://docs.gradle.org/current/userguide/upgrading_version_8.html#test_framework_implementation_dependencies
// testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.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"
}

// Ensure that mlHost and mlPassword can override the defaults of localhost/admin if they've been modified
Expand Down
6 changes: 0 additions & 6 deletions ml-development-tools/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@ dependencies {
testCompileOnly gradleTestKit()

testImplementation 'com.squareup.okhttp3:okhttp:4.12.0'

// We need the MarkLogicVersion class, but that has no dependencies and so we exclude all dependencies from
// this, in particular to avoid vulnerabilities on Spring 5.x libraries.
testImplementation ("com.marklogic:marklogic-junit5:1.5.0") {
transitive = false
}
}

// Added to avoid problem where processResources fails because - somehow - the plugin properties file is getting
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,10 @@ ${validations.joinToString("\n"){validation -> validation.message}}""")
val classDesc = servdef.get("desc")?.asText() ?:
"Provides a set of operations on the database server"

val classSrc = """package ${packageName};
val classSrc = """/*
* Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
*/
package ${packageName};

// IMPORTANT: Do not edit. This file is generated.

Expand Down
Loading