From 92178f1466fd8783ef4685526a8bd12e0aef28d2 Mon Sep 17 00:00:00 2001
From: Marco Fargetta <mfargett@redhat.com>
Date: Fri, 13 Mar 2026 10:58:10 +0100
Subject: [PATCH] Revert to tomcat 9

Resolves: RHEL-155406
---
 jss.spec | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/jss.spec b/jss.spec
index 434fdea..982c864 100644
--- a/jss.spec
+++ b/jss.spec
@@ -13,7 +13,7 @@ Name:           jss
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
 # - GA/update (supported): <n> where n >= 1
-%global         release_number 2
+%global         release_number 3
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
@@ -153,7 +153,7 @@ This only works with gcj. Other JREs require that JCE providers be signed.
 Summary:        Java Security Services (JSS) Connector for Tomcat
 
 # Tomcat
-%if 0%{?rhel} && 0%{?rhel} >= 10
+%if 0%{?rhel} && 0%{?rhel} >= 11
 BuildRequires:  mvn(org.apache.tomcat:tomcat-catalina) >= 10.1.36
 BuildRequires:  mvn(org.apache.tomcat:tomcat-coyote) >= 10.1.36
 BuildRequires:  mvn(org.apache.tomcat:tomcat-juli) >= 10.1.36
@@ -169,11 +169,19 @@ BuildRequires:  mvn(org.apache.tomcat:tomcat-catalina) >= 9.0.62
 BuildRequires:  mvn(org.apache.tomcat:tomcat-coyote) >= 9.0.62
 BuildRequires:  mvn(org.apache.tomcat:tomcat-juli) >= 9.0.62
 
+BuildRequires:  mvn(org.apache.tomcat:tomcat-catalina) < 10
+BuildRequires:  mvn(org.apache.tomcat:tomcat-coyote) < 10
+BuildRequires:  mvn(org.apache.tomcat:tomcat-juli) < 10
+
 Requires:       %{product_id} = %{version}-%{release}
 Requires:       mvn(org.apache.tomcat:tomcat-catalina) >= 9.0.62
 Requires:       mvn(org.apache.tomcat:tomcat-coyote) >= 9.0.62
 Requires:       mvn(org.apache.tomcat:tomcat-juli) >= 9.0.62
 
+Requires:       mvn(org.apache.tomcat:tomcat-catalina) < 10
+Requires:       mvn(org.apache.tomcat:tomcat-coyote) < 10
+Requires:       mvn(org.apache.tomcat:tomcat-juli) < 10
+
 %endif
 
 # Tomcat JSS has been replaced with JSS Connector for Tomcat.
@@ -261,7 +269,7 @@ This package provides test suite for JSS.
 %pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin
 
 
-%if 0%{?rhel} >= 10
+%if 0%{?rhel} >= 11
 #
 # specify Maven artifact locations
 %mvn_file org.dogtagpki.jss:jss-tomcat         jss/jss-tomcat
@@ -429,6 +437,10 @@ cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib
 
 ################################################################################
 %changelog
+* Fri Mar 13 2026 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.9.0-3
+- Revert to tomcat 9
+- Resolves: RHEL-155406
+
 * Tue Mar 10 2026 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.9.0-2
 - Rebuilt for exception target