Skip to content

Commit 8bebdae

Browse files
committed
MLE-12345 Updated JUnit to 5.13.4
Brought back fix for Gradle deprecation warning as well. Updated Gradle wrapper to latest version too - 8.14.3. And gave up on trying to ignore Spring dependencies from marklogic-junit5 - just cloned the one class we need.
1 parent 56de795 commit 8bebdae

File tree

9 files changed

+217
-119
lines changed

9 files changed

+217
-119
lines changed

gradle/wrapper/gradle-wrapper.jar

-16.6 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

Lines changed: 26 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 94 additions & 91 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

marklogic-client-api-functionaltests/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,12 @@ dependencies {
3333
}
3434

3535
testImplementation 'ch.qos.logback:logback-classic:1.3.15'
36-
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.1'
36+
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
3737
testImplementation 'org.xmlunit:xmlunit-legacy:2.10.0'
38+
39+
// Without this, once using JUnit 5.12 or higher, Gradle will not find any tests and report an error of:
40+
// org.junit.platform.commons.JUnitException: TestEngine with ID 'junit-jupiter' failed to discover tests
41+
testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4"
3842
}
3943

4044
tasks.register("runFragileTests", Test) {

marklogic-client-api/build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ dependencies {
3939
compileOnly 'org.dom4j:dom4j:2.1.4'
4040
compileOnly 'com.google.code.gson:gson:2.10.1'
4141

42-
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.1'
42+
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
43+
4344
// Forcing junit version to avoid vulnerability with older version in xmlunit
4445
testImplementation 'junit:junit:4.13.2'
4546
testImplementation 'org.xmlunit:xmlunit-legacy:2.10.0'
@@ -64,17 +65,18 @@ dependencies {
6465
// Using this to avoid a schema validation issue with the regular xercesImpl
6566
testImplementation 'org.opengis.cite.xerces:xercesImpl-xsd11:2.12-beta-r1667115'
6667

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

74-
// Commenting out for now as it prevents tests from being runnable in Intellij.
7575
// Automatic loading of test framework implementation dependencies is deprecated.
7676
// https://docs.gradle.org/current/userguide/upgrading_version_8.html#test_framework_implementation_dependencies
77-
// testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
77+
// Without this, once using JUnit 5.12 or higher, Gradle will not find any tests and report an error of:
78+
// org.junit.platform.commons.JUnitException: TestEngine with ID 'junit-jupiter' failed to discover tests
79+
testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4"
7880
}
7981

8082
// Ensure that mlHost and mlPassword can override the defaults of localhost/admin if they've been modified

ml-development-tools/build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ dependencies {
2424
testCompileOnly gradleTestKit()
2525

2626
testImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
27-
28-
// We need the MarkLogicVersion class, but that has no dependencies and so we exclude all dependencies from
29-
// this, in particular to avoid vulnerabilities on Spring 5.x libraries.
30-
testImplementation ("com.marklogic:marklogic-junit5:1.5.0") {
31-
transitive = false
32-
}
3327
}
3428

3529
// Added to avoid problem where processResources fails because - somehow - the plugin properties file is getting

0 commit comments

Comments
 (0)