Merge pull request #745 from marklogic/feature/22458-black-duck

MLE-22458 More Black Duck fixes

Author: rjrudin

examples/data-services/build.gradle

@@ -25,7 +25,7 @@ dependencies {
 	testImplementation "org.junit.jupiter:junit-jupiter:5.12.2"
 
 	// Force usage of logback for logging
-	testImplementation "ch.qos.logback:logback-classic:1.3.14"
+	testImplementation "ch.qos.logback:logback-classic:1.5.18"
 	testImplementation "org.slf4j:jcl-over-slf4j:2.0.17"
 	testImplementation "org.slf4j:slf4j-api:2.0.17"
 }

examples/jdbc-project/build.gradle

@@ -8,7 +8,7 @@ repositories {
 }
 
 dependencies {
-	implementation "org.springframework:spring-jdbc:6.2.7"
+	implementation "org.springframework:spring-jdbc:6.2.8"
 	implementation "org.postgresql:postgresql:42.6.2"
 }
 

examples/mlcp-project/build.gradle

@@ -31,7 +31,7 @@ dependencies {
 	// Since MLCP 11.2, have not been able to get logging to work via a log4j2.xml or
 	// log4j2.properties file. MLCP 11.2 removed logback as a direct dependency. Adding it back
 	// results in logging working correctly.
-	mlcp "ch.qos.logback:logback-classic:1.3.14"
+	mlcp "ch.qos.logback:logback-classic:1.5.18"
 
 	/**
 	 * mlcp uses logback for logging, and without a logback configuration file, no MLCP logging will appear.

examples/sample-project/build.gradle

@@ -55,7 +55,6 @@ configurations {
  */
 dependencies {
 	testImplementation "com.marklogic:marklogic-junit5:1.5.0"
-	testImplementation "com.jayway.restassured:rest-assured:2.9.0"
 	testImplementation "javax.xml.bind:jaxb-api:2.3.1"
 	testImplementation "org.glassfish.jaxb:jaxb-runtime:2.3.2"
 	testImplementation "org.glassfish.jaxb:jaxb-core:2.3.0.1"

examples/sample-project/gradle.properties

@@ -5,11 +5,11 @@ mlHost=localhost
 mlAppName=sample-project
 
 # ml-gradle is geared towards applications that use the REST API, so a port number is needed for a new REST API server
-mlRestPort=8050
+mlRestPort=8004
 
 # If specified, then a test database with app servers for that database will be created, which can then be used for
 # automated tests.
-mlTestRestPort=8051
+mlTestRestPort=8005
 
 # You can define just mlUsername and mlPassword, and that user will be used for all deployment operations, but that's
 # generally not a good practice, as this user will need the admin role in order to create security resources. Generally,

examples/sample-project/src/test/java/sample/GetClientConfigTest.java

@@ -20,7 +20,7 @@ public class GetClientConfigTest extends AbstractSampleProjectTest {
 	public void testConfig() {
 		DatabaseClientConfig config = applicationContext.getBean(DatabaseClientConfig.class);
 		assertEquals("localhost", config.getHost());
-		assertEquals(8051, config.getPort());
+		assertEquals(8005, config.getPort());
 	}
 
 }

examples/sample-project/src/test/java/sample/SearchDocumentsViaRestAssuredTest.java

@@ -2,7 +2,7 @@ dependencies {
 	api project(":ml-javaclient-util")
 
 	// For RestTemplate, which wraps OkHttpClient.
-	api 'org.springframework:spring-web:6.2.7'
+	api 'org.springframework:spring-web:6.2.8'
 
 	// For wrangling JSON. Matching the version used by the Java Client.
 	api 'com.fasterxml.jackson.core:jackson-databind:2.17.2'
@@ -32,7 +32,7 @@ dependencies {
 
 	// With 5.12.x, tests are somehow not found by Gradle.
 	testImplementation 'org.junit.jupiter:junit-jupiter:5.11.2'
-	testImplementation 'org.springframework:spring-test:6.2.7'
+	testImplementation 'org.springframework:spring-test:6.2.8'
 	testImplementation 'commons-io:commons-io:2.19.0'
 	testImplementation 'xmlunit:xmlunit:1.6'
 }

ml-app-deployer/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
 	api 'com.marklogic:marklogic-client-api:7.1.0'
 	api 'com.marklogic:marklogic-xcc:11.3.1'
-	api 'org.springframework:spring-context:6.2.7'
+	api 'org.springframework:spring-context:6.2.8'
 
 	implementation 'org.jdom:jdom2:2.0.6.1'
 
@@ -13,7 +13,7 @@ dependencies {
 
 	// With 5.12.x, tests are somehow not found by Gradle.
 	testImplementation 'org.junit.jupiter:junit-jupiter:5.11.2'
-	testImplementation 'org.springframework:spring-test:6.2.7'
+	testImplementation 'org.springframework:spring-test:6.2.8'
 	testImplementation 'org.mockito:mockito-core:4.11.0'
 
 	// Used for testing loading modules from the classpath