From de591740cf0c2a02709c70b7d8ae8aa11b43272eb5a0294f04a8b882c86a8de0 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sat, 19 Mar 2022 13:39:47 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-resolver?expand=0&rev=28

---
 maven-resolver.changes | 6 ++++++
 maven-resolver.spec    | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/maven-resolver.changes b/maven-resolver.changes
index 97b801d..d4e72d2 100644
--- a/maven-resolver.changes
+++ b/maven-resolver.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Mar 19 13:38:39 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Remove the javax.annotation:javax.annotation-api dependency on
+  distribution versions that do not incorporate the JavaEE modules
+
 -------------------------------------------------------------------
 Thu Mar 17 03:20:22 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/maven-resolver.spec b/maven-resolver.spec
index a0a889e..df10603 100644
--- a/maven-resolver.spec
+++ b/maven-resolver.spec
@@ -190,6 +190,10 @@ done
   </archive>
 </configuration>"
 
+%if 0%{?suse_version} > 1500
+%pom_remove_dep javax.annotation:javax.annotation-api maven-resolver-impl
+%endif
+
 %{mvn_package} :maven-resolver
 %{mvn_package} :maven-resolver-{*}  @1
 %{mvn_alias} 'org.apache.maven.resolver:maven-resolver{*}' 'org.eclipse.aether:aether@1'

From 90c5644b1da804d022b3933cb727faedc505e16411d4eb2ab613ff1401ca4ead Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sun, 20 Mar 2022 08:44:11 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-resolver?expand=0&rev=29

---
 maven-resolver.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/maven-resolver.spec b/maven-resolver.spec
index df10603..3859085 100644
--- a/maven-resolver.spec
+++ b/maven-resolver.spec
@@ -31,9 +31,6 @@ BuildRequires:  ant
 BuildRequires:  apache-commons-lang3
 BuildRequires:  atinject
 BuildRequires:  fdupes
-%if 0%{?suse_version} > 1500
-BuildRequires:  glassfish-annotation-api
-%endif
 BuildRequires:  google-guice
 BuildRequires:  httpcomponents-client
 BuildRequires:  httpcomponents-core
@@ -49,6 +46,9 @@ BuildRequires:  unzip
 BuildRequires:  xmvn-install
 BuildRequires:  xmvn-resolve
 BuildArch:      noarch
+%if 0%{?suse_version} > 1500
+BuildRequires:  glassfish-annotation-api
+%endif
 %if %{with tests}
 BuildRequires:  ant-junit
 BuildRequires:  cglib
@@ -190,7 +190,7 @@ done
   </archive>
 </configuration>"
 
-%if 0%{?suse_version} > 1500
+%if 0%{?suse_version} <= 1500
 %pom_remove_dep javax.annotation:javax.annotation-api maven-resolver-impl
 %endif