|
| 1 | +From f9ae1b0f4f9f1cf1beaa4ce589e2af9fde344b5b Mon Sep 17 00:00:00 2001 |
| 2 | +From: Malte Sander < [email protected]> |
| 3 | +Date: Tue, 23 Sep 2025 09:55:40 +0200 |
| 4 | +Subject: Include jackson dataformat xml dependency |
| 5 | + |
| 6 | +--- |
| 7 | + build.gradle | 13 +++++++++++++ |
| 8 | + gradle/dependencies.gradle | 1 + |
| 9 | + 2 files changed, 14 insertions(+) |
| 10 | + |
| 11 | +diff --git a/build.gradle b/build.gradle |
| 12 | +index 7497ce70a3..021adcb3db 100644 |
| 13 | +--- a/build.gradle |
| 14 | ++++ b/build.gradle |
| 15 | +@@ -185,12 +185,14 @@ ext { |
| 16 | + libs.slf4jLog4j2, |
| 17 | + libs.junitPlatformLanucher, |
| 18 | + libs.jacksonDatabindYaml, |
| 19 | ++ libs.jacksonDatabindXml, |
| 20 | + project(":test-common:test-common-util") |
| 21 | + ] |
| 22 | + |
| 23 | + log4jReleaseLibs = [ |
| 24 | + libs.slf4jLog4j2, |
| 25 | + libs.log4j1Bridge2Api, |
| 26 | ++ libs.jacksonDatabindXml, |
| 27 | + libs.jacksonDatabindYaml |
| 28 | + ] |
| 29 | + |
| 30 | +@@ -1134,6 +1136,7 @@ project(':core') { |
| 31 | + implementation libs.jacksonDataformatCsv |
| 32 | + implementation libs.jacksonJDK8Datatypes |
| 33 | + implementation libs.jacksonDatabindYaml |
| 34 | ++ implementation libs.jacksonDatabindXml |
| 35 | + implementation libs.joptSimple |
| 36 | + implementation libs.jose4j |
| 37 | + implementation libs.metrics |
| 38 | +@@ -1534,6 +1537,7 @@ project(':group-coordinator') { |
| 39 | + testImplementation project(':server-common').sourceSets.test.output |
| 40 | + testImplementation project(':coordinator-common').sourceSets.test.output |
| 41 | + testImplementation libs.jacksonDatabindYaml |
| 42 | ++ testImplementation libs.jacksonDatabindXml |
| 43 | + testImplementation libs.junitJupiter |
| 44 | + testImplementation libs.mockitoCore |
| 45 | + testImplementation testLog4j2Libs |
| 46 | +@@ -1654,6 +1658,7 @@ project(':test-common:test-common-runtime') { |
| 47 | + implementation libs.junitPlatformLanucher |
| 48 | + implementation libs.junitJupiter |
| 49 | + implementation libs.jacksonDatabindYaml |
| 50 | ++ implementation libs.jacksonDatabindXml |
| 51 | + implementation libs.slf4jApi |
| 52 | + |
| 53 | + testImplementation libs.junitJupiter |
| 54 | +@@ -2086,6 +2091,7 @@ project(':raft') { |
| 55 | + testImplementation project(':clients') |
| 56 | + testImplementation project(':clients').sourceSets.test.output |
| 57 | + testImplementation libs.jacksonDatabindYaml |
| 58 | ++ testImplementation libs.jacksonDatabindXml |
| 59 | + testImplementation libs.junitJupiter |
| 60 | + testImplementation libs.mockitoCore |
| 61 | + testImplementation libs.jqwik |
| 62 | +@@ -2183,6 +2189,7 @@ project(':server-common') { |
| 63 | + testImplementation project(':clients') |
| 64 | + testImplementation project(':clients').sourceSets.test.output |
| 65 | + testImplementation libs.jacksonDatabindYaml |
| 66 | ++ testImplementation libs.jacksonDatabindXml |
| 67 | + testImplementation libs.junitJupiter |
| 68 | + testImplementation libs.mockitoCore |
| 69 | + testImplementation testLog4j2Libs |
| 70 | +@@ -2320,6 +2327,7 @@ project(':storage') { |
| 71 | + testImplementation project(':server-common').sourceSets.test.output |
| 72 | + testImplementation libs.hamcrest |
| 73 | + testImplementation libs.jacksonDatabindYaml |
| 74 | ++ testImplementation libs.jacksonDatabindXml |
| 75 | + testImplementation libs.junitJupiter |
| 76 | + testImplementation libs.mockitoCore |
| 77 | + testImplementation libs.bcpkix |
| 78 | +@@ -2636,6 +2644,7 @@ project(':shell') { |
| 79 | + testImplementation project(':server-common') |
| 80 | + testImplementation project(':server-common').sourceSets.test.output |
| 81 | + testImplementation libs.jacksonDatabindYaml |
| 82 | ++ testImplementation libs.jacksonDatabindXml |
| 83 | + testImplementation libs.junitJupiter |
| 84 | + testImplementation testLog4j2Libs |
| 85 | + |
| 86 | +@@ -2685,6 +2694,7 @@ project(':streams') { |
| 87 | + |
| 88 | + testImplementation project(':clients').sourceSets.test.output |
| 89 | + testImplementation libs.jacksonDatabindYaml |
| 90 | ++ testImplementation libs.jacksonDatabindXml |
| 91 | + testImplementation libs.junitJupiter |
| 92 | + testImplementation libs.bcpkix |
| 93 | + testImplementation libs.hamcrest |
| 94 | +@@ -2829,6 +2839,7 @@ project(':streams:streams-scala') { |
| 95 | + testImplementation project(':streams:test-utils') |
| 96 | + |
| 97 | + testImplementation libs.jacksonDatabindYaml |
| 98 | ++ testImplementation libs.jacksonDatabindXml |
| 99 | + testImplementation libs.junitJupiter |
| 100 | + testImplementation libs.mockitoJunitJupiter // supports MockitoExtension |
| 101 | + testImplementation testLog4j2Libs |
| 102 | +@@ -2932,6 +2943,7 @@ project(':streams:test-utils') { |
| 103 | + |
| 104 | + testImplementation project(':clients').sourceSets.test.output |
| 105 | + testImplementation libs.jacksonDatabindYaml |
| 106 | ++ testImplementation libs.jacksonDatabindXml |
| 107 | + testImplementation libs.junitJupiter |
| 108 | + testImplementation libs.mockitoCore |
| 109 | + testImplementation libs.hamcrest |
| 110 | +@@ -3569,6 +3581,7 @@ project(':connect:runtime') { |
| 111 | + testImplementation project(':server-common').sourceSets.test.output |
| 112 | + |
| 113 | + testImplementation libs.jacksonDatabindYaml |
| 114 | ++ testImplementation libs.jacksonDatabindXml |
| 115 | + testImplementation libs.junitJupiter |
| 116 | + testImplementation libs.mockitoCore |
| 117 | + testImplementation libs.mockitoJunitJupiter |
| 118 | +diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle |
| 119 | +index 66eca369aa..06aad64e6c 100644 |
| 120 | +--- a/gradle/dependencies.gradle |
| 121 | ++++ b/gradle/dependencies.gradle |
| 122 | +@@ -152,6 +152,7 @@ libs += [ |
| 123 | + jacksonAnnotations: "com.fasterxml.jackson.core:jackson-annotations:$versions.jackson", |
| 124 | + jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:$versions.jackson", |
| 125 | + jacksonDatabindYaml: "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$versions.jackson", |
| 126 | ++ jacksonDatabindXml: "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$versions.jackson", |
| 127 | + jacksonDataformatCsv: "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:$versions.jackson", |
| 128 | + jacksonJDK8Datatypes: "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$versions.jackson", |
| 129 | + jacksonBlackbird: "com.fasterxml.jackson.module:jackson-module-blackbird:$versions.jackson", |
0 commit comments