From cb62d670373b3740cdef236aed6ba09d0a48b9fb2125ddbf00fd42b5a888eba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 31 May 2024 14:36:50 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main guava revision f717cddcc8cdf89ff1b7c8a12dd42e08 --- guava-build.tar.xz | 4 +- guava.changes | 128 +++++++++++++++++++++++++++++++++++++++++++++ guava.spec | 29 +++------- v32.0.1.tar.gz | 3 -- v33.1.0.tar.gz | 3 ++ 5 files changed, 141 insertions(+), 26 deletions(-) delete mode 100644 v32.0.1.tar.gz create mode 100644 v33.1.0.tar.gz diff --git a/guava-build.tar.xz b/guava-build.tar.xz index c1ab83a..35c16ff 100644 --- a/guava-build.tar.xz +++ b/guava-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29904f3ef7ad58da1446e4fbdcadf6744ecd6d2b150948f9701aece01ec8e150 -size 2880 +oid sha256:86dbfca80ae01e492e2cb52a8fcd1da5d34a4e017d4689e5ba38af0784ed7d72 +size 2920 diff --git a/guava.changes b/guava.changes index 7082ecd..91b891b 100644 --- a/guava.changes +++ b/guava.changes @@ -1,3 +1,131 @@ +------------------------------------------------------------------- +Wed Apr 17 16:34:39 UTC 2024 - Fridrich Strba + +- Upgrade to guava 33.1.0 + * Changes of version 33.1.0: + + Updated our Error Prone dependency to 2.26.1, which includes + a JPMS-ready jar of annotations. If you use the Error Prone + annotations in a modular build of your own code, you may need + to add a requires line for them. + + base: Added a Duration overload for + Suppliers.memoizeWithExpiration. + + base: Deprecated the remaining two overloads of + Throwables.propagateIfPossible. They won't be deleted, but we + recommend migrating off them. + + cache: Fixed a bug that could cause false "recursive load" + reports during refresh. + + graph: Changed the return types of transitiveClosure() and + reachableNodes() to Immutable* types. reachableNodes() already + returned an immutable object (even though that was not + reflected in the declared return type); transitiveClosure() + used to return a mutable object. The old signatures remain + available, so this change does not break binary compatibility. + + graph: Changed the behavior of views returned by graph + accessor methods that take a graph element as input: They now + throw IllegalStateException when that element is removed from + the graph. + + hash: Optimized Checksum-based hash functions for Java 9+. + + testing: Exposed FakeTicker Duration methods to Android users. + + util.concurrent: Deprecated the constructors of + UncheckedExecutionException and ExecutionError that don't + accept a cause. We won't remove these constructors, but we + recommend migrating off them, as users of those classes often + assume that instances will contain a cause. + + util.concurrent: Improved the correctness of racy accesses for + J2ObjC users. + * Changes of version 33.0.0: + + This version of guava-android contains some package-private + methods whose signature includes the Java 8 Collector API. + This is a test to identify any problems before we expose those + methods publicly to users. Please report any problems that you + encounter. + + Changed various classes to catch Exception instead of + RuntimeException even when only RuntimeException is + theoretically possible. This can help code that throws + undeclared exceptions, as some bytecode rewriters (e.g., + Robolectric) and languages (e.g., Kotlin) do. + + Added an Automatic-Module-Name to failureaccess, Guava's one + strong runtime dependency. + + reflect: In guava-android only, removed + Invokable.getAnnotatedReturnType() and + Parameter.getAnnotatedType(). These methods never worked in an + Android VM, and to reflect that, they were born @Deprecated, + @Beta, and @DoNotCall. They're now preventing us from rolling + out some new Android compatibility testing. This is the only + binary-incompatible change in this release, and it should have + no effect in practice. Still, we bump the major version number + to follow Semantic Versioning. + + util.concurrent: Changed our implementations to avoid eagerly + initializing loggers during class loading. This can help + performance, especially under Android. + * Changes of version 32.1.3: + + Changed Gradle Metadata to include dependency versions + directly. This may address "Could not find some-dependency" + errors that some users have reported (which might be a result + of users' excluding guava-parent). + + collect: Changed Multisets.unmodifiableMultiset(set) + .removeIf(predicate) to throw an exception always, even if + nothing matches predicate. + + graph: Fixed the behavior of Graph/ValueGraph views for a node + when that node is removed from the graph. + + io: Fixed Files.createTempDir and FileBackedOutputStream under + Windows services, a rare use case. (The fix actually covers + only Java 9+ because Java 8 would require an additional + approach. Let us know if you need support under Java 8.) + + net: Made MediaType.parse allow and skip over whitespace + around the / and = separator tokens in addition to the ; + separator, for which it was already being allowed. + + util.concurrent: Tweaked Futures.getChecked + constructor-selection behavior: The method continues to prefer + to call constructors with a String parameter, but now it + breaks ties based on whether the constructor has a Throwable + parameter. Beyond that, the choice of constructor remains + undefined. (For this and other reasons, we discourage the use + of getChecked.) + * Changes of version 32.1.2: + + Removed the section of our Gradle metadata that caused Gradle + to report conflicts with listenablefuture. + + Changed our Maven project to avoid affecting which version of + Mockito our Gradle users see. + + collect: Under J2CL, exposed ImmutableList and ImmutableSet + methods copyOf and of for JavaScript usage. + + net: Optimized InternetDomainName construction. + * Changes of version 32.1.1: + + Fixed our broken Gradle metadata from 32.1.0. Sorry again for + the trouble. If you use Gradle, please still read the release + notes from that version: You may still see errors from the new + checking that the metadata enables, and the release notes + discuss how to fix those errors. + * Changes of version 32.1.0: + + collect: Tweaked more nullness annotations. + + hash: Enhanced crc32c() to use Java's hardware-accelerated + implementation where available. + + util.concurrent: Added Duration-based default methods to + ListeningExecutorService. + + Began updating Javadoc to focus less on APIs that have been + superseded by additions to the JDK. We're also looking to add + more documentation that directs users to JDK equivalents for + our APIs. Further PRs welcome! + + Fixed some problems with using Guava from a Java Agent. + (But we don't test that configuration, and we don't know how + well we'll be able to keep it working.) + + Fixed BootstrapMethodError when using CacheBuilder from a + custom system class loader. (As with the previous item, + we're not sure how well we'll be able to keep this use case + working.) + + Suppressed a harmless unusable-by-js warning seen by users of + guava-gwt. + +------------------------------------------------------------------- +Tue Mar 12 18:57:05 UTC 2024 - Fridrich Strba + +- Fix version mismatch in the ant build files. + +------------------------------------------------------------------- +Wed Feb 21 22:05:15 UTC 2024 - Fridrich Strba + +- Clean the spec file and simplify it a bit + ------------------------------------------------------------------- Thu Jun 15 13:20:35 UTC 2023 - Fridrich Strba diff --git a/guava.spec b/guava.spec index 7f77915..b39cff1 100644 --- a/guava.spec +++ b/guava.spec @@ -1,7 +1,7 @@ # # spec file for package guava # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: guava -Version: 32.0.1 +Version: 33.1.0 Release: 0 Summary: Google Core Libraries for Java License: Apache-2.0 AND CC0-1.0 @@ -28,12 +28,11 @@ Source1: %{name}-build.tar.xz BuildRequires: ant BuildRequires: checker-qual BuildRequires: fdupes -BuildRequires: google-errorprone-annotations +BuildRequires: google-errorprone-annotations >= 2.21.0 BuildRequires: j2objc-annotations -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: jsr-305 BuildRequires: junit -Requires: mvn(com.google.code.findbugs:jsr305) BuildArch: noarch %description @@ -54,7 +53,6 @@ API documentation for %{name}. %package testlib Summary: The guava-testlib artifact Group: Development/Libraries/Java -Requires: mvn(junit:junit) %description testlib guava-testlib provides additional functionality for conveninent unit testing @@ -68,31 +66,20 @@ find . -name '*.jar' -delete %pom_disable_module guava-tests %pom_remove_plugin -r :animal-sniffer-maven-plugin -# Downloads JDK source for doc generation -%pom_remove_plugin :maven-dependency-plugin guava %pom_xpath_inject /pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration/pom:instructions "<_nouses>true" guava/pom.xml %pom_remove_dep -r :listenablefuture %pom_remove_dep -r :failureaccess -for mod in guava guava-testlib futures/failureaccess; do - %pom_remove_parent ${mod} - %pom_xpath_inject pom:project ' - com.google.guava - %{version}' ${mod} -done - %pom_change_dep -r :error_prone_annotations :::provided %pom_change_dep -r :j2objc-annotations :::provided %pom_change_dep -r org.checkerframework: :::provided -%pom_change_dep -r -f :::: :::: - %build mkdir -p lib build-jar-repository -s lib junit jsr-305 google-errorprone/annotations checker-qual j2objc-annotations -%{ant} -Dtest.skip=true package javadoc +%{ant} -Dproject.version=%{version} -Dtest.skip=true package javadoc %install # jars @@ -102,12 +89,12 @@ install -pm 0644 %{name}-testlib/target/%{name}-testlib-%{version}*.jar %{buildr # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%{mvn_install_pom} %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar # We integrated this artifact in our main package -install -pm 0644 futures/failureaccess/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/failureaccess.pom +%{mvn_install_pom} futures/failureaccess/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/failureaccess.pom %add_maven_depmap %{name}/failureaccess.pom %{name}/%{name}.jar -install -pm 0644 %{name}-testlib/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-testlib.pom +%{mvn_install_pom} %{name}-testlib/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-testlib.pom %add_maven_depmap %{name}/%{name}-testlib.pom %{name}/%{name}-testlib.jar -f %{name}-testlib # javadoc diff --git a/v32.0.1.tar.gz b/v32.0.1.tar.gz deleted file mode 100644 index ca977a6..0000000 --- a/v32.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c850b565fdb5b577b9d02a647e21dd033cb967d97a66604d42e8d33689d136c9 -size 5678582 diff --git a/v33.1.0.tar.gz b/v33.1.0.tar.gz new file mode 100644 index 0000000..5478a02 --- /dev/null +++ b/v33.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bac19a589ca458d49f5f8e6d3e088cbc4da63844cfa87a5eba5a809d60e5b48 +size 5809369