Skip to content

MLE-24529 - Upgrades Java and Spring versions (based on Copilot's suggestion) #225

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

Closed
wants to merge 1 commit into from
Closed

MLE-24529 - Upgrades Java and Spring versions (based on Copilot's suggestion) #225

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
23 changes: 15 additions & 8 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ plugins {
}

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

repositories {
Expand All @@ -44,12 +44,19 @@ configurations {
// Force v4.5.0 of commons-collections4 to avoid CVEs in v4.4.0 from transitive dependecies:
// CVE-2025-48924 (https://www.cve.org/CVERecord?id=CVE-2025-48924) and
// CVE-2020-15250 (https://www.cve.org/CVERecord?id=CVE-2020-15250)
force "org.apache.commons:commons-collections4:4.5.0"

// Force v3.18 of commons-lang3 to avoid CVE-2025-48924
// (https://www.cve.org/CVERecord?id=CVE-2025-48924), without also
// upgrading ml-app-deployer to 6.0.0, which we are not ready to do yet.
force 'org.apache.commons:commons-lang3:3.18.0'
eachDependency { DependencyResolveDetails details ->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can hopefully get rid of these once you've upgraded to Kafka 4. Per the comment on the commons-lang3 one - that was due to an older version of ml-app-deployer, so it's likely that that "force" can be removed. Note as well, we never want to have these "useVersion" blocks in here without a corresponding details.because to document why we're forcing a version.

if (details.requested.group == 'org.apache.commons' && details.requested.name == 'commons-collections4') {
details.useVersion '4.5.0'
}
if (details.requested.group == 'org.apache.commons' && details.requested.name == 'commons-lang3') {
details.useVersion '3.18.0'
}
if (details.requested.group == 'org.springframework') {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem with this is the reader has no idea what's bringing in Spring. We only have one problem - which is that marklogic-junit5 is bring in Spring 5. So it's better to make that problem explicit by modifying the marklogic-junit5 dependency until it's been bumped up to use Spring 6.

if (['spring-core', 'spring-context', 'spring-beans', 'spring-aop', 'spring-expression', 'spring-web', 'spring-jcl'].contains(details.requested.name)) {
details.useVersion '6.2.11'
}
}
}
}
}
}
Expand Down