Accepting request 963198 from Java:packages

standalone annotations-api

OBS-URL: https://build.opensuse.org/request/show/963198
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-resolver?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger 2022-03-20 19:55:33 +00:00 committed by Git OBS Bridge
commit 2eff422537
2 changed files with 13 additions and 3 deletions

View File

@ -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>

View File

@ -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
</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'