Accepting request 892422 from Java:packages

- Do not build/run tests against the legacy guava20 package

OBS-URL: https://build.opensuse.org/request/show/892422
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-io?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2021-05-12 17:32:20 +00:00 committed by Git OBS Bridge
commit 70a868915e
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 11 20:09:08 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Do not build/run tests against the legacy guava20 package
-------------------------------------------------------------------
Sun Nov 24 12:01:11 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package plexus-io
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -38,7 +38,7 @@ Requires: mvn(org.codehaus.plexus:plexus-utils)
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
BuildRequires: guava20
BuildRequires: guava
BuildRequires: plexus-classworlds
BuildRequires: plexus-containers-container-default
BuildRequires: xbean
@ -72,7 +72,7 @@ mkdir -p lib
build-jar-repository -s lib plexus/utils commons-io jsr-305
%if %{with tests}
build-jar-repository -s lib plexus-containers/plexus-container-default plexus/classworlds
build-jar-repository -s lib guava20/guava-20.0 xbean/xbean-reflect
build-jar-repository -s lib guava/guava xbean/xbean-reflect
%endif
%{ant} \