Skip to content

Commit f832c48

Browse files
rjrudinrjrudin
authored
#152 Bumped Java Client to 6.0 (#153)
Bumped a few other dependencies; jaxen is now 2.0.0 and according to the release notes is a drop-in replacement, despite the major version change. Note that the pom.xml files are not used for building the software but only to power Github's Dependency Graph feature.
1 parent 77cabf5 commit f832c48

File tree

6 files changed

+40
-27
lines changed

6 files changed

+40
-27
lines changed

‎build.gradle‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ subprojects {
44
apply plugin: "signing"
55

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

99
java {
1010
sourceCompatibility = 1.8
@@ -18,6 +18,13 @@ subprojects {
1818
mavenLocal()
1919
}
2020

21+
dependencies {
22+
// Forcing Spring to use logback instead of commons-logging
23+
testImplementation "ch.qos.logback:logback-classic:1.3.5" // Not using 1.4.x yet as it requires Java 11
24+
testImplementation 'org.slf4j:jcl-over-slf4j:1.7.36'
25+
testImplementation 'org.slf4j:slf4j-api:1.7.36'
26+
}
27+
2128
javadoc.failOnError = false
2229
// Ignores warnings on params that don't have descriptions, which is a little too noisy
2330
javadoc.options.addStringOption('Xdoclint:none', '-quiet')

‎marklogic-junit5/build.gradle‎

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

55
dependencies {
66
api project(":marklogic-unit-test-client")
7-
api "com.marklogic:ml-javaclient-util:4.3.3"
7+
api "com.marklogic:ml-javaclient-util:4.3.7" // TODO Upgrade this to 4.4.0 once it's available
88
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"
9+
api "org.junit.jupiter:junit-jupiter:5.9.1"
10+
api "org.springframework:spring-context:5.3.24"
11+
api "org.springframework:spring-test:5.3.24"
12+
api "com.fasterxml.jackson.core:jackson-databind:2.13.4.2"
1313
api 'org.slf4j:slf4j-api:1.7.36'
1414

15-
implementation "jaxen:jaxen:1.2.0"
16-
17-
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
18-
19-
// Forcing Spring to use logback instead of commons-logging
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'
15+
implementation "jaxen:jaxen:2.0.0"
2316
}
2417

2518
test {

‎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.1</version>
15+
<version>1.3.0</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,13 +40,13 @@ 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.1</version>
43+
<version>1.3.0</version>
4444
<scope>compile</scope>
4545
</dependency>
4646
<dependency>
4747
<groupId>com.marklogic</groupId>
4848
<artifactId>ml-javaclient-util</artifactId>
49-
<version>4.3.3</version>
49+
<version>4.3.7</version>
5050
<scope>compile</scope>
5151
</dependency>
5252
<dependency>
@@ -58,25 +58,25 @@ It is not intended to be used to build this project.
5858
<dependency>
5959
<groupId>org.junit.jupiter</groupId>
6060
<artifactId>junit-jupiter</artifactId>
61-
<version>5.9.0</version>
61+
<version>5.9.1</version>
6262
<scope>compile</scope>
6363
</dependency>
6464
<dependency>
6565
<groupId>org.springframework</groupId>
6666
<artifactId>spring-context</artifactId>
67-
<version>5.3.22</version>
67+
<version>5.3.24</version>
6868
<scope>compile</scope>
6969
</dependency>
7070
<dependency>
7171
<groupId>org.springframework</groupId>
7272
<artifactId>spring-test</artifactId>
73-
<version>5.3.22</version>
73+
<version>5.3.24</version>
7474
<scope>compile</scope>
7575
</dependency>
7676
<dependency>
7777
<groupId>com.fasterxml.jackson.core</groupId>
7878
<artifactId>jackson-databind</artifactId>
79-
<version>2.12.7.1</version>
79+
<version>2.13.4.2</version>
8080
<scope>compile</scope>
8181
</dependency>
8282
<dependency>
@@ -88,7 +88,7 @@ It is not intended to be used to build this project.
8888
<dependency>
8989
<groupId>jaxen</groupId>
9090
<artifactId>jaxen</artifactId>
91-
<version>1.2.0</version>
91+
<version>2.0.0</version>
9292
<scope>runtime</scope>
9393
</dependency>
9494
</dependencies>

‎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.5"
3+
id "com.marklogic.ml-gradle" version "4.3.7"
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:5.5.3"
10+
api "com.marklogic:marklogic-client-api:6.0.0"
1111
implementation "org.slf4j:slf4j-api:1.7.36"
1212

13-
testImplementation "org.junit.jupiter:junit-jupiter:5.9.0"
13+
testImplementation "org.junit.jupiter:junit-jupiter:5.9.1"
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.1</version>
15+
<version>1.3.0</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>
@@ -40,7 +40,7 @@ It is not intended to be used to build this project.
4040
<dependency>
4141
<groupId>com.marklogic</groupId>
4242
<artifactId>marklogic-client-api</artifactId>
43-
<version>5.5.3</version>
43+
<version>6.0.0</version>
4444
<scope>compile</scope>
4545
</dependency>
4646
<dependency>

‎marklogic-unit-test-client/src/test/resources/logback.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<configuration>
2+
<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
6+
</encoder>
7+
</appender>
8+
<root level="INFO">
9+
<appender-ref ref="STDOUT"/>
10+
</root>
11+
<logger name="ch.qos.logback" level="WARN" additivity="false"/>
12+
<logger name="com.marklogic.client" level="WARN" additivity="false"/>
13+
</configuration>

0 commit comments

Comments
 (0)