Skip to content

Commit af28323

Browse files
committed
DEVEXP-210 Bumped Java Client to 6.1.0
Bumped a few other dependencies to latest minor/patch versions. And removed "src" directory that had mysteriously escaped my attention ever since this project was converted into subprojects. The files under "src" have long been under "marklogic-unit-test-modules".
1 parent 2246ab9 commit af28323

File tree

12 files changed

+12
-920
lines changed

12 files changed

+12
-920
lines changed

marklogic-junit5/build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@ plugins {
44

55
dependencies {
66
api project(":marklogic-unit-test-client")
7-
api "com.marklogic:ml-javaclient-util:4.3.7" // TODO Upgrade this to 4.4.0 once it's available
7+
api ("com.marklogic:ml-javaclient-util:4.4.0") {
8+
// Prefer the version coming from marklogic-unit-test-client
9+
exclude module: "marklogic-client-api"
10+
}
811
api "org.jdom:jdom2:2.0.6.1"
9-
api "org.junit.jupiter:junit-jupiter:5.9.1"
12+
api "org.junit.jupiter:junit-jupiter:5.9.2"
1013
api "org.springframework:spring-context:5.3.24"
1114
api "org.springframework:spring-test:5.3.24"
12-
api "com.fasterxml.jackson.core:jackson-databind:2.13.4.2"
15+
api "com.fasterxml.jackson.core:jackson-databind:2.14.1"
1316
api 'org.slf4j:slf4j-api:1.7.36'
1417

1518
implementation "jaxen:jaxen:2.0.0"

marklogic-junit5/examples/simple-ml-gradle/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "net.saliman.properties" version "1.5.1"
3-
id "com.marklogic.ml-gradle" version "4.2.1"
3+
id "com.marklogic.ml-gradle" version "4.4.0"
44
id "java-library"
55
}
66

@@ -16,11 +16,11 @@ repositories {
1616
dependencies {
1717
mlBundle "com.marklogic:marklogic-unit-test-modules:1.2.1"
1818

19-
api "com.marklogic:marklogic-client-api:5.5.3"
19+
api "com.marklogic:marklogic-client-api:6.1.0"
2020

2121
testImplementation "com.marklogic:marklogic-junit5:1.2.1"
2222

2323
// Forcing Spring to use logback instead of commons-logging
24-
testImplementation "ch.qos.logback:logback-classic:1.2.12"
24+
testImplementation "ch.qos.logback:logback-classic:1.3.5"
2525
testImplementation "org.slf4j:jcl-over-slf4j:1.7.36"
2626
}

marklogic-unit-test-client/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
plugins {
22
// ml-gradle is used for deploying a test application so that this project itself can be tested
3-
id "com.marklogic.ml-gradle" version "4.3.7"
3+
id "com.marklogic.ml-gradle" version "4.4.0"
44

55
// Used to generate a license report
66
id "com.github.jk1.dependency-license-report" version "1.17"
77
}
88

99
dependencies {
10-
api "com.marklogic:marklogic-client-api:6.0.0"
10+
api "com.marklogic:marklogic-client-api:6.1.0"
1111
implementation "org.slf4j:slf4j-api:1.7.36"
1212

13-
testImplementation "org.junit.jupiter:junit-jupiter:5.9.1"
13+
testImplementation "org.junit.jupiter:junit-jupiter:5.9.2"
1414
}
1515

1616
test {

src/main/ml-modules/root/test/css/coverage.css

Lines changed: 0 additions & 91 deletions
This file was deleted.

src/main/ml-modules/root/test/formats/j-unit.xsl

Lines changed: 0 additions & 86 deletions
This file was deleted.

0 commit comments

Comments
 (0)