Merge pull request #743 from marklogic/feature/22526-spring-6

MLE-22526 Bumping to Spring 6 and Java 17

Author: rjrudin

Jenkinsfile

@@ -6,7 +6,7 @@ pipeline{
     buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '30', numToKeepStr: '')
   }
   environment{
-    JAVA_HOME_DIR="/home/builder/java/jdk-11.0.2"
+    JAVA_HOME_DIR="/home/builder/java/jdk-17.0.2"
     GRADLE_DIR   =".gradle"
     DMC_USER     = credentials('MLBUILD_USER')
     DMC_PASSWORD = credentials('MLBUILD_PASSWORD')

build.gradle

@@ -7,8 +7,8 @@ subprojects {
 	version = "5.1-SNAPSHOT"
 
 	java {
-		sourceCompatibility = JavaVersion.VERSION_1_8
-		targetCompatibility = JavaVersion.VERSION_1_8
+		sourceCompatibility = 17
+		targetCompatibility = 17
 	}
 
 	repositories {
@@ -17,15 +17,11 @@ subprojects {
 
 	dependencies {
 		// Forcing Spring to use logback instead of commons-logging
-		testImplementation "ch.qos.logback:logback-classic:1.3.15" // Not using 1.4.x yet as it requires Java 11
+		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'
 	}
 
-	task javadocJar(type: Jar, dependsOn: javadoc) {
-		archiveClassifier = "javadoc"
-		from javadoc
-	}
 	javadoc.failOnError = false
 	// Ignores warnings on params that don't have descriptions, which is a little too noisy
 	javadoc.options.addStringOption('Xdoclint:none', '-quiet')

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

ml-app-deployer/build.gradle

@@ -2,9 +2,9 @@ dependencies {
 	api project(":ml-javaclient-util")
 
 	// For RestTemplate, which wraps OkHttpClient.
-	api 'org.springframework:spring-web:5.3.39'
+	api 'org.springframework:spring-web:6.2.7'
 
-	// For wrangling JSON.
+	// For wrangling JSON. Matching the version used by the Java Client.
 	api 'com.fasterxml.jackson.core:jackson-databind:2.17.2'
 
 	// For resolving XPath expressions against XML documents.
@@ -30,8 +30,9 @@ dependencies {
 	compileOnly "com.beust:jcommander:1.82"
 	compileOnly "ch.qos.logback:logback-classic:1.3.15"
 
-	testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
-	testImplementation 'org.springframework:spring-test:5.3.39'
+	// 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 'commons-io:commons-io:2.19.0'
 	testImplementation 'xmlunit:xmlunit:1.6'
 }

ml-app-deployer/src/main/java/com/marklogic/rest/util/PreviewInterceptor.java

@@ -66,16 +66,16 @@ public PreviewInterceptor(ManageClient manageClient) {
 	 * If the associated triggers database hasn't been created yet, a 404 will occur. But that shouldn't interrupt a
 	 * deployment process. So a 404 is logged but not treated as an error.
 	 *
-	 * @param statusCode
+	 * @param httpResponse
 	 * @return
 	 */
 	@Override
-	protected boolean hasError(HttpStatus statusCode) {
-		if (HttpStatus.NOT_FOUND.equals(statusCode)) {
+	public boolean hasError(ClientHttpResponse httpResponse) throws IOException {
+		if (HttpStatus.NOT_FOUND.equals(httpResponse.getStatusCode())) {
 			logger.info("Received a 404 response, but ignoring while doing a preview");
 			return false;
 		}
-		return super.hasError(statusCode);
+		return super.hasError(httpResponse);
 	}
 
 	@Override

ml-app-deployer/src/test/java/com/marklogic/rest/util/PreviewInterceptorTest.java

@@ -18,18 +18,26 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.marklogic.mgmt.util.ObjectMapperFactory;
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
+import org.springframework.mock.http.client.MockClientHttpResponse;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class PreviewInterceptorTest  {
 
 	private PreviewInterceptor interceptor = new PreviewInterceptor(null);
 
 	@Test
-	public void hasError() {
-		assertTrue(interceptor.hasError(HttpStatus.BAD_REQUEST));
-		assertFalse(interceptor.hasError(HttpStatus.NOT_FOUND),
+	public void hasError() throws IOException {
+		final byte[] fakeData = "{}".getBytes(Charset.defaultCharset());
+
+		assertTrue(interceptor.hasError(new MockClientHttpResponse(fakeData, HttpStatus.BAD_REQUEST)));
+		assertFalse(interceptor.hasError(new MockClientHttpResponse(fakeData, HttpStatus.NOT_FOUND)),
 			"A 404 isn't regarded as an error because while doing a preview, " +
 				"it may occur because a new resource, like a database, needs to be created and a GET is " +
 				"being made on a resource specific to that database, like a CPF pipeline");

ml-gradle/build.gradle

@@ -18,7 +18,7 @@ dependencies {
 	}
 
 	// For tasks that need to fiddle with the filesystem.
-	implementation "commons-io:commons-io:2.16.1"
+	implementation "commons-io:commons-io:2.19.0"
 
 	// For UnitTestTask.
 	compileOnly ("com.marklogic:marklogic-unit-test-client:1.5.0") {

ml-javaclient-util/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
 	api 'com.marklogic:marklogic-client-api:7.1.0'
-	api 'com.marklogic:marklogic-xcc:11.3.0'
-	api 'org.springframework:spring-context:5.3.39'
+	api 'com.marklogic:marklogic-xcc:11.3.1'
+	api 'org.springframework:spring-context:6.2.7'
 
 	implementation 'org.jdom:jdom2:2.0.6.1'
 
@@ -11,8 +11,9 @@ dependencies {
 	// LoggingObject; not clear yet on whether the protected Logger in that class should make this an api dependency or not
 	implementation 'org.slf4j:slf4j-api:2.0.17'
 
-	testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
-	testImplementation 'org.springframework:spring-test:5.3.39'
+	// 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.mockito:mockito-core:4.11.0'
 
 	// Used for testing loading modules from the classpath