.gitignore

@@ -1 +1,16 @@
-SOURCES/v30.1.tar.gz
+/guava-r05.tar.bz2
+/guava-r09.tar.bz2
+/guava-11.0.2.tar.xz
+/guava-15.0.tar.xz
+/guava-17.0.tar.xz
+/v18.0.tar.xz
+/v18.0.tar.gz
+/v20.0.tar.gz
+/v24.0.tar.gz
+/v25.0.tar.gz
+/v28.0.tar.gz
+/v28.1.tar.gz
+/v28.2.tar.gz
+/v29.0.tar.gz
+/v30.1.tar.gz
+/guava-31.0.1.tar.gz

.guava.metadata

@@ -1 +0,0 @@
-2874ae9f3c910fde0aa66a576da7a05b02a417d3 SOURCES/v30.1.tar.gz

0001-Remove-multi-line-annotations.patch

@@ -0,0 +1,379 @@
+diff -up guava-31.0.1/android/guava/src/com/google/common/collect/CompactHashMap.java.multiline guava-31.0.1/android/guava/src/com/google/common/collect/CompactHashMap.java
+--- guava-31.0.1/android/guava/src/com/google/common/collect/CompactHashMap.java.multiline	2021-10-13 20:45:58.443768858 -0600
++++ guava-31.0.1/android/guava/src/com/google/common/collect/CompactHashMap.java	2021-10-13 20:45:58.827772298 -0600
+@@ -113,8 +113,6 @@ class CompactHashMap<K extends Object, V
+    * Maximum allowed false positive probability of detecting a hash flooding attack given random
+    * input.
+    */
+-  (
+-      )
+   static final double HASH_FLOODING_FPP = 0.001;
+ 
+   /**
+diff -up guava-31.0.1/android/guava/src/com/google/common/collect/CompactHashSet.java.multiline guava-31.0.1/android/guava/src/com/google/common/collect/CompactHashSet.java
+--- guava-31.0.1/android/guava/src/com/google/common/collect/CompactHashSet.java.multiline	2021-10-13 20:45:58.413768589 -0600
++++ guava-31.0.1/android/guava/src/com/google/common/collect/CompactHashSet.java	2021-10-13 20:45:58.827772298 -0600
+@@ -127,8 +127,6 @@ class CompactHashSet<E extends Object> e
+    * Maximum allowed false positive probability of detecting a hash flooding attack given random
+    * input.
+    */
+-  (
+-      )
+   static final double HASH_FLOODING_FPP = 0.001;
+ 
+   /**
+diff -up guava-31.0.1/android/guava/src/com/google/common/graph/Traverser.java.multiline guava-31.0.1/android/guava/src/com/google/common/graph/Traverser.java
+--- guava-31.0.1/android/guava/src/com/google/common/graph/Traverser.java.multiline	2021-10-13 20:45:58.364768150 -0600
++++ guava-31.0.1/android/guava/src/com/google/common/graph/Traverser.java	2021-10-13 20:45:58.827772298 -0600
+@@ -61,9 +61,6 @@ import javax.annotation.CheckForNull;
+  * @since 23.1
+  */
+ 
+-(
+-    "Call forGraph or forTree, passing a lambda or a Graph with the desired edges (built with"
+-        + " GraphBuilder)")
+ @ElementTypesAreNonnullByDefault
+ public abstract class Traverser<N> {
+   private final SuccessorsFunction<N> successorFunction;
+diff -up guava-31.0.1/android/guava/src/com/google/common/primitives/Doubles.java.multiline guava-31.0.1/android/guava/src/com/google/common/primitives/Doubles.java
+--- guava-31.0.1/android/guava/src/com/google/common/primitives/Doubles.java.multiline	2021-10-13 20:45:58.372768222 -0600
++++ guava-31.0.1/android/guava/src/com/google/common/primitives/Doubles.java	2021-10-13 20:45:58.827772298 -0600
+@@ -209,8 +209,6 @@ public final class Doubles extends Doubl
+    *     the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static double min(double... array) {
+     checkArgument(array.length > 0);
+     double min = array[0];
+@@ -229,8 +227,6 @@ public final class Doubles extends Doubl
+    *     in the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static double max(double... array) {
+     checkArgument(array.length > 0);
+     double max = array[0];
+diff -up guava-31.0.1/android/guava/src/com/google/common/primitives/Floats.java.multiline guava-31.0.1/android/guava/src/com/google/common/primitives/Floats.java
+--- guava-31.0.1/android/guava/src/com/google/common/primitives/Floats.java.multiline	2021-10-13 20:45:58.370768204 -0600
++++ guava-31.0.1/android/guava/src/com/google/common/primitives/Floats.java	2021-10-13 20:45:58.828772307 -0600
+@@ -206,8 +206,6 @@ public final class Floats extends Floats
+    *     the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static float min(float... array) {
+     checkArgument(array.length > 0);
+     float min = array[0];
+@@ -226,8 +224,6 @@ public final class Floats extends Floats
+    *     in the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static float max(float... array) {
+     checkArgument(array.length > 0);
+     float max = array[0];
+diff -up guava-31.0.1/android/guava/src/com/google/common/primitives/Ints.java.multiline guava-31.0.1/android/guava/src/com/google/common/primitives/Ints.java
+--- guava-31.0.1/android/guava/src/com/google/common/primitives/Ints.java.multiline	2021-10-13 20:45:58.369768195 -0600
++++ guava-31.0.1/android/guava/src/com/google/common/primitives/Ints.java	2021-10-13 20:45:58.828772307 -0600
+@@ -220,8 +220,6 @@ public final class Ints extends IntsMeth
+    *     the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static int min(int... array) {
+     checkArgument(array.length > 0);
+     int min = array[0];
+@@ -241,8 +239,6 @@ public final class Ints extends IntsMeth
+    *     in the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static int max(int... array) {
+     checkArgument(array.length > 0);
+     int max = array[0];
+diff -up guava-31.0.1/android/guava/src/com/google/common/primitives/Shorts.java.multiline guava-31.0.1/android/guava/src/com/google/common/primitives/Shorts.java
+--- guava-31.0.1/android/guava/src/com/google/common/primitives/Shorts.java.multiline	2021-10-13 20:45:58.367768177 -0600
++++ guava-31.0.1/android/guava/src/com/google/common/primitives/Shorts.java	2021-10-13 20:45:58.828772307 -0600
+@@ -219,8 +219,6 @@ public final class Shorts extends Shorts
+    *     the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static short min(short... array) {
+     checkArgument(array.length > 0);
+     short min = array[0];
+@@ -240,8 +238,6 @@ public final class Shorts extends Shorts
+    *     in the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static short max(short... array) {
+     checkArgument(array.length > 0);
+     short max = array[0];
+diff -up guava-31.0.1/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java.multiline guava-31.0.1/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java
+--- guava-31.0.1/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java.multiline	2021-10-13 20:45:58.353768052 -0600
++++ guava-31.0.1/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java	2021-10-13 20:45:58.828772307 -0600
+@@ -1227,9 +1227,6 @@ public final class ClosingFuture<V exten
+    *           .closing(executor);
+    * }</pre>
+    */
+-  // TODO(cpovirk): Use simple name instead of fully qualified after we stop building with JDK 8.
+-  @com.google.errorprone.annotations.DoNotMock(
+-      "Use ClosingFuture.whenAllSucceed() or .whenAllComplete() instead.")
+   public static class Combiner {
+ 
+     private final CloseableList closeables = new CloseableList();
+diff -up guava-31.0.1/android/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java.multiline guava-31.0.1/android/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java
+--- guava-31.0.1/android/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java.multiline	2021-10-13 20:45:58.340767936 -0600
++++ guava-31.0.1/android/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java	2021-10-13 20:45:58.829772316 -0600
+@@ -33,10 +33,6 @@ import java.util.concurrent.TimeUnit;
+  * @author Chris Povirk
+  * @since 10.0
+  */
+-(
+-    "Use TestingExecutors.sameThreadScheduledExecutor, or wrap a real Executor from "
+-        + "java.util.concurrent.Executors with MoreExecutors.listeningDecorator")
+-
+ @ElementTypesAreNonnullByDefault
+ public interface ListeningExecutorService extends ExecutorService {
+   /**
+diff -up guava-31.0.1/guava/src/com/google/common/base/Strings.java.multiline guava-31.0.1/guava/src/com/google/common/base/Strings.java
+--- guava-31.0.1/guava/src/com/google/common/base/Strings.java.multiline	2021-10-13 20:45:58.793771994 -0600
++++ guava-31.0.1/guava/src/com/google/common/base/Strings.java	2021-10-13 20:45:58.829772316 -0600
+@@ -147,8 +147,6 @@ public final class Strings {
+    *     {@code count} is zero)
+    * @throws IllegalArgumentException if {@code count} is negative
+    */
+-  ")
+-  
+   public static String repeat(String string, int count) {
+     checkNotNull(string); // eager for GWT.
+ 
+diff -up guava-31.0.1/guava/src/com/google/common/collect/CompactHashMap.java.multiline guava-31.0.1/guava/src/com/google/common/collect/CompactHashMap.java
+--- guava-31.0.1/guava/src/com/google/common/collect/CompactHashMap.java.multiline	2021-10-13 20:45:58.776771841 -0600
++++ guava-31.0.1/guava/src/com/google/common/collect/CompactHashMap.java	2021-10-13 20:45:58.829772316 -0600
+@@ -117,8 +117,6 @@ class CompactHashMap<K extends Object, V
+    * Maximum allowed false positive probability of detecting a hash flooding attack given random
+    * input.
+    */
+-  (
+-      )
+   static final double HASH_FLOODING_FPP = 0.001;
+ 
+   /**
+diff -up guava-31.0.1/guava/src/com/google/common/collect/CompactHashSet.java.multiline guava-31.0.1/guava/src/com/google/common/collect/CompactHashSet.java
+--- guava-31.0.1/guava/src/com/google/common/collect/CompactHashSet.java.multiline	2021-10-13 20:45:58.747771582 -0600
++++ guava-31.0.1/guava/src/com/google/common/collect/CompactHashSet.java	2021-10-13 20:45:58.829772316 -0600
+@@ -131,8 +131,6 @@ class CompactHashSet<E extends Object> e
+    * Maximum allowed false positive probability of detecting a hash flooding attack given random
+    * input.
+    */
+-  (
+-      )
+   static final double HASH_FLOODING_FPP = 0.001;
+ 
+   /**
+diff -up guava-31.0.1/guava/src/com/google/common/collect/FluentIterable.java.multiline guava-31.0.1/guava/src/com/google/common/collect/FluentIterable.java
+--- guava-31.0.1/guava/src/com/google/common/collect/FluentIterable.java.multiline	2021-10-13 20:45:58.750771608 -0600
++++ guava-31.0.1/guava/src/com/google/common/collect/FluentIterable.java	2021-10-13 20:47:09.340403972 -0600
+@@ -173,9 +173,6 @@ public abstract class FluentIterable<E e
+    *     FluentIterable}
+    */
+   @Deprecated
+-  (
+-      replacement = "checkNotNull(iterable)",
+-      staticImports = {"com.google.common.base.Preconditions.checkNotNull"})
+   public static <E extends Object> FluentIterable<E> from(FluentIterable<E> iterable) {
+     return checkNotNull(iterable);
+   }
+diff -up guava-31.0.1/guava/src/com/google/common/collect/Streams.java.multiline guava-31.0.1/guava/src/com/google/common/collect/Streams.java
+--- guava-31.0.1/guava/src/com/google/common/collect/Streams.java.multiline	2021-10-13 20:45:58.779771868 -0600
++++ guava-31.0.1/guava/src/com/google/common/collect/Streams.java	2021-10-13 20:45:58.829772316 -0600
+@@ -76,7 +76,6 @@ public final class Streams {
+    */
+   
+   @Deprecated
+-  ")
+   public static <T extends Object> Stream<T> stream(Collection<T> collection) {
+     return collection.stream();
+   }
+@@ -106,8 +105,6 @@ public final class Streams {
+    * <p><b>Java 9 users:</b> use {@code optional.stream()} instead.
+    */
+   
+-  ")
+-  
+   public static <T> Stream<T> stream(java.util.Optional<T> optional) {
+     return optional.isPresent() ? Stream.of(optional.get()) : Stream.empty();
+   }
+@@ -119,8 +116,6 @@ public final class Streams {
+    * <p><b>Java 9 users:</b> use {@code optional.stream()} instead.
+    */
+   
+-  ")
+-  
+   public static IntStream stream(OptionalInt optional) {
+     return optional.isPresent() ? IntStream.of(optional.getAsInt()) : IntStream.empty();
+   }
+@@ -132,8 +127,6 @@ public final class Streams {
+    * <p><b>Java 9 users:</b> use {@code optional.stream()} instead.
+    */
+   
+-  ")
+-  
+   public static LongStream stream(OptionalLong optional) {
+     return optional.isPresent() ? LongStream.of(optional.getAsLong()) : LongStream.empty();
+   }
+@@ -145,8 +138,6 @@ public final class Streams {
+    * <p><b>Java 9 users:</b> use {@code optional.stream()} instead.
+    */
+   
+-  ")
+-  
+   public static DoubleStream stream(OptionalDouble optional) {
+     return optional.isPresent() ? DoubleStream.of(optional.getAsDouble()) : DoubleStream.empty();
+   }
+diff -up guava-31.0.1/guava/src/com/google/common/graph/Traverser.java.multiline guava-31.0.1/guava/src/com/google/common/graph/Traverser.java
+--- guava-31.0.1/guava/src/com/google/common/graph/Traverser.java.multiline	2021-10-13 20:45:58.697771134 -0600
++++ guava-31.0.1/guava/src/com/google/common/graph/Traverser.java	2021-10-13 20:45:58.830772325 -0600
+@@ -61,9 +61,6 @@ import javax.annotation.CheckForNull;
+  * @since 23.1
+  */
+ 
+-(
+-    "Call forGraph or forTree, passing a lambda or a Graph with the desired edges (built with"
+-        + " GraphBuilder)")
+ @ElementTypesAreNonnullByDefault
+ public abstract class Traverser<N> {
+   private final SuccessorsFunction<N> successorFunction;
+diff -up guava-31.0.1/guava/src/com/google/common/primitives/Doubles.java.multiline guava-31.0.1/guava/src/com/google/common/primitives/Doubles.java
+--- guava-31.0.1/guava/src/com/google/common/primitives/Doubles.java.multiline	2021-10-13 20:45:58.704771196 -0600
++++ guava-31.0.1/guava/src/com/google/common/primitives/Doubles.java	2021-10-13 20:45:58.830772325 -0600
+@@ -211,8 +211,6 @@ public final class Doubles extends Doubl
+    *     the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static double min(double... array) {
+     checkArgument(array.length > 0);
+     double min = array[0];
+@@ -231,8 +229,6 @@ public final class Doubles extends Doubl
+    *     in the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static double max(double... array) {
+     checkArgument(array.length > 0);
+     double max = array[0];
+diff -up guava-31.0.1/guava/src/com/google/common/primitives/Floats.java.multiline guava-31.0.1/guava/src/com/google/common/primitives/Floats.java
+--- guava-31.0.1/guava/src/com/google/common/primitives/Floats.java.multiline	2021-10-13 20:45:58.703771187 -0600
++++ guava-31.0.1/guava/src/com/google/common/primitives/Floats.java	2021-10-13 20:45:58.830772325 -0600
+@@ -206,8 +206,6 @@ public final class Floats extends Floats
+    *     the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static float min(float... array) {
+     checkArgument(array.length > 0);
+     float min = array[0];
+@@ -226,8 +224,6 @@ public final class Floats extends Floats
+    *     in the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static float max(float... array) {
+     checkArgument(array.length > 0);
+     float max = array[0];
+diff -up guava-31.0.1/guava/src/com/google/common/primitives/Ints.java.multiline guava-31.0.1/guava/src/com/google/common/primitives/Ints.java
+--- guava-31.0.1/guava/src/com/google/common/primitives/Ints.java.multiline	2021-10-13 20:45:58.702771178 -0600
++++ guava-31.0.1/guava/src/com/google/common/primitives/Ints.java	2021-10-13 20:45:58.830772325 -0600
+@@ -222,8 +222,6 @@ public final class Ints extends IntsMeth
+    *     the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static int min(int... array) {
+     checkArgument(array.length > 0);
+     int min = array[0];
+@@ -243,8 +241,6 @@ public final class Ints extends IntsMeth
+    *     in the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static int max(int... array) {
+     checkArgument(array.length > 0);
+     int max = array[0];
+diff -up guava-31.0.1/guava/src/com/google/common/primitives/Shorts.java.multiline guava-31.0.1/guava/src/com/google/common/primitives/Shorts.java
+--- guava-31.0.1/guava/src/com/google/common/primitives/Shorts.java.multiline	2021-10-13 20:45:58.700771161 -0600
++++ guava-31.0.1/guava/src/com/google/common/primitives/Shorts.java	2021-10-13 20:45:58.830772325 -0600
+@@ -219,8 +219,6 @@ public final class Shorts extends Shorts
+    *     the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static short min(short... array) {
+     checkArgument(array.length > 0);
+     short min = array[0];
+@@ -240,8 +238,6 @@ public final class Shorts extends Shorts
+    *     in the array
+    * @throws IllegalArgumentException if {@code array} is empty
+    */
+-  (
+-      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
+   public static short max(short... array) {
+     checkArgument(array.length > 0);
+     short max = array[0];
+diff -up guava-31.0.1/guava/src/com/google/common/util/concurrent/ClosingFuture.java.multiline guava-31.0.1/guava/src/com/google/common/util/concurrent/ClosingFuture.java
+--- guava-31.0.1/guava/src/com/google/common/util/concurrent/ClosingFuture.java.multiline	2021-10-13 20:45:58.686771035 -0600
++++ guava-31.0.1/guava/src/com/google/common/util/concurrent/ClosingFuture.java	2021-10-13 20:45:58.831772334 -0600
+@@ -1229,9 +1229,6 @@ public final class ClosingFuture<V exten
+    *           .closing(executor);
+    * }</pre>
+    */
+-  // TODO(cpovirk): Use simple name instead of fully qualified after we stop building with JDK 8.
+-  @com.google.errorprone.annotations.DoNotMock(
+-      "Use ClosingFuture.whenAllSucceed() or .whenAllComplete() instead.")
+   public static class Combiner {
+ 
+     private final CloseableList closeables = new CloseableList();
+diff -up guava-31.0.1/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java.multiline guava-31.0.1/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java
+--- guava-31.0.1/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java.multiline	2021-10-13 20:45:58.673770919 -0600
++++ guava-31.0.1/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java	2021-10-13 20:45:58.831772334 -0600
+@@ -33,10 +33,6 @@ import java.util.concurrent.TimeUnit;
+  * @author Chris Povirk
+  * @since 10.0
+  */
+-(
+-    "Use TestingExecutors.sameThreadScheduledExecutor, or wrap a real Executor from "
+-        + "java.util.concurrent.Executors with MoreExecutors.listeningDecorator")
+-
+ @ElementTypesAreNonnullByDefault
+ public interface ListeningExecutorService extends ExecutorService {
+   /**
+diff -up guava-31.0.1/guava/target/classes/com/google/common/base/Strings.java.multiline guava-31.0.1/guava/target/classes/com/google/common/base/Strings.java
+diff -up guava-31.0.1/guava/target/classes/com/google/common/collect/CompactHashMap.java.multiline guava-31.0.1/guava/target/classes/com/google/common/collect/CompactHashMap.java
+diff -up guava-31.0.1/guava/target/classes/com/google/common/collect/CompactHashSet.java.multiline guava-31.0.1/guava/target/classes/com/google/common/collect/CompactHashSet.java
+diff -up guava-31.0.1/guava/target/classes/com/google/common/collect/Streams.java.multiline guava-31.0.1/guava/target/classes/com/google/common/collect/Streams.java
+diff -up guava-31.0.1/guava/target/classes/com/google/common/graph/Traverser.java.multiline guava-31.0.1/guava/target/classes/com/google/common/graph/Traverser.java
+diff -up guava-31.0.1/guava/target/classes/com/google/common/primitives/Doubles.java.multiline guava-31.0.1/guava/target/classes/com/google/common/primitives/Doubles.java
+diff -up guava-31.0.1/guava/target/classes/com/google/common/primitives/Floats.java.multiline guava-31.0.1/guava/target/classes/com/google/common/primitives/Floats.java
+diff -up guava-31.0.1/guava/target/classes/com/google/common/primitives/Ints.java.multiline guava-31.0.1/guava/target/classes/com/google/common/primitives/Ints.java
+diff -up guava-31.0.1/guava/target/classes/com/google/common/primitives/Shorts.java.multiline guava-31.0.1/guava/target/classes/com/google/common/primitives/Shorts.java
+diff -up guava-31.0.1/guava/target/classes/com/google/common/util/concurrent/ClosingFuture.java.multiline guava-31.0.1/guava/target/classes/com/google/common/util/concurrent/ClosingFuture.java
+diff -up guava-31.0.1/guava/target/classes/com/google/common/util/concurrent/ListeningExecutorService.java.multiline guava-31.0.1/guava/target/classes/com/google/common/util/concurrent/ListeningExecutorService.java

SOURCES/0001-Remove-multi-line-annotations.patch

@@ -1,343 +0,0 @@
-From c5d3a8295d62ede99b5e4c7c6ef63c14819ec112 Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Mon, 18 Jan 2021 12:39:46 +0100
-Subject: [PATCH] Remove multi-line annotations
-
----
- .../guava/src/com/google/common/collect/CompactHashMap.java   | 2 --
- .../guava/src/com/google/common/collect/CompactHashSet.java   | 2 --
- android/guava/src/com/google/common/graph/Traverser.java      | 3 ---
- android/guava/src/com/google/common/primitives/Doubles.java   | 4 ----
- android/guava/src/com/google/common/primitives/Floats.java    | 4 ----
- android/guava/src/com/google/common/primitives/Ints.java      | 4 ----
- android/guava/src/com/google/common/primitives/Shorts.java    | 4 ----
- .../src/com/google/common/util/concurrent/ClosingFuture.java  | 3 ---
- .../common/util/concurrent/ListeningExecutorService.java      | 4 ----
- guava/src/com/google/common/collect/CompactHashMap.java       | 2 --
- guava/src/com/google/common/collect/CompactHashSet.java       | 2 --
- guava/src/com/google/common/graph/Traverser.java              | 3 ---
- guava/src/com/google/common/primitives/Doubles.java           | 4 ----
- guava/src/com/google/common/primitives/Floats.java            | 4 ----
- guava/src/com/google/common/primitives/Ints.java              | 4 ----
- guava/src/com/google/common/primitives/Shorts.java            | 4 ----
- .../src/com/google/common/util/concurrent/ClosingFuture.java  | 3 ---
- .../common/util/concurrent/ListeningExecutorService.java      | 4 ----
- 18 files changed, 60 deletions(-)
-
-diff --git a/android/guava/src/com/google/common/collect/CompactHashMap.java b/android/guava/src/com/google/common/collect/CompactHashMap.java
-index 69e1412..e6cba86 100644
---- a/android/guava/src/com/google/common/collect/CompactHashMap.java
-+++ b/android/guava/src/com/google/common/collect/CompactHashMap.java
-@@ -105,8 +105,6 @@ class CompactHashMap<K, V> extends AbstractMap<K, V> implements Serializable {
-    * Maximum allowed false positive probability of detecting a hash flooding attack given random
-    * input.
-    */
--  (
--      )
-   static final double HASH_FLOODING_FPP = 0.001;
- 
-   /**
-diff --git a/android/guava/src/com/google/common/collect/CompactHashSet.java b/android/guava/src/com/google/common/collect/CompactHashSet.java
-index 43072b6..85debcd 100644
---- a/android/guava/src/com/google/common/collect/CompactHashSet.java
-+++ b/android/guava/src/com/google/common/collect/CompactHashSet.java
-@@ -122,8 +122,6 @@ class CompactHashSet<E> extends AbstractSet<E> implements Serializable {
-    * Maximum allowed false positive probability of detecting a hash flooding attack given random
-    * input.
-    */
--  (
--      )
-   static final double HASH_FLOODING_FPP = 0.001;
- 
-   /**
-diff --git a/android/guava/src/com/google/common/graph/Traverser.java b/android/guava/src/com/google/common/graph/Traverser.java
-index 7a40bdd..2b3f60c 100644
---- a/android/guava/src/com/google/common/graph/Traverser.java
-+++ b/android/guava/src/com/google/common/graph/Traverser.java
-@@ -60,9 +60,6 @@ import java.util.Set;
-  * @since 23.1
-  */
- 
--(
--    "Call forGraph or forTree, passing a lambda or a Graph with the desired edges (built with"
--        + " GraphBuilder)")
- public abstract class Traverser<N> {
-   private final SuccessorsFunction<N> successorFunction;
- 
-diff --git a/android/guava/src/com/google/common/primitives/Doubles.java b/android/guava/src/com/google/common/primitives/Doubles.java
-index d99300b..2cab6b8 100644
---- a/android/guava/src/com/google/common/primitives/Doubles.java
-+++ b/android/guava/src/com/google/common/primitives/Doubles.java
-@@ -208,8 +208,6 @@ public final class Doubles extends DoublesMethodsForWeb {
-    *     the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static double min(double... array) {
-     checkArgument(array.length > 0);
-     double min = array[0];
-@@ -228,8 +226,6 @@ public final class Doubles extends DoublesMethodsForWeb {
-    *     in the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static double max(double... array) {
-     checkArgument(array.length > 0);
-     double max = array[0];
-diff --git a/android/guava/src/com/google/common/primitives/Floats.java b/android/guava/src/com/google/common/primitives/Floats.java
-index 6166813..aa293dc 100644
---- a/android/guava/src/com/google/common/primitives/Floats.java
-+++ b/android/guava/src/com/google/common/primitives/Floats.java
-@@ -205,8 +205,6 @@ public final class Floats extends FloatsMethodsForWeb {
-    *     the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static float min(float... array) {
-     checkArgument(array.length > 0);
-     float min = array[0];
-@@ -225,8 +223,6 @@ public final class Floats extends FloatsMethodsForWeb {
-    *     in the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static float max(float... array) {
-     checkArgument(array.length > 0);
-     float max = array[0];
-diff --git a/android/guava/src/com/google/common/primitives/Ints.java b/android/guava/src/com/google/common/primitives/Ints.java
-index 511ec2b..f7f5ce3 100644
---- a/android/guava/src/com/google/common/primitives/Ints.java
-+++ b/android/guava/src/com/google/common/primitives/Ints.java
-@@ -219,8 +219,6 @@ public final class Ints extends IntsMethodsForWeb {
-    *     the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static int min(int... array) {
-     checkArgument(array.length > 0);
-     int min = array[0];
-@@ -240,8 +238,6 @@ public final class Ints extends IntsMethodsForWeb {
-    *     in the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static int max(int... array) {
-     checkArgument(array.length > 0);
-     int max = array[0];
-diff --git a/android/guava/src/com/google/common/primitives/Shorts.java b/android/guava/src/com/google/common/primitives/Shorts.java
-index f07c59d..7ebc7de 100644
---- a/android/guava/src/com/google/common/primitives/Shorts.java
-+++ b/android/guava/src/com/google/common/primitives/Shorts.java
-@@ -218,8 +218,6 @@ public final class Shorts extends ShortsMethodsForWeb {
-    *     the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static short min(short... array) {
-     checkArgument(array.length > 0);
-     short min = array[0];
-@@ -239,8 +237,6 @@ public final class Shorts extends ShortsMethodsForWeb {
-    *     in the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static short max(short... array) {
-     checkArgument(array.length > 0);
-     short max = array[0];
-diff --git a/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java b/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java
-index f1d1250..ca89d9d 100644
---- a/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java
-+++ b/android/guava/src/com/google/common/util/concurrent/ClosingFuture.java
-@@ -1203,9 +1203,6 @@ public final class ClosingFuture<V> {
-    *           .closing(executor);
-    * }</pre>
-    */
--  // TODO(cpovirk): Use simple name instead of fully qualified after we stop building with JDK 8.
--  @com.google.errorprone.annotations.DoNotMock(
--      "Use ClosingFuture.whenAllSucceed() or .whenAllComplete() instead.")
-   public static class Combiner {
- 
-     private final CloseableList closeables = new CloseableList();
-diff --git a/android/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java b/android/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java
-index 241242a..6ada4e9 100644
---- a/android/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java
-+++ b/android/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java
-@@ -32,10 +32,6 @@ import java.util.concurrent.TimeUnit;
-  * @author Chris Povirk
-  * @since 10.0
-  */
--(
--    "Use TestingExecutors.sameThreadScheduledExecutor, or wrap a real Executor from "
--        + "java.util.concurrent.Executors with MoreExecutors.listeningDecorator")
--
- public interface ListeningExecutorService extends ExecutorService {
-   /**
-    * @return a {@code ListenableFuture} representing pending completion of the task
-diff --git a/guava/src/com/google/common/collect/CompactHashMap.java b/guava/src/com/google/common/collect/CompactHashMap.java
-index fbf1d4d..8a88a9f 100644
---- a/guava/src/com/google/common/collect/CompactHashMap.java
-+++ b/guava/src/com/google/common/collect/CompactHashMap.java
-@@ -109,8 +109,6 @@ class CompactHashMap<K, V> extends AbstractMap<K, V> implements Serializable {
-    * Maximum allowed false positive probability of detecting a hash flooding attack given random
-    * input.
-    */
--  (
--      )
-   static final double HASH_FLOODING_FPP = 0.001;
- 
-   /**
-diff --git a/guava/src/com/google/common/collect/CompactHashSet.java b/guava/src/com/google/common/collect/CompactHashSet.java
-index 9f6b3b9..7237175 100644
---- a/guava/src/com/google/common/collect/CompactHashSet.java
-+++ b/guava/src/com/google/common/collect/CompactHashSet.java
-@@ -126,8 +126,6 @@ class CompactHashSet<E> extends AbstractSet<E> implements Serializable {
-    * Maximum allowed false positive probability of detecting a hash flooding attack given random
-    * input.
-    */
--  (
--      )
-   static final double HASH_FLOODING_FPP = 0.001;
- 
-   /**
-diff --git a/guava/src/com/google/common/graph/Traverser.java b/guava/src/com/google/common/graph/Traverser.java
-index 7a40bdd..2b3f60c 100644
---- a/guava/src/com/google/common/graph/Traverser.java
-+++ b/guava/src/com/google/common/graph/Traverser.java
-@@ -60,9 +60,6 @@ import java.util.Set;
-  * @since 23.1
-  */
- 
--(
--    "Call forGraph or forTree, passing a lambda or a Graph with the desired edges (built with"
--        + " GraphBuilder)")
- public abstract class Traverser<N> {
-   private final SuccessorsFunction<N> successorFunction;
- 
-diff --git a/guava/src/com/google/common/primitives/Doubles.java b/guava/src/com/google/common/primitives/Doubles.java
-index 8317163..3b157ba 100644
---- a/guava/src/com/google/common/primitives/Doubles.java
-+++ b/guava/src/com/google/common/primitives/Doubles.java
-@@ -210,8 +210,6 @@ public final class Doubles extends DoublesMethodsForWeb {
-    *     the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static double min(double... array) {
-     checkArgument(array.length > 0);
-     double min = array[0];
-@@ -230,8 +228,6 @@ public final class Doubles extends DoublesMethodsForWeb {
-    *     in the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static double max(double... array) {
-     checkArgument(array.length > 0);
-     double max = array[0];
-diff --git a/guava/src/com/google/common/primitives/Floats.java b/guava/src/com/google/common/primitives/Floats.java
-index 7578aa8..60a6da3 100644
---- a/guava/src/com/google/common/primitives/Floats.java
-+++ b/guava/src/com/google/common/primitives/Floats.java
-@@ -205,8 +205,6 @@ public final class Floats extends FloatsMethodsForWeb {
-    *     the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static float min(float... array) {
-     checkArgument(array.length > 0);
-     float min = array[0];
-@@ -225,8 +223,6 @@ public final class Floats extends FloatsMethodsForWeb {
-    *     in the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static float max(float... array) {
-     checkArgument(array.length > 0);
-     float max = array[0];
-diff --git a/guava/src/com/google/common/primitives/Ints.java b/guava/src/com/google/common/primitives/Ints.java
-index f2a0cad..0e4ea1f 100644
---- a/guava/src/com/google/common/primitives/Ints.java
-+++ b/guava/src/com/google/common/primitives/Ints.java
-@@ -221,8 +221,6 @@ public final class Ints extends IntsMethodsForWeb {
-    *     the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static int min(int... array) {
-     checkArgument(array.length > 0);
-     int min = array[0];
-@@ -242,8 +240,6 @@ public final class Ints extends IntsMethodsForWeb {
-    *     in the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static int max(int... array) {
-     checkArgument(array.length > 0);
-     int max = array[0];
-diff --git a/guava/src/com/google/common/primitives/Shorts.java b/guava/src/com/google/common/primitives/Shorts.java
-index f07c59d..7ebc7de 100644
---- a/guava/src/com/google/common/primitives/Shorts.java
-+++ b/guava/src/com/google/common/primitives/Shorts.java
-@@ -218,8 +218,6 @@ public final class Shorts extends ShortsMethodsForWeb {
-    *     the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static short min(short... array) {
-     checkArgument(array.length > 0);
-     short min = array[0];
-@@ -239,8 +237,6 @@ public final class Shorts extends ShortsMethodsForWeb {
-    *     in the array
-    * @throws IllegalArgumentException if {@code array} is empty
-    */
--  (
--      "Available in GWT! Annotation is to avoid conflict with GWT specialization of base class.")
-   public static short max(short... array) {
-     checkArgument(array.length > 0);
-     short max = array[0];
-diff --git a/guava/src/com/google/common/util/concurrent/ClosingFuture.java b/guava/src/com/google/common/util/concurrent/ClosingFuture.java
-index 0a867aa..fdb3887 100644
---- a/guava/src/com/google/common/util/concurrent/ClosingFuture.java
-+++ b/guava/src/com/google/common/util/concurrent/ClosingFuture.java
-@@ -1201,9 +1201,6 @@ public final class ClosingFuture<V> {
-    *           .closing(executor);
-    * }</pre>
-    */
--  // TODO(cpovirk): Use simple name instead of fully qualified after we stop building with JDK 8.
--  @com.google.errorprone.annotations.DoNotMock(
--      "Use ClosingFuture.whenAllSucceed() or .whenAllComplete() instead.")
-   public static class Combiner {
- 
-     private final CloseableList closeables = new CloseableList();
-diff --git a/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java b/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java
-index 241242a..6ada4e9 100644
---- a/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java
-+++ b/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java
-@@ -32,10 +32,6 @@ import java.util.concurrent.TimeUnit;
-  * @author Chris Povirk
-  * @since 10.0
-  */
--(
--    "Use TestingExecutors.sameThreadScheduledExecutor, or wrap a real Executor from "
--        + "java.util.concurrent.Executors with MoreExecutors.listeningDecorator")
--
- public interface ListeningExecutorService extends ExecutorService {
-   /**
-    * @return a {@code ListenableFuture} representing pending completion of the task
--- 
-2.29.2
-

guava.spec

@@ -1,23 +1,24 @@
 %bcond_with bootstrap
 
 Name:           guava
-Version:        30.1
+Version:        31.0.1
-Release:        8%{?dist}
+Release:        4%{?dist}
 Summary:        Google Core Libraries for Java
 # Most of the code is under ASL 2.0
 # Few classes are under CC0, grep for creativecommons
 License:        ASL 2.0 and CC0
 URL:            https://github.com/google/guava
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
-Source0:        https://github.com/google/guava/archive/v%{version}.tar.gz
+Source0:        https://github.com/google/guava/archive/v%{version}/guava-%{version}.tar.gz
 
 Patch1:         0001-Remove-multi-line-annotations.patch
 
-BuildRequires:  maven-local-openjdk8
 %if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
+BuildRequires:  javapackages-bootstrap-openjdk8
 %else
+BuildRequires:  maven-local-openjdk8
 BuildRequires:  %{?module_prefix}mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
@@ -91,7 +92,7 @@ annotations=$(
 find -name '*.java' | xargs sed -ri \
     "s/^import .*\.($annotations);//;s/@($annotations)"'\>\s*(\((("[^"]*")|([^)]*))\))?//g'
 
-%patch -P 1 -p1
+%patch1 -p1 -b .multiline
 
 %mvn_package "com.google.guava:failureaccess" guava
 
@@ -112,24 +113,20 @@ find -name '*.java' | xargs sed -ri \
 %files testlib -f .mfiles-guava-testlib
 
 %changelog
-* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 30.1-8
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 31.0.1-4
-- Fix patch usage
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 30.1-7
-- Rebuild with regenerated Requires on Java
 
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 30.1-6
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 31.0.1-3
-- Rebuild to regenerate auto-requires
+- Rebuilt for java-17-openjdk as system jdk
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 30.1-5
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 31.0.1-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-  Related: rhbz#1991688
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 30.1-4
+* Thu Oct 14 2021 Orion Poplawski <orion@nwra.com> - 31.0.1-1
-- Rebuild to workaround DistroBaker issue
+- Update to 31.0.1
 
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 30.1-3
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 30.1-3
-- Bootstrap Maven for CentOS Stream 9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 30.1-2
 - Bootstrap build
@@ -267,7 +264,7 @@ find -name '*.java' | xargs sed -ri \
 
 * Fri Jun 28 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 13.0-4
 - Rebuild to regenerate API documentation
-- Resolves: CVE-2013-1571
+- Resolves CVE-2013-1571
 
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 13.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

sources

@@ -0,0 +1 @@
+SHA512 (guava-31.0.1.tar.gz) = 902b88c03ed156c5613cbdfaa0610704f69357d3117536495c33d6c1bf742350ac0707c2509be0f47de9b76495fd61022430c67bebe28859da2d72cf550b8340