MLE-24529 - Upgrades Java and Spring versions (based on Rob's suggestion) #226
Conversation
There was a problem hiding this comment.
Copilot wasn't able to review any files in this pull request.
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
|
Copyright Validation Results ⏭️ Skipped (Excluded) Files
✅ All files have valid copyright headers! |
| // Add back all required Spring 6 modules for tests, since junit5 and test code need more than just spring-test | ||
| testImplementation "org.springframework:spring-test:6.2.11" | ||
| testImplementation "org.springframework:spring-context:6.2.11" | ||
| testImplementation "org.springframework:spring-beans:6.2.11" |
There was a problem hiding this comment.
You don't need this, spring-context will bring it in.
| sourceCompatibility = 1.8 | ||
| targetCompatibility = 1.8 | ||
| sourceCompatibility = JavaVersion.VERSION_17 | ||
| targetCompatibility = JavaVersion.VERSION_17 |
There was a problem hiding this comment.
I was going to say - just specify the toolchain - but Copilot notes that it's best to specify both the toolchain and the source target compatibility. So do this, and we'll eventually do this in all our repositories:
java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
| // Use the Java Client declared above. | ||
| exclude module: "marklogic-client-api" | ||
|
|
||
| // Use the Spring dependencies from ml-app-deployer 6 to avoid vulnerabilities in Spring 5. |
There was a problem hiding this comment.
I definitely prefer this because it's explicit.
NOTE - This PR is an either/or with PR #225. I'll wait to see comments to decide which one to use.
Upgrades the project to use Spring 6 to address vulnerabilities in Spring 5.
This includes:
sourceCompatibilityandtargetCompatibilityto Java 17.marklogic-junit5to avoid conflicts.