From d1986d44ef3345f2744cf197e394ca262444ffaa Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Wed, 30 Jun 2021 09:25:42 -0500 Subject: [PATCH] Replace jakarta-ws-rs with jboss-jaxrs-2.0-api Resolves: #1952530 --- jackson-jaxrs-providers.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/jackson-jaxrs-providers.spec b/jackson-jaxrs-providers.spec index 3c986c9..e5a5878 100644 --- a/jackson-jaxrs-providers.spec +++ b/jackson-jaxrs-providers.spec @@ -2,7 +2,7 @@ Name: jackson-jaxrs-providers Version: 2.11.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Jackson JAX-RS providers License: ASL 2.0 @@ -17,7 +17,7 @@ BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) >= %{version} BuildRequires: mvn(com.fasterxml.jackson.module:jackson-module-jaxb-annotations) >= %{version} BuildRequires: mvn(com.fasterxml.jackson:jackson-base:pom:) >= %{version} BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer) -BuildRequires: mvn(javax.ws.rs:javax.ws.rs-api) +BuildRequires: mvn(org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) %if %{without jp_minimal} @@ -150,6 +150,9 @@ sed -i 's/\r//' LICENSE NOTICE %pom_remove_plugin :maven-jar-plugin yaml %pom_remove_plugin :maven-jar-plugin datatypes +# Replace jakarta-ws-rs with jboss-jaxrs-2.0-api +%pom_change_dep javax.ws.rs:javax.ws.rs-api org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec + # Add missing deps to fix java.lang.ClassNotFoundException during tests %pom_add_dep com.google.guava:guava:18.0:test datatypes cbor json smile xml yaml %pom_add_dep org.ow2.asm:asm:5.1:test cbor json smile xml yaml @@ -201,6 +204,9 @@ rm json/src/test/java/com/fasterxml/jackson/jaxrs/json/resteasy/RestEasyProvider %license LICENSE NOTICE %changelog +* Wed Jun 30 2021 Red Hat PKI Team - 2.11.4-6 +- Replace jakarta-ws-rs with jboss-jaxrs-2.0-api + * Wed Apr 28 2021 Red Hat PKI Team - 2.11.4-5 - Add Obsoletes and Conflicts