From 80c0e96a186b73b8d48d3bb897808531b80f373f9dc8fe88fe4ccb3e782af16a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 Mar 2022 03:20:50 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resolver?expand=0&rev=23 --- maven-resolver.changes | 5 +++++ maven-resolver.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/maven-resolver.changes b/maven-resolver.changes index 58cade8..97b801d 100644 --- a/maven-resolver.changes +++ b/maven-resolver.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 17 03:20:22 UTC 2022 - Fridrich Strba + +- Add the glassfish-annotation-api jar to the build classpath + ------------------------------------------------------------------- Fri Mar 11 12:10:26 UTC 2022 - Fridrich Strba diff --git a/maven-resolver.spec b/maven-resolver.spec index fd75ca2..41cd953 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -202,6 +202,7 @@ mkdir -p lib build-jar-repository -s lib \ atinject \ commons-lang3 \ + glassfish-annotation-api \ guice/google-guice-no_aop \ httpcomponents/httpclient \ httpcomponents/httpcore \ From d0c3bd40fce57ed580dd37b693d806e74ff25c0b347637934adef5f9e678797f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 18 Mar 2022 14:27:36 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resolver?expand=0&rev=24 --- maven-resolver.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maven-resolver.spec b/maven-resolver.spec index 41cd953..f4b5e74 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -31,7 +31,9 @@ BuildRequires: ant BuildRequires: apache-commons-lang3 BuildRequires: atinject BuildRequires: fdupes -BuildRequires: glassfish-annotation-api +%if 0%{?suse_version} > 1500 +BuildRequires: glassfish-activation-api +%endif BuildRequires: google-guice BuildRequires: httpcomponents-client BuildRequires: httpcomponents-core From 6472717f812cfe24888f152630d4133af19b0763390db2cd639f122684d74b58 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 18 Mar 2022 14:28:12 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resolver?expand=0&rev=25 --- maven-resolver.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maven-resolver.spec b/maven-resolver.spec index f4b5e74..b6b4106 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -204,7 +204,9 @@ mkdir -p lib build-jar-repository -s lib \ atinject \ commons-lang3 \ +%if 0%{?suse_version} > 1500 glassfish-annotation-api \ +%endif guice/google-guice-no_aop \ httpcomponents/httpclient \ httpcomponents/httpcore \ From 497cbc08e889188220aa0009bec281a2951ca9c48a9c322c0e17d3b9c86b6b27 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 18 Mar 2022 14:38:50 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resolver?expand=0&rev=26 --- maven-resolver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-resolver.spec b/maven-resolver.spec index b6b4106..a0a889e 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -32,7 +32,7 @@ BuildRequires: apache-commons-lang3 BuildRequires: atinject BuildRequires: fdupes %if 0%{?suse_version} > 1500 -BuildRequires: glassfish-activation-api +BuildRequires: glassfish-annotation-api %endif BuildRequires: google-guice BuildRequires: httpcomponents-client