Skip to content

Commit 5a7ebaa

Browse files
rjrudinrjrudin
authored
Merge pull request #1634 from marklogic/feature/bumps
Bumped dependencies
2 parents a31bda5 + 732f557 commit 5a7ebaa

File tree

5 files changed

+32
-36
lines changed

5 files changed

+32
-36
lines changed

‎marklogic-client-api-functionaltests/build.gradle‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,16 @@ dependencies {
2323
implementation 'org.skyscreamer:jsonassert:1.5.1'
2424
implementation 'org.slf4j:slf4j-api:1.7.36'
2525
implementation 'commons-io:commons-io:2.11.0'
26-
implementation 'com.squareup.okio:okio:3.4.0'
27-
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
28-
implementation 'com.fasterxml.jackson.core:jackson-core:2.15.2'
29-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
26+
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
27+
implementation 'com.fasterxml.jackson.core:jackson-core:2.15.3'
28+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.3'
3029
implementation "org.jdom:jdom2:2.0.6.1"
31-
implementation "com.marklogic:ml-app-deployer:4.5.2"
30+
implementation "com.marklogic:ml-app-deployer:4.6.1"
3231

33-
testImplementation 'ch.qos.logback:logback-classic:1.3.5'
34-
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
32+
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
33+
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
3534
testImplementation 'org.xmlunit:xmlunit-legacy:2.9.0'
36-
testImplementation 'org.apache.commons:commons-lang3:3.12.0'
35+
testImplementation 'org.apache.commons:commons-lang3:3.14.0'
3736
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
3837
}
3938

‎marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/datamovement/ExportListenerTest.java‎ renamed to ‎marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ExportListenerTest.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.marklogic.client.fastfunctest.datamovement;
17+
package com.marklogic.client.datamovement.functionaltests;
1818

1919
import static org.junit.jupiter.api.Assertions.assertEquals;
2020
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -41,6 +41,9 @@
4141
import com.marklogic.client.query.QueryManager;
4242
import com.marklogic.client.query.StringQueryDefinition;
4343

44+
/**
45+
* This is a "fast" test but it's also brittle, with testOnBatchFailure failing intermittently.
46+
*/
4447
public class ExportListenerTest extends AbstractFunctionalTest {
4548

4649
private static DataMovementManager dmManager = null;

‎marklogic-client-api/build.gradle‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,49 +16,46 @@ dependencies {
1616
implementation 'org.glassfish.jaxb:jaxb-core:2.3.0.1'
1717
}
1818

19-
// Forcing usage of 3.4.0 instead of 3.2.0 to address vulnerability - https://security.snyk.io/vuln/SNYK-JAVA-COMSQUAREUPOKIO-5820002
20-
implementation 'com.squareup.okio:okio:3.4.0'
21-
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
22-
implementation 'com.squareup.okhttp3:logging-interceptor:4.11.0'
19+
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
20+
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
2321
implementation 'io.github.rburgst:okhttp-digest:2.7'
2422

2523
implementation 'com.sun.mail:javax.mail:1.6.2'
2624
implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
2725
implementation 'org.slf4j:slf4j-api:1.7.36'
28-
implementation 'com.fasterxml.jackson.core:jackson-core:2.15.2'
29-
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.2'
30-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
31-
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.15.2'
26+
implementation 'com.fasterxml.jackson.core:jackson-core:2.15.3'
27+
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.3'
28+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.3'
29+
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.15.3'
3230

3331
// Only used by extras (which some examples then depend on)
3432
// Forcing codec version to avoid vulnerability with older version in httpclient
35-
compileOnly 'commons-codec:commons-codec:1.15'
33+
compileOnly 'commons-codec:commons-codec:1.16.0'
3634
compileOnly 'org.apache.httpcomponents:httpclient:4.5.14'
3735
compileOnly 'org.jdom:jdom2:2.0.6.1'
3836
compileOnly 'org.dom4j:dom4j:2.1.4'
3937
compileOnly 'com.google.code.gson:gson:2.10.1'
4038

41-
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.3'
39+
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
4240
// Forcing junit version to avoid vulnerability with older version in xmlunit
4341
testImplementation 'junit:junit:4.13.2'
4442
testImplementation 'org.xmlunit:xmlunit-legacy:2.9.1'
4543
testImplementation project(':examples')
4644

4745
// Allows talking to the Manage API. It depends on the Java Client itself, which will usually be a slightly older
4846
// version, but that should not have any impact on the tests.
49-
testImplementation "com.marklogic:ml-app-deployer:4.5.2"
47+
testImplementation "com.marklogic:ml-app-deployer:4.6.1"
5048

5149
// Starting with mockito 5.x, Java 11 is required, so sticking with 4.x as we have to support Java 8.
5250
testImplementation "org.mockito:mockito-core:4.11.0"
5351
testImplementation "org.mockito:mockito-inline:4.11.0"
54-
testImplementation 'com.squareup.okio:okio:3.4.0'
55-
testImplementation "com.squareup.okhttp3:mockwebserver:4.11.0"
52+
testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
5653

57-
testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.2'
58-
testImplementation 'ch.qos.logback:logback-classic:1.3.5'
54+
testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.3'
55+
testImplementation 'ch.qos.logback:logback-classic:1.3.15'
5956
// schema validation issue with testImplementation 'xerces:xercesImpl:2.12.0'
6057
testImplementation 'org.opengis.cite.xerces:xercesImpl-xsd11:2.12-beta-r1667115'
61-
testImplementation 'org.apache.commons:commons-lang3:3.12.0'
58+
testImplementation 'org.apache.commons:commons-lang3:3.14.0'
6259
testImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
6360
testImplementation 'com.opencsv:opencsv:4.6'
6461
testImplementation 'org.geonames:geonames:1.0'

‎ml-development-tools/build.gradle‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,16 @@ dependencies {
1212
compileOnly gradleApi()
1313
implementation project(':marklogic-client-api')
1414
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.22'
15-
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2'
16-
implementation 'com.networknt:json-schema-validator:1.0.86'
15+
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.3'
16+
implementation 'com.networknt:json-schema-validator:1.0.88'
1717

1818
// Not yet migrating this project to JUnit 5. Will reconsider it once we have a reason to enhance
1919
// this project.
2020
testImplementation 'junit:junit:4.13.2'
2121
testImplementation 'xmlunit:xmlunit:1.6'
2222
testCompileOnly gradleTestKit()
2323

24-
// Forcing usage of 3.4.0 instead of 3.2.0 to address vulnerability - https://security.snyk.io/vuln/SNYK-JAVA-COMSQUAREUPOKIO-5820002
25-
testImplementation 'com.squareup.okio:okio:3.4.0'
26-
testImplementation 'com.squareup.okhttp3:okhttp:4.11.0'
24+
testImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
2725
}
2826

2927
// Added to avoid problem where processResources fails because - somehow - the plugin properties file is getting

‎test-app/build.gradle‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
plugins {
2-
id 'com.marklogic.ml-gradle' version '4.5.2'
2+
id 'com.marklogic.ml-gradle' version '4.6.1'
33
id 'java'
44
id "com.github.psxpaul.execfork" version "0.2.2"
55
}
66

77
dependencies {
88
implementation "io.undertow:undertow-core:2.2.24.Final"
99
implementation "io.undertow:undertow-servlet:2.2.24.Final"
10-
implementation "com.marklogic:ml-javaclient-util:4.5.1"
10+
implementation "com.marklogic:ml-javaclient-util:4.6.0"
1111
implementation 'org.slf4j:slf4j-api:1.7.36'
12-
implementation 'ch.qos.logback:logback-classic:1.3.5'
13-
implementation "com.fasterxml.jackson.core:jackson-databind:2.15.2"
14-
implementation 'com.squareup.okio:okio:3.4.0'
15-
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
12+
implementation 'ch.qos.logback:logback-classic:1.3.14'
13+
implementation "com.fasterxml.jackson.core:jackson-databind:2.15.3"
14+
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
1615
}
1716

1817
// See https://github.com/psxpaul/gradle-execfork-plugin for docs.

0 commit comments

Comments
 (0)