Package failureaccess as a submodule

This commit is contained in:
Marian Koncek 2019-08-13 09:15:51 +02:00
parent ef73281634
commit ee12bee294

View File

@ -60,9 +60,6 @@ find . -name '*.jar' -delete
%pom_remove_dep -r :j2objc-annotations
%pom_remove_dep -r org.checkerframework:
%pom_remove_dep -r :listenablefuture
%pom_remove_dep -r :failureaccess
cp -r futures/failureaccess/src/com/google/common/util/concurrent/internal/ guava/src/com/google/common/
annotations=$(
find -name '*.java' \
@ -80,6 +77,11 @@ annotations=$(
find -name '*.java' | xargs sed -ri \
"s/^import .*\.($annotations);//;s/@($annotations)"'\>\s*(\((("[^"]*")|([^)]*))\))?//g'
%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