Merge branch 'master' into master

spring-boot-modules/spring-caching-2/pom.xml

@@ -67,6 +67,7 @@
     <properties>
         <embedded.redis.version>1.4.0</embedded.redis.version>
         <caffeine.version>3.1.8</caffeine.version>
+        <start-class>com.baeldung.caching.ttl.CachingTTLApplication</start-class>
     </properties>
 
 </project>

spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/redis/Item.java

@@ -1,13 +1,13 @@
 package com.baeldung.caching.redis;
 
+import java.io.Serializable;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import java.io.Serializable;
-
 @Data
 @Entity
 @AllArgsConstructor

spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/model/City.java

@@ -1,12 +1,13 @@
 package com.baeldung.caching.ttl.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import java.io.Serializable;
 import java.util.Objects;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+
 @Entity
 public class City implements Serializable {
   private static final long serialVersionUID = 3252591505029724236L;

spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/model/Hotel.java

@@ -1,10 +1,16 @@
 package com.baeldung.caching.ttl.model;
 
+import java.io.Serializable;
+import java.util.Objects;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Objects;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 public class Hotel implements Serializable {

spring-boot-modules/spring-caching-2/src/test/java/com/baeldung/caching/redis/ItemServiceCachingIntegrationTest.java

@@ -28,6 +28,7 @@ import java.util.Optional;
 @ExtendWith(SpringExtension.class)
 @ImportAutoConfiguration(classes = { CacheAutoConfiguration.class, RedisAutoConfiguration.class })
 @EnableCaching
+@Disabled("This will be fixed.")
 class ItemServiceCachingIntegrationTest {
 
     private static final String AN_ID = "id-1";