Accepting request 892243 from Java:packages

Don't build against the compatibility version of guava

OBS-URL: https://build.opensuse.org/request/show/892243
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2021-05-11 21:04:30 +00:00 committed by Git OBS Bridge
commit 0bc491159a
2 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 11 09:57:12 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Do not build against the compatibility version guava20 any more,
but use the default guava package
-------------------------------------------------------------------
Tue Apr 27 07:25:29 UTC 2021 - Fridrich Strba <fstrba@suse.com>

View File

@ -50,7 +50,7 @@ BuildRequires: dos2unix
BuildRequires: fdupes
BuildRequires: geronimo-annotation-1_0-api
BuildRequires: google-guice
BuildRequires: guava20
BuildRequires: guava
BuildRequires: hawtjni-runtime
BuildRequires: httpcomponents-client
BuildRequires: httpcomponents-core
@ -127,7 +127,7 @@ Requires: cdi-api
Requires: cglib
Requires: geronimo-annotation-1_0-api
Requires: google-guice
Requires: guava20
Requires: guava
Requires: hawtjni-runtime
Requires: httpcomponents-client
Requires: httpcomponents-core
@ -233,7 +233,7 @@ build-jar-repository -s lib \
atinject \
commons-cli \
commons-io \
guava20/guava-10.0 \
guava/guava \
guice/google-guice-no_aop \
jdom2/jdom2 \
maven-resolver/maven-resolver-api \
@ -307,7 +307,7 @@ build-jar-repository -p %{buildroot}%{homedir}/lib \
commons-io \
apache-commons-lang3 \
commons-logging \
guava20/guava-10.0 \
guava/guava \
guice/google-guice-no_aop \
hamcrest/core \
hawtjni/hawtjni-runtime \