Skip to content

Commit 52d139d

Browse files
rjrudinrjrudin
authored
Upgrading dependencies and bumped to 1.2.1 (#146)
1 parent bf6c7d0 commit 52d139d

File tree

9 files changed

+42
-47
lines changed

9 files changed

+42
-47
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ buildscript {
3131
mavenCentral()
3232
}
3333
dependencies {
34-
classpath "com.marklogic:marklogic-unit-test-client:1.2.0"
35-
classpath "com.marklogic:ml-gradle:4.2.1"
34+
classpath "com.marklogic:marklogic-unit-test-client:1.2.1"
35+
classpath "com.marklogic:ml-gradle:4.3.5"
3636
}
3737
}
3838
@@ -43,7 +43,7 @@ repositories {
4343
}
4444
4545
dependencies {
46-
mlBundle "com.marklogic:marklogic-unit-test-modules:1.2.0"
46+
mlBundle "com.marklogic:marklogic-unit-test-modules:1.2.1"
4747
}
4848
```
4949

‎build.gradle‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ subprojects {
44
apply plugin: "signing"
55

66
group = "com.marklogic"
7-
version = "1.2.0"
7+
version = "1.2.1"
88

9-
sourceCompatibility = "8"
10-
targetCompatibility = "8"
9+
java {
10+
sourceCompatibility = 1.8
11+
targetCompatibility = 1.8
12+
}
1113

1214
repositories {
1315
mavenCentral()

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
# Using 6.9 until ml-gradle 4.3 is available, which will support 7.x
7-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip

‎marklogic-junit5/build.gradle‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ plugins {
44

55
dependencies {
66
api project(":marklogic-unit-test-client")
7-
api "com.marklogic:ml-javaclient-util:4.3.1"
8-
api "org.jdom:jdom2:2.0.6"
9-
api "org.junit.jupiter:junit-jupiter:5.7.2"
10-
api "org.springframework:spring-context:5.3.18"
11-
api "org.springframework:spring-test:5.3.18"
12-
api "com.fasterxml.jackson.core:jackson-databind:2.11.1"
13-
api "org.slf4j:slf4j-api:1.7.31"
7+
api "com.marklogic:ml-javaclient-util:4.3.3"
8+
api "org.jdom:jdom2:2.0.6.1"
9+
api "org.junit.jupiter:junit-jupiter:5.9.0"
10+
api "org.springframework:spring-context:5.3.22"
11+
api "org.springframework:spring-test:5.3.22"
12+
api "com.fasterxml.jackson.core:jackson-databind:2.12.6.1"
13+
api 'org.slf4j:slf4j-api:1.7.36'
1414

1515
implementation "jaxen:jaxen:1.2.0"
1616

17-
testImplementation "org.junit.jupiter:junit-jupiter:5.7.2"
17+
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
1818

1919
// Forcing Spring to use logback instead of commons-logging
20-
testImplementation "ch.qos.logback:logback-classic:1.2.4"
21-
testImplementation "org.slf4j:jcl-over-slf4j:1.7.31"
22-
testImplementation "org.slf4j:slf4j-api:1.7.31"
20+
testImplementation 'ch.qos.logback:logback-classic:1.2.11'
21+
testImplementation 'org.slf4j:jcl-over-slf4j:1.7.36'
22+
testImplementation 'org.slf4j:slf4j-api:1.7.36'
2323
}
2424

2525
test {

‎marklogic-junit5/examples/simple-ml-gradle/README.md‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,11 @@ Next, add the following dependencies:
3636
dependencies {
3737
// existing dependencies
3838
39-
testImplementation "com.marklogic:marklogic-junit5:1.2.0"
39+
testImplementation "com.marklogic:marklogic-junit5:1.2.1"
4040
41-
testImplementation "org.junit.jupiter:junit-jupiter:5.7.2"
42-
4341
// Forcing Spring to use logback instead of commons-logging
44-
testImplementation "ch.qos.logback:logback-classic:1.2.4"
45-
testImplementation "org.slf4j:jcl-over-slf4j:1.7.31"
46-
testImplementation "org.slf4j:slf4j-api:1.7.31"
42+
testImplementation "ch.qos.logback:logback-classic:1.2.11"
43+
testImplementation "org.slf4j:jcl-over-slf4j:1.7.36"
4744
}
4845

4946
### Configure gradle.properties
@@ -110,8 +107,8 @@ You'll still be able to leverage all of the testing support in AbstractMarkLogic
110107
If you'd like to write and execute marklogic-unit-test test modules, add the following to your build.gradle file as well (grab
111108
the latest version for both dependencies):
112109

113-
mlBundle "com.marklogic:marklogic-unit-test-modules:1.2.0"
114-
testImplementation "com.marklogic:marklogic-unit-test-client:1.2.0"
110+
mlBundle "com.marklogic:marklogic-unit-test-modules:1.2.1"
111+
testImplementation "com.marklogic:marklogic-unit-test-client:1.2.1"
115112

116113
In addition, add the following to gradle.properties so that you can store test modules in a directory separate from
117114
your application modules:

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@ repositories {
1414
}
1515

1616
dependencies {
17-
mlBundle "com.marklogic:marklogic-unit-test-modules:1.2.0"
17+
mlBundle "com.marklogic:marklogic-unit-test-modules:1.2.1"
1818

1919
api "com.marklogic:marklogic-client-api:5.5.3"
2020

21-
testImplementation "com.marklogic:marklogic-junit5:1.2.0"
22-
23-
testImplementation "org.junit.jupiter:junit-jupiter:5.7.2"
21+
testImplementation "com.marklogic:marklogic-junit5:1.2.1"
2422

2523
// Forcing Spring to use logback instead of commons-logging
26-
testImplementation "ch.qos.logback:logback-classic:1.2.4"
27-
testImplementation "org.slf4j:jcl-over-slf4j:1.7.31"
28-
testImplementation "org.slf4j:slf4j-api:1.7.31"
24+
testImplementation "ch.qos.logback:logback-classic:1.2.12"
25+
testImplementation "org.slf4j:jcl-over-slf4j:1.7.36"
2926
}

‎marklogic-junit5/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ It is not intended to be used to build this project.
1212
<modelVersion>4.0.0</modelVersion>
1313
<groupId>com.marklogic</groupId>
1414
<artifactId>marklogic-junit5</artifactId>
15-
<version>1.2.0</version>
15+
<version>1.2.1</version>
1616
<name>com.marklogic:marklogic-junit5</name>
1717
<description>Supports testing MarkLogic applications</description>
1818
<url>https://github.com/marklogic-community/marklogic-junit5</url>
@@ -40,37 +40,37 @@ It is not intended to be used to build this project.
4040
<dependency>
4141
<groupId>com.marklogic</groupId>
4242
<artifactId>marklogic-unit-test-client</artifactId>
43-
<version>1.2.0</version>
43+
<version>1.2.1</version>
4444
<scope>compile</scope>
4545
</dependency>
4646
<dependency>
4747
<groupId>com.marklogic</groupId>
4848
<artifactId>ml-javaclient-util</artifactId>
49-
<version>4.3.1</version>
49+
<version>4.3.3</version>
5050
<scope>compile</scope>
5151
</dependency>
5252
<dependency>
5353
<groupId>org.jdom</groupId>
5454
<artifactId>jdom2</artifactId>
55-
<version>2.0.6</version>
55+
<version>2.0.6.1</version>
5656
<scope>compile</scope>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.junit.jupiter</groupId>
6060
<artifactId>junit-jupiter</artifactId>
61-
<version>5.7.2</version>
61+
<version>5.9.0</version>
6262
<scope>compile</scope>
6363
</dependency>
6464
<dependency>
6565
<groupId>org.springframework</groupId>
6666
<artifactId>spring-context</artifactId>
67-
<version>5.3.18</version>
67+
<version>5.3.22</version>
6868
<scope>compile</scope>
6969
</dependency>
7070
<dependency>
7171
<groupId>org.springframework</groupId>
7272
<artifactId>spring-test</artifactId>
73-
<version>5.3.18</version>
73+
<version>5.3.22</version>
7474
<scope>compile</scope>
7575
</dependency>
7676
<dependency>
@@ -82,7 +82,7 @@ It is not intended to be used to build this project.
8282
<dependency>
8383
<groupId>org.slf4j</groupId>
8484
<artifactId>slf4j-api</artifactId>
85-
<version>1.7.31</version>
85+
<version>1.7.36</version>
8686
<scope>compile</scope>
8787
</dependency>
8888
<dependency>

‎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.2.1"
3+
id "com.marklogic.ml-gradle" version "4.3.5"
44

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

99
dependencies {
1010
api "com.marklogic:marklogic-client-api:5.5.3"
11-
implementation "org.slf4j:slf4j-api:1.7.31"
11+
implementation "org.slf4j:slf4j-api:1.7.36"
1212

13-
testImplementation "org.junit.jupiter:junit-jupiter:5.7.2"
13+
testImplementation "org.junit.jupiter:junit-jupiter:5.9.0"
1414
}
1515

1616
test {

‎marklogic-unit-test-client/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ It is not intended to be used to build this project.
1212
<modelVersion>4.0.0</modelVersion>
1313
<groupId>com.marklogic</groupId>
1414
<artifactId>marklogic-unit-test-client</artifactId>
15-
<version>1.2.0</version>
15+
<version>1.2.1</version>
1616
<name>com.marklogic:marklogic-unit-test-client</name>
1717
<description>Supports testing MarkLogic applications</description>
1818
<url>https://github.com/marklogic-community/marklogic-unit-test-client</url>
@@ -46,7 +46,7 @@ It is not intended to be used to build this project.
4646
<dependency>
4747
<groupId>org.slf4j</groupId>
4848
<artifactId>slf4j-api</artifactId>
49-
<version>1.7.31</version>
49+
<version>1.7.36</version>
5050
<scope>runtime</scope>
5151
</dependency>
5252
</dependencies>

0 commit comments

Comments
 (0)