diff --git a/9.0.96.tar.gz b/9.0.98.tar.gz
similarity index 48%
rename from 9.0.96.tar.gz
rename to 9.0.98.tar.gz
index fbe5ba2168c1383f68c5d6fa1b8b9492da630041..114aae1900677c566ab1c6c524f434c007f1a519 100644
Binary files a/9.0.96.tar.gz and b/9.0.98.tar.gz differ
diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch
index 65680f03c1bf10f82fd018e66998b12d35613f2c..d6185aa7d662ebd024ccbdcb1eb2a209dfd3e136 100644
--- a/rhbz-1857043.patch
+++ b/rhbz-1857043.patch
@@ -1,7 +1,6 @@
-diff -up ./build.xml.orig ./build.xml
---- build.xml.orig	2021-07-07 10:53:55.493742841 +0800
-+++ build.xml	2021-07-07 11:09:43.107968515 +0800
-@@ -1020,7 +1020,7 @@
+--- build.xml.orig	2024-08-03 00:24:59.000000000 +0300
++++ build.xml	2024-08-06 13:42:04.710875124 +0300
+@@ -1110,7 +1110,7 @@
        filesDir="${tomcat.classes}"
        filesId="files.annotations-api"
        manifest="${tomcat.manifests}/annotations-api.jar.manifest"
@@ -10,7 +9,7 @@ diff -up ./build.xml.orig ./build.xml
  
      <!-- Servlet Implementation JAR File -->
      <jarIt jarfile="${servlet-api.jar}"
-@@ -1029,41 +1029,41 @@
+@@ -1119,41 +1119,41 @@
        manifest="${tomcat.manifests}/servlet-api.jar.manifest"
        notice="${tomcat.manifests}/servlet-api.jar.notice"
        license="${tomcat.manifests}/servlet-api.jar.license"
@@ -58,7 +57,7 @@ diff -up ./build.xml.orig ./build.xml
  
      <!-- Bootstrap JAR File -->
      <jarIt jarfile="${bootstrap.jar}"
-@@ -1167,68 +1167,68 @@
+@@ -1165,68 +1165,68 @@
      <jarIt jarfile="${tomcat-util.jar}"
        filesDir="${tomcat.classes}"
        filesId="files.tomcat-util"
@@ -138,7 +137,7 @@ diff -up ./build.xml.orig ./build.xml
  
      <!-- Catalina Ant Tasks JAR File -->
      <jarIt jarfile="${catalina-ant.jar}"
-@@ -1140,27 +1140,27 @@
+@@ -1237,27 +1237,27 @@
      <jarIt jarfile="${catalina-storeconfig.jar}"
        filesDir="${tomcat.classes}"
        filesId="files.catalina-storeconfig"
@@ -170,7 +169,7 @@ diff -up ./build.xml.orig ./build.xml
  
      <!-- i18n JARs -->
      <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1620,7 +1620,7 @@
+@@ -1719,7 +1719,7 @@
             filesId="files.tomcat-embed-core"
             notice="${tomcat.manifests}/servlet-api.jar.notice"
             license="${tomcat.manifests}/servlet-api.jar.license"
@@ -179,7 +178,7 @@ diff -up ./build.xml.orig ./build.xml
             addGraal="true"
             graalPrefix="org.apache.tomcat.embed/tomcat-embed-core"
             graalFiles="res/graal/tomcat-embed-core/native-image"
-@@ -1628,7 +1628,7 @@
+@@ -1727,7 +1727,7 @@
      <jarIt jarfile="${tomcat-embed-el.jar}"
             filesDir="${tomcat.classes}"
             filesId="files.tomcat-embed-el"
@@ -188,7 +187,7 @@ diff -up ./build.xml.orig ./build.xml
             addGraal="true"
             graalPrefix="org.apache.tomcat.embed/tomcat-embed-el"
             graalFiles="res/graal/tomcat-embed-el/native-image"
-@@ -1637,7 +1637,7 @@
+@@ -1736,7 +1736,7 @@
             filesDir="${tomcat.classes}"
             filesId="files.tomcat-embed-jasper"
             meta-inf="${tomcat.manifests}/jasper.jar"
@@ -197,7 +196,7 @@ diff -up ./build.xml.orig ./build.xml
             addGraal="true"
             graalPrefix="org.apache.tomcat.embed/tomcat-embed-jasper"
             graalFiles="res/graal/tomcat-embed-jasper/native-image"
-@@ -1646,7 +1646,7 @@
+@@ -1745,7 +1745,7 @@
             filesDir="${tomcat.classes}"
             filesId="files.tomcat-embed-websocket"
             meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
diff --git a/tomcat-9.0-JDTCompiler.patch b/tomcat-9.0-JDTCompiler.patch
deleted file mode 100644
index edf156aaa0911cbb94a786413e25e384b440555a..0000000000000000000000000000000000000000
--- a/tomcat-9.0-JDTCompiler.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up ./java/org/apache/jasper/compiler/JDTCompiler.java ./java/org/apache/jasper/compiler/JDTCompiler.java
-index 2e361f2..277d8f4 100644
---- java/org/apache/jasper/compiler/JDTCompiler.java
-+++ java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -310,7 +310,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
-             } else if(opt.equals("15")) {
-                 settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_15);
-             } else if(opt.equals("16")) {
--                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_16);
-+                settings.put(CompilerOptions.OPTION_Source, "16");
-             } else if(opt.equals("17")) {
-                 // Constant not available in latest ECJ version that runs on
-                 // Java 8.
-@@ -377,8 +377,8 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
-                 settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15);
-                 settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15);
-             } else if(opt.equals("16")) {
--                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_16);
--                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_16);
-+                settings.put(CompilerOptions.OPTION_TargetPlatform, "16");
-+                settings.put(CompilerOptions.OPTION_Compliance, "16");
-             } else if(opt.equals("17")) {
-                 // Constant not available in latest ECJ version that runs on
-                 // Java 8.
diff --git a/tomcat-9.0.conf b/tomcat-9.0.conf
index e5fa60a5eefd741f0f3893a8a740a2d31b7e5aa9..6e9eed13a5c5af13a83f68080ed8e051af2db8d5 100644
--- a/tomcat-9.0.conf
+++ b/tomcat-9.0.conf
@@ -35,7 +35,7 @@ CATALINA_TMPDIR="/var/cache/tomcat/temp"
 #JAVA_OPTS="-Djava.library.path=/usr/lib"
 
 # Set default javax.sql.DataSource factory to apache commons one. See rhbz#1214381
-JAVA_OPTS="-Djavax.sql.DataSource.Factory=org.apache.commons.dbcp.BasicDataSourceFactory"
+JAVA_OPTS="-Djavax.sql.DataSource.Factory=org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory"
 
 # You can change your tomcat locale here
 #LANG="en_US"
diff --git a/tomcat-functions b/tomcat-functions
index a45503867cfce456705dafc32461b6f6966bb5b4..ab08fa22c597f89175a36df9feb90a522d7921e2 100644
--- a/tomcat-functions
+++ b/tomcat-functions
@@ -34,9 +34,9 @@ _save_function run run_java
 
 run() {
    if [ "${USE_JSVC}" = "true" ] ; then
-	run_jsvc "$@"
+	run_jsvc $@
    else
-	run_java "$@"
+	run_java $@
    fi
 }
 
diff --git a/tomcat.spec b/tomcat.spec
index 29bbcd5cda312e95c1fb47cc32c00970e6152ed2..0339e9d9581ff9158359a625bebb0f5d0cd457f6 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -3,7 +3,7 @@
 %global jspspec 2.3
 %global major_version 9
 %global minor_version 0
-%global micro_version 96
+%global micro_version 98
 %global packdname tomcat-%{version}
 %global servletspec 4.0
 %global elspec 3.0
@@ -23,6 +23,7 @@
 %global cachedir %{_var}/cache/%{name}
 %global tempdir %{cachedir}/temp
 %global workdir %{cachedir}/work
+%global _systemddir /lib/systemd/system
 
 Name:          tomcat
 Epoch:         1
@@ -51,28 +52,23 @@ Patch1:        %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pat
 Patch2:        %{name}-build.patch
 Patch3:        %{name}-%{major_version}.%{minor_version}-catalina-policy.patch
 Patch4:        rhbz-1857043.patch
-Patch5:        %{name}-%{major_version}.%{minor_version}-JDTCompiler.patch
 Patch6:        %{name}-%{major_version}.%{minor_version}-bnd-annotation.patch
 
 BuildArch:     noarch
 
 BuildRequires: ant
-BuildRequires: wsdl4j
-BuildRequires: systemd
-BuildRequires: rpm_macro(_unitdir)
+BuildRequires: ecj >= 1:4.10
 BuildRequires: findutils
+BuildRequires: java-devel >= 1:1.8.0
+BuildRequires: javapackages-local
 BuildRequires: aqute-bnd
 BuildRequires: aqute-bndlib
-BuildRequires: ecj >= 1:4.10
-BuildRequires: javapackages-local
-BuildRequires: java-devel >= 1:1.8.0
+BuildRequires: systemd
 
-Requires:      procps
-Requires:      javapackages-tools
 Requires:      java-headless >= 1:1.8.0
+Requires:      javapackages-tools
 Requires:      %{name}-lib = %{EVR}
 Recommends:    tomcat-native >= %{native_version}
-Conflicts:     tomcat-native >= 2
 Requires(pre):    shadow-utils
 Requires(post):   systemd
 Requires(preun):  systemd
@@ -82,42 +78,14 @@ Requires(postun): systemd
 Provides:         %{name}-log4j = %{EVR}
 
 %description
-Tomcat, also known as Apache Tomcat, is an open-source web application server
-that is designed to run Java-based applications. It is a lightweight, yet
-powerful server that can be used to serve static and dynamic web pages.
-
-Tomcat provides a robust and scalable platform for deploying web applications
-and handling high volumes of traffic. It is widely used in the industry,
-particularly for building and deploying Java-based web applications.
-
-Tomcat is known for its modular architecture, which allows users to customize
-and extend the server's functionality. It is built using the Java Servlet API
-and the JavaServer Pages (JSP) technology, which makes it a suitable platform
-for deploying dynamic web applications.
-
-One of Tomcat's key features is its ability to support multiple protocols,
-including HTTP, HTTPS, and AJP. This allows developers to build web applications
-that can be accessed using different protocols, depending on the needs of the
-application.
-
-Another important feature of Tomcat is its support for multiple operating
-systems and platforms. It can run on Windows, Linux, and Mac OS X, among others,
-making it a versatile choice for web application deployment.
-
-Tomcat provides various features that make it easy to configure and manage,
-such as a web-based administration console, configuration files, and connectors.
-The web-based administration console is a user-friendly interface that allows
-administrators to configure and manage the server from a web browser.
-
-Tomcat is often used in conjunction with other technologies, such as Apache HTTP
-Server, to provide a complete web application stack. It can be used to host
-Java-based applications that use the Spring framework, Hibernate, and other
-popular Java libraries.
-
-Overall, Tomcat is a powerful and flexible web application server that is widely
-used in the industry. Its modular architecture, support for multiple protocols
-and operating systems, and ease of configuration and management make it an ideal
-choice for deploying Java-based web applications.
+Tomcat is the servlet container that is used in the official Reference
+Implementation for the Java Servlet and JavaServer Pages technologies.
+The Java Servlet and JavaServer Pages specifications are developed by
+Sun under the Java Community Process.
+
+Tomcat is developed in an open and participatory environment and
+released under the Apache Software License version 2.0. Tomcat is intended
+to be a collaboration of the best-of-breed developers from around the world.
 
 %package admin-webapps
 Summary: The host-manager and manager web applications for Apache Tomcat
@@ -136,6 +104,7 @@ The docs web application for Apache Tomcat.
 %package jsp-%{jspspec}-api
 Summary: Apache Tomcat JavaServer Pages v%{jspspec} API Implementation Classes
 Provides: jsp = %{jspspec}
+Obsoletes: %{name}-jsp-2.2-api
 Requires: %{name}-servlet-%{servletspec}-api = %{EVR}
 Requires: %{name}-el-%{elspec}-api = %{EVR}
 
@@ -158,6 +127,7 @@ Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes
 Provides: servlet = %{servletspec}
 Provides: servlet6
 Provides: servlet3
+Obsoletes: %{name}-servlet-3.1-api
 
 %description servlet-%{servletspec}-api
 Apache Tomcat Servlet API Implementation Classes.
@@ -165,6 +135,7 @@ Apache Tomcat Servlet API Implementation Classes.
 %package el-%{elspec}-api
 Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes
 Provides: el_api = %{elspec}
+Obsoletes: %{name}-el-2.2-api
 
 %description el-%{elspec}-api
 Apache Tomcat EL API Implementation Classes.
@@ -235,7 +206,7 @@ touch HACK
 # build initial path structure
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir}
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_unitdir}
+%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_systemddir}
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{appdir}
@@ -323,7 +294,6 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
     %{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar .
     %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar .
     %{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar
-
     cp ../../%{name}/bin/tomcat-juli.jar .
 popd
 
@@ -550,6 +520,12 @@ fi
 %doc {NOTICE,RELEASE*}
 
 %changelog
+* Thu Jan 09 2025 mgb01105731 <mgb01105731@alibaba-inc.com> - 1:9.0.98-1
+- to #IBGRS9 , #IBGRSC , #IBGRSI
+- Update to version 9.0.98 for CVE-2024-56337,CVE-2024-50379,CVE-2024-54677
+- Project: TC2024080204
+- Signed-off-by: mgb01105731 mgb01105731@alibaba-inc.com
+
 * Wed Dec 18 2024 yangxinyu <yangxinyu@nfschina.com> - 1:9.0.96-1
 - update to 9.0.96
 - fix CVE-2024-52316
@@ -582,4 +558,3 @@ fi
 
 * Mon Jun 20 2022 mgb01105731 <mgb01105731@alibaba-inc.com> - 1:9.0.63-1
 - Init from upstream version 9.0.63
-