diff --git a/core-java-modules/core-java-optional/pom.xml b/core-java-modules/core-java-optional/pom.xml
index 68800f67fc..c676827427 100644
--- a/core-java-modules/core-java-optional/pom.xml
+++ b/core-java-modules/core-java-optional/pom.xml
@@ -15,7 +15,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.core.version}</version>
         </dependency>
@@ -53,7 +53,7 @@
     </dependencies>
 
     <properties>
-        <hibernate.core.version>5.4.0.Final</hibernate.core.version>
+        <hibernate.core.version>6.4.2.Final</hibernate.core.version>
         <json-path.version>5.3.2</json-path.version>
     </properties>
 
diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/HandleOptionalTypeExample.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/HandleOptionalTypeExample.java
index a280957a3c..afcee10064 100644
--- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/HandleOptionalTypeExample.java
+++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/HandleOptionalTypeExample.java
@@ -5,7 +5,7 @@ import java.util.Map;
 import java.util.Optional;
 
 public class HandleOptionalTypeExample {
-    static Map<String, User> usersByName = new HashMap();
+    static Map<String, User> usersByName = new HashMap<>();
     static {
         User user1 = new User();
         user1.setUserId(1l);
diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample.java
index a0c182bb7d..2bbfe241f6 100644
--- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample.java
+++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample.java
@@ -2,9 +2,9 @@ package com.baeldung.optionalreturntype;
 
 import java.util.Optional;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 public class PersistOptionalTypeExample {
     static String persistenceUnit = "com.baeldung.optionalreturntype";
diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample2.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample2.java
index 5671266b68..936bc27925 100644
--- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample2.java
+++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample2.java
@@ -1,8 +1,8 @@
 package com.baeldung.optionalreturntype;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 public class PersistOptionalTypeExample2 {
     static String persistenceUnit = "com.baeldung.optionalreturntype";
diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistUserExample.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistUserExample.java
index e26268d8e6..a083f21e77 100644
--- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistUserExample.java
+++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistUserExample.java
@@ -1,8 +1,8 @@
 package com.baeldung.optionalreturntype;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 
 public class PersistUserExample {
     static String persistenceUnit = "com.baeldung.optionalreturntype";
diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/User.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/User.java
index b754b41787..7f0bb476e9 100644
--- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/User.java
+++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/User.java
@@ -2,8 +2,8 @@ package com.baeldung.optionalreturntype;
 
 import java.io.Serializable;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 @Entity
 public class User implements Serializable {
diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptional.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptional.java
index 081553dbe5..bde0dec191 100644
--- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptional.java
+++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptional.java
@@ -3,9 +3,9 @@ package com.baeldung.optionalreturntype;
 import java.io.Serializable;
 import java.util.Optional;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 @Entity
 public class UserOptional implements Serializable {
diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptionalField.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptionalField.java
index e8c16bfa02..788d66e2b9 100644
--- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptionalField.java
+++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptionalField.java
@@ -3,8 +3,8 @@ package com.baeldung.optionalreturntype;
 import java.io.Serializable;
 import java.util.Optional;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 @Entity
 public class UserOptionalField implements Serializable {
diff --git a/persistence-modules/spring-boot-persistence-3/pom.xml b/persistence-modules/spring-boot-persistence-3/pom.xml
index eb0507ca56..0ceefe9a63 100644
--- a/persistence-modules/spring-boot-persistence-3/pom.xml
+++ b/persistence-modules/spring-boot-persistence-3/pom.xml
@@ -61,7 +61,7 @@
 
 
     <properties>
-        <spring.boot.dependencies>3.2.0</spring.boot.dependencies>
+        <spring.boot.dependencies>3.2.2</spring.boot.dependencies>
         <org.slf4j.version>2.0.9</org.slf4j.version>
         <logback.version>1.4.14</logback.version>
     </properties>
diff --git a/persistence-modules/spring-boot-persistence-4/pom.xml b/persistence-modules/spring-boot-persistence-4/pom.xml
index 1452f5ad66..223b754f07 100644
--- a/persistence-modules/spring-boot-persistence-4/pom.xml
+++ b/persistence-modules/spring-boot-persistence-4/pom.xml
@@ -69,7 +69,7 @@
     </build>
 
     <properties>
-        <spring.boot.dependencies>3.1.0</spring.boot.dependencies>
+        <spring.boot.dependencies>3.2.2</spring.boot.dependencies>
         <junit-jupiter.version>5.9.3</junit-jupiter.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
diff --git a/persistence-modules/spring-boot-persistence-h2/pom.xml b/persistence-modules/spring-boot-persistence-h2/pom.xml
index 3c4bf888b3..8db600f273 100644
--- a/persistence-modules/spring-boot-persistence-h2/pom.xml
+++ b/persistence-modules/spring-boot-persistence-h2/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>6.3.1.Final</version>
+            <version>${hibernate.core.version}</version>
         </dependency>
     </dependencies>
 
@@ -57,6 +57,7 @@
         <!-- The main class to start by executing java -jar -->
         <start-class>com.baeldung.h2db.demo.server.SpringBootApp</start-class>
         <db-util.version>1.0.7</db-util.version>
+        <hibernate.core.version>6.4.2.Final</hibernate.core.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-hibernate-6/pom.xml b/persistence-modules/spring-hibernate-6/pom.xml
index 3cd69a963e..e096fc421a 100644
--- a/persistence-modules/spring-hibernate-6/pom.xml
+++ b/persistence-modules/spring-hibernate-6/pom.xml
@@ -101,7 +101,7 @@
         <org.springframework.data.version>3.1.3</org.springframework.data.version>
         <org.springframework.security.version>6.1.3</org.springframework.security.version>
         <!-- persistence -->
-        <hibernate.version>6.2.8.Final</hibernate.version>
+        <hibernate.version>6.4.2.Final</hibernate.version>
         <mysql-connector-java.version>8.2.0</mysql-connector-java.version>
         <tomcat-dbcp.version>9.0.80</tomcat-dbcp.version>
     </properties>