Accepting request 892424 from Java:packages

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

OBS-URL: https://build.opensuse.org/request/show/892424
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-cli?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2021-05-12 17:32:21 +00:00 committed by Git OBS Bridge
commit 5cef993253
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 11 15:01:31 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Do not compile/run tests against the legacy guava20 package
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Mar 3 18:20:04 UTC 2019 - Jan Engelhardt <jengelh@inai.de> Sun Mar 3 18:20:04 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
# #
# spec file for package plexus-cli # spec file for package plexus-cli
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2021 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -43,7 +43,7 @@ Requires: mvn(org.codehaus.plexus:plexus-utils)
BuildArch: noarch BuildArch: noarch
%if %{with tests} %if %{with tests}
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: guava20 BuildRequires: guava
%endif %endif
%description %description
@ -65,12 +65,12 @@ Javadoc for %{name}.
cp -p %{SOURCE1} . cp -p %{SOURCE1} .
cp -p %{SOURCE100} build.xml cp -p %{SOURCE100} build.xml
%{pom_remove_parent} %pom_remove_parent
mkdir -p lib mkdir -p lib
build-jar-repository -s lib commons-cli plexus/utils plexus/classworlds plexus-containers/plexus-container-default build-jar-repository -s lib commons-cli plexus/utils plexus/classworlds plexus-containers/plexus-container-default
%if %{with tests} %if %{with tests}
build-jar-repository -s lib guava20/guava-20.0 build-jar-repository -s lib guava/guava
%endif %endif
%build %build