SHA256
1
0
forked from pool/plexus-i18n
Fridrich Strba 2021-05-11 14:57:39 +00:00 committed by Git OBS Bridge
parent 3a277bfcad
commit 2bcfa2d705
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 11 14:56:51 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Do not compile/run tests against the legacy guava20 package
-------------------------------------------------------------------
Mon Apr 1 23:12:40 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package plexus-i18n
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# 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
@ -46,7 +46,7 @@ Requires: mvn(org.codehaus.plexus:plexus-utils)
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
BuildRequires: guava20
BuildRequires: guava
BuildRequires: xbean
BuildConflicts: java-devel >= 9
%endif
@ -78,7 +78,7 @@ cp %{SOURCE1} build.xml
mkdir -p lib
build-jar-repository -s lib plexus/utils plexus-containers/plexus-container-default
%if %{with tests}
build-jar-repository -s lib guava20/guava-20.0 xbean/xbean-reflect plexus/classworlds
build-jar-repository -s lib guava/guava xbean/xbean-reflect plexus/classworlds
%endif
%{ant} \
%if %{without tests}