Replace jboss-annotations-1.2-api with jakarta-annotations
This commit is contained in:
parent
80ba974b48
commit
8255828b16
@ -3,7 +3,7 @@
|
||||
|
||||
Name: resteasy
|
||||
Version: 3.0.26
|
||||
Release: 10%{?dist}
|
||||
Release: 11%{?dist}
|
||||
Summary: Framework for RESTful Web services and Java applications
|
||||
License: ASL 2.0
|
||||
URL: http://resteasy.jboss.org/
|
||||
@ -32,7 +32,7 @@ BuildRequires: mvn(org.jboss:jboss-parent:pom:)
|
||||
BuildRequires: mvn(org.jboss.logging:jboss-logging)
|
||||
BuildRequires: mvn(org.jboss.logging:jboss-logging-annotations)
|
||||
BuildRequires: mvn(org.jboss.logging:jboss-logging-processor)
|
||||
BuildRequires: mvn(org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec)
|
||||
BuildRequires: mvn(javax.annotation:javax.annotation-api)
|
||||
BuildRequires: mvn(org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
|
||||
@ -110,9 +110,7 @@ Provides: %{name}-client = %{version}-%{release}
|
||||
%{extdesc} %{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q -n Resteasy-%{namedversion}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%autosetup -n Resteasy-%{namedversion} -p 1
|
||||
|
||||
%pom_disable_module arquillian
|
||||
%pom_disable_module eagledns
|
||||
@ -153,10 +151,24 @@ find -name '*.jar' -print -delete
|
||||
%pom_remove_plugin :maven-clover2-plugin
|
||||
%pom_remove_plugin :maven-javadoc-plugin
|
||||
|
||||
# add jakarta-activation dependencies
|
||||
# depend on jakarta-activation
|
||||
%pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api resteasy-jaxrs
|
||||
%pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api resteasy-spring
|
||||
|
||||
# depend on jakarta-annotations
|
||||
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api jboss-modules
|
||||
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api providers/jaxb
|
||||
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api resteasy-dependencies-bom
|
||||
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api resteasy-guice
|
||||
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api resteasy-jaxrs
|
||||
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api resteasy-links
|
||||
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api resteasy-spring
|
||||
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api security/keystone/keystone-core
|
||||
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api security/resteasy-crypto
|
||||
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api security/skeleton-key-idm/skeleton-key-core
|
||||
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api security/skeleton-key-idm/skeleton-key-idp
|
||||
%pom_change_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec javax.annotation:javax.annotation-api server-adapters/resteasy-jdk-http
|
||||
|
||||
# remove resteasy-dependencies pom
|
||||
%pom_remove_dep "org.jboss.resteasy:resteasy-dependencies"
|
||||
|
||||
@ -220,6 +232,9 @@ find -name '*.jar' -print -delete
|
||||
%license License.html
|
||||
|
||||
%changelog
|
||||
* Fri Jun 18 2021 Dogtag PKI Team <pki-devel@redhat.com> - 3.0.26-11
|
||||
- Replace jboss-annotations-1.2-api with jakarta-annotations
|
||||
|
||||
* Wed Jun 2 2021 Dogtag PKI Team <pki-devel@redhat.com> - 3.0.26-10
|
||||
- Drop log4j dependency
|
||||
- Add jakarta-activation dependency
|
||||
|
Loading…
Reference in New Issue
Block a user