From 87384fa743622fc4cbddf3571e01ceef3706bae5 Mon Sep 17 00:00:00 2001 From: Adam Krajcik Date: Fri, 2 Aug 2024 12:14:08 +0200 Subject: [PATCH] Resolves: RHEL-52906 - tomcat: Switch to using Java 21 as the default JDK --- tomcat.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 4584c39..cb7d5bf 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -87,13 +87,13 @@ BuildArch: noarch BuildRequires: ant BuildRequires: ecj >= 1:4.10 BuildRequires: findutils -BuildRequires: java-devel >= 1:1.8.0 +BuildRequires: java-devel BuildRequires: javapackages-local BuildRequires: aqute-bnd BuildRequires: aqute-bndlib BuildRequires: systemd -Requires: (java-headless >= 1:1.8 or java-1.8.0-headless or java-11-headless or java-17-headless or java >= 1:1.8) +Requires: java-headless Requires: javapackages-tools Requires: %{name}-lib = %{epoch}:%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 @@ -548,6 +548,7 @@ fi - Resolves: RHEL-50166 - Rebase tomcat to version 9.0.87 - Resolves: RHEL-12274 - Use src.zip file as a Source0 instead of tar.gz - Resolves: RHEL-51277 - Prune changelog to remove non-relevant history +- Resolves: RHEL-52906 - tomcat: Switch to using Java 21 as the default JDK * Mon Jun 24 2024 Troy Dawson - 1:9.0.83-3 - Bump release for June 2024 mass rebuild