From 1f110eb3c6d0f275495e15b8d219f2408cd9a030 Mon Sep 17 00:00:00 2001
From: Coty Sutherland <csutherl@redhat.com>
Date: Thu, 26 Feb 2026 21:17:22 -0500
Subject: [PATCH] Related: RHEL-154364 Tomcat fails to respond to client
 connections when using Java 8

---
 build-with-java-25.patch | 76 ----------------------------------------
 tomcat.spec              |  9 ++---
 2 files changed, 5 insertions(+), 80 deletions(-)
 delete mode 100644 build-with-java-25.patch

diff --git a/build-with-java-25.patch b/build-with-java-25.patch
deleted file mode 100644
index cb7c5eb..0000000
--- a/build-with-java-25.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- build.xml.orig	2026-02-12 14:28:31.466893106 -0500
-+++ build.xml	2026-02-12 14:28:44.320933346 -0500
-@@ -968,7 +968,7 @@
-     <javac srcdir="java" destdir="${tomcat.classes}"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
--           release="${compile.release}"
-+           source="8" target="8"
-            encoding="ISO-8859-1"
-            includeAntRuntime="true" >
-       <!-- Uncomment this to show unchecked warnings:
-@@ -1021,7 +1021,7 @@
-     <javac srcdir="java" destdir="${tomcat.classes}"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
--           release="${compile.release}"
-+           source="8" target="8"
-            encoding="ISO-8859-1"
-            includeAntRuntime="true" >
-       <!-- Uncomment this to show unchecked warnings:
-@@ -1038,7 +1038,7 @@
-     <javac srcdir="java" destdir="${tomcat.classes}"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
--           release="${release.java.version}"
-+           source="22" target="22"
-            encoding="ISO-8859-1"
-            includeAntRuntime="true"
-            if:set="has-ffm" >
-@@ -1577,7 +1577,7 @@
-     <javac   srcdir="webapps/examples/WEB-INF/classes"
-              destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
-              debug="${compile.debug}" deprecation="${compile.deprecation}"
--             release="${compile.release}"
-+             source="8" target="8"
-              classpath="${tomcat.classes}"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -1806,7 +1806,7 @@
-            destdir="${xreflect.directory}/classes"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
--           release="${compile.release}"
-+           source="8" target="8"
-            encoding="ISO-8859-1"
-            includeAntRuntime="true" >
-       <compilerarg value="-XDignore.symbol.file"/>
-@@ -1892,7 +1892,7 @@
-     <javac srcdir="test" destdir="${test.classes}"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
--           release="${compile.release}"
-+           source="8" target="8"
-            encoding="ISO-8859-1"
-            includeantruntime="true">
-       <classpath refid="tomcat.test.classpath" />
---- modules/jdbc-pool/build.xml.orig	2026-02-12 14:28:31.469893115 -0500
-+++ modules/jdbc-pool/build.xml	2026-02-12 14:28:44.327503027 -0500
-@@ -163,7 +163,7 @@
-     <javac srcdir="${basedir}/src/main/java" destdir="${tomcat.classes}"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
--           release="${compile.release}"
-+           source="8" target="8"
-            encoding="ISO-8859-1"
-            includeantruntime="false">
-       <classpath refid="tomcat.jdbc.classpath"/>
-@@ -201,7 +201,7 @@
-     <javac srcdir="${basedir}/src/test/java" destdir="${tomcat.testclasses}"
-            debug="${compile.debug}"
-            deprecation="${compile.deprecation}"
--           release="${compile.release}"
-+           source="8" target="8"
-            encoding="ISO-8859-1"
-            includeantruntime="false">
-       <classpath refid="tomcat.jdbc.classpath"/>
diff --git a/tomcat.spec b/tomcat.spec
index 1d61023..644172b 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -56,7 +56,7 @@
 Name:          tomcat
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       ASL 2.0
@@ -81,7 +81,6 @@ Patch2:        %{name}-build.patch
 Patch3:        %{name}-%{major_version}.%{minor_version}-catalina-policy.patch
 Patch4:        rhbz-1857043.patch
 Patch6:        %{name}-%{major_version}.%{minor_version}-bnd-annotation.patch
-Patch7:        build-with-java-25.patch
 
 BuildArch:     noarch
 
@@ -92,7 +91,7 @@ BuildRequires: javapackages-local
 BuildRequires: aqute-bnd
 BuildRequires: aqute-bndlib
 BuildRequires: systemd
-BuildRequires: java-25-headless
+BuildRequires: java-25-devel
 
 Requires:      (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java-21-headless or java-25-headless or java >= 1:1.8)
 Requires:      javapackages-tools
@@ -198,7 +197,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch -P3 -p0
 %patch -P4 -p0
 %patch -P6 -p0
-%patch -P7 -p0
 
 # Remove webservices naming resources as it's generally unused
 %{__rm} -rf java/org/apache/naming/factory/webservices
@@ -565,6 +563,9 @@ fi
 
 
 %changelog
+* Thu Feb 26 2026 Coty Sutherland <csutherl@redhat.com> - 1:9.0.110-2
+- Resolves: RHEL-154364 Tomcat fails to respond to client connections when using Java 8
+
 * Wed Feb 11 2026 Coty Sutherland <csutherl@redhat.com> - 1:9.0.110-1
 - Resolves: RHEL-148687
   Update to 9.0.110 and compile with Java 25 to enable FFM features for PQC support