.gitignore

@@ -1 +1 @@
-SOURCES/tomcat-9.0.87.redhat-00003-src.zip
+SOURCES/tomcat-9.0.62.redhat-00018-src.zip

.tomcat.metadata

@@ -1 +1 @@
-4e1552026d103c3310c1bd678ac8fe7bab597e4b SOURCES/tomcat-9.0.87.redhat-00003-src.zip
+5becf21ed1eb5c031c31d5f295ce499234e98f82 SOURCES/tomcat-9.0.62.redhat-00018-src.zip

SOURCES/fix-malformed-dtd.patch

@@ -0,0 +1,8 @@
+diff -up ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd.orig ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
+--- ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd.orig	2023-02-07 14:11:25.294179017 -0500
++++ ./java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd	2023-02-07 14:11:28.629196705 -0500
+@@ -1,4 +1,3 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with

SOURCES/remove-bnd-annotation.patch

@@ -2,7 +2,7 @@ diff --git a/build.xml b/build.xml
 index 5a0be1b..2131211 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -3296,7 +3296,7 @@ asf.ldap.username=${release.asfusername}
+@@ -3062,7 +3062,7 @@ skip.installer property in build.properties" />
  
    <target name="download-compile"
            description="Download components necessary to compile"
@@ -15,7 +15,7 @@ diff --git a/java/org/apache/el/ExpressionFactoryImpl.java b/java/org/apache/el/
 index a6faeb6..5afbda7 100644
 --- a/java/org/apache/el/ExpressionFactoryImpl.java
 +++ b/java/org/apache/el/ExpressionFactoryImpl.java
-@@ -34,7 +34,7 @@ import org.apache.el.util.MessageFactory;
+@@ -33,7 +33,7 @@ import org.apache.el.util.MessageFactory;
   *
   * @author Jacob Hookom [jacob@hookom.net]
   */
@@ -23,7 +23,7 @@ index a6faeb6..5afbda7 100644
 +//@aQute.bnd.annotation.spi.ServiceProvider(value=ExpressionFactory.class)
  public class ExpressionFactoryImpl extends ExpressionFactory {
  
-     static {
+     @Override
 diff --git a/java/org/apache/juli/logging/LogFactory.java b/java/org/apache/juli/logging/LogFactory.java
 index 56c805a..bd6eb0d 100644
 --- a/java/org/apache/juli/logging/LogFactory.java
@@ -41,8 +41,8 @@ index 56c805a..bd6eb0d 100644
   * @author Costin Manolache
   * @author Richard A. Sitze
   */
--@ServiceConsumer(value=Log.class)
+-@ServiceConsumer(value=org.apache.juli.logging.Log.class)
-+//@ServiceConsumer(value=Log.class)
++//@ServiceConsumer(value=org.apache.juli.logging.Log.class)
  public class LogFactory {
  
      private static final LogFactory singleton = new LogFactory();
@@ -69,6 +69,6 @@ index 5c385ed..2e4e82e 100644
  
 -@aQute.bnd.annotation.spi.ServiceProvider(value=ServerEndpointConfig.Configurator.class)
 +//@aQute.bnd.annotation.spi.ServiceProvider(value=ServerEndpointConfig.Configurator.class)
- public class DefaultServerEndpointConfigurator extends ServerEndpointConfig.Configurator {
+ public class DefaultServerEndpointConfigurator
+         extends ServerEndpointConfig.Configurator {
  
-     @Override

SOURCES/tomcat-build.patch

@@ -1,11 +1,12 @@
---- ./res/bnd/build-defaults.bnd.orig	2024-05-01 11:07:38.804582327 +0300
+diff -up ./res/bnd/build-defaults.bnd.orig ./res/bnd/build-defaults.bnd
-+++ ./res/bnd/build-defaults.bnd	2024-05-01 11:17:08.857295279 +0300
+--- ./res/bnd/build-defaults.bnd.orig	2020-07-13 13:47:01.229077747 -0400
++++ ./res/bnd/build-defaults.bnd	2020-07-13 13:47:12.923095618 -0400
 @@ -13,7 +13,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
 
 -Bundle-Version: ${version_cleanup;${version}}
 +Bundle-Version: ${version}
- Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt
 
  Specification-Title: Apache Tomcat
+ Specification-Version: ${version.major.minor}

SPECS/tomcat.spec

@@ -31,8 +31,8 @@
 %global jspspec 2.3
 %global major_version 9
 %global minor_version 0
-%global micro_version 87
+%global micro_version 62
-%global packdname  %{name}-%{major_version}.%{minor_version}.%{micro_version}.redhat-00003-src
+%global packdname  %{name}-%{major_version}.%{minor_version}.%{micro_version}.redhat-00018-src
 %global servletspec 4.0
 %global elspec 3.0
 %global tcuid 53
@@ -56,7 +56,7 @@
 Name:          tomcat
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       1%{?dist}.1.alma.1
+Release:       29%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       ASL 2.0
@@ -83,6 +83,7 @@ Patch4:        rhbz-1857043.patch
 # remove bnd dependency which version is too low on rhel8
 Patch6:        remove-bnd-annotation.patch
 Patch7:        JmxRemoteLifecycleListener.patch
+Patch8:        fix-malformed-dtd.patch
 
 BuildArch:     noarch
 
@@ -105,7 +106,7 @@ Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
 
-Obsoletes: pki-servlet-engine <= 1:9.0.50
+Conflicts: pki-servlet-engine <= 1:9.0.50
 
 # added after log4j sub-package was removed
 Provides:         %{name}-log4j = %{epoch}:%{version}-%{release}
@@ -140,7 +141,7 @@ Provides: jsp = %{jspspec}
 Obsoletes: %{name}-jsp-2.2-api
 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
-Obsoletes: pki-servlet-engine <= 1:9.0.50
+Conflicts: pki-servlet-engine <= 1:9.0.50
 
 %description jsp-%{jspspec}-api
 Apache Tomcat JSP API Implementation Classes.
@@ -152,7 +153,7 @@ Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
 Requires: ecj >= 1:4.10
 Requires(preun): coreutils
-Obsoletes: pki-servlet-engine <= 1:9.0.50
+Conflicts: pki-servlet-engine <= 1:9.0.50
 
 %description lib
 Libraries needed to run the Tomcat Web container.
@@ -163,7 +164,7 @@ Provides: servlet = %{servletspec}
 Provides: servlet6
 Provides: servlet3
 Obsoletes: %{name}-servlet-3.1-api
-Obsoletes: pki-servlet-4.0-api <= 1:9.0.50
+Conflicts: pki-servlet-4.0-api <= 1:9.0.50
 
 %description servlet-%{servletspec}-api
 Apache Tomcat Servlet API Implementation Classes.
@@ -172,7 +173,7 @@ Apache Tomcat Servlet API Implementation Classes.
 Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes
 Provides: el_api = %{elspec}
 Obsoletes: %{name}-el-2.2-api
-Obsoletes: pki-servlet-engine <= 1:9.0.50
+Conflicts: pki-servlet-engine <= 1:9.0.50 and pki-servlet-container <= 1:9.0.7
 
 %description el-%{elspec}-api
 Apache Tomcat EL API Implementation Classes.
@@ -197,6 +198,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch -P4 -p0
 %patch -P6 -p1
 %patch -P7 -p1
+%patch -P8 -p1
 
 # Remove webservices naming resources as it's generally unused
 %{__rm} -rf java/org/apache/naming/factory/webservices
@@ -556,12 +558,6 @@ fi
 
 
 %changelog
-* Thu Jun 06 2024 Eduard Abdullin <eabdullin@redhat.com> - 1:9.0.87-1.el8_10.1.alma.1
-- Update to 9.0.87
-
-* Fri Jan 19 2024 Hui Wang <huwang@redhat.com> - 1:9.0.62-30
-- Resolves: RHEL-6971
-
 * Thu Jan 18 2024 Hui Wang <huwang@redhat.com> - 1:9.0.62-29
 - Resolves: RHEL-17602