Sync from SUSE:SLFO:1.1 guava revision b3334f7d6986dc38aefdae6987f7744d

guava.changes

@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Wed Oct 30 08:49:24 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Add aliases for the failureaccess and listenablefuture
-
 -------------------------------------------------------------------
 Wed Jun 12 10:14:08 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

guava.spec

@@ -72,6 +72,10 @@ find . -name '*.jar' -delete
 %pom_remove_dep -r :listenablefuture
 %pom_remove_dep -r :failureaccess
 
+%pom_change_dep -r :error_prone_annotations :::provided
+%pom_change_dep -r :j2objc-annotations :::provided
+%pom_change_dep -r org.checkerframework: :::provided
+
 %build
 mkdir -p lib
 build-jar-repository -s lib junit jsr-305 google-errorprone/annotations checker-qual j2objc-annotations
@@ -86,7 +90,10 @@ install -pm 0644 %{name}-testlib/target/%{name}-testlib-%{version}*.jar %{buildr
 # poms
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
 %{mvn_install_pom} %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
-%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -a "com.google.guava:failureaccess","com.google.guava:listenablefuture"
+%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
+# We integrated this artifact in our main package
+%{mvn_install_pom} futures/failureaccess/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/failureaccess.pom
+%add_maven_depmap %{name}/failureaccess.pom %{name}/%{name}.jar
 %{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