From 8378916c8348a776521157a8ac8fd7dc73f1867be0c2e0d7bcb414a990418507 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 11 May 2021 14:51:23 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-archiver?expand=0&rev=7 --- plexus-archiver.changes | 5 +++++ plexus-archiver.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plexus-archiver.changes b/plexus-archiver.changes index 00199b6..8b2d283 100644 --- a/plexus-archiver.changes +++ b/plexus-archiver.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 11 14:50:27 UTC 2021 - Fridrich Strba + +- Do not compile the test build against the legacy guava20 any more + ------------------------------------------------------------------- Sun Nov 24 14:42:08 UTC 2019 - Fridrich Strba diff --git a/plexus-archiver.spec b/plexus-archiver.spec index 596a9c1..99f6f37 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-archiver # -# 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 @@ -49,7 +49,7 @@ BuildRequires: mvn(org.iq80.snappy:snappy) %endif %if %{with tests} BuildRequires: ant-junit -BuildRequires: guava20 +BuildRequires: guava BuildRequires: plexus-classworlds BuildRequires: xbean BuildRequires: xz-java @@ -93,7 +93,7 @@ rm -r src/test/java/org/codehaus/plexus/archiver/tar/TarSnappyUnArchiverTest.jav mkdir -p lib build-jar-repository -s lib plexus-containers/plexus-container-default jsr-305 commons-compress commons-io plexus/utils plexus/io %if %{with tests} -build-jar-repository -s lib plexus/classworlds guava20/guava-20.0 xbean/xbean-reflect xz-java +build-jar-repository -s lib plexus/classworlds guava/guava xbean/xbean-reflect xz-java %endif %{ant} \ %if %{without tests}