From 7ad9276235264669d1aa84a48c1ee19b365189ac Mon Sep 17 00:00:00 2001
From: Chandra Guntur <chandra.guntur@bnymellon.com>
Date: Wed, 10 May 2023 13:55:59 -0400
Subject: [PATCH] Spring Framework Kata update to Spring 6.0.8 and Java 17.
 Associated changes to dependencies and imports.

---
 .github/workflows/maven.yml                   |  2 +-
 spring-framework/README.adoc                  |  4 +-
 .../ch01_spring-inversion-of-control/pom.xml  | 13 +---
 .../ch02_spring-dependency-injection/pom.xml  | 13 +---
 spring-framework/ch03_spring-testing/pom.xml  | 14 +---
 .../ch04_spring-persistence/pom.xml           | 13 +---
 .../ch05_spring-hibernate/pom.xml             | 26 +++----
 .../spring/framework/model/ColoredShape.java  | 12 ++--
 spring-framework/ch06_spring-jpa/pom.xml      | 28 +++-----
 .../framework/config/HibernateJPAConfig.java  |  2 +-
 .../framework/dao/ColoredShapeDaoImpl.java    |  4 +-
 .../spring/framework/model/ColoredShape.java  | 12 ++--
 spring-framework/ch07_spring-data-jpa/pom.xml | 32 ++++-----
 .../framework/config/HibernateJPAConfig.java  |  2 +-
 .../spring/framework/model/ColoredShape.java  | 12 ++--
 .../service/ColoredShapeServiceImpl.java      |  6 +-
 spring-framework/ch08_spring-rest/pom.xml     | 36 ++--------
 .../framework/config/HibernateJPAConfig.java  |  2 +-
 .../spring/framework/model/ColoredShape.java  | 12 ++--
 .../service/ColoredShapeServiceImpl.java      |  6 +-
 spring-framework/pom.xml                      | 67 ++++++++++++-------
 21 files changed, 127 insertions(+), 191 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 5ca4e19..d4e9d71 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         # os: [macos-latest, ubuntu-latest, windows-latest]
         os: [ubuntu-latest]
-        java-version: [11, 16, 17]
+        java-version: [17]
 
     runs-on: ${{ matrix.os }}
 
diff --git a/spring-framework/README.adoc b/spring-framework/README.adoc
index ea2750c..14b0f87 100644
--- a/spring-framework/README.adoc
+++ b/spring-framework/README.adoc
@@ -37,9 +37,9 @@ The project can be loaded into an IDE as a single structure.
 
 === Project pre-requisites
 
-1. JDK 11
+1. JDK 17
 2. A modern IDE (IntelliJ IDEA or Eclipse or Netbeans)
-3. Apache Maven v3.6.3 or above
+3. Apache Maven v3.8.6 or above
 
 === Project tree
 
diff --git a/spring-framework/ch01_spring-inversion-of-control/pom.xml b/spring-framework/ch01_spring-inversion-of-control/pom.xml
index 74f2b13..3021773 100644
--- a/spring-framework/ch01_spring-inversion-of-control/pom.xml
+++ b/spring-framework/ch01_spring-inversion-of-control/pom.xml
@@ -24,10 +24,9 @@
     <parent>
         <groupId>bnymellon.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
     <artifactId>ch01_spring-inversion-of-control</artifactId>
-    <version>1.0.0</version>
 
     <!-- Instruction to hint that we are producing a jar file -->
     <packaging>jar</packaging>
@@ -35,16 +34,6 @@
     <name>Spring Framework - Inversion of Control</name>
     <description>Understanding Spring Inversion of Control</description>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <!-- The properties below ensure that the code is picked up and compiled as Java 11 -->
-        <java.version>11</java.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
 
diff --git a/spring-framework/ch02_spring-dependency-injection/pom.xml b/spring-framework/ch02_spring-dependency-injection/pom.xml
index f84a8e9..7263d95 100644
--- a/spring-framework/ch02_spring-dependency-injection/pom.xml
+++ b/spring-framework/ch02_spring-dependency-injection/pom.xml
@@ -23,10 +23,9 @@
     <parent>
         <groupId>bnymellon.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
     <artifactId>ch02_spring-dependency-injection</artifactId>
-    <version>1.0.0</version>
 
     <!-- Instruction to hint that we are producing a jar file -->
     <packaging>jar</packaging>
@@ -34,16 +33,6 @@
     <name>Spring Framework - Dependency Injection</name>
     <description>Understanding Spring Dependency Injection</description>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <!-- The properties below ensure that the code is picked up and compiled as Java 11 -->
-        <java.version>11</java.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
 
diff --git a/spring-framework/ch03_spring-testing/pom.xml b/spring-framework/ch03_spring-testing/pom.xml
index 1f38ab6..09f6fba 100644
--- a/spring-framework/ch03_spring-testing/pom.xml
+++ b/spring-framework/ch03_spring-testing/pom.xml
@@ -23,10 +23,10 @@
     <parent>
         <groupId>bnymellon.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
     <artifactId>ch03_spring-testing</artifactId>
-    <version>1.0.0</version>
+    <version>2.0.0</version>
 
     <!-- Instruction to hint that we are producing a jar file -->
     <packaging>jar</packaging>
@@ -34,16 +34,6 @@
     <name>Spring Framework - Testing</name>
     <description>Testing with Spring</description>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <!-- The properties below ensure that the code is picked up and compiled as Java 11 -->
-        <java.version>11</java.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
 
diff --git a/spring-framework/ch04_spring-persistence/pom.xml b/spring-framework/ch04_spring-persistence/pom.xml
index 6c11196..82b1128 100644
--- a/spring-framework/ch04_spring-persistence/pom.xml
+++ b/spring-framework/ch04_spring-persistence/pom.xml
@@ -23,10 +23,9 @@
     <parent>
         <groupId>bnymellon.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
     <artifactId>ch04_spring-persistence</artifactId>
-    <version>1.0.0</version>
 
     <!-- Instruction to hint that we are producing a jar file -->
     <packaging>jar</packaging>
@@ -34,16 +33,6 @@
     <name>Spring Framework - Persistence (JDBC)</name>
     <description>Database Persistence with Spring</description>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <!-- The properties below ensure that the code is picked up and compiled as Java 11 -->
-        <java.version>11</java.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
 
diff --git a/spring-framework/ch05_spring-hibernate/pom.xml b/spring-framework/ch05_spring-hibernate/pom.xml
index 61b4ece..7c824da 100644
--- a/spring-framework/ch05_spring-hibernate/pom.xml
+++ b/spring-framework/ch05_spring-hibernate/pom.xml
@@ -23,10 +23,9 @@
     <parent>
         <groupId>bnymellon.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
     <artifactId>ch05_spring-hibernate</artifactId>
-    <version>1.0.0</version>
 
     <!-- Instruction to hint that we are producing a jar file -->
     <packaging>jar</packaging>
@@ -34,16 +33,6 @@
     <name>Spring Framework - Persistence (Hibernate)</name>
     <description>Database Persistence with Spring and Hibernate</description>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <!-- The properties below ensure that the code is picked up and compiled as Java 11 -->
-        <java.version>11</java.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
 
@@ -80,6 +69,11 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
@@ -91,13 +85,13 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${jaxb-api.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
diff --git a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java b/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
index 9d64f92..8d432ce 100644
--- a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
+++ b/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
@@ -17,12 +17,12 @@
 package bnymellon.training.spring.framework.model;
 
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 @Entity
diff --git a/spring-framework/ch06_spring-jpa/pom.xml b/spring-framework/ch06_spring-jpa/pom.xml
index 14c8695..4370589 100644
--- a/spring-framework/ch06_spring-jpa/pom.xml
+++ b/spring-framework/ch06_spring-jpa/pom.xml
@@ -23,10 +23,9 @@
     <parent>
         <groupId>bnymellon.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
     <artifactId>ch06_spring-jpa</artifactId>
-    <version>1.0.0</version>
 
     <!-- Instruction to hint that we are producing a jar file -->
     <packaging>jar</packaging>
@@ -34,16 +33,6 @@
     <name>Spring Framework - Persistence (JPA)</name>
     <description>Database Persistence with Spring JPA</description>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <!-- The properties below ensure that the code is picked up and compiled as Java 11 -->
-        <java.version>11</java.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
 
@@ -91,13 +80,18 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${jaxb-api.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
@@ -105,7 +99,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>${hibernate.version}</version>
+            <version>5.6.15.Final</version>
         </dependency>
 
         <!-- H2 DB -->
diff --git a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java b/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java
index 4ce5866..5850a3f 100644
--- a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java
+++ b/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java
@@ -16,7 +16,7 @@
 
 package bnymellon.training.spring.framework.config;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 import java.util.Properties;
 
diff --git a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImpl.java b/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImpl.java
index 94c3a4f..346a394 100644
--- a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImpl.java
+++ b/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImpl.java
@@ -16,8 +16,8 @@
 
 package bnymellon.training.spring.framework.dao;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Propagation;
diff --git a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java b/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
index 3f5787e..5e4b466 100644
--- a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
+++ b/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
@@ -16,12 +16,12 @@
 
 package bnymellon.training.spring.framework.model;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 @Entity
diff --git a/spring-framework/ch07_spring-data-jpa/pom.xml b/spring-framework/ch07_spring-data-jpa/pom.xml
index f0933a0..745849d 100644
--- a/spring-framework/ch07_spring-data-jpa/pom.xml
+++ b/spring-framework/ch07_spring-data-jpa/pom.xml
@@ -23,10 +23,9 @@
     <parent>
         <groupId>bnymellon.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
     <artifactId>ch07_spring-data-jpa</artifactId>
-    <version>1.0.0</version>
 
     <!-- Instruction to hint that we are producing a jar file -->
     <packaging>jar</packaging>
@@ -34,18 +33,6 @@
     <name>Spring Framework - Persistence (Spring Data JPA)</name>
     <description>Database Persistence with Spring Data JPA</description>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <!-- The properties below ensure that the code is picked up and compiled as Java 11 -->
-        <java.version>11</java.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-
-        <spring-data-jpa.version>1.10.6.RELEASE</spring-data-jpa.version>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
 
@@ -79,7 +66,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
-            <version>${spring-data-jpa.version}</version>
+            <version>${spring-data.jpa}</version>
         </dependency>
 
         <dependency>
@@ -93,13 +80,18 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${jaxb-api.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
@@ -107,7 +99,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>${hibernate.version}</version>
+            <version>5.6.15.Final</version>
         </dependency>
 
         <!-- H2 DB -->
diff --git a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java b/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java
index f194d91..2bda2a1 100644
--- a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java
+++ b/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java
@@ -16,7 +16,7 @@
 
 package bnymellon.training.spring.framework.config;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 import java.util.Properties;
 
diff --git a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java b/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
index 1e95216..6d1a16b 100644
--- a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
+++ b/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
@@ -17,12 +17,12 @@
 package bnymellon.training.spring.framework.model;
 
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 @Entity
diff --git a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java b/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java
index 2f3945e..5aa4f38 100644
--- a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java
+++ b/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java
@@ -16,6 +16,8 @@
 
 package bnymellon.training.spring.framework.service;
 
+import java.util.Optional;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,7 +35,9 @@ public class ColoredShapeServiceImpl implements ColoredShapeService {
     @Override
     public ColoredShape getColoredShape(final Long id) {
 
-        return coloredShapeDao.findOne(id);
+        Optional<ColoredShape> optionalColoredShape = coloredShapeDao.findById(id);
+
+        return optionalColoredShape.orElse(null);
     }
 
     @Override
diff --git a/spring-framework/ch08_spring-rest/pom.xml b/spring-framework/ch08_spring-rest/pom.xml
index 1b5843d..04d2e8a 100644
--- a/spring-framework/ch08_spring-rest/pom.xml
+++ b/spring-framework/ch08_spring-rest/pom.xml
@@ -23,10 +23,9 @@
     <parent>
         <groupId>bnymellon.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0</version>
     </parent>
     <artifactId>ch08_spring-rest</artifactId>
-    <version>1.0.0</version>
 
     <!-- Instruction to hint that we are producing a jar file -->
     <packaging>jar</packaging>
@@ -34,29 +33,6 @@
     <name>Spring Framework - RESTful API</name>
     <description>RESTful API with Spring</description>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <!-- The properties below ensure that the code is picked up and compiled as Java 11 -->
-        <java.version>11</java.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-
-        <jackson.version>2.4.0</jackson.version>
-        <jaxb-api.version>2.2.11</jaxb-api.version>
-
-        <swagger2.version>2.6.0</swagger2.version>
-
-        <h2-database.version>1.4.196</h2-database.version>
-
-        <hibernate.version>5.2.10.Final</hibernate.version>
-
-        <spring-data-jpa.version>1.10.6.RELEASE</spring-data-jpa.version>
-        <logback.version>1.1.11</logback.version>
-        <jcl-over-slf4j.version>1.7.24</jcl-over-slf4j.version>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
 
@@ -90,7 +66,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
-            <version>${spring-data-jpa.version}</version>
+            <version>${spring-data.jpa}</version>
         </dependency>
 
         <dependency>
@@ -120,8 +96,8 @@
             <version>${jackson.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
             <version>${jaxb-api.version}</version>
             <scope>runtime</scope>
         </dependency>
@@ -145,7 +121,7 @@
 
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
@@ -153,7 +129,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>${hibernate.version}</version>
+            <version>5.6.15.Final</version>
         </dependency>
 
         <!-- H2 DB -->
diff --git a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java b/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java
index fd1b921..288f81d 100644
--- a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java
+++ b/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java
@@ -16,7 +16,7 @@
 
 package bnymellon.training.spring.framework.config;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 import java.util.Properties;
 
diff --git a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java b/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
index dde3220..7b39f8c 100644
--- a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
+++ b/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
@@ -17,12 +17,12 @@
 package bnymellon.training.spring.framework.model;
 
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 
 @Entity
diff --git a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java b/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java
index 39e582e..ce651bd 100644
--- a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java
+++ b/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java
@@ -18,6 +18,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,7 +36,10 @@ public class ColoredShapeServiceImpl implements ColoredShapeService {
 
     @Override
     public ColoredShape getColoredShape(final Long id) {
-        return coloredShapeDao.findOne(id);
+
+        Optional<ColoredShape> optionalColoredShape = coloredShapeDao.findById(id);
+
+        return optionalColoredShape.orElse(null);
     }
 
     @Override
diff --git a/spring-framework/pom.xml b/spring-framework/pom.xml
index 9f51458..6f89a1f 100644
--- a/spring-framework/pom.xml
+++ b/spring-framework/pom.xml
@@ -15,14 +15,14 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <!-- G-A-V coordinates for our application build artifact -->
     <groupId>bnymellon.training.spring.framework</groupId>
     <artifactId>spring-framework</artifactId>
-    <version>1.0.0</version>
+    <version>2.0.0</version>
 
     <!-- Instruction to hint that we are producing a jar file -->
     <packaging>pom</packaging>
@@ -33,19 +33,26 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <!-- The properties below ensure that the code is picked up and compiled as Java 11 -->
-        <java.version>11</java.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <!-- The properties below ensure that the code is picked up and compiled as Java 17 -->
+        <java.version>17</java.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
 
-        <spring-framework.version>5.3.3</spring-framework.version>
-        <junit5.version>5.7.0</junit5.version>
-        <logback.version>1.1.11</logback.version>
+        <spring-framework.version>6.0.8</spring-framework.version>
+        <spring-data.jpa>3.0.5</spring-data.jpa>
 
-        <h2-database.version>1.4.200</h2-database.version>
-        <hibernate.version>5.2.10.Final</hibernate.version>
-        <jcl-over-slf4j.version>1.7.24</jcl-over-slf4j.version>
+        <junit5.version>5.9.3</junit5.version>
 
+        <logback.version>1.4.6</logback.version>
+
+        <h2-database.version>2.1.214</h2-database.version>
+        <hibernate.version>6.1.7.Final</hibernate.version>
+        <jcl-over-slf4j.version>2.0.5</jcl-over-slf4j.version>
+
+        <jackson.version>2.4.0</jackson.version>
+        <jaxb-api.version>4.0.0</jaxb-api.version>
+
+        <swagger2.version>2.6.0</swagger2.version>
     </properties>
 
     <modules>
@@ -64,26 +71,34 @@
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter</artifactId>
-                <version>5.7.0</version>
+                <version>${junit5.version}</version>
                 <scope>test</scope>
             </dependency>
+
+            <dependency>
+                <groupId>jakarta.persistence</groupId>
+                <artifactId>jakarta.persistence-api</artifactId>
+                <version>3.1.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.11.0</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.22.2</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
 </project>
\ No newline at end of file