From 74e32592e218b819bf2a71fb347cd266a6d5a918a20a5146c6f3b3a894d41a0e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 11 May 2021 20:09:50 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-io?expand=0&rev=7 --- plexus-io.changes | 5 +++++ plexus-io.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plexus-io.changes b/plexus-io.changes index 514fad5..1f75331 100644 --- a/plexus-io.changes +++ b/plexus-io.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 11 20:09:08 UTC 2021 - Fridrich Strba + +- Do not build/run tests against the legacy guava20 package + ------------------------------------------------------------------- Sun Nov 24 12:01:11 UTC 2019 - Fridrich Strba diff --git a/plexus-io.spec b/plexus-io.spec index 86c0914..0f57069 100644 --- a/plexus-io.spec +++ b/plexus-io.spec @@ -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} \