Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package guava for openSUSE:Factory checked in at 2022-05-19 22:49:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/guava (Old) and /work/SRC/openSUSE:Factory/.guava.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guava" Thu May 19 22:49:23 2022 rev:7 rq:977988 version:31.1 Changes: -------- --- /work/SRC/openSUSE:Factory/guava/guava.changes 2022-03-11 21:42:02.442106270 +0100 +++ /work/SRC/openSUSE:Factory/.guava.new.1538/guava.changes 2022-05-19 22:49:36.322356833 +0200 @@ -1,0 +2,10 @@ +Wed May 18 17:26:01 UTC 2022 - Fridrich Strba <fst...@suse.com> + +- Upgrade to guava 31.1 + * Remove the hack of removing annotations, since we have now + all the required dependencies packaged +- Removed patch: + * donotmock.patch + + hack not needed any more + +------------------------------------------------------------------- Old: ---- donotmock.patch v30.1.1.tar.gz New: ---- v31.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guava.spec ++++++ --- /var/tmp/diff_new_pack.WyfXuA/_old 2022-05-19 22:49:37.290358074 +0200 +++ /var/tmp/diff_new_pack.WyfXuA/_new 2022-05-19 22:49:37.290358074 +0200 @@ -17,7 +17,7 @@ Name: guava -Version: 30.1.1 +Version: 31.1 Release: 0 Summary: Google Core Libraries for Java License: Apache-2.0 AND CC0-1.0 @@ -25,9 +25,11 @@ URL: https://github.com/google/guava Source0: https://github.com/google/guava/archive/v%{version}.tar.gz Source1: %{name}-build.tar.xz -Patch0: donotmock.patch BuildRequires: ant +BuildRequires: checker-qual BuildRequires: fdupes +BuildRequires: google-errorprone-annotations +BuildRequires: j2objc-annotations BuildRequires: javapackages-local BuildRequires: jsr-305 BuildRequires: junit @@ -52,8 +54,6 @@ %package testlib Summary: The guava-testlib artifact Group: Development/Libraries/Java -Requires: mvn(com.google.code.findbugs:jsr305) -Requires: mvn(com.google.guava:guava) Requires: mvn(junit:junit) %description testlib @@ -61,7 +61,6 @@ %prep %setup -q -a1 -%patch0 -p1 find . -name '*.jar' -delete @@ -74,29 +73,9 @@ %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 :error_prone_annotations -%pom_remove_dep -r :j2objc-annotations -%pom_remove_dep -r org.checkerframework: - %pom_remove_dep -r :listenablefuture %pom_remove_dep -r :failureaccess -annotations=$( - find -name '*.java' \ - | xargs grep -F -h \ - -e 'import com.google.j2objc.annotations' \ - -e 'import com.google.errorprone.annotation' \ - -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' - for mod in guava guava-testlib futures/failureaccess; do %pom_remove_parent ${mod} %pom_xpath_inject pom:project ' @@ -104,11 +83,15 @@ <version>%{version}</version>' ${mod} done -%pom_change_dep -r -f ::::: ::::: +%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 +build-jar-repository -s lib junit jsr-305 google-errorprone/annotations checker-qual j2objc-annotations %{ant} -Dtest.skip=true package javadoc %install ++++++ guava-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2021-05-10 17:05:58.631896847 +0200 +++ new/common.xml 2022-05-17 02:33:57.060608131 +0200 @@ -3,7 +3,7 @@ <project name="common"> <property name="project.groupId" value="com.google.guava"/> - <property name="project.version" value="30.1.1-jre"/> + <property name="project.version" value="31.1-jre"/> <property name="compiler.source" value="1.8"/> <property name="compiler.target" value="${compiler.source}"/> ++++++ v30.1.1.tar.gz -> v31.1.tar.gz ++++++ ++++ 151384 lines of diff (skipped)
