From cc479ba6fc998c6509daacb1621817862f9b5264 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 9 Jan 2023 11:50:30 +0100 Subject: [PATCH] Depend on compat jakarta.activation --- resteasy.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/resteasy.spec b/resteasy.spec index 11f836c..fad8670 100644 --- a/resteasy.spec +++ b/resteasy.spec @@ -3,7 +3,7 @@ Name: resteasy Version: 3.0.26 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Framework for RESTful Web services and Java applications License: Apache-2.0 URL: http://resteasy.jboss.org/ @@ -16,7 +16,7 @@ ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(javax.activation:activation) +BuildRequires: mvn(jakarta.activation:jakarta.activation-api:1.1.1) BuildRequires: mvn(org.apache.httpcomponents:httpclient) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) @@ -141,6 +141,10 @@ find -name '*.jar' -print -delete %pom_remove_plugin :maven-clover2-plugin %pom_remove_plugin :maven-javadoc-plugin +# depend on jakarta-activation +%pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api:1.1.1 resteasy-jaxrs +%pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api:1.1.1 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 @@ -214,6 +218,9 @@ find -name '*.jar' -print -delete %license License.html %changelog +* Mon Jan 09 2023 Marian Koncek - 3.0.26-19 +- Depend on compat jakarta.activation + * Tue Dec 20 2022 Marian Koncek - 3.0.26-18 - Rebuild with compat jakarta.activation version 1