From 703557e0a6e86d22c00a160620749e61af18f818 Mon Sep 17 00:00:00 2001
From: Hui Wang <huwang@redhat.com>
Date: Oct 16 2023 03:06:28 +0000
Subject: Update to 9.0.82

Resolves: rhbz#2244333 Wrong dbcp class in tomcat 9

---

diff --git a/sources b/sources
index 2068d0a..05325b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apache-tomcat-9.0.80-src.tar.gz) = a2fb298c1fd2615e1a69371b5f84eb569e897faad3cbe17e3626460f5ce311085c120dd3f62c255fde87e6517915365ab52ada613776d45185b8e53624935114
+SHA512 (apache-tomcat-9.0.82-src.tar.gz) = 0291196832150147230a263bcfd64f7ac9ce9f6c26924f72b831d28479e7886f00b9ab3adff175785e8c5b47d8b16f7a7897acafa3474428f48cec02fd852b3e
diff --git a/tomcat-9.0.conf b/tomcat-9.0.conf
index e5fa60a..6e9eed1 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.spec b/tomcat.spec
index c33f106..8c97935 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -31,7 +31,7 @@
 %global jspspec 2.3
 %global major_version 9
 %global minor_version 0
-%global micro_version 80
+%global micro_version 82
 %global packdname apache-tomcat-%{version}-src
 %global servletspec 4.0
 %global elspec 3.0
@@ -550,6 +550,10 @@ fi
 %{appdir}/ROOT
 
 %changelog
+* Mon Oct 16 2023 Hui Wang <huwang@redhat.com> - 1:9.0.82-1
+- Update to 9.0.82
+- Resolves: rhbz#2244333 Wrong dbcp class in tomcat 9
+
 * Wed Sep 13 2023 Hui Wang <huwang@redhat.com> - 1:9.0.80-1
 - Update to 9.0.80
 - Fix java version