Skip to content

Bumped dependencies #1634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 24, 2024
Merged

Bumped dependencies #1634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions marklogic-client-api-functionaltests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
5 changes: 4 additions & 1 deletion ...test/datamovement/ExportListenerTest.java → ...t/functionaltests/ExportListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
29 changes: 13 additions & 16 deletions marklogic-client-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,49 +16,46 @@ 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'
testImplementation project(':examples')

// 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'
Expand Down
8 changes: 3 additions & 5 deletions ml-development-tools/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,16 @@ 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.
testImplementation 'junit:junit:4.13.2'
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
Expand Down
11 changes: 5 additions & 6 deletions test-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
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"
}

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.
Expand Down