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 + +- 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 diff --git a/maven-resolver.spec b/maven-resolver.spec index a0a889e..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,6 +190,10 @@ done " +%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'