From 303239d74d07daf49ecdba6e23e41c8fe5a9b41e Mon Sep 17 00:00:00 2001
From: Sandy Zhang <sandyzhang@google.com>
Date: Mon, 22 Jan 2024 16:51:03 -0800
Subject: [PATCH] Drop Protobuf support for Android KitKat per EOL and add
 existing minimum Java 1.8 in Maven pom.xmls

See https://android-developers.googleblog.com/2023/07/google-play-services-discontinuing-updates-for-kitkat.html for more details on Android KitKat EOL.

PiperOrigin-RevId: 600609333
---
 java/pom.xml      | 9 +++++++--
 java/util/pom.xml | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index 89b155d989a00..f786f572b5a9c 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -178,10 +178,15 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
         <configuration>
+          <signature>
+            <groupId>org.codehaus.mojo.signature</groupId>
+            <artifactId>java18</artifactId>
+            <version>1.0</version>
+          </signature>
           <signature>
             <groupId>net.sf.androidscents.signature</groupId>
-            <artifactId>android-api-level-14</artifactId>
-            <version>4.0_r4</version>
+            <artifactId>android-api-level-21</artifactId>
+            <version>5.0.1_r2</version>
           </signature>
           <ignores>
             <ignore>sun.misc.Unsafe</ignore>
diff --git a/java/util/pom.xml b/java/util/pom.xml
index f25581be84db0..68280db223e59 100644
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@@ -122,10 +122,15 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
         <configuration>
+          <signature>
+            <groupId>org.codehaus.mojo.signature</groupId>
+            <artifactId>java18</artifactId>
+            <version>1.0</version>
+          </signature>
           <signature>
             <groupId>net.sf.androidscents.signature</groupId>
-            <artifactId>android-api-level-19</artifactId>
-            <version>4.4.2_r4</version>
+            <artifactId>android-api-level-21</artifactId>
+            <version>5.0.1_r2</version>
           </signature>
         </configuration>
         <executions>