Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file.
- opensearch: Replace the demo configuration of the OpenSearch Security plugin with a minimal one ([#1228]).
- nifi: Backport NIFI-14848 to NiFi ([#1225]).
- stackable-base: Add cert-tools ([#1247]).
- kafka: Add jackson xml dataformat for Kafka 4.0.0 ([#1262]).

### Changed

Expand All @@ -39,6 +40,7 @@ All notable changes to this project will be documented in this file.
[#1247]: https://github.com/stackabletech/docker-images/pull/1247
[#1253]: https://github.com/stackabletech/docker-images/pull/1253
[#1258]: https://github.com/stackabletech/docker-images/pull/1258
[#1262]: https://github.com/stackabletech/docker-images/pull/1262

## [25.7.0] - 2025-07-23

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
From f9ae1b0f4f9f1cf1beaa4ce589e2af9fde344b5b Mon Sep 17 00:00:00 2001
From: Malte Sander <malte.sander.it@gmail.com>
Date: Tue, 23 Sep 2025 09:55:40 +0200
Subject: Include jackson dataformat xml dependency

---
build.gradle | 13 +++++++++++++
gradle/dependencies.gradle | 1 +
2 files changed, 14 insertions(+)

diff --git a/build.gradle b/build.gradle
index 7497ce70a3..021adcb3db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -185,12 +185,14 @@ ext {
libs.slf4jLog4j2,
libs.junitPlatformLanucher,
libs.jacksonDatabindYaml,
+ libs.jacksonDatabindXml,
project(":test-common:test-common-util")
]

log4jReleaseLibs = [
libs.slf4jLog4j2,
libs.log4j1Bridge2Api,
+ libs.jacksonDatabindXml,
libs.jacksonDatabindYaml
]

@@ -1134,6 +1136,7 @@ project(':core') {
implementation libs.jacksonDataformatCsv
implementation libs.jacksonJDK8Datatypes
implementation libs.jacksonDatabindYaml
+ implementation libs.jacksonDatabindXml
implementation libs.joptSimple
implementation libs.jose4j
implementation libs.metrics
@@ -1534,6 +1537,7 @@ project(':group-coordinator') {
testImplementation project(':server-common').sourceSets.test.output
testImplementation project(':coordinator-common').sourceSets.test.output
testImplementation libs.jacksonDatabindYaml
+ testImplementation libs.jacksonDatabindXml
testImplementation libs.junitJupiter
testImplementation libs.mockitoCore
testImplementation testLog4j2Libs
@@ -1654,6 +1658,7 @@ project(':test-common:test-common-runtime') {
implementation libs.junitPlatformLanucher
implementation libs.junitJupiter
implementation libs.jacksonDatabindYaml
+ implementation libs.jacksonDatabindXml
implementation libs.slf4jApi

testImplementation libs.junitJupiter
@@ -2086,6 +2091,7 @@ project(':raft') {
testImplementation project(':clients')
testImplementation project(':clients').sourceSets.test.output
testImplementation libs.jacksonDatabindYaml
+ testImplementation libs.jacksonDatabindXml
testImplementation libs.junitJupiter
testImplementation libs.mockitoCore
testImplementation libs.jqwik
@@ -2183,6 +2189,7 @@ project(':server-common') {
testImplementation project(':clients')
testImplementation project(':clients').sourceSets.test.output
testImplementation libs.jacksonDatabindYaml
+ testImplementation libs.jacksonDatabindXml
testImplementation libs.junitJupiter
testImplementation libs.mockitoCore
testImplementation testLog4j2Libs
@@ -2320,6 +2327,7 @@ project(':storage') {
testImplementation project(':server-common').sourceSets.test.output
testImplementation libs.hamcrest
testImplementation libs.jacksonDatabindYaml
+ testImplementation libs.jacksonDatabindXml
testImplementation libs.junitJupiter
testImplementation libs.mockitoCore
testImplementation libs.bcpkix
@@ -2636,6 +2644,7 @@ project(':shell') {
testImplementation project(':server-common')
testImplementation project(':server-common').sourceSets.test.output
testImplementation libs.jacksonDatabindYaml
+ testImplementation libs.jacksonDatabindXml
testImplementation libs.junitJupiter
testImplementation testLog4j2Libs

@@ -2685,6 +2694,7 @@ project(':streams') {

testImplementation project(':clients').sourceSets.test.output
testImplementation libs.jacksonDatabindYaml
+ testImplementation libs.jacksonDatabindXml
testImplementation libs.junitJupiter
testImplementation libs.bcpkix
testImplementation libs.hamcrest
@@ -2829,6 +2839,7 @@ project(':streams:streams-scala') {
testImplementation project(':streams:test-utils')

testImplementation libs.jacksonDatabindYaml
+ testImplementation libs.jacksonDatabindXml
testImplementation libs.junitJupiter
testImplementation libs.mockitoJunitJupiter // supports MockitoExtension
testImplementation testLog4j2Libs
@@ -2932,6 +2943,7 @@ project(':streams:test-utils') {

testImplementation project(':clients').sourceSets.test.output
testImplementation libs.jacksonDatabindYaml
+ testImplementation libs.jacksonDatabindXml
testImplementation libs.junitJupiter
testImplementation libs.mockitoCore
testImplementation libs.hamcrest
@@ -3569,6 +3581,7 @@ project(':connect:runtime') {
testImplementation project(':server-common').sourceSets.test.output

testImplementation libs.jacksonDatabindYaml
+ testImplementation libs.jacksonDatabindXml
testImplementation libs.junitJupiter
testImplementation libs.mockitoCore
testImplementation libs.mockitoJunitJupiter
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 66eca369aa..06aad64e6c 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -152,6 +152,7 @@ libs += [
jacksonAnnotations: "com.fasterxml.jackson.core:jackson-annotations:$versions.jackson",
jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:$versions.jackson",
jacksonDatabindYaml: "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$versions.jackson",
+ jacksonDatabindXml: "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$versions.jackson",
jacksonDataformatCsv: "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:$versions.jackson",
jacksonJDK8Datatypes: "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$versions.jackson",
jacksonBlackbird: "com.fasterxml.jackson.module:jackson-module-blackbird:$versions.jackson",
Loading