diff --git a/pom.xml b/pom.xml
index 9e3a329fa48d92cbd2e847a50cba584446415c70..15de26b066151111893f34fa62e2c79d7148f4e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,14 +8,14 @@
 	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>15</maven.compiler.source>
-		<maven.compiler.target>15</maven.compiler.target>
-		<maven.compiler.version>3.8.1</maven.compiler.version>
-		<javafx.version>15.0.1</javafx.version>
-		<junit.version>5.7.1</junit.version>
-		<log4j.version>2.14.1</log4j.version>
-		<lombok.version>1.18.20</lombok.version>
-		<hibernate.version>5.4.30.Final</hibernate.version>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
+		<maven.compiler.version>3.11.0</maven.compiler.version>
+		<javafx.version>17.0.2</javafx.version>
+		<junit.version>5.9.2</junit.version>
+		<log4j.version>2.20.0</log4j.version>
+		<lombok.version>1.18.26</lombok.version>
+		<hibernate.version>6.1.7.Final</hibernate.version>
 		<derby.version>10.15.2.0</derby.version>
 	</properties>
 	<dependencies>
@@ -125,7 +125,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.3.0</version>
 				<configuration>
 					<sources>
 						<source>target/generated-sources/annotations</source>
diff --git a/src/main/java/koz01/java2/lab10/BaseEntity.java b/src/main/java/koz01/java2/lab10/BaseEntity.java
index 176191a49ddead30d5c4611e08870735ac451bf1..d7afffe1791ce863db29f658a3002312b811a801 100644
--- a/src/main/java/koz01/java2/lab10/BaseEntity.java
+++ b/src/main/java/koz01/java2/lab10/BaseEntity.java
@@ -2,11 +2,10 @@ package koz01.java2.lab10;
 
 import java.io.Serializable;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
diff --git a/src/main/java/koz01/java2/lab10/Clas.java b/src/main/java/koz01/java2/lab10/Clas.java
index 660d6f398bd9ff1f437897e852ea4e70d04f7173..6c0e5515493432d65e1f85f97532c6569d6df28c 100644
--- a/src/main/java/koz01/java2/lab10/Clas.java
+++ b/src/main/java/koz01/java2/lab10/Clas.java
@@ -2,9 +2,8 @@ package koz01.java2.lab10;
 
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.Transient;
-
+import jakarta.persistence.Entity;
+import jakarta.persistence.Transient;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/koz01/java2/lab10/Department.java b/src/main/java/koz01/java2/lab10/Department.java
index 8ab9522c788c397cce714224efa2835b264ba5a6..ab1b47ead87b8c8a2ae15ee0b9e41116af13ede5 100644
--- a/src/main/java/koz01/java2/lab10/Department.java
+++ b/src/main/java/koz01/java2/lab10/Department.java
@@ -2,9 +2,8 @@ package koz01.java2.lab10;
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.Transient;
-
+import jakarta.persistence.Entity;
+import jakarta.persistence.Transient;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/koz01/java2/lab10/Employee.java b/src/main/java/koz01/java2/lab10/Employee.java
index b4b98dfa0b35a3cf6c2af02d8c5fdd7c9ce6d6af..4d9be7cc35e5399ab1a949c8864ed1113bb318e3 100644
--- a/src/main/java/koz01/java2/lab10/Employee.java
+++ b/src/main/java/koz01/java2/lab10/Employee.java
@@ -1,8 +1,7 @@
 package koz01.java2.lab10;
 
-import javax.persistence.Entity;
-import javax.persistence.Transient;
-
+import jakarta.persistence.Entity;
+import jakarta.persistence.Transient;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/koz01/java2/lab10/NonTeachingStaff.java b/src/main/java/koz01/java2/lab10/NonTeachingStaff.java
index 59b164a093a8b8cfb44417e01b5cc233a4083d68..c2f216f5d1248bac9435be2be5601e60a85d45e0 100644
--- a/src/main/java/koz01/java2/lab10/NonTeachingStaff.java
+++ b/src/main/java/koz01/java2/lab10/NonTeachingStaff.java
@@ -1,7 +1,6 @@
 package koz01.java2.lab10;
 
-import javax.persistence.Entity;
-
+import jakarta.persistence.Entity;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
diff --git a/src/main/java/koz01/java2/lab10/Staff.java b/src/main/java/koz01/java2/lab10/Staff.java
index 6f09a62943a09c3d44b4b9e1bf0c4f0e8a270c52..e2a4540626210e7fb0f001fa10b26945b38ac501 100644
--- a/src/main/java/koz01/java2/lab10/Staff.java
+++ b/src/main/java/koz01/java2/lab10/Staff.java
@@ -1,7 +1,6 @@
 package koz01.java2.lab10;
 
-import javax.persistence.Entity;
-
+import jakarta.persistence.Entity;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
diff --git a/src/main/java/koz01/java2/lab10/Teacher.java b/src/main/java/koz01/java2/lab10/Teacher.java
index d2b11e5af9e3a67fb8a70d19d712ba97e1783c9c..de64c87886ff9e564d5a670b3ef91d78bffab8c5 100644
--- a/src/main/java/koz01/java2/lab10/Teacher.java
+++ b/src/main/java/koz01/java2/lab10/Teacher.java
@@ -3,9 +3,8 @@ package koz01.java2.lab10;
 
 import java.util.Set;
 
-import javax.persistence.Entity;
-import javax.persistence.Transient;
-
+import jakarta.persistence.Entity;
+import jakarta.persistence.Transient;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/koz01/java2/lab10/TeachingStaff.java b/src/main/java/koz01/java2/lab10/TeachingStaff.java
index 7900ce4ab8eda147d5aa3fba18f7223524422053..9083e2bbbedb3644d74f1024bb3088329cbb2221 100644
--- a/src/main/java/koz01/java2/lab10/TeachingStaff.java
+++ b/src/main/java/koz01/java2/lab10/TeachingStaff.java
@@ -1,7 +1,6 @@
 package koz01.java2.lab10;
 
-import javax.persistence.Entity;
-
+import jakarta.persistence.Entity;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 894207c032f8b6f8e7b45d73a632302649435e9d..a893be8b1ff5585d29d17c7565affb09d9f38492 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 module koz01.java2.lab10 {
-		requires java.persistence;
+		requires jakarta.persistence;
 		requires lombok;
 		requires java.sql;
 		requires org.hibernate.orm.core;
diff --git a/src/test/java/koz01/java2/lab10/DemoJPA.java b/src/test/java/koz01/java2/lab10/DemoJPA.java
index deea5f3af9ff805860624ddfbeaaa398ac0cfd37..66d5e9ec4274670f34d0efbf62d8cec9fa3abeb9 100644
--- a/src/test/java/koz01/java2/lab10/DemoJPA.java
+++ b/src/test/java/koz01/java2/lab10/DemoJPA.java
@@ -6,15 +6,14 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
-
 import org.junit.jupiter.api.Test;
 
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2