Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit dc893de

Browse files
committed
Bump the dependencies and update properties test
1 parent 8de25f8 commit dc893de

File tree

3 files changed

+24
-25
lines changed

3 files changed

+24
-25
lines changed

build.gradle

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ plugins {
22
id "java-library"
33
id "maven-publish"
44
id "signing"
5-
id "com.github.jk1.dependency-license-report" version "1.3"
5+
id "com.github.jk1.dependency-license-report" version "2.1"
66
id "io.snyk.gradle.plugin.snykplugin" version "0.4"
77
}
88

99
group = "com.marklogic"
10-
version = "4.3.0"
10+
version = "4.3.1"
1111

1212
sourceCompatibility = "8"
1313
targetCompatibility = "8"
@@ -17,30 +17,29 @@ repositories {
1717
}
1818

1919
dependencies {
20-
api 'com.marklogic:marklogic-client-api:5.5.0'
21-
api 'com.marklogic:marklogic-xcc:10.0.7'
22-
api 'org.springframework:spring-context:5.3.9'
20+
api 'com.marklogic:marklogic-client-api:5.5.3'
21+
api 'com.marklogic:marklogic-xcc:10.0.9'
22+
api 'org.springframework:spring-context:5.3.18'
2323

24-
implementation 'org.jdom:jdom2:2.0.6'
24+
implementation 'org.jdom:jdom2:2.0.6.1'
2525

26-
// This isn't the latest release, but it matches what is used by the ML Java Client
27-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.1'
26+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.6.1'
2827

2928
// This is currently an implementation dependency, though perhaps should be an api dependency due to its usage in
3029
// LoggingObject; not clear yet on whether the protected Logger in that class should make this an api dependency or not
31-
implementation 'org.slf4j:slf4j-api:1.7.31'
30+
implementation 'org.slf4j:slf4j-api:1.7.36'
3231

3332
testImplementation "org.junit.jupiter:junit-jupiter:5.7.2"
34-
testImplementation 'org.springframework:spring-test:5.3.9'
35-
testImplementation 'org.mockito:mockito-core:2.1.0'
33+
testImplementation 'org.springframework:spring-test:5.3.18'
34+
testImplementation 'org.mockito:mockito-core:2.1.0'
3635

3736
// Used for testing loading modules from the classpath
3837
testImplementation files("lib/modules.jar")
3938

4039
// Forcing Spring to use logback instead of commons-logging
41-
testImplementation "ch.qos.logback:logback-classic:1.2.4"
42-
testImplementation "org.slf4j:jcl-over-slf4j:1.7.31"
43-
testImplementation "org.slf4j:slf4j-api:1.7.31"
40+
testImplementation "ch.qos.logback:logback-classic:1.2.11"
41+
testImplementation "org.slf4j:jcl-over-slf4j:1.7.36"
42+
testImplementation "org.slf4j:slf4j-api:1.7.36"
4443
}
4544

4645
test {

pom.xml

Lines changed: 7 additions & 7 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>ml-javaclient-util</artifactId>
15-
<version>4.3.0</version>
15+
<version>4.3.1</version>
1616
<name>com.marklogic:ml-javaclient-util</name>
1717
<description>Library that adds functionality on top of the MarkLogic Java Client</description>
1818
<url>https://github.com/marklogic-community/ml-javaclient-util</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-client-api</artifactId>
43-
<version>5.5.0</version>
43+
<version>5.5.3</version>
4444
<scope>compile</scope>
4545
</dependency>
4646
<dependency>
4747
<groupId>com.marklogic</groupId>
4848
<artifactId>marklogic-xcc</artifactId>
49-
<version>10.0.7</version>
49+
<version>10.0.9</version>
5050
<scope>compile</scope>
5151
</dependency>
5252
<dependency>
5353
<groupId>org.springframework</groupId>
5454
<artifactId>spring-context</artifactId>
55-
<version>5.3.9</version>
55+
<version>5.3.18</version>
5656
<scope>compile</scope>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.jdom</groupId>
6060
<artifactId>jdom2</artifactId>
61-
<version>2.0.6</version>
61+
<version>2.0.6.1</version>
6262
<scope>runtime</scope>
6363
</dependency>
6464
<dependency>
6565
<groupId>com.fasterxml.jackson.core</groupId>
6666
<artifactId>jackson-databind</artifactId>
67-
<version>2.11.1</version>
67+
<version>2.12.6.1</version>
6868
<scope>runtime</scope>
6969
</dependency>
7070
<dependency>
7171
<groupId>org.slf4j</groupId>
7272
<artifactId>slf4j-api</artifactId>
73-
<version>1.7.31</version>
73+
<version>1.7.36</version>
7474
<scope>runtime</scope>
7575
</dependency>
7676
</dependencies>

src/test/java/com/marklogic/client/ext/modulesloader/impl/PropertiesModuleManagerTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.marklogic.client.ext.modulesloader.impl;
22

3-
import org.junit.Test;
3+
import org.junit.jupiter.api.Test;
44

55
import java.io.File;
66
import java.nio.file.Path;
77

8-
import static org.junit.Assert.*;
8+
import static org.junit.jupiter.api.Assertions.assertEquals;
99
import static org.mockito.Mockito.mock;
1010
import static org.mockito.Mockito.when;
1111

@@ -21,7 +21,7 @@ public void normalizeDriveLetter() {
2121
when(mockPath.getRoot()).thenReturn(mockPath);
2222
when(mockFile.toPath()).thenReturn(mockPath);
2323

24-
assertEquals("Drive letter is lower-cased", "c:\\temp", moduleManager.normalizeDriveLetter(mockFile));
24+
assertEquals("c:\\temp", moduleManager.normalizeDriveLetter(mockFile), "Drive letter is lower-cased");
2525
}
2626

2727
@Test
@@ -34,6 +34,6 @@ public void normalizeDriveLetterNullRoot() {
3434
when(mockPath.getRoot()).thenReturn(null);
3535
when(mockFile.toPath()).thenReturn(mockPath);
3636

37-
assertEquals("Since getRoot() was null, original path is returned", moduleManager.normalizeDriveLetter(mockFile));
37+
assertEquals("Temp", moduleManager.normalizeDriveLetter(mockFile),"Since getRoot() was null, original path is returned");
3838
}
3939
}

0 commit comments

Comments
 (0)