Skip to content

Commit 6705c3b

Browse files
committed
MLE-24717 Bumping marklogic-junit5 dependency
This is just to verify the ml-app-deployer tests run fine using marklogic-junit5 2.x. This has no impact on users.
1 parent ccf01da commit 6705c3b

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

NOTICE.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ product and version for which you are requesting source code.
1111
Third Party Notices
1212

1313
commons-io 2.20.0 (Apache-2.0)
14-
commons-lang3 3.18.0 (Apache-2.0)
15-
jackson-databind 2.19.0 (Apache-2.0)
14+
commons-lang3 3.19.0 (Apache-2.0)
15+
jackson-databind 2.20.0 (Apache-2.0)
1616
jaxen 2.0.0 (Apache-2.0)
1717
jdom2 2.0.6.1 (Apache-2.0)
18-
marklogic-client-api 7.2.0 (Apache-2.0)
18+
marklogic-client-api 8.0.0 (Apache-2.0)
1919
marklogic-xcc 12.0.0 (Apache-2.0)
20-
okhttp 4.12.0 (Apache-2.0)
20+
okhttp 5.2.0 (Apache-2.0)
2121
slf4j-api 2.0.17 (MIT)
2222
spring-web 6.2.11 (Apache-2.0)
2323
zjsonpatch 0.4.16 (Apache-2.0)

build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ subprojects {
1414

1515
repositories {
1616
mavenCentral()
17+
18+
// Temporarily using to depend on marklogic-junit5 snapshot until it's released.
19+
maven {
20+
url = "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
21+
}
1722
}
1823

1924
dependencies {

examples/unit-test-project/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ include this by default (not every ml-gradle user will use marklogic-unit-test),
1212
mavenCentral()
1313
}
1414
dependencies {
15-
classpath "com.marklogic:marklogic-unit-test-client:1.1.0"
15+
classpath "com.marklogic:marklogic-unit-test-client:1.5.0"
1616
}
1717
}
1818

ml-app-deployer/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ dependencies {
3535
testImplementation 'commons-io:commons-io:2.19.0'
3636
testImplementation 'xmlunit:xmlunit:1.6'
3737

38-
testImplementation ("com.marklogic:marklogic-junit5:1.5.0") {
39-
// Use the version of ml-javaclient-util within this repository.
40-
exclude module: "ml-javaclient-util"
41-
}
38+
// Gradle will alter this to use the ml-javaclient-util project in this repository.
39+
testImplementation "com.marklogic:marklogic-junit5:2.0-SNAPSHOT"
4240
}

ml-gradle/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ dependencies {
1111
// For tasks that need to fiddle with the filesystem.
1212
implementation "commons-io:commons-io:2.20.0"
1313

14-
// For UnitTestTask.
14+
// For UnitTestTask. Compiling against 1.5.0 until 2.0.0 is released. But this does not
15+
// impact users, who must provide their own version of this library in order to use the task.
1516
compileOnly ("com.marklogic:marklogic-unit-test-client:1.5.0") {
1617
// Prefer the Java Client version coming from ml-javaclient-util.
1718
exclude module: "marklogic-client-api"

0 commit comments

Comments
 (0)