From 2bcfa2d705d48d9a754f0471c86fa85cb1634b5bfeaaa86fb532f615580208b1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 11 May 2021 14:57:39 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-i18n?expand=0&rev=6 --- plexus-i18n.changes | 5 +++++ plexus-i18n.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plexus-i18n.changes b/plexus-i18n.changes index 800528f..1ae1868 100644 --- a/plexus-i18n.changes +++ b/plexus-i18n.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 11 14:56:51 UTC 2021 - Fridrich Strba + +- Do not compile/run tests against the legacy guava20 package + ------------------------------------------------------------------- Mon Apr 1 23:12:40 UTC 2019 - Jan Engelhardt diff --git a/plexus-i18n.spec b/plexus-i18n.spec index 5e20275..07c1385 100644 --- a/plexus-i18n.spec +++ b/plexus-i18n.spec @@ -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}