From b1fd0902124081f0d77e7e0c152edeefd2c065e1291245ff6c1a28c5e06c5dc6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 11 May 2021 09:58:04 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=23 --- maven.changes | 6 ++++++ maven.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/maven.changes b/maven.changes index b0ee17e..7206eaf 100644 --- a/maven.changes +++ b/maven.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 11 09:57:12 UTC 2021 - Fridrich Strba + +- Do not build against the compatibility version guava20 any more, + but use the default guava package + ------------------------------------------------------------------- Tue Apr 27 07:25:29 UTC 2021 - Fridrich Strba diff --git a/maven.spec b/maven.spec index a9d1ee4..95582bc 100644 --- a/maven.spec +++ b/maven.spec @@ -50,7 +50,7 @@ BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: geronimo-annotation-1_0-api BuildRequires: google-guice -BuildRequires: guava20 +BuildRequires: guava BuildRequires: hawtjni-runtime BuildRequires: httpcomponents-client BuildRequires: httpcomponents-core @@ -127,7 +127,7 @@ Requires: cdi-api Requires: cglib Requires: geronimo-annotation-1_0-api Requires: google-guice -Requires: guava20 +Requires: guava Requires: hawtjni-runtime Requires: httpcomponents-client Requires: httpcomponents-core @@ -233,7 +233,7 @@ build-jar-repository -s lib \ atinject \ commons-cli \ commons-io \ - guava20/guava-10.0 \ + guava/guava \ guice/google-guice-no_aop \ jdom2/jdom2 \ maven-resolver/maven-resolver-api \ @@ -307,7 +307,7 @@ build-jar-repository -p %{buildroot}%{homedir}/lib \ commons-io \ apache-commons-lang3 \ commons-logging \ - guava20/guava-10.0 \ + guava/guava \ guice/google-guice-no_aop \ hamcrest/core \ hawtjni/hawtjni-runtime \