From d6917b5fff25fbc3e7718cef40f1870a3c57c881 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Tue, 2 Nov 2021 18:49:03 -0600
Subject: [PATCH] Update java for 3.19.0

---
 protobuf.spec | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/protobuf.spec b/protobuf.spec
index 2efe5dd..148b07c 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -215,15 +215,14 @@ mv googletest-5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081/* third_party/googletest/
 find -name \*.cc -o -name \*.h | xargs chmod -x
 chmod 644 examples/*
 %if %{with java}
-%pom_remove_dep org.easymock:easymockclassextension java/pom.xml java/core/pom.xml java/lite/pom.xml java/util/pom.xml
 %pom_remove_dep com.google.errorprone:error_prone_annotations java/util/pom.xml
-# These use easymockclassextension
-rm java/core/src/test/java/com/google/protobuf/ServiceTest.java
+%pom_remove_dep com.google.j2objc:j2objc-annotations java/util/pom.xml
 
 # Remove annotation libraries we don't have
 annotations=$(
     find -name '*.java' |
-      xargs grep -h -e '^import com\.google\.errorprone\.annotation' |
+      xargs grep -h -e '^import com\.google\.errorprone\.annotation' \
+                    -e '^import com\.google\.j2objc\.annotations' |
       sort -u | sed 's/.*\.\([^.]*\);/\1/' | paste -sd\|
 )
 find -name '*.java' | xargs sed -ri \