.gitignore

@@ -0,0 +1 @@
+SOURCES/v28.1.tar.gz

.guava.metadata

@@ -1 +1 @@
-4fcabd63616e0d2b949b2d90732928dfbe838bd2 SOURCES/guava-31.0.1.tar.gz
+adc45c534dcb7ee494893b5b8e38c92dd31f6250 SOURCES/v28.1.tar.gz

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

@@ -1,379 +0,0 @@
-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

SPECS/guava.spec

@@ -1,29 +1,21 @@
-%bcond_with bootstrap
-
 Name:           guava
-Version:        31.0.1
+Version:        28.1
-Release:        4%{?dist}
+Release:        3%{?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}/guava-%{version}.tar.gz
+Source0:        https://github.com/google/guava/archive/v%{version}.tar.gz
 
-Patch1:         0001-Remove-multi-line-annotations.patch
-
-%if %{with 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)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
-%endif
+BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 
 %description
 Guava is a suite of core and expanded libraries that include
@@ -33,6 +25,7 @@ This project is a complete packaging of all the Guava libraries
 into a single jar.  Individual portions of Guava can be used
 by downloading the appropriate module and its dependencies.
 
+%{?module_package}
 %{?javadoc_package}
 
 %package testlib
@@ -46,15 +39,9 @@ guava-testlib provides additional functionality for conveninent unit testing
 
 find . -name '*.jar' -delete
 
-%pom_remove_parent guava-bom
-
 %pom_disable_module guava-gwt
 %pom_disable_module guava-tests
 
-%pom_xpath_inject pom:modules "<module>futures/failureaccess</module>"
-%pom_xpath_inject pom:parent "<relativePath>../..</relativePath>" futures/failureaccess
-%pom_xpath_set pom:parent/pom:version %{version}-jre futures/failureaccess
-
 %pom_remove_plugin -r :animal-sniffer-maven-plugin
 # Downloads JDK source for doc generation
 %pom_remove_plugin :maven-dependency-plugin guava
@@ -68,6 +55,7 @@ find . -name '*.jar' -delete
 
 %pom_xpath_inject /pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration/pom:instructions "<_nouses>true</_nouses>" guava/pom.xml
 
+%pom_remove_dep -r :animal-sniffer-annotations
 %pom_remove_dep -r :error_prone_annotations
 %pom_remove_dep -r :j2objc-annotations
 %pom_remove_dep -r org.checkerframework:
@@ -78,24 +66,22 @@ annotations=$(
     | 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 -b .multiline
-
 %mvn_package "com.google.guava:failureaccess" guava
 
+%pom_xpath_inject pom:modules \
+"<module>futures/failureaccess</module>"
+
 %mvn_package "com.google.guava:guava-bom" __noinstall
 
 %build
@@ -106,59 +92,16 @@ find -name '*.java' | xargs sed -ri \
 %install
 %mvn_install
 
-%files -f .mfiles-guava
+%files -n %{?module_prefix}%{name} -f .mfiles-guava
 %doc CONTRIBUTORS README*
 %license COPYING
 
 %files testlib -f .mfiles-guava-testlib
 
 %changelog
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 31.0.1-4
+* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 28.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 31.0.1-3
-- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 31.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Oct 14 2021 Orion Poplawski <orion@nwra.com> - 31.0.1-1
-- Update to 31.0.1
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 30.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 30.1-2
-- Bootstrap build
-- Non-bootstrap build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 25.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* 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
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 25.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 25.0-8
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Feb 19 2020 Fabio Valentini <decathorpe@gmail.com> - 25.0-7
-- Drop unnecessary dependency on parent POM.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 25.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 28.2-2
 - Build with OpenJDK 8
 
-* Fri Jan 24 2020 Marian Koncek <mkoncek@redhat.com> - 28.2-1
-- Update to upstream version 28.2
-
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 28.1-2
 - Mass rebuild for javapackages-tools 201902
 
@@ -168,15 +111,9 @@ find -name '*.java' | xargs sed -ri \
 * Thu Aug 01 2019 Marian Koncek <mkoncek@redhat.com> - 28.0-1
 - Update to upstream version 28.0
 
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 25.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 25.0-4
 - Mass rebuild for javapackages-tools 201901
 
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 25.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Fri Aug 03 2018 Michael Simacek <msimacek@redhat.com> - 25.0-3
 - Fix license tag to include CC0
 
@@ -264,7 +201,6 @@ 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
 
 * 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