From d64d8255579f7eff3b1d1fb057160ccf19d299af Mon Sep 17 00:00:00 2001
From: Julian Reschke <julian.reschke@gmx.de>
Date: Wed, 24 Jun 2026 15:35:43 +0100
Subject: [PATCH 1/2] OAK-12276: Upgrade jackson-databind dependency to 2.22.0

---
 oak-parent/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index 080e358e640..6b4f585f479 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -64,7 +64,8 @@
     <h2.version>2.1.214</h2.version>
     <tika.version>1.28.5</tika.version>
     <derby.version>10.16.1.1</derby.version>
-    <jackson.version>2.19.4</jackson.version>
+    <jackson.version>2.22.0</jackson.version>
+    <jackson.annotations.version>2.22</jackson.annotations.version> <!-- not aligned with jackson anymore -->
     <testcontainers.version>1.21.4</testcontainers.version>
     <pax-exam.version>4.14.0</pax-exam.version>
     <pax-url.version>2.6.17</pax-url.version>
@@ -709,7 +710,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-annotations</artifactId>
-        <version>${jackson.version}</version>
+        <version>${jackson.annotations.version}</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>

From 7bb43d3a9961f2f84f781082c67b7d4b4cca15d6 Mon Sep 17 00:00:00 2001
From: Julian Reschke <julian.reschke@gmx.de>
Date: Wed, 24 Jun 2026 18:10:17 +0100
Subject: [PATCH 2/2] OAK-12276: Upgrade jackson-databind dependency to 2.22.0
 - align OSGi tests

---
 .../jackrabbit/oak/osgi/IndexVersionSelectionIT.java      | 8 +++++---
 .../test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java  | 7 ++++---
 oak-it-osgi/test-bundles.xml                              | 2 ++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/IndexVersionSelectionIT.java b/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/IndexVersionSelectionIT.java
index a7a2a82ff36..2d18d769f36 100644
--- a/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/IndexVersionSelectionIT.java
+++ b/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/IndexVersionSelectionIT.java
@@ -290,12 +290,14 @@ public Option[] configuration() throws IOException, URISyntaxException {
                 mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.9.20"),
                 mavenBundle("org.apache.felix", "org.apache.felix.fileinstall", "3.2.6"),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.7.2"),
+
                 // Jackson dependency for object serialisation.
                 // (these only need to be defined here when the versions are different from the ones
                 // defined in the project -- otherwise -> "bundle symbolic name and version are not unique")
-                mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").version("2.19.1"),
-                mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-annotations").version("2.19.1"),
-                mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").version("2.19.1"),
+                // mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").version("2.22.0"),
+                // mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-annotations").version("2.22"),
+                // mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").version("2.22.0"),
+
                 mavenBundle().groupId("com.github.ben-manes.caffeine").artifactId("caffeine").version("3.1.8"),
 
                 frameworkProperty("repository.home").value("target"),
diff --git a/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java b/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
index 8a33d934cb1..bdd6327ac7d 100644
--- a/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
+++ b/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
@@ -70,13 +70,14 @@ public Option[] configuration() throws IOException, URISyntaxException {
                 // require at least ConfigAdmin 1.6 supported by felix.configadmin 1.9.0+
                 mavenBundle( "org.apache.felix", "org.apache.felix.configadmin", "1.9.20" ),
                 mavenBundle( "org.apache.felix", "org.apache.felix.fileinstall", "3.2.6" ),
+
                 mavenBundle( "org.ops4j.pax.logging", "pax-logging-api", "1.7.2" ),
                 // Jackson dependency for object serialisation.
                 // (these only need to be defined here when the versions are different from the ones
                 // defined in the project -- otherwise -> "bundle symbolic name and version are not unique")
-                mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").version("2.19.1"),
-                mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-annotations").version("2.19.1"),
-                mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").version("2.19.1"),
+                // mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").version("2.22.0"),
+                // mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-annotations").version("2.22"),
+                // mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").version("2.22.0"),
 
                 mavenBundle().groupId("com.github.ben-manes.caffeine").artifactId("caffeine").version("3.1.8"),
 
diff --git a/oak-it-osgi/test-bundles.xml b/oak-it-osgi/test-bundles.xml
index 96fdb9928d7..14e87fd7d3d 100644
--- a/oak-it-osgi/test-bundles.xml
+++ b/oak-it-osgi/test-bundles.xml
@@ -36,7 +36,9 @@
         <include>commons-codec:commons-codec</include>
         <include>commons-io:commons-io</include>
         <include>commons-logging:commons-logging</include>
+        <include>com.fasterxml.jackson.core:jackson-annotations</include>
         <include>com.fasterxml.jackson.core:jackson-core</include>
+        <include>com.fasterxml.jackson.core:jackson-databind</include>
         <include>org.apache.commons:commons-lang3</include>
         <include>org.apache.commons:commons-math3</include>
         <include>org.apache.commons:commons-text</include>