Fridrich Strba 2021-05-11 20:09:50 +00:00 committed by Git OBS Bridge
parent 15f4c1b329
commit cd0ff5da7f
2 changed files with 11 additions and 6 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 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
@ -18,27 +18,27 @@
%bcond_with tests
Name: plexus-io
Version: 3.0.0
Version: 3.2.0
Release: 0
Summary: Plexus IO Components
License: Apache-2.0
Group: Development/Libraries/Java
URL: https://github.com/codehaus-plexus/%{name}
Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz
Source1: %{name}-%{version}-build.xml
Source1: %{name}-build.xml
Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildRequires: ant
BuildRequires: apache-commons-io
BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: jsr-305
BuildRequires: plexus-utils
BuildRequires: plexus-utils >= 3.3.0
Requires: mvn(commons-io:commons-io)
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} \