diff --git a/2023-01/spring-13-data-jpa/demo/pom.xml b/2023-01/spring-13-data-jpa/demo/pom.xml
index 6decee96..f46c275d 100644
--- a/2023-01/spring-13-data-jpa/demo/pom.xml
+++ b/2023-01/spring-13-data-jpa/demo/pom.xml
@@ -11,13 +11,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.8</version>
+        <version>3.0.4</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
diff --git a/2023-01/spring-13-data-jpa/demo/src/main/java/ru/otus/springdata/domain/Email.java b/2023-01/spring-13-data-jpa/demo/src/main/java/ru/otus/springdata/domain/Email.java
index e3b8d344..bf40bee2 100644
--- a/2023-01/spring-13-data-jpa/demo/src/main/java/ru/otus/springdata/domain/Email.java
+++ b/2023-01/spring-13-data-jpa/demo/src/main/java/ru/otus/springdata/domain/Email.java
@@ -1,14 +1,13 @@
 package ru.otus.springdata.domain;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/2023-01/spring-13-data-jpa/demo/src/main/java/ru/otus/springdata/domain/Person.java b/2023-01/spring-13-data-jpa/demo/src/main/java/ru/otus/springdata/domain/Person.java
index e24e42aa..499cd632 100644
--- a/2023-01/spring-13-data-jpa/demo/src/main/java/ru/otus/springdata/domain/Person.java
+++ b/2023-01/spring-13-data-jpa/demo/src/main/java/ru/otus/springdata/domain/Person.java
@@ -1,11 +1,15 @@
 package ru.otus.springdata.domain;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/2023-01/spring-13-data-jpa/exercise/pom.xml b/2023-01/spring-13-data-jpa/exercise/pom.xml
index 46d446db..76e6c937 100644
--- a/2023-01/spring-13-data-jpa/exercise/pom.xml
+++ b/2023-01/spring-13-data-jpa/exercise/pom.xml
@@ -11,13 +11,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.8</version>
+        <version>3.0.4</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
diff --git a/2023-01/spring-13-data-jpa/exercise/src/main/java/ru/otus/springdata/domain/Person.java b/2023-01/spring-13-data-jpa/exercise/src/main/java/ru/otus/springdata/domain/Person.java
index cc8e6d0a..b087adca 100644
--- a/2023-01/spring-13-data-jpa/exercise/src/main/java/ru/otus/springdata/domain/Person.java
+++ b/2023-01/spring-13-data-jpa/exercise/src/main/java/ru/otus/springdata/domain/Person.java
@@ -1,14 +1,13 @@
 package ru.otus.springdata.domain;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/2023-01/spring-13-data-jpa/solution-01/pom.xml b/2023-01/spring-13-data-jpa/solution-01/pom.xml
index d89e13de..824be4f7 100644
--- a/2023-01/spring-13-data-jpa/solution-01/pom.xml
+++ b/2023-01/spring-13-data-jpa/solution-01/pom.xml
@@ -11,13 +11,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.8</version>
+        <version>3.0.4</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
diff --git a/2023-01/spring-13-data-jpa/solution-01/src/main/java/ru/otus/springdata/domain/Email.java b/2023-01/spring-13-data-jpa/solution-01/src/main/java/ru/otus/springdata/domain/Email.java
index 3f0bd00c..918f052a 100644
--- a/2023-01/spring-13-data-jpa/solution-01/src/main/java/ru/otus/springdata/domain/Email.java
+++ b/2023-01/spring-13-data-jpa/solution-01/src/main/java/ru/otus/springdata/domain/Email.java
@@ -4,10 +4,10 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Data
 @NoArgsConstructor
diff --git a/2023-01/spring-13-data-jpa/solution-01/src/main/java/ru/otus/springdata/domain/Person.java b/2023-01/spring-13-data-jpa/solution-01/src/main/java/ru/otus/springdata/domain/Person.java
index 96d92b91..e5905f85 100644
--- a/2023-01/spring-13-data-jpa/solution-01/src/main/java/ru/otus/springdata/domain/Person.java
+++ b/2023-01/spring-13-data-jpa/solution-01/src/main/java/ru/otus/springdata/domain/Person.java
@@ -1,11 +1,13 @@
 package ru.otus.springdata.domain;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/2023-01/spring-13-data-jpa/solution-02/pom.xml b/2023-01/spring-13-data-jpa/solution-02/pom.xml
index 7a32f631..e363f891 100644
--- a/2023-01/spring-13-data-jpa/solution-02/pom.xml
+++ b/2023-01/spring-13-data-jpa/solution-02/pom.xml
@@ -11,13 +11,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.8</version>
+        <version>3.0.4</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
diff --git a/2023-01/spring-13-data-jpa/solution-02/src/main/java/ru/otus/springdata/domain/Email.java b/2023-01/spring-13-data-jpa/solution-02/src/main/java/ru/otus/springdata/domain/Email.java
index e3b8d344..bea8c7a5 100644
--- a/2023-01/spring-13-data-jpa/solution-02/src/main/java/ru/otus/springdata/domain/Email.java
+++ b/2023-01/spring-13-data-jpa/solution-02/src/main/java/ru/otus/springdata/domain/Email.java
@@ -4,10 +4,10 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Data
 @NoArgsConstructor
diff --git a/2023-01/spring-13-data-jpa/solution-02/src/main/java/ru/otus/springdata/domain/Person.java b/2023-01/spring-13-data-jpa/solution-02/src/main/java/ru/otus/springdata/domain/Person.java
index 96d92b91..e5905f85 100644
--- a/2023-01/spring-13-data-jpa/solution-02/src/main/java/ru/otus/springdata/domain/Person.java
+++ b/2023-01/spring-13-data-jpa/solution-02/src/main/java/ru/otus/springdata/domain/Person.java
@@ -1,11 +1,13 @@
 package ru.otus.springdata.domain;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/2023-01/spring-13-data-jpa/solution-03/pom.xml b/2023-01/spring-13-data-jpa/solution-03/pom.xml
index 4a9a6008..2b9c22c4 100644
--- a/2023-01/spring-13-data-jpa/solution-03/pom.xml
+++ b/2023-01/spring-13-data-jpa/solution-03/pom.xml
@@ -11,13 +11,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.8</version>
+        <version>3.0.4</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
diff --git a/2023-01/spring-13-data-jpa/solution-03/src/main/java/ru/otus/springdata/domain/Email.java b/2023-01/spring-13-data-jpa/solution-03/src/main/java/ru/otus/springdata/domain/Email.java
index e3b8d344..bf40bee2 100644
--- a/2023-01/spring-13-data-jpa/solution-03/src/main/java/ru/otus/springdata/domain/Email.java
+++ b/2023-01/spring-13-data-jpa/solution-03/src/main/java/ru/otus/springdata/domain/Email.java
@@ -1,14 +1,13 @@
 package ru.otus.springdata.domain;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/2023-01/spring-13-data-jpa/solution-03/src/main/java/ru/otus/springdata/domain/Person.java b/2023-01/spring-13-data-jpa/solution-03/src/main/java/ru/otus/springdata/domain/Person.java
index e24e42aa..499cd632 100644
--- a/2023-01/spring-13-data-jpa/solution-03/src/main/java/ru/otus/springdata/domain/Person.java
+++ b/2023-01/spring-13-data-jpa/solution-03/src/main/java/ru/otus/springdata/domain/Person.java
@@ -1,11 +1,15 @@
 package ru.otus.springdata.domain;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/2023-01/spring-13-data-jpa/solution-04/pom.xml b/2023-01/spring-13-data-jpa/solution-04/pom.xml
index a7e1de42..60280f24 100644
--- a/2023-01/spring-13-data-jpa/solution-04/pom.xml
+++ b/2023-01/spring-13-data-jpa/solution-04/pom.xml
@@ -11,13 +11,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.8</version>
+        <version>3.0.4</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
diff --git a/2023-01/spring-13-data-jpa/solution-04/src/main/java/ru/otus/springdata/domain/Email.java b/2023-01/spring-13-data-jpa/solution-04/src/main/java/ru/otus/springdata/domain/Email.java
index e3b8d344..bf40bee2 100644
--- a/2023-01/spring-13-data-jpa/solution-04/src/main/java/ru/otus/springdata/domain/Email.java
+++ b/2023-01/spring-13-data-jpa/solution-04/src/main/java/ru/otus/springdata/domain/Email.java
@@ -1,14 +1,13 @@
 package ru.otus.springdata.domain;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/2023-01/spring-13-data-jpa/solution-04/src/main/java/ru/otus/springdata/domain/Person.java b/2023-01/spring-13-data-jpa/solution-04/src/main/java/ru/otus/springdata/domain/Person.java
index e24e42aa..499cd632 100644
--- a/2023-01/spring-13-data-jpa/solution-04/src/main/java/ru/otus/springdata/domain/Person.java
+++ b/2023-01/spring-13-data-jpa/solution-04/src/main/java/ru/otus/springdata/domain/Person.java
@@ -1,11 +1,15 @@
 package ru.otus.springdata.domain;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.*;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor