From 73fd55fe0c443ad7f4a22fcc1a39c33c8eb779ae Mon Sep 17 00:00:00 2001
From: anthorob <anthorob@xtremmail.com>
Date: Sat, 9 Mar 2024 22:09:54 -0500
Subject: [PATCH] Update Hibernate to 6.x

---
 pom.xml                                                    | 4 ++--
 src/main/java/netneutrality/core/SessionManager.java       | 2 +-
 src/main/java/netneutrality/db/entities/OBlacklist.java    | 2 +-
 src/main/java/netneutrality/db/entities/OGuild.java        | 2 +-
 src/main/java/netneutrality/db/entities/OGuildSetting.java | 2 +-
 src/main/java/netneutrality/db/entities/OLogMessage.java   | 2 +-
 src/main/java/netneutrality/db/entities/OLogging.java      | 2 +-
 src/main/java/netneutrality/db/entities/OLoggingId.java    | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae0bfa9..f1e551d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,12 +130,12 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>5.6.5.Final</version>
+            <version>6.1.7.Final</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-hikaricp</artifactId>
-            <version>5.6.5.Final</version>
+            <version>6.1.7.Final</version>
         </dependency>
         <dependency>
             <groupId>io.sentry</groupId>
diff --git a/src/main/java/netneutrality/core/SessionManager.java b/src/main/java/netneutrality/core/SessionManager.java
index 249f459..f338703 100644
--- a/src/main/java/netneutrality/core/SessionManager.java
+++ b/src/main/java/netneutrality/core/SessionManager.java
@@ -29,7 +29,7 @@ public class SessionManager {
         if (sessionFactory == null) {
             try {
                 StandardServiceRegistryBuilder registryBuilder = new StandardServiceRegistryBuilder().configure();
-                Map<String, String> settings = new HashMap<>();
+                Map<String, Object> settings = new HashMap<>();
                 String dbName = Settings.getInstance().get("MYSQL_DATABASE", "netneutrality");
                 String dbUser = Settings.getInstance().get("MYSQL_USER", "root");
                 String dbPass = Settings.getInstance().get("MYSQL_PASSWORD", "");
diff --git a/src/main/java/netneutrality/db/entities/OBlacklist.java b/src/main/java/netneutrality/db/entities/OBlacklist.java
index 36c4715..d8f0228 100644
--- a/src/main/java/netneutrality/db/entities/OBlacklist.java
+++ b/src/main/java/netneutrality/db/entities/OBlacklist.java
@@ -7,7 +7,7 @@ package netneutrality.db.entities;
  * https://discord.gg/CdFcyQ
  */
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table(name = "blacklist")
diff --git a/src/main/java/netneutrality/db/entities/OGuild.java b/src/main/java/netneutrality/db/entities/OGuild.java
index c7d4659..1be8b89 100644
--- a/src/main/java/netneutrality/db/entities/OGuild.java
+++ b/src/main/java/netneutrality/db/entities/OGuild.java
@@ -7,7 +7,7 @@ package netneutrality.db.entities;
  * https://discord.gg/CdFcyQ
  */
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.LinkedHashSet;
 import java.util.Optional;
 import java.util.Set;
diff --git a/src/main/java/netneutrality/db/entities/OGuildSetting.java b/src/main/java/netneutrality/db/entities/OGuildSetting.java
index b2704ca..5116aae 100644
--- a/src/main/java/netneutrality/db/entities/OGuildSetting.java
+++ b/src/main/java/netneutrality/db/entities/OGuildSetting.java
@@ -7,7 +7,7 @@ package netneutrality.db.entities;
  * https://discord.gg/CdFcyQ
  */
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table(name = "guild_settings")
diff --git a/src/main/java/netneutrality/db/entities/OLogMessage.java b/src/main/java/netneutrality/db/entities/OLogMessage.java
index cc5ccee..dc0da9f 100644
--- a/src/main/java/netneutrality/db/entities/OLogMessage.java
+++ b/src/main/java/netneutrality/db/entities/OLogMessage.java
@@ -7,7 +7,7 @@ package netneutrality.db.entities;
  * https://discord.gg/CdFcyQ
  */
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.Instant;
 
 @Entity
diff --git a/src/main/java/netneutrality/db/entities/OLogging.java b/src/main/java/netneutrality/db/entities/OLogging.java
index ed1b470..a690912 100644
--- a/src/main/java/netneutrality/db/entities/OLogging.java
+++ b/src/main/java/netneutrality/db/entities/OLogging.java
@@ -7,7 +7,7 @@ package netneutrality.db.entities;
  * https://discord.gg/CdFcyQ
  */
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table(name = "logging")
diff --git a/src/main/java/netneutrality/db/entities/OLoggingId.java b/src/main/java/netneutrality/db/entities/OLoggingId.java
index d3eafa2..f32f9bb 100644
--- a/src/main/java/netneutrality/db/entities/OLoggingId.java
+++ b/src/main/java/netneutrality/db/entities/OLoggingId.java
@@ -9,8 +9,8 @@ package netneutrality.db.entities;
 
 import org.hibernate.Hibernate;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Objects;