Skip to content

MLE-30953 MLE-30952 MLE-30968 Vulnerability fixes #1952

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

Open
jonmille wants to merge 5 commits into
base: develop
Choose a base branch
from
+4 −4
Open

MLE-30953 MLE-30952 MLE-30968 Vulnerability fixes #1952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7761872
MLE-30953
jonmille Jun 25, 2026
0e80055
MLE-30952
jonmille Jun 25, 2026
9e2ebed
MLE-30953 Kotlin upgrade
jonmille Jun 29, 2026
067c0c5
MLE-30952
jonmille Jun 29, 2026
5a6651d
MLE-30968 Bump JacksonVersion to 2.22.0
jonmille Jun 29, 2026
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
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ publishUrl=file:../marklogic-java/releases
okhttpVersion=5.3.2

# See https://github.com/FasterXML/jackson for more information on the Jackson libraries.
jacksonVersion=2.21.1
jacksonVersion=2.22.0

junitVersion=6.0.3
logbackVersion=1.5.32
logbackVersion=1.5.37

# Defined at this level so that they can be set as system properties and used by the marklogic-client-api and test-app
# project
Expand Down
4 changes: 2 additions & 2 deletions ml-development-tools/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
id 'maven-publish'
id "com.gradle.plugin-publish" version "1.2.1"
id "java-gradle-plugin"
id 'org.jetbrains.kotlin.jvm' version '2.2.21'
id 'org.jetbrains.kotlin.jvm' version '2.4.0'
}

dependencies {
Expand All @@ -23,7 +23,7 @@ dependencies {
// additional work during development, though we rarely modify the code in this plugin anymore.
implementation "com.marklogic:marklogic-client-api:${version}"

implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.2.21'
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.4.0'

@rjrudin rjrudin Jun 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This one is a bit tricky. This plugin (regrettably, IMO) uses Kotlin code. But OkHttp (sadly) depends on Kotlin as well. OkHttp 5.3.2 depends on kotlin-stdlib 2.2.20 and the recent 5.4.0 release (which I recommend upgrading to) depends on kotlin-stdlib 2.2.21.

Ideally, OkHttp would be on the latest kotlin-stdlib release, but it's not. For that reason, I would not bump this up. I think you can safely bump up the Gradle plugin as that only impacts the build process. But for runtime, I think we want to stick with 2.2.20 (or 2.2.21 after updating OkHttp) so that we don't risk any incompatibilities between OkHttp and kotlin-stdlib 2.4.0.

implementation "com.fasterxml.jackson.module:jackson-module-kotlin:${jacksonVersion}"

// Sticking with this older version for now as the latest 1.x version introduces breaking changes.
Expand Down
Loading