diff --git a/pom.xml b/pom.xml
index f74e056..9479aeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.5.RELEASE</version>
+        <version>3.0.0-M3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>guru.springframework</groupId>
@@ -17,11 +17,11 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <jaxb.version>2.3.0</jaxb.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <org.mapstruct.version>1.3.0.Final</org.mapstruct.version>
+        <org.mapstruct.version>1.5.2.Final</org.mapstruct.version>
     </properties>
 
     <dependencies>
@@ -33,6 +33,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -123,5 +127,24 @@
             </plugin>
         </plugins>
     </build>
-
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
 </project>
diff --git a/src/main/java/guru/springframework/sfgrestdocsexample/domain/Beer.java b/src/main/java/guru/springframework/sfgrestdocsexample/domain/Beer.java
index 7e8f36c..ed9d542 100644
--- a/src/main/java/guru/springframework/sfgrestdocsexample/domain/Beer.java
+++ b/src/main/java/guru/springframework/sfgrestdocsexample/domain/Beer.java
@@ -1,11 +1,12 @@
 package guru.springframework.sfgrestdocsexample.domain;
 
+import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.UpdateTimestamp;
 
-import javax.persistence.*;
+
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.util.UUID;
diff --git a/src/main/java/guru/springframework/sfgrestdocsexample/repositories/BeerRepository.java b/src/main/java/guru/springframework/sfgrestdocsexample/repositories/BeerRepository.java
index 0bdfe85..c98ce37 100644
--- a/src/main/java/guru/springframework/sfgrestdocsexample/repositories/BeerRepository.java
+++ b/src/main/java/guru/springframework/sfgrestdocsexample/repositories/BeerRepository.java
@@ -1,6 +1,7 @@
 package guru.springframework.sfgrestdocsexample.repositories;
 
 import guru.springframework.sfgrestdocsexample.domain.Beer;
+import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 import java.util.UUID;
@@ -8,5 +9,5 @@ import java.util.UUID;
 /**
  * Created by jt on 2019-05-17.
  */
-public interface BeerRepository extends PagingAndSortingRepository<Beer, UUID> {
+public interface BeerRepository extends PagingAndSortingRepository<Beer, UUID>, CrudRepository<Beer, UUID> {
 }
diff --git a/src/main/java/guru/springframework/sfgrestdocsexample/web/controller/BeerController.java b/src/main/java/guru/springframework/sfgrestdocsexample/web/controller/BeerController.java
index 9f8d1e3..6ecff29 100644
--- a/src/main/java/guru/springframework/sfgrestdocsexample/web/controller/BeerController.java
+++ b/src/main/java/guru/springframework/sfgrestdocsexample/web/controller/BeerController.java
@@ -25,6 +25,7 @@ public class BeerController {
     @GetMapping("/{beerId}")
     public ResponseEntity<BeerDto> getBeerById(@PathVariable("beerId") UUID beerId){
 
+
         return new ResponseEntity<>(beerMapper.BeerToBeerDto(beerRepository.findById(beerId).get()), HttpStatus.OK);
     }
 
diff --git a/src/main/java/guru/springframework/sfgrestdocsexample/web/controller/MvcExceptionHandler.java b/src/main/java/guru/springframework/sfgrestdocsexample/web/controller/MvcExceptionHandler.java
index 99b8184..93922d4 100644
--- a/src/main/java/guru/springframework/sfgrestdocsexample/web/controller/MvcExceptionHandler.java
+++ b/src/main/java/guru/springframework/sfgrestdocsexample/web/controller/MvcExceptionHandler.java
@@ -1,11 +1,11 @@
 package guru.springframework.sfgrestdocsexample.web.controller;
 
+import jakarta.validation.ConstraintViolationException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 
-import javax.validation.ConstraintViolationException;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/main/java/guru/springframework/sfgrestdocsexample/web/model/BeerDto.java b/src/main/java/guru/springframework/sfgrestdocsexample/web/model/BeerDto.java
index d2f1eac..0c6dc94 100644
--- a/src/main/java/guru/springframework/sfgrestdocsexample/web/model/BeerDto.java
+++ b/src/main/java/guru/springframework/sfgrestdocsexample/web/model/BeerDto.java
@@ -5,10 +5,10 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-import javax.validation.constraints.Positive;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Null;
+import jakarta.validation.constraints.Positive;
 import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import java.util.UUID;