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:
commit
2eff422537
@ -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>
|
Thu Mar 17 03:20:22 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -31,9 +31,6 @@ BuildRequires: ant
|
|||||||
BuildRequires: apache-commons-lang3
|
BuildRequires: apache-commons-lang3
|
||||||
BuildRequires: atinject
|
BuildRequires: atinject
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
%if 0%{?suse_version} > 1500
|
|
||||||
BuildRequires: glassfish-annotation-api
|
|
||||||
%endif
|
|
||||||
BuildRequires: google-guice
|
BuildRequires: google-guice
|
||||||
BuildRequires: httpcomponents-client
|
BuildRequires: httpcomponents-client
|
||||||
BuildRequires: httpcomponents-core
|
BuildRequires: httpcomponents-core
|
||||||
@ -49,6 +46,9 @@ BuildRequires: unzip
|
|||||||
BuildRequires: xmvn-install
|
BuildRequires: xmvn-install
|
||||||
BuildRequires: xmvn-resolve
|
BuildRequires: xmvn-resolve
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
%if 0%{?suse_version} > 1500
|
||||||
|
BuildRequires: glassfish-annotation-api
|
||||||
|
%endif
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
BuildRequires: ant-junit
|
BuildRequires: ant-junit
|
||||||
BuildRequires: cglib
|
BuildRequires: cglib
|
||||||
@ -190,6 +190,10 @@ done
|
|||||||
</archive>
|
</archive>
|
||||||
</configuration>"
|
</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
|
||||||
%{mvn_package} :maven-resolver-{*} @1
|
%{mvn_package} :maven-resolver-{*} @1
|
||||||
%{mvn_alias} 'org.apache.maven.resolver:maven-resolver{*}' 'org.eclipse.aether:aether@1'
|
%{mvn_alias} 'org.apache.maven.resolver:maven-resolver{*}' 'org.eclipse.aether:aether@1'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user