diff --git a/content-review/impl/compilatio/pom.xml b/content-review/impl/compilatio/pom.xml
index c70a114193d4..a6a05811fb52 100644
--- a/content-review/impl/compilatio/pom.xml
+++ b/content-review/impl/compilatio/pom.xml
@@ -124,11 +124,6 @@
             <groupId>javax.transaction</groupId>
             <artifactId>jta</artifactId>
             <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <scope>test</scope>
         </dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
diff --git a/content-review/impl/dao/pom.xml b/content-review/impl/dao/pom.xml
index e966e85efb33..754236443621 100644
--- a/content-review/impl/dao/pom.xml
+++ b/content-review/impl/dao/pom.xml
@@ -17,16 +17,10 @@
 			<groupId>org.sakaiproject.contentreview</groupId>
 			<artifactId>content-review-api</artifactId>
 		</dependency>
-		<!-- Hibernate dependencies -->
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.javassist</groupId>
-			<artifactId>javassist</artifactId>
-		</dependency>
-		<!-- Spring dependencies -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
diff --git a/content-review/impl/turnitin-oc/pom.xml b/content-review/impl/turnitin-oc/pom.xml
index c2b5a66c7eac..9436ad0e3dc2 100644
--- a/content-review/impl/turnitin-oc/pom.xml
+++ b/content-review/impl/turnitin-oc/pom.xml
@@ -110,12 +110,6 @@
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 		</dependency>
-
-		<!-- needed by hibernate unit tests -->
-		<dependency>
-			<groupId>org.javassist</groupId>
-			<artifactId>javassist</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
diff --git a/content-review/impl/turnitin/pom.xml b/content-review/impl/turnitin/pom.xml
index a6170b91d68e..6f05dcca2830 100644
--- a/content-review/impl/turnitin/pom.xml
+++ b/content-review/impl/turnitin/pom.xml
@@ -122,11 +122,6 @@
             <artifactId>jta</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
 	        <groupId>javax.servlet</groupId>
 	        <artifactId>javax.servlet-api</artifactId>
diff --git a/content-review/impl/urkund/pom.xml b/content-review/impl/urkund/pom.xml
index 0d46e6dc01fc..f8f929661cec 100644
--- a/content-review/impl/urkund/pom.xml
+++ b/content-review/impl/urkund/pom.xml
@@ -141,11 +141,6 @@
 			<version>2.0.8</version>
 		</dependency>
 
-		<!-- needed by hibernate unit tests -->
-		<dependency>
-			<groupId>org.javassist</groupId>
-			<artifactId>javassist</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
diff --git a/deploy/pom.xml b/deploy/pom.xml
index f6b6500e8425..97444f57d331 100644
--- a/deploy/pom.xml
+++ b/deploy/pom.xml
@@ -627,11 +627,6 @@
             <artifactId>aopalliance</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <scope>compile</scope>
-        </dependency>
 
         <!-- apache -->
         <dependency>
@@ -847,11 +842,6 @@
         </dependency>
 
         <!-- xml -->
-        <dependency>
-            <groupId>org.dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.jdom</groupId>
             <artifactId>jdom2</artifactId>
diff --git a/edu-services/cm-service/cm-impl/hibernate-impl/impl/pom.xml b/edu-services/cm-service/cm-impl/hibernate-impl/impl/pom.xml
index 103272214366..5bac20eae596 100644
--- a/edu-services/cm-service/cm-impl/hibernate-impl/impl/pom.xml
+++ b/edu-services/cm-service/cm-impl/hibernate-impl/impl/pom.xml
@@ -50,10 +50,6 @@
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.javassist</groupId>
-			<artifactId>javassist</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
@@ -98,11 +94,6 @@
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>jaxen</groupId>
 			<artifactId>jaxen</artifactId>
diff --git a/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyNodeMetaData.hbm.xml b/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyNodeMetaData.hbm.xml
deleted file mode 100644
index eeca8f85e666..000000000000
--- a/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyNodeMetaData.hbm.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.sakaiproject.hierarchy.dao.model">
-
-   <class name="org.sakaiproject.hierarchy.dao.model.HierarchyNodeMetaData"
-      table="HIERARCHY_NODE_META">
-
-      <!-- create the primary key id, using native is typically the best way -->
-      <id name="id" type="java.lang.Long" unsaved-value="null">
-         <column name="ID" />
-         <generator class="native">
-            <param name="sequence">HIERARCHY_META_ID_SEQ</param>
-         </generator>
-      </id>
-      <one-to-one name="node"
-         class="org.sakaiproject.hierarchy.dao.model.HierarchyPersistentNode"
-         foreign-key="HIER_NODE_FKC" lazy="false" fetch="join" />
-      <property name="hierarchyId" type="string" length="255" index="HIERARCHY_HID" />
-      <property name="isRootNode" type="java.lang.Boolean" not-null="true" />
-      <property name="ownerId" type="string" length="255" />
-      <property name="title" type="string" length="255" />
-      <property name="description" type="text" />
-      <property name="permToken" type="string" length="255" index="HIERARCHY_PERMTOKEN" />
-	  <property name="isDisabled" type="java.lang.Boolean" not-null="true" />
-   </class>
-</hibernate-mapping>
diff --git a/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyNodePermission.hbm.xml b/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyNodePermission.hbm.xml
deleted file mode 100644
index 14d8be118ad1..000000000000
--- a/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyNodePermission.hbm.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.sakaiproject.hierarchy.dao.model">
-
-    <class name="org.sakaiproject.hierarchy.dao.model.HierarchyNodePermission"
-        table="HIERARCHY_PERMS">
-
-        <!-- create the primary key id, using native is typically the best way -->
-        <id name="id" type="java.lang.Long" unsaved-value="null">
-            <column name="ID" />
-            <generator class="native">
-                <param name="sequence">HIERARCHY_PERM_ID_SEQ</param>
-            </generator>
-        </id>
-        <property name="createdOn" type="java.util.Date" not-null="true" />
-        <property name="lastModified" type="java.util.Date" not-null="true" />
-        <property name="userId" type="string" length="255" not-null="true" index="HIER_PERM_USER" />
-        <property name="nodeId" type="string" length="255" not-null="true" index="HIER_PERM_NODE" />
-        <property name="permission" type="string" length="255" not-null="true" index="HIER_PERM_PERM" />
-    </class>
-</hibernate-mapping>
diff --git a/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyPersistentNode.hbm.xml b/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyPersistentNode.hbm.xml
deleted file mode 100644
index 833769b5c795..000000000000
--- a/hierarchy/api/src/java/org/sakaiproject/hierarchy/dao/oldhbm/HierarchyPersistentNode.hbm.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.sakaiproject.hierarchy.dao.model">
-
-   <class name="org.sakaiproject.hierarchy.dao.model.HierarchyPersistentNode"
-      table="HIERARCHY_NODE">
-
-      <!-- create the primary key id, using native is typically the best way -->
-      <id name="id" type="java.lang.Long" unsaved-value="null">
-         <column name="ID" />
-         <generator class="native">
-            <param name="sequence">HIERARCHY_NODE_ID_SEQ</param>
-         </generator>
-      </id>
-      <property name="directParentIds" type="string" length="2000" />
-      <property name="parentIds" type="string" length="4000" />
-      <property name="directChildIds" type="string" length="2000" />
-      <property name="childIds" type="string" length="4000" />
-   </class>
-</hibernate-mapping>
diff --git a/hierarchy/impl/pom.xml b/hierarchy/impl/pom.xml
index f072e30bed5b..0f4f852b453f 100644
--- a/hierarchy/impl/pom.xml
+++ b/hierarchy/impl/pom.xml
@@ -29,12 +29,6 @@
                     <groupId>org.hibernate</groupId>
                     <artifactId>hibernate-core</artifactId>
                 </dependency>
-                <!-- needed by hibernate unit tests -->
-                <dependency>
-                    <groupId>org.javassist</groupId>
-                    <artifactId>javassist</artifactId>
-                    <scope>test</scope>
-                </dependency>
                 <dependency>
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-core</artifactId>
@@ -106,11 +100,6 @@
             <artifactId>hsqldb</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>javax.transaction</groupId>
             <artifactId>jta</artifactId>
diff --git a/jobscheduler/scheduler-component-shared/pom.xml b/jobscheduler/scheduler-component-shared/pom.xml
index 7d1e65e92eef..a1a91e7d68af 100644
--- a/jobscheduler/scheduler-component-shared/pom.xml
+++ b/jobscheduler/scheduler-component-shared/pom.xml
@@ -80,12 +80,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
         </dependency>
-<!-- needed by hibernate unit tests -->
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
diff --git a/kernel/kernel-impl/pom.xml b/kernel/kernel-impl/pom.xml
index d7b1d348fab4..0fa8b5a3b1d8 100644
--- a/kernel/kernel-impl/pom.xml
+++ b/kernel/kernel-impl/pom.xml
@@ -264,10 +264,6 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-        </dependency>
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
diff --git a/master/pom.xml b/master/pom.xml
index e855265dfe95..bd1a0d9381f0 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -37,8 +37,8 @@
     <sakai.ehcache.artifactId>ehcache-core</sakai.ehcache.artifactId>
     <sakai.ehcache.version>2.6.11</sakai.ehcache.version>
     <sakai.opensearch.version>1.3.8</sakai.opensearch.version>
-    <sakai.hibernate.version>5.3.20.Final</sakai.hibernate.version>
-    <sakai.hikaricp.version>4.0.3</sakai.hikaricp.version>
+    <sakai.hibernate.version>5.6.15.Final</sakai.hibernate.version>
+    <sakai.hikaricp.version>5.0.1</sakai.hikaricp.version>
     <sakai.httpclient.version>4.5.14</sakai.httpclient.version>
     <sakai.httpcore.version>4.4.16</sakai.httpcore.version>
     <sakai.httpmime.version>4.5.14</sakai.httpmime.version>
@@ -891,12 +891,6 @@
         <version>1.0</version>
         <scope>provided</scope>
       </dependency>
-      <dependency>
-        <groupId>org.dom4j</groupId>
-        <artifactId>dom4j</artifactId>
-        <version>2.1.3</version>
-        <scope>provided</scope>
-      </dependency>
       <dependency>
         <groupId>javax.inject</groupId>
         <artifactId>javax.inject</artifactId>
@@ -987,7 +981,7 @@
       <dependency>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy</artifactId>
-        <version>1.11.9</version>
+        <version>1.14.3</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -1048,7 +1042,7 @@
       <dependency>
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging</artifactId>
-        <version>3.4.2.Final</version>
+        <version>3.4.3.Final</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -1060,7 +1054,7 @@
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jandex</artifactId>
-        <version>2.3.0.Final</version>
+        <version>2.4.3.Final</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -1075,12 +1069,6 @@
         <version>2.2</version>
         <scope>provided</scope>
       </dependency>
-      <dependency>
-        <groupId>org.javassist</groupId>
-        <artifactId>javassist</artifactId>
-        <version>3.28.0-GA</version>
-        <scope>provided</scope>
-      </dependency>
       <dependency>
         <groupId>org.hsqldb</groupId>
         <artifactId>hsqldb</artifactId>
diff --git a/polls/impl/pom.xml b/polls/impl/pom.xml
index 9e94742010b4..234493f2dacf 100644
--- a/polls/impl/pom.xml
+++ b/polls/impl/pom.xml
@@ -66,11 +66,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -93,11 +88,6 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
         </dependency>
-        <!-- needed by hibernate unit tests -->
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
diff --git a/reset-pass/account-validator-impl/pom.xml b/reset-pass/account-validator-impl/pom.xml
index edd0728870ba..fb977f593864 100644
--- a/reset-pass/account-validator-impl/pom.xml
+++ b/reset-pass/account-validator-impl/pom.xml
@@ -107,10 +107,6 @@
 			<artifactId>hsqldb</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>javax.transaction</groupId>
 			<artifactId>jta</artifactId>
diff --git a/samigo/samigo-app/pom.xml b/samigo/samigo-app/pom.xml
index 2969a6fcbf13..d4c9e448f1e5 100644
--- a/samigo/samigo-app/pom.xml
+++ b/samigo/samigo-app/pom.xml
@@ -123,10 +123,6 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.dom4j</groupId>
-            <artifactId>dom4j</artifactId>
         </dependency>
 		<dependency>
             <groupId>jakarta.activation</groupId>
diff --git a/samigo/samigo-services/pom.xml b/samigo/samigo-services/pom.xml
index 6f6d2e99deeb..370509d53875 100644
--- a/samigo/samigo-services/pom.xml
+++ b/samigo/samigo-services/pom.xml
@@ -103,11 +103,6 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
         </dependency>
-        <!-- needed by hibernate unit tests -->
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
diff --git a/signup/impl/pom.xml b/signup/impl/pom.xml
index 763ffad7fa78..c1d5bc33ea52 100644
--- a/signup/impl/pom.xml
+++ b/signup/impl/pom.xml
@@ -97,10 +97,6 @@
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.transaction</groupId>
             <artifactId>jta</artifactId>
diff --git a/sitestats/sitestats-impl/pom.xml b/sitestats/sitestats-impl/pom.xml
index 23e22e419f11..feee393f214f 100644
--- a/sitestats/sitestats-impl/pom.xml
+++ b/sitestats/sitestats-impl/pom.xml
@@ -159,12 +159,6 @@
             <artifactId>HikariCP</artifactId>
         </dependency>
 
-        <!-- needed by hibernate unit tests -->
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-        </dependency>
-
         <!-- Apache Commons -->
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -230,11 +224,6 @@
             <artifactId>mysql-connector-j</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>