Replace pki-servlet-4.0-api with tomcat-servlet-4.0-api

Resolves: https://issues.redhat.com/browse/RHEL-30061

.gitignore

@@ -1 +1,2 @@
 SOURCES/resteasy-3.0.26.Final.tar.gz
+/resteasy-3.0.26.Final.tar.gz

0001-Remove-Log4jLogger.patch

@@ -1,163 +0,0 @@
-From d9ad1ff80c45333922fb51e454ee6036b389faa4 Mon Sep 17 00:00:00 2001
-From: "Endi S. Dewata" <edewata@redhat.com>
-Date: Wed, 2 Jun 2021 19:34:16 -0500
-Subject: [PATCH] Remove Log4jLogger
-
----
- .../resteasy/logging/impl/Log4jLogger.java    | 144 ------------------
- 1 file changed, 144 deletions(-)
- delete mode 100644 resteasy-jaxrs/src/main/java/org/jboss/resteasy/logging/impl/Log4jLogger.java
-
-diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/logging/impl/Log4jLogger.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/logging/impl/Log4jLogger.java
-deleted file mode 100644
-index 6cf43d251..000000000
---- a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/logging/impl/Log4jLogger.java
-+++ /dev/null
-@@ -1,144 +0,0 @@
--package org.jboss.resteasy.logging.impl;
--
--import org.apache.log4j.Logger;
--
--import java.text.MessageFormat;
--
--/**
-- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
-- * @version $Revision: 1 $
-- */
--public class Log4jLogger extends org.jboss.resteasy.logging.Logger
--{
--   private transient Logger delegate;
--   private String classname;
--
--   public Log4jLogger(String classname)
--   {
--      this.classname = classname;
--      delegate = Logger.getLogger(classname);
--   }
--
--   @Override
--   public boolean isTraceEnabled()
--   {
--      return delegate.isTraceEnabled();
--   }
--
--   @Override
--   public void trace(String message)
--   {
--      if (!delegate.isTraceEnabled()) return;
--      delegate.trace(message);
--   }
--
--   @Override
--   public void trace(String message, Object... params)
--   {
--      if (!delegate.isTraceEnabled()) return;
--      String msg = MessageFormat.format(message, params);
--      delegate.trace(msg);
--   }
--
--   @Override
--   public void trace(String message, Throwable error)
--   {
--      if (!delegate.isTraceEnabled()) return;
--      delegate.trace(message, error);
--   }
--
--   @Override
--   public boolean isDebugEnabled()
--   {
--      return delegate.isDebugEnabled();
--   }
--
--   @Override
--   public void debug(String message)
--   {
--      if (!delegate.isDebugEnabled()) return;
--      delegate.debug(message);
--   }
--
--   @Override
--   public void debug(String message, Object... params)
--   {
--      if (!delegate.isDebugEnabled()) return;
--      String msg = MessageFormat.format(message, params);
--      delegate.debug(msg);
--   }
--
--   @Override
--   public void debug(String message, Throwable error)
--   {
--      if (!isDebugEnabled()) return;
--      delegate.debug(message, error);
--   }
--
--   @Override
--   public void info(String message)
--   {
--      if (!(delegate.isInfoEnabled())) return;
--      delegate.info(message);
--   }
--
--   @Override
--   public void info(String message, Object... params)
--   {
--      if (!delegate.isInfoEnabled()) return;
--      String msg = MessageFormat.format(message, params);
--      delegate.info(msg);
--   }
--
--   @Override
--   public void info(String message, Throwable error)
--   {
--      if (!delegate.isInfoEnabled()) return;
--      delegate.info(message, error);
--   }
--
--   @Override
--   public void warn(String message)
--   {
--      delegate.warn(message);
--   }
--
--   @Override
--   public void warn(String message, Object... params)
--   {
--      String msg = MessageFormat.format(message, params);
--      delegate.warn(msg);
--   }
--
--   @Override
--   public void warn(String message, Throwable error)
--   {
--      delegate.warn(message, error);
--   }
--
--   @Override
--   public void error(String message)
--   {
--      delegate.warn(message);
--   }
--
--   @Override
--   public void error(String message, Object... params)
--   {
--      String msg = MessageFormat.format(message, params);
--      delegate.error(msg);
--   }
--
--   @Override
--   public void error(String message, Throwable error)
--   {
--      delegate.warn(message, error);
--   }
--
--   @Override
--   public boolean isWarnEnabled()
--   {
--      return true;
--   }
--
--}
--- 
-2.31.1
-

resteasy.spec

@@ -3,7 +3,7 @@
 
 Name:           resteasy
 Version:        3.0.26
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Framework for RESTful Web services and Java applications
 License:        ASL 2.0
 URL:            http://resteasy.jboss.org/
@@ -33,8 +33,8 @@ BuildRequires:  mvn(org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 
 # Require the Servlet API 4.0
-BuildRequires:  pki-servlet-4.0-api
-Requires:       pki-servlet-4.0-api
+BuildRequires:  tomcat-servlet-4.0-api
+Requires:       tomcat-servlet-4.0-api
 
 #XXX just to make pki-core build. pki-core should switch to mvn requires
 Provides:    resteasy-atom-provider
@@ -119,7 +119,7 @@ find -name '*.jar' -print -delete
 %pom_remove_dep junit:junit providers/jaxb
 %pom_remove_dep junit:junit resteasy-jaxrs
 
-# depend on servlet-api from pki-servlet-4.0-api
+# depend on servlet-api from tomcat-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 providers/abdera-atom
 %pom_change_dep org.jboss.spec.javax.servlet: org.apache.tomcat:tomcat-servlet-api providers/jaxb
@@ -182,6 +182,9 @@ done
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Thu Mar 21 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-7
+- RHEL-30061: Replace pki-servlet-4.0-api with tomcat-servlet-4.0-api
+
 * Mon Nov 30 2020 Alexander Scheel <ascheel@redhat.com> - 3.0.26-6
 - CVE-2020-1695: Improper validation of response header in MediaTypeHeaderDelegate.java class
   Resolves: rh-bz#1845548

sources

@@ -1 +1 @@
-SHA1 (resteasy-3.0.26.Final.tar.gz) = 46f76675a579ac45441399220b0cefff9ffa8dbf
+SHA512 (resteasy-3.0.26.Final.tar.gz) = 2108f9dd313a619ba856cae2355146b85baeb7fc35ffa58b584b66e2dcb806a57be0e7cd6ebb8003b60adb3007285e3d6b707f6c55f8400296e08dbc127004cc