Compare commits
	
		
			No commits in common. "c8-stream-3.6" and "c9-beta" have entirely different histories.
		
	
	
		
			c8-stream-
			...
			c9-beta
		
	
		
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @ -1 +1 @@ | ||||
| SOURCES/v28.1.tar.gz | ||||
| SOURCES/v30.1.tar.gz | ||||
|  | ||||
| @ -1 +1 @@ | ||||
| adc45c534dcb7ee494893b5b8e38c92dd31f6250 SOURCES/v28.1.tar.gz | ||||
| 2874ae9f3c910fde0aa66a576da7a05b02a417d3 SOURCES/v30.1.tar.gz | ||||
|  | ||||
							
								
								
									
										343
									
								
								SOURCES/0001-Remove-multi-line-annotations.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										343
									
								
								SOURCES/0001-Remove-multi-line-annotations.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,343 @@ | ||||
| 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 | ||||
| 
 | ||||
| @ -1,21 +1,29 @@ | ||||
| %bcond_with bootstrap | ||||
| 
 | ||||
| Name:           guava | ||||
| Version:        28.1 | ||||
| Release:        3%{?dist} | ||||
| Version:        30.1 | ||||
| Release:        10%{?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:  aarch64 ppc64le s390x x86_64 noarch | ||||
| 
 | ||||
| Source0:        https://github.com/google/guava/archive/v%{version}.tar.gz | ||||
| 
 | ||||
| Patch1:         0001-Remove-multi-line-annotations.patch | ||||
| 
 | ||||
| BuildRequires:  maven-local-openjdk8 | ||||
| %if %{with bootstrap} | ||||
| BuildRequires:  javapackages-bootstrap | ||||
| %else | ||||
| 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) | ||||
| BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:) | ||||
| %endif | ||||
| 
 | ||||
| %description | ||||
| Guava is a suite of core and expanded libraries that include | ||||
| @ -25,7 +33,6 @@ 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 | ||||
| @ -39,9 +46,15 @@ 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 | ||||
| @ -55,7 +68,6 @@ 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: | ||||
| @ -66,21 +78,23 @@ 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' | ||||
| 
 | ||||
| %mvn_package "com.google.guava:failureaccess" guava | ||||
| %patch -P 1 -p1 | ||||
| 
 | ||||
| %pom_xpath_inject pom:modules \ | ||||
| "<module>futures/failureaccess</module>" | ||||
| %mvn_package "com.google.guava:failureaccess" guava | ||||
| 
 | ||||
| %mvn_package "com.google.guava:guava-bom" __noinstall | ||||
| 
 | ||||
| @ -92,16 +106,69 @@ find -name '*.java' | xargs sed -ri \ | ||||
| %install | ||||
| %mvn_install | ||||
| 
 | ||||
| %files -n %{?module_prefix}%{name} -f .mfiles-guava | ||||
| %files -f .mfiles-guava | ||||
| %doc CONTRIBUTORS README* | ||||
| %license COPYING | ||||
| 
 | ||||
| %files testlib -f .mfiles-guava-testlib | ||||
| 
 | ||||
| %changelog | ||||
| * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 28.1-3 | ||||
| * Sat Nov 23 2024 Marián Konček <mkoncek@redhat.com> - 30.1-10 | ||||
| - Add noarch to ExclusiveArch | ||||
| 
 | ||||
| * Sat Nov 23 2024 Marián Konček <mkoncek@redhat.com> - 30.1-9 | ||||
| - Disable building on i686 | ||||
| 
 | ||||
| * Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 30.1-8 | ||||
| - Fix patch usage | ||||
| 
 | ||||
| * 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 | ||||
| - Rebuild to regenerate auto-requires | ||||
| 
 | ||||
| * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 30.1-5 | ||||
| - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags | ||||
|   Related: rhbz#1991688 | ||||
| 
 | ||||
| * Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 30.1-4 | ||||
| - Rebuild to workaround DistroBaker issue | ||||
| 
 | ||||
| * Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 30.1-3 | ||||
| - Bootstrap Maven for CentOS Stream 9 | ||||
| 
 | ||||
| * 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 | ||||
| 
 | ||||
| @ -111,9 +178,15 @@ 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 | ||||
| 
 | ||||
| @ -201,6 +274,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 | ||||
| 
 | ||||
| * 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 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user