From 001abdf87aad77d2c593d0e6e1f3e1dd9c9146d60297383d28a077b1c469644b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 11 May 2021 15:02:09 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-cli?expand=0&rev=6 --- plexus-cli.changes | 5 +++++ plexus-cli.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plexus-cli.changes b/plexus-cli.changes index 291ab81..414c703 100644 --- a/plexus-cli.changes +++ b/plexus-cli.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 11 15:01:31 UTC 2021 - Fridrich Strba + +- Do not compile/run tests against the legacy guava20 package + ------------------------------------------------------------------- Sun Mar 3 18:20:04 UTC 2019 - Jan Engelhardt diff --git a/plexus-cli.spec b/plexus-cli.spec index f51a118..f5524c1 100644 --- a/plexus-cli.spec +++ b/plexus-cli.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -43,7 +43,7 @@ Requires: mvn(org.codehaus.plexus:plexus-utils) BuildArch: noarch %if %{with tests} BuildRequires: ant-junit -BuildRequires: guava20 +BuildRequires: guava %endif %description @@ -70,7 +70,7 @@ cp -p %{SOURCE100} build.xml mkdir -p lib build-jar-repository -s lib commons-cli plexus/utils plexus/classworlds plexus-containers/plexus-container-default %if %{with tests} -build-jar-repository -s lib guava20/guava-20.0 +build-jar-repository -s lib guava/guava %endif %build