Skip to content

Commit 1562e7d

Browse files
authored
Merge pull request #747 from marklogic/feature/22458-black-duck
MLE-22458 More Black Duck fixes
2 parents ee57da6 + 46e6bf5 commit 1562e7d

File tree

4 files changed

+9
-256
lines changed

4 files changed

+9
-256
lines changed

examples/sample-project/build.gradle

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ plugins {
1919

2020
// The Java plugin is used to compile and run JUnit tests
2121
id "java"
22-
23-
// These plugins are used to generate IDE files
24-
id "eclipse"
25-
id "idea"
2622
}
2723

2824
apply plugin: "com.marklogic.ml-gradle"
@@ -48,17 +44,17 @@ configurations {
4844
corb
4945
}
5046

51-
/*
52-
* This expresses dependencies on the ml-java and ml-junit libraries. The former is typically used for application
53-
* code, and the latter supports writing JUnit-based tests. A dependency exists on RestAssured to show an option for
54-
* using that library in tests that must invoke MarkLogic HTTP endpoints.
55-
*/
47+
configurations.all {
48+
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
49+
if (details.requested.group.startsWith('org.springframework')) {
50+
details.useVersion '6.2.8'
51+
details.because 'Forcing marklogic-junit5 to use the latest version of Spring to minimize security vulnerabilities.'
52+
}
53+
}
54+
}
55+
5656
dependencies {
5757
testImplementation "com.marklogic:marklogic-junit5:1.5.0"
58-
testImplementation "javax.xml.bind:jaxb-api:2.3.1"
59-
testImplementation "org.glassfish.jaxb:jaxb-runtime:2.3.2"
60-
testImplementation "org.glassfish.jaxb:jaxb-core:2.3.0.1"
61-
6258
corb "com.marklogic:marklogic-corb:2.5.5"
6359
}
6460

ml-app-deployer/pom.xml

Lines changed: 0 additions & 89 deletions
This file was deleted.

ml-javaclient-util/pom.xml

Lines changed: 0 additions & 77 deletions
This file was deleted.

pom.xml

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)