Skip to content

Commit d8f1519

Browse files
committed
MLE-24505 Giving Gradle 9.1 a spin
No warnings or errors locally. Also shifting to the 11.3.2 build temporarily to try things out. And fixing a problem with the ml-development-tools tests.
1 parent 30cf9ac commit d8f1519

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ pipeline{
166166
}
167167
}
168168
steps {
169-
setupDockerMarkLogic("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless:12.0.0-ubi-rootless-2.2.0")
169+
setupDockerMarkLogic("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless:11.3.2-ubi-rootless-2.2.2")
170170
sh label:'run marklogic-client-api tests', script: '''#!/bin/bash
171171
export JAVA_HOME=$JAVA_HOME_DIR
172172
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
@@ -212,7 +212,7 @@ pipeline{
212212
}
213213
}
214214
steps {
215-
runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11")
215+
runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless:11.3.2-ubi-rootless-2.2.2")
216216
junit '**/build/**/TEST*.xml'
217217
}
218218
post {

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ subprojects {
3535
}
3636

3737
tasks.withType(Test).configureEach {
38-
useJUnitPlatform()
38+
// Can't use useJUnitPlatform here as it breaks ml-development-tools
3939
testLogging {
4040
events = ['started', 'passed', 'skipped', 'failed']
4141
exceptionFormat = 'full'

gradle/wrapper/gradle-wrapper.jar

1.65 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ dependencies {
3030
}
3131

3232
tasks.withType(Test).configureEach {
33+
useJUnitPlatform()
34+
3335
// For use in testing TestDatabaseClientKerberosFromFile
3436
systemProperty "keytabFile", System.getProperty("keytabFile")
3537
systemProperty "principal", System.getProperty("principal")

marklogic-client-api/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ dependencies {
7878

7979
// Ensure that mlHost and mlPassword can override the defaults of localhost/admin if they've been modified
8080
tasks.withType(Test).configureEach {
81+
useJUnitPlatform()
82+
8183
systemProperty "TEST_HOST", mlHost
8284
systemProperty "TEST_ADMIN_PASSWORD", mlPassword
8385
// Needed by the tests for the example programs

0 commit comments

Comments
 (0)