Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

0001-Replace-javax.activation-imports-with-jakarta.activa.patch

@@ -0,0 +1,194 @@
+From fdb522bdf915566fc01fc4502404da5a4d73d247 Mon Sep 17 00:00:00 2001
+From: Chris Kelley <ckelley@redhat.com>
+Date: Fri, 3 Feb 2023 11:37:13 +0000
+Subject: [PATCH] Replace javax.activation imports with jakarta.activation
+
+---
+ .../plugins/providers/multipart/MimeMultipartProvider.java    | 2 +-
+ .../multipart/XopWithMultipartRelatedJAXBProvider.java        | 4 ++--
+ .../jboss/resteasy/plugins/providers/DataSourceProvider.java  | 2 +-
+ .../test/client/resource/EntityBufferingInFileResource.java   | 2 +-
+ .../datasource/DataSourceProviderInputStreamTest.java         | 2 +-
+ .../datasource/resource/BigSmallDataSourceResource.java       | 2 +-
+ .../resource/CleanFilesDataSourceProviderResource.java        | 2 +-
+ .../providers/datasource/resource/ReadDataSourceResource.java | 2 +-
+ .../resource/ReadDataSourceTwiceCountTempFileResource.java    | 2 +-
+ .../test/providers/multipart/MimeMultipartProviderTest.java   | 2 +-
+ .../multipart/resource/MimeMultipartProviderResource.java     | 2 +-
+ .../resource/basic/resource/DefaultMediaTypeResource.java     | 2 +-
+ .../resteasy/test/client/NoContentStreamingCloseTest.java     | 2 +-
+ 13 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MimeMultipartProvider.java b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MimeMultipartProvider.java
+index adc0d7c21..6c6425fbd 100644
+--- a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MimeMultipartProvider.java
++++ b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/MimeMultipartProvider.java
+@@ -5,7 +5,7 @@ import org.jboss.resteasy.spi.ReaderException;
+ import org.jboss.resteasy.spi.WriterException;
+ import org.jboss.resteasy.resteasy_jaxrs.i18n.*;
+ 
+-import javax.activation.DataSource;
++import jakarta.activation.DataSource;
+ import javax.mail.MessagingException;
+ import javax.mail.internet.MimeMultipart;
+ import javax.mail.util.ByteArrayDataSource;
+diff --git a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/XopWithMultipartRelatedJAXBProvider.java b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/XopWithMultipartRelatedJAXBProvider.java
+index 52486bcc2..919f6f0a9 100755
+--- a/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/XopWithMultipartRelatedJAXBProvider.java
++++ b/providers/multipart/src/main/java/org/jboss/resteasy/plugins/providers/multipart/XopWithMultipartRelatedJAXBProvider.java
+@@ -3,8 +3,8 @@ package org.jboss.resteasy.plugins.providers.multipart;
+ import org.jboss.resteasy.plugins.providers.jaxb.AbstractJAXBProvider;
+ import org.jboss.resteasy.plugins.providers.multipart.i18n.*;
+ 
+-import javax.activation.DataHandler;
+-import javax.activation.DataSource;
++import jakarta.activation.DataHandler;
++import jakarta.activation.DataSource;
+ import javax.ws.rs.WebApplicationException;
+ import javax.ws.rs.core.MediaType;
+ import javax.ws.rs.core.MultivaluedMap;
+diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/DataSourceProvider.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/DataSourceProvider.java
+index c57bf4587..dc9040a55 100644
+--- a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/DataSourceProvider.java
++++ b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/DataSourceProvider.java
+@@ -20,7 +20,7 @@ import java.io.SequenceInputStream;
+ import java.lang.annotation.Annotation;
+ import java.lang.reflect.Type;
+ 
+-import javax.activation.DataSource;
++import jakarta.activation.DataSource;
+ import javax.ws.rs.Consumes;
+ import javax.ws.rs.Produces;
+ import javax.ws.rs.WebApplicationException;
+diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/resource/EntityBufferingInFileResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/resource/EntityBufferingInFileResource.java
+index 2cc429db1..ad5597f22 100644
+--- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/resource/EntityBufferingInFileResource.java
++++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/resource/EntityBufferingInFileResource.java
+@@ -2,7 +2,7 @@ package org.jboss.resteasy.test.client.resource;
+ 
+ import org.jboss.logging.Logger;
+ 
+-import javax.activation.DataSource;
++import jakarta.activation.DataSource;
+ import javax.ws.rs.POST;
+ import javax.ws.rs.Path;
+ import javax.ws.rs.Produces;
+diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/DataSourceProviderInputStreamTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/DataSourceProviderInputStreamTest.java
+index 01f3a0926..c4a352890 100644
+--- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/DataSourceProviderInputStreamTest.java
++++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/DataSourceProviderInputStreamTest.java
+@@ -22,7 +22,7 @@ import org.junit.Assert;
+ import org.junit.Test;
+ import org.junit.runner.RunWith;
+ 
+-import javax.activation.DataSource;
++import jakarta.activation.DataSource;
+ import javax.ws.rs.client.Client;
+ import javax.ws.rs.client.WebTarget;
+ import javax.ws.rs.core.MediaType;
+diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/BigSmallDataSourceResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/BigSmallDataSourceResource.java
+index 58ead73bd..59678be32 100644
+--- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/BigSmallDataSourceResource.java
++++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/BigSmallDataSourceResource.java
+@@ -1,7 +1,7 @@
+ package org.jboss.resteasy.test.providers.datasource.resource;
+ 
+ 
+-import javax.activation.DataSource;
++import jakarta.activation.DataSource;
+ import javax.ws.rs.Consumes;
+ import javax.ws.rs.GET;
+ import javax.ws.rs.POST;
+diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/CleanFilesDataSourceProviderResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/CleanFilesDataSourceProviderResource.java
+index 9dafd8707..7beb84596 100644
+--- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/CleanFilesDataSourceProviderResource.java
++++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/CleanFilesDataSourceProviderResource.java
+@@ -1,6 +1,6 @@
+ package org.jboss.resteasy.test.providers.datasource.resource;
+ 
+-import javax.activation.DataSource;
++import jakarta.activation.DataSource;
+ import javax.ws.rs.GET;
+ import javax.ws.rs.POST;
+ import javax.ws.rs.Path;
+diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceResource.java
+index 84cda755a..8cb767347 100644
+--- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceResource.java
++++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceResource.java
+@@ -4,7 +4,7 @@ import java.io.BufferedReader;
+ import java.io.IOException;
+ import java.io.InputStreamReader;
+ 
+-import javax.activation.DataSource;
++import jakarta.activation.DataSource;
+ import javax.ws.rs.POST;
+ import javax.ws.rs.Path;
+ import javax.ws.rs.Produces;
+diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceTwiceCountTempFileResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceTwiceCountTempFileResource.java
+index ce7ea7b4c..bb7f49570 100644
+--- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceTwiceCountTempFileResource.java
++++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/datasource/resource/ReadDataSourceTwiceCountTempFileResource.java
+@@ -2,7 +2,7 @@ package org.jboss.resteasy.test.providers.datasource.resource;
+ 
+ import org.jboss.logging.Logger;
+ 
+-import javax.activation.DataSource;
++import jakarta.activation.DataSource;
+ import javax.ws.rs.Consumes;
+ import javax.ws.rs.POST;
+ import javax.ws.rs.Path;
+diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/MimeMultipartProviderTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/MimeMultipartProviderTest.java
+index b8c402833..b06dc04e6 100644
+--- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/MimeMultipartProviderTest.java
++++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/MimeMultipartProviderTest.java
+@@ -22,7 +22,7 @@ import org.junit.AfterClass;
+ import org.junit.Test;
+ import org.junit.runner.RunWith;
+ 
+-import javax.activation.DataHandler;
++import jakarta.activation.DataHandler;
+ import javax.mail.internet.MimeMultipart;
+ import javax.mail.util.ByteArrayDataSource;
+ import javax.servlet.http.HttpServletResponse;
+diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderResource.java
+index 38757425d..435812a84 100644
+--- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderResource.java
++++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/multipart/resource/MimeMultipartProviderResource.java
+@@ -11,7 +11,7 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
+ import org.jboss.resteasy.plugins.providers.multipart.MultipartRelatedInput;
+ import org.junit.Assert;
+ 
+-import javax.activation.DataHandler;
++import jakarta.activation.DataHandler;
+ import javax.mail.MessagingException;
+ import javax.mail.internet.MimeBodyPart;
+ import javax.mail.internet.MimeMultipart;
+diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/resource/basic/resource/DefaultMediaTypeResource.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/resource/basic/resource/DefaultMediaTypeResource.java
+index ba7ce813c..841fdf4cc 100644
+--- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/resource/basic/resource/DefaultMediaTypeResource.java
++++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/resource/basic/resource/DefaultMediaTypeResource.java
+@@ -2,7 +2,7 @@ package org.jboss.resteasy.test.resource.basic.resource;
+ 
+ import org.jboss.logging.Logger;
+ 
+-import javax.activation.DataSource;
++import jakarta.activation.DataSource;
+ import javax.ws.rs.Consumes;
+ import javax.ws.rs.POST;
+ import javax.ws.rs.Path;
+diff --git a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/client/NoContentStreamingCloseTest.java b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/client/NoContentStreamingCloseTest.java
+index be60dee77..459223c2b 100644
+--- a/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/client/NoContentStreamingCloseTest.java
++++ b/testsuite/unit-tests/src/test/java/org/jboss/resteasy/test/client/NoContentStreamingCloseTest.java
+@@ -9,7 +9,7 @@ import org.jboss.resteasy.test.client.resource.NoContentStreamingCloseTestRespon
+ import org.junit.Assert;
+ import org.junit.Test;
+ 
+-import javax.activation.DataSource;
++import jakarta.activation.DataSource;
+ import javax.xml.transform.Source;
+ import javax.xml.transform.stream.StreamSource;
+ import java.io.InputStream;
+-- 
+2.39.0
+

resteasy.spec

@@ -3,21 +3,25 @@
 
 Name:           resteasy
 Version:        3.0.26
-Release:        21%{?dist}
+Release:        29%{?dist}
 Summary:        Framework for RESTful Web services and Java applications
 License:        Apache-2.0
 URL:            http://resteasy.jboss.org/
 Source0:        https://github.com/resteasy/Resteasy/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz
 Patch1:         0001-RESTEASY-2559-Improper-validation-of-response-header.patch
 Patch2:         0001-Remove-Log4jLogger.patch
+Patch3:         0001-Replace-javax.activation-imports-with-jakarta.activa.patch
+Patch4:         0001-Update-to-new-jakarta-xml-bind-namespace.patch
 
 BuildArch:      noarch
+%if 0%{?fedora}
 ExclusiveArch:  %{java_arches} noarch
+%endif
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(commons-io:commons-io)
-BuildRequires:  mvn(jakarta.activation:jakarta.activation-api:1.1.1)
-BuildRequires:  mvn(jakarta.xml.bind:jakarta.xml.bind-api:2)
+BuildRequires:  mvn(jakarta.activation:jakarta.activation-api)
+BuildRequires:  mvn(jakarta.xml.bind:jakarta.xml.bind-api)
 BuildRequires:  mvn(org.apache.httpcomponents:httpclient)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
 BuildRequires:  mvn(org.apache.tomcat:tomcat-servlet-api)
@@ -52,9 +56,10 @@ Obsoletes:      %{name} < %{version}-%{release}
 Conflicts:      %{name} < %{version}-%{release}
 Provides:       %{name} = %{version}-%{release}
 
-Requires:       pki-%{name}-client            = %{version}-%{release}
-Requires:       pki-%{name}-core              = %{version}-%{release}
-Requires:       pki-%{name}-jackson2-provider = %{version}-%{release}
+Requires:       pki-%{name}-client              = %{version}-%{release}
+Requires:       pki-%{name}-core                = %{version}-%{release}
+Requires:       pki-%{name}-jackson2-provider   = %{version}-%{release}
+Requires:       pki-%{name}-servlet-initializer = %{version}-%{release}
 
 # subpackages removed in fedora 32
 Obsoletes:      %{name}-fastinfoset-provider < 3.0.26-1
@@ -99,6 +104,15 @@ Provides:       %{name}-client = %{version}-%{release}
 %description -n pki-%{name}-client
 %{extdesc} %{summary}.
 
+%package -n     pki-%{name}-servlet-initializer
+Summary:        %{name} Servlet Initializer
+Obsoletes:      %{name}-servlet-initializer < %{version}-%{release}
+Conflicts:      %{name}-servlet-initializer < %{version}-%{release}
+Provides:       %{name}-servlet-initializer = %{version}-%{release}
+
+%description -n pki-%{name}-servlet-initializer
+%{extdesc} %{summary}.
+
 %prep
 %autosetup -n Resteasy-%{namedversion} -p 1
 
@@ -115,7 +129,6 @@ Provides:       %{name}-client = %{version}-%{release}
 %pom_disable_module resteasy-jsapi
 %pom_disable_module resteasy-jsapi-testing
 %pom_disable_module resteasy-links
-%pom_disable_module resteasy-servlet-initializer
 %pom_disable_module resteasy-spring
 %pom_disable_module resteasy-wadl
 %pom_disable_module resteasy-wadl-undertow-connector
@@ -143,8 +156,8 @@ find -name '*.jar' -print -delete
 %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
+%pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api:2.1.1 resteasy-jaxrs
+%pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api:2.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
@@ -171,18 +184,21 @@ find -name '*.jar' -print -delete
 %pom_remove_dep junit:junit providers/resteasy-atom
 %pom_remove_dep junit:junit providers/jaxb
 %pom_remove_dep junit:junit resteasy-jaxrs
+%pom_remove_dep junit:junit resteasy-servlet-initializer
 
 # remove log4j dependency
 %pom_remove_dep log4j:log4j resteasy-jaxrs
 
 # depend on servlet-api from pki-servlet-4.0-api
 %pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api resteasy-jaxrs
+%pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api resteasy-servlet-initializer
 %pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/abdera-atom
 %pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/jaxb
 %pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/jackson2
 
 # add dependencies for EE APIs that were removed in Java 11
-%pom_add_dep jakarta.xml.bind:jakarta.xml.bind-api:2 resteasy-jaxrs
+%pom_add_dep jakarta.xml.bind:jakarta.xml.bind-api resteasy-jaxrs
+%pom_add_dep jakarta.xml.bind:jakarta.xml.bind-api resteasy-servlet-initializer
 
 %pom_remove_plugin :maven-clean-plugin
 
@@ -192,6 +208,7 @@ find -name '*.jar' -print -delete
 %mvn_package ":resteasy-pom" core
 %mvn_package ":resteasy-jackson2-provider" jackson2-provider
 %mvn_package ":resteasy-client" client
+%mvn_package ":resteasy-servlet-initializer" servlet-initializer
 
 # Disable useless artifacts generation, package __noinstall do not work
 %pom_add_plugin org.apache.maven.plugins:maven-source-plugin . '
@@ -218,7 +235,34 @@ find -name '*.jar' -print -delete
 %files -n pki-%{name}-client -f .mfiles-client
 %license License.html
 
+%files -n pki-%{name}-servlet-initializer -f .mfiles-servlet-initializer
+%license License.html
+
 %changelog
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.26-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.26-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.26-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jul 06 2023 Dogtag PKI Team <devel@lists.dogtagpki.org> - 3.0.26-26
+- Conditionalize use of ExclusiveArch
+
+* Mon May 01 2023 Dogtag PKI Team <pki-devel@redhat.com> - 3.0.26-25
+- Update top-level package to depend on servlet-initializer
+
+* Mon May 01 2023 Dogtag PKI Team <pki-devel@redhat.com> - 3.0.26-24
+- Enable servlet-initializer subpackage
+
+* Fri Feb 03 2023 Chris Kelley <ckelley@redhat.com> - 3.0.26-23
+- Remove dependency on jaxb-api2 compat package
+
+* Fri Feb 03 2023 Chris Kelley <ckelley@redhat.com> - 3.0.26-22
+- Remove dependency on jakarta-activation1 compat package
+
 * Mon Jan 23 2023 Marian Koncek <mkoncek@redhat.com> - 3.0.26-21
 - Depend on compat jaxb-api version 2