From f9511943d32fc03cc2689fb537fef2583e87f254 Mon Sep 17 00:00:00 2001
From: Ramanathan <ramanathanbscmca@gmail.com>
Date: Mon, 7 Sep 2026 05:35:58 +0530
Subject: [PATCH 1/2] Update compile and target SDK versions to 36; add
 dependency management for commons-io 2.17.0

---
 log4j-samples-android/app/build.gradle |  4 ++--
 log4j-samples-flume-embedded/pom.xml   | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/log4j-samples-android/app/build.gradle b/log4j-samples-android/app/build.gradle
index 6a47ebb..b25140e 100644
--- a/log4j-samples-android/app/build.gradle
+++ b/log4j-samples-android/app/build.gradle
@@ -19,13 +19,13 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 36
     namespace = "org.apache.logging.log4j.samples.android"
 
     defaultConfig {
         applicationId "org.apache.logging.log4j.samples.android"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode 1
         versionName "1.0"
 
diff --git a/log4j-samples-flume-embedded/pom.xml b/log4j-samples-flume-embedded/pom.xml
index 45dfa51..09ba24e 100644
--- a/log4j-samples-flume-embedded/pom.xml
+++ b/log4j-samples-flume-embedded/pom.xml
@@ -25,6 +25,17 @@
   <artifactId>log4j-samples-flume-embedded</artifactId>
   <packaging>war</packaging>
   <name>Apache Log4j Samples: Flume - Embedded</name>
+  <dependencyManagement>
+    <dependencies>
+      <!-- Flume 1.11.0 resolves commons-io 2.11.0, below the 2.17.0 that
+           spring-cloud-dependencies pulls in via curator/zookeeper -->
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>2.17.0</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>org.jspecify</groupId>

From 714b73b06750cd6aaba0c19ab2608e607aedc695 Mon Sep 17 00:00:00 2001
From: Ramanathan <ramanathanbscmca@gmail.com>
Date: Mon, 7 Sep 2026 13:12:31 +0530
Subject: [PATCH 2/2] Update jackson.version to 2.22.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f298571..20c4567 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
     <error_prone.version>2.50.0</error_prone.version>
     <guava.version>33.6.0-jre</guava.version>
     <httpclient.version>4.5.14</httpclient.version>
-    <jackson.version>2.22.1</jackson.version>
+    <jackson.version>2.22.2</jackson.version>
     <joda-time.version>2.14.2</joda-time.version>
     <kotlin.version>2.4.10</kotlin.version>
     <snakeyaml.version>2.6</snakeyaml.version>