From 732f5574927b894f29126b44113f12aece95847f Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Wed, 24 Jan 2024 08:20:15 -0500 Subject: [PATCH] Bumped dependencies Moved a brittle test to get it out of the PR test suite. --- .../build.gradle | 15 +++++----- .../functionaltests}/ExportListenerTest.java | 5 +++- marklogic-client-api/build.gradle | 29 +++++++++---------- ml-development-tools/build.gradle | 8 ++--- test-app/build.gradle | 11 ++++--- 5 files changed, 32 insertions(+), 36 deletions(-) rename marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/{fastfunctest/datamovement => datamovement/functionaltests}/ExportListenerTest.java (99%) diff --git a/marklogic-client-api-functionaltests/build.gradle b/marklogic-client-api-functionaltests/build.gradle index 8ba5d9041..20326ed5e 100755 --- a/marklogic-client-api-functionaltests/build.gradle +++ b/marklogic-client-api-functionaltests/build.gradle @@ -23,17 +23,16 @@ dependencies { implementation 'org.skyscreamer:jsonassert:1.5.1' implementation 'org.slf4j:slf4j-api:1.7.36' implementation 'commons-io:commons-io:2.11.0' - implementation 'com.squareup.okio:okio:3.4.0' - implementation 'com.squareup.okhttp3:okhttp:4.11.0' - implementation 'com.fasterxml.jackson.core:jackson-core:2.15.2' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.fasterxml.jackson.core:jackson-core:2.15.3' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.3' implementation "org.jdom:jdom2:2.0.6.1" - implementation "com.marklogic:ml-app-deployer:4.5.2" + implementation "com.marklogic:ml-app-deployer:4.6.1" - testImplementation 'ch.qos.logback:logback-classic:1.3.5' - testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2' + testImplementation 'ch.qos.logback:logback-classic:1.3.14' + testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1' testImplementation 'org.xmlunit:xmlunit-legacy:2.9.0' - testImplementation 'org.apache.commons:commons-lang3:3.12.0' + testImplementation 'org.apache.commons:commons-lang3:3.14.0' testImplementation 'org.apache.httpcomponents:httpclient:4.5.14' } diff --git a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/datamovement/ExportListenerTest.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ExportListenerTest.java similarity index 99% rename from marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/datamovement/ExportListenerTest.java rename to marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ExportListenerTest.java index 3d06f7250..0514f681d 100644 --- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/datamovement/ExportListenerTest.java +++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ExportListenerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.marklogic.client.fastfunctest.datamovement; +package com.marklogic.client.datamovement.functionaltests; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -41,6 +41,9 @@ import com.marklogic.client.query.QueryManager; import com.marklogic.client.query.StringQueryDefinition; +/** + * This is a "fast" test but it's also brittle, with testOnBatchFailure failing intermittently. + */ public class ExportListenerTest extends AbstractFunctionalTest { private static DataMovementManager dmManager = null; diff --git a/marklogic-client-api/build.gradle b/marklogic-client-api/build.gradle index 8c914219b..71e8b0076 100644 --- a/marklogic-client-api/build.gradle +++ b/marklogic-client-api/build.gradle @@ -16,29 +16,27 @@ dependencies { implementation 'org.glassfish.jaxb:jaxb-core:2.3.0.1' } - // Forcing usage of 3.4.0 instead of 3.2.0 to address vulnerability - https://security.snyk.io/vuln/SNYK-JAVA-COMSQUAREUPOKIO-5820002 - implementation 'com.squareup.okio:okio:3.4.0' - implementation 'com.squareup.okhttp3:okhttp:4.11.0' - implementation 'com.squareup.okhttp3:logging-interceptor:4.11.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' implementation 'io.github.rburgst:okhttp-digest:2.7' implementation 'com.sun.mail:javax.mail:1.6.2' implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1' implementation 'org.slf4j:slf4j-api:1.7.36' - implementation 'com.fasterxml.jackson.core:jackson-core:2.15.2' - implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.2' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2' - implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.15.2' + implementation 'com.fasterxml.jackson.core:jackson-core:2.15.3' + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.3' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.3' + implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.15.3' // Only used by extras (which some examples then depend on) // Forcing codec version to avoid vulnerability with older version in httpclient - compileOnly 'commons-codec:commons-codec:1.15' + compileOnly 'commons-codec:commons-codec:1.16.0' compileOnly 'org.apache.httpcomponents:httpclient:4.5.14' compileOnly 'org.jdom:jdom2:2.0.6.1' compileOnly 'org.dom4j:dom4j:2.1.4' compileOnly 'com.google.code.gson:gson:2.10.1' - testImplementation 'org.junit.jupiter:junit-jupiter:5.9.3' + testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1' // Forcing junit version to avoid vulnerability with older version in xmlunit testImplementation 'junit:junit:4.13.2' testImplementation 'org.xmlunit:xmlunit-legacy:2.9.1' @@ -46,19 +44,18 @@ dependencies { // Allows talking to the Manage API. It depends on the Java Client itself, which will usually be a slightly older // version, but that should not have any impact on the tests. - testImplementation "com.marklogic:ml-app-deployer:4.5.2" + testImplementation "com.marklogic:ml-app-deployer:4.6.1" // Starting with mockito 5.x, Java 11 is required, so sticking with 4.x as we have to support Java 8. testImplementation "org.mockito:mockito-core:4.11.0" testImplementation "org.mockito:mockito-inline:4.11.0" - testImplementation 'com.squareup.okio:okio:3.4.0' - testImplementation "com.squareup.okhttp3:mockwebserver:4.11.0" + testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0" - testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.2' - testImplementation 'ch.qos.logback:logback-classic:1.3.5' + testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.3' + testImplementation 'ch.qos.logback:logback-classic:1.3.15' // schema validation issue with testImplementation 'xerces:xercesImpl:2.12.0' testImplementation 'org.opengis.cite.xerces:xercesImpl-xsd11:2.12-beta-r1667115' - testImplementation 'org.apache.commons:commons-lang3:3.12.0' + testImplementation 'org.apache.commons:commons-lang3:3.14.0' testImplementation 'org.apache.httpcomponents:httpclient:4.5.14' testImplementation 'com.opencsv:opencsv:4.6' testImplementation 'org.geonames:geonames:1.0' diff --git a/ml-development-tools/build.gradle b/ml-development-tools/build.gradle index 456579b04..a4dbdba8b 100644 --- a/ml-development-tools/build.gradle +++ b/ml-development-tools/build.gradle @@ -12,8 +12,8 @@ dependencies { compileOnly gradleApi() implementation project(':marklogic-client-api') implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.22' - implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2' - implementation 'com.networknt:json-schema-validator:1.0.86' + implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.3' + implementation 'com.networknt:json-schema-validator:1.0.88' // Not yet migrating this project to JUnit 5. Will reconsider it once we have a reason to enhance // this project. @@ -21,9 +21,7 @@ dependencies { testImplementation 'xmlunit:xmlunit:1.6' testCompileOnly gradleTestKit() - // Forcing usage of 3.4.0 instead of 3.2.0 to address vulnerability - https://security.snyk.io/vuln/SNYK-JAVA-COMSQUAREUPOKIO-5820002 - testImplementation 'com.squareup.okio:okio:3.4.0' - testImplementation 'com.squareup.okhttp3:okhttp:4.11.0' + testImplementation 'com.squareup.okhttp3:okhttp:4.12.0' } // Added to avoid problem where processResources fails because - somehow - the plugin properties file is getting diff --git a/test-app/build.gradle b/test-app/build.gradle index 2bce530d0..bab083b82 100644 --- a/test-app/build.gradle +++ b/test-app/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.marklogic.ml-gradle' version '4.5.2' + id 'com.marklogic.ml-gradle' version '4.6.1' id 'java' id "com.github.psxpaul.execfork" version "0.2.2" } @@ -7,12 +7,11 @@ plugins { dependencies { implementation "io.undertow:undertow-core:2.2.24.Final" implementation "io.undertow:undertow-servlet:2.2.24.Final" - implementation "com.marklogic:ml-javaclient-util:4.5.1" + implementation "com.marklogic:ml-javaclient-util:4.6.0" implementation 'org.slf4j:slf4j-api:1.7.36' - implementation 'ch.qos.logback:logback-classic:1.3.5' - implementation "com.fasterxml.jackson.core:jackson-databind:2.15.2" - implementation 'com.squareup.okio:okio:3.4.0' - implementation 'com.squareup.okhttp3:okhttp:4.11.0' + implementation 'ch.qos.logback:logback-classic:1.3.14' + implementation "com.fasterxml.jackson.core:jackson-databind:2.15.3" + implementation 'com.squareup.okhttp3:okhttp:4.12.0' } // See https://github.com/psxpaul/gradle-execfork-plugin for docs.