From b9a832aed47e0498460b8c329125fbe0a012cbd3 Mon Sep 17 00:00:00 2001 From: Alessandro Garagnani Date: Mon, 3 Aug 2026 12:04:03 +0200 Subject: [PATCH] Upgrades to tomcat 10 Resolves: RHEL-210971 --- dogtag-pki.spec | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/dogtag-pki.spec b/dogtag-pki.spec index a330f0d..8e25b93 100644 --- a/dogtag-pki.spec +++ b/dogtag-pki.spec @@ -14,7 +14,7 @@ Name: dogtag-pki # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 # - GA/update (supported): where n >= 1 -%global release_number 4 +%global release_number 5 # Development phase: # - development (unsupported): alpha where n >= 1 @@ -217,7 +217,7 @@ BuildRequires: javapackages-tools %if %{without runtime_deps} BuildRequires: xmlstarlet %endif -%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 10 BuildRequires: tomcat-lib >= 1:10.1.36 BuildRequires: tomcat-jakartaee-migration %else @@ -258,8 +258,7 @@ BuildRequires: mvn(org.jboss.resteasy:resteasy-jackson2-provider) BuildRequires: mvn(org.jboss.resteasy:resteasy-servlet-initializer) %endif -%if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 11 - +%if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 10 BuildRequires: mvn(org.apache.tomcat:tomcat-catalina) >= 10.1.36 BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) >= 10.1.36 BuildRequires: mvn(org.apache.tomcat:tomcat-jaspic-api) >= 10.1.36 @@ -694,7 +693,7 @@ Requires: mvn(org.jboss.resteasy:resteasy-servlet-initializer) Provides: bundled(resteasy-servlet-initializer) = 3.0.26 %endif -%if 0%{?rhel} && 0%{?rhel} >= 11 +%if 0%{?rhel} && 0%{?rhel} >= 10 Requires: tomcat >= 1:10.1.36 %else Requires: tomcat9 >= 1:9.0.62 @@ -1111,7 +1110,7 @@ popd %endif -%if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 11 +%if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 10 #migrate the source first because we are starting with tomcat 9 code, so we can build against either tomcat 9 or 10.1, based on the build platform /usr/bin/javax2jakarta -profile=EE -exclude=./base/tomcat-9.0 ./base ./base %endif @@ -1194,7 +1193,7 @@ then #migrate necessary files being copied around to jakarta 9.0 ee, for >= f43 and rhel10 - %if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 11 + %if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 10 echo "Doing the tomcat 10 version..." /usr/bin/javax2jakarta -profile=EE jboss-jaxrs-api_2.0_spec-$JAXRS_VERSION.jar jboss-jaxrs-api_2.0_spec-$JAXRS_VERSION.jar @@ -1243,7 +1242,7 @@ then cp /usr/share/java/resteasy/resteasy-servlet-initializer.jar \ resteasy-servlet-initializer-$RESTEASY_VERSION.jar - %if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 11 + %if 0%{?fedora} && 0%{?fedora} >= 44 || 0%{?rhel} && 0%{?rhel} >= 10 /usr/bin/javax2jakarta -profile=EE resteasy-servlet-initializer-$RESTEASY_VERSION.jar resteasy-servlet-initializer-$RESTEASY_VERSION.jar %endif @@ -1260,7 +1259,7 @@ fi %if ! %{with server} %pom_disable_module tomcat base -%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 10 %pom_disable_module tomcat-10.1 base %else %pom_disable_module tomcat-9.0 base @@ -1313,7 +1312,7 @@ fi %mvn_file org.dogtagpki.pki:pki-server pki/pki-server %mvn_file org.dogtagpki.pki:pki-server-webapp pki/pki-server-webapp %mvn_file org.dogtagpki.pki:pki-tomcat pki/pki-tomcat -%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 10 %mvn_file org.dogtagpki.pki:pki-tomcat-10.1 pki/pki-tomcat-10.1 %else %mvn_file org.dogtagpki.pki:pki-tomcat-9.0 pki/pki-tomcat-9.0 @@ -1338,7 +1337,7 @@ fi %mvn_package org.dogtagpki.pki:pki-server-webapp pki-server %mvn_package org.dogtagpki.pki:pki-tomcat pki-server -%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 10 %mvn_package org.dogtagpki.pki:pki-tomcat-10.1 pki-server %else %mvn_package org.dogtagpki.pki:pki-tomcat-9.0 pki-server @@ -1369,7 +1368,7 @@ export JAVA_HOME=%{java_home} %if %{with maven} # build Java binaries and run unit tests with Maven -%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 10 %pom_disable_module tomcat-9.0 base %pom_remove_dep :pki-tomcat-9.0 base/server %else @@ -1391,7 +1390,7 @@ ln -sf ../../base/tools/target/pki-tools.jar %if %{with server} ln -sf ../../base/tomcat/target/pki-tomcat.jar -%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 10 ln -sf ../../base/tomcat-10.1/target/pki-tomcat-10.1.jar %else ln -sf ../../base/tomcat-9.0/target/pki-tomcat-9.0.jar @@ -1457,13 +1456,6 @@ pkgs=base\ %{?with_tests:,tests}\ %{?with_debug:,debug} - -## Force use of tomcat 9. - -sed -i 's/^APP_SERVER=.*/APP_SERVER=tomcat-9.0/g' build.sh - - - # build PKI console, Javadoc, and native binaries with CMake ./build.sh \ %{?_verbose:-v} \ @@ -1984,7 +1976,7 @@ fi %{_datadir}/java/pki/pki-server.jar %{_datadir}/java/pki/pki-server-webapp.jar %{_datadir}/java/pki/pki-tomcat.jar -%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 10 %{_datadir}/java/pki/pki-tomcat-10.1.jar %else %{_datadir}/java/pki/pki-tomcat-9.0.jar @@ -2176,6 +2168,10 @@ fi ################################################################################ %changelog +* Wed Jul 29 2026 Red Hat PKI Team - 11.9.0-5 +- Upgrade to tomcat 10 +- Resolves: RHEL-210971 + * Thu Jul 16 2026 Red Hat PKI Team - 11.9.0-4 - Update jackson bundled to 2.21.4 - Resolves: RHEL-188290