Skip to content

MLE-12345 One more Black Duck fix #1800

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
Jul 23, 2025
Merged

MLE-12345 One more Black Duck fix #1800

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
46 changes: 23 additions & 23 deletions marklogic-client-api-functionaltests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
// Copyright © 2024 MarkLogic Corporation. All Rights Reserved.
/*
* Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
*/

test {
useJUnitPlatform()
testLogging{
events 'started','passed', 'skipped'
}
/* For use in testing TestDatabaseClientKerberosFromFile */
// For use in testing TestDatabaseClientKerberosFromFile
systemProperty "keytabFile", System.getProperty("keytabFile")
systemProperty "principal", System.getProperty("principal")

systemProperty "TEST_USE_REVERSE_PROXY_SERVER", testUseReverseProxyServer
}

/* The minimal number of tests that run in a sandbox environment */

task testSandbox(type:Test) {
include 'com/marklogic/client/functionaltest/TestSandBox.class'
}

dependencies {
implementation project (':marklogic-client-api')
implementation 'org.skyscreamer:jsonassert:1.5.3'
implementation 'org.slf4j:slf4j-api:2.0.17'
implementation 'commons-io:commons-io:2.17.0'
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
implementation "org.jdom:jdom2:2.0.6.1"
implementation ("com.marklogic:ml-app-deployer:5.0.0") {
testImplementation project(':marklogic-client-api')
testImplementation 'org.skyscreamer:jsonassert:1.5.3'
testImplementation 'org.slf4j:slf4j-api:2.0.17'
testImplementation 'commons-io:commons-io:2.17.0'
testImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
testImplementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
testImplementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
testImplementation "org.jdom:jdom2:2.0.6.1"

testImplementation 'org.apache.commons:commons-lang3:3.18.0'
// Allows talking to the Manage API.
testImplementation("com.marklogic:ml-app-deployer:5.0.0") {
exclude module: "marklogic-client-api"
// Use the commons-lang3 declared above to keep Black Duck happy.
exclude module: "commons-lang3"
}

testImplementation 'ch.qos.logback:logback-classic:1.3.15'
testImplementation 'ch.qos.logback:logback-classic:1.3.15'
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.1'
testImplementation 'org.xmlunit:xmlunit-legacy:2.10.0'
testImplementation 'org.apache.commons:commons-lang3:3.17.0'
}

task runFragileTests(type: Test) {
tasks.register("runFragileTests", Test) {
useJUnitPlatform()
description = "These are called 'fragile' because they'll pass when run by themselves, but when run as part of the " +
"full suite, there seem to be one or more other fast functional tests that run before them and cause some of " +
Expand All @@ -48,7 +48,7 @@ task runFragileTests(type: Test) {
include "com/marklogic/client/fastfunctest/TestRawStructuredQuery.class"
}

task runFastFunctionalTests(type: Test) {
tasks.register("runFastFunctionalTests", Test) {
useJUnitPlatform()
description = "Run all fast functional tests that don't setup/teardown custom app servers / databases"
include "com/marklogic/client/fastfunctest/**"
Expand All @@ -58,14 +58,14 @@ task runFastFunctionalTests(type: Test) {
exclude "com/marklogic/client/fastfunctest/TestRawStructuredQuery.class"
}

task runSlowFunctionalTests(type: Test) {
tasks.register("runSlowFunctionalTests", Test) {
useJUnitPlatform()
description = "Run slow functional tests; i.e. those that setup/teardown custom app servers / databases"
include "com/marklogic/client/datamovement/functionaltests/**"
include "com/marklogic/client/functionaltest/**"
}

task runFunctionalTests {
tasks.register("runFunctionalTests") {
dependsOn(runFragileTests, runFastFunctionalTests, runSlowFunctionalTests)
}
runFastFunctionalTests.mustRunAfter runFragileTests
Expand Down
5 changes: 3 additions & 2 deletions marklogic-client-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Copyright © 2024 MarkLogic Corporation. All Rights Reserved.
/*
* Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
*/

plugins {
id 'java-library'
Expand Down Expand Up @@ -44,7 +46,6 @@ dependencies {
testImplementation project(':examples')

testImplementation 'org.apache.commons:commons-lang3:3.18.0'

// Allows talking to the Manage API.
testImplementation ("com.marklogic:ml-app-deployer:5.0.0") {
exclude module: "marklogic-client-api"
Expand Down
4 changes: 3 additions & 1 deletion ml-development-tools/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Copyright © 2024 MarkLogic Corporation. All Rights Reserved.
/*
* Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
*/

plugins {
id "groovy"
Expand Down