Update to upstream version 30.1

.gitignore

@@ -12,3 +12,4 @@
 /v28.1.tar.gz
 /v28.2.tar.gz
 /v29.0.tar.gz
+/v30.1.tar.gz

guava.spec

@@ -1,5 +1,5 @@
 Name:           guava
-Version:        29.0
+Version:        30.1
 Release:        1%{?dist}
 Summary:        Google Core Libraries for Java
 # Most of the code is under ASL 2.0
@@ -10,6 +10,8 @@ BuildArch:      noarch
 
 Source0:        https://github.com/google/guava/archive/v%{version}.tar.gz
 
+Patch1:         0001-Remove-multi-line-annotations.patch
+
 BuildRequires:  maven-local-openjdk8
 BuildRequires:  %{?module_prefix}mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(junit:junit)
@@ -64,25 +66,27 @@ find . -name '*.jar' -delete
 %pom_remove_dep -r org.checkerframework:
 %pom_remove_dep -r :listenablefuture
 
-# This multiline annotation escapes the following annotation removal
-sed -i -z 's/@DoNotMock([^()]*)\n//' guava/src/com/google/common/util/concurrent/ListeningExecutorService.java
-
 annotations=$(
     find -name '*.java' \
     | xargs fgrep -h \
         -e 'import com.google.j2objc.annotations' \
         -e 'import com.google.errorprone.annotation' \
+        -e 'import com.google.errorprone.annotations' \
+        -e 'import com.google.common.annotations' \
         -e 'import org.codehaus.mojo.animal_sniffer' \
         -e 'import org.checkerframework' \
     | sort -u \
     | sed 's/.*\.\([^.]*\);/\1/' \
     | paste -sd\|
 )
+
 # guava started using quite a few annotation libraries for code quality, which
 # we don't have. This ugly regex is supposed to remove their usage from the code
 find -name '*.java' | xargs sed -ri \
     "s/^import .*\.($annotations);//;s/@($annotations)"'\>\s*(\((("[^"]*")|([^)]*))\))?//g'
 
+%patch1 -p1
+
 %mvn_package "com.google.guava:failureaccess" guava
 
 %mvn_package "com.google.guava:guava-bom" __noinstall
@@ -102,6 +106,9 @@ find -name '*.java' | xargs sed -ri \
 %files testlib -f .mfiles-guava-testlib
 
 %changelog
+* Tue Jan 26 2021 Marian Koncek <mkoncek@redhat.com> - 30.1-1
+- Update to upstream version 30.1
+
 * Fri Sep 18 2020 Marian Koncek <mkoncek@redhat.com> - 29.0-1
 - Update to upstream version 29.0
 

sources

@@ -1 +1 @@
-SHA512 (v29.0.tar.gz) = 62d14762b9803194c5b8a72d3ef3577ef3608d6c8824d5cceb52dedf389ff9279eb80392622bde53a22d12391d593b55c9416ec6780677378ed3a67098fe57e9
+SHA512 (v30.1.tar.gz) = 0f8fa73414cf844a853ffc551f7ef808cd1f41ae9978a9b4261660ac039c0966448973f7c946efd33a6ab5d3995ef113107db1a7806cd5586473ed9434afc7b3