diff --git a/spring-web-modules/spring-rest-testing/pom.xml b/spring-web-modules/spring-rest-testing/pom.xml
index db1ec6c165..d3f110bb90 100644
--- a/spring-web-modules/spring-rest-testing/pom.xml
+++ b/spring-web-modules/spring-rest-testing/pom.xml
@@ -10,9 +10,9 @@
com.baeldung
- parent-boot-2
+ parent-boot-3
0.0.1-SNAPSHOT
- ../../parent-boot-2
+ ../../parent-boot-3
@@ -74,6 +74,7 @@
commons-logging
+ ${httpclient.version}
org.apache.httpcomponents
@@ -91,6 +92,7 @@
org.hibernate
hibernate-core
+ ${hibernate-core.version}
xml-apis
@@ -132,6 +134,14 @@
spring-test
test
+
+
+ org.apache.commons
+ commons-lang3
+ ${commons-lang3.version}
+ test
+
+
@@ -238,6 +248,10 @@
1.9.9
1.1.3
+ 6.4.2.Final
+ 4.5.8
+ 3.14.0
+ com.baeldung.spring.Application
\ No newline at end of file
diff --git a/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/model/Foo.java b/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/model/Foo.java
index 9af3d07bed..99a6a8a3ce 100644
--- a/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/model/Foo.java
+++ b/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/model/Foo.java
@@ -2,11 +2,11 @@ package com.baeldung.persistence.model;
import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
@Entity
public class Foo implements Serializable {
diff --git a/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/model/User.java b/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/model/User.java
index dbc2b9360f..8a019eccaf 100644
--- a/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/model/User.java
+++ b/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/model/User.java
@@ -1,9 +1,9 @@
package com.baeldung.persistence.model;
-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;
@Entity
public class User {
diff --git a/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/service/common/AbstractService.java b/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/service/common/AbstractService.java
index 5a5d9d6241..a7122248d1 100644
--- a/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/service/common/AbstractService.java
+++ b/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/service/common/AbstractService.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.List;
import com.baeldung.persistence.IOperations;
+import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.transaction.annotation.Transactional;
@@ -40,6 +41,6 @@ public abstract class AbstractService implements IOperat
return getDao().save(entity);
}
- protected abstract PagingAndSortingRepository getDao();
+ protected abstract JpaRepository getDao();
}
diff --git a/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/service/impl/FooService.java b/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/service/impl/FooService.java
index 92fb6c28a0..3da077183e 100644
--- a/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/service/impl/FooService.java
+++ b/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/persistence/service/impl/FooService.java
@@ -5,6 +5,7 @@ import com.baeldung.persistence.model.Foo;
import com.baeldung.persistence.service.IFooService;
import com.baeldung.persistence.service.common.AbstractService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -23,7 +24,7 @@ public class FooService extends AbstractService implements IFooService {
// API
@Override
- protected PagingAndSortingRepository getDao() {
+ protected JpaRepository getDao() {
return dao;
}
diff --git a/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/web/controller/FooController.java b/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/web/controller/FooController.java
index b5350c33c1..45f9ca443f 100644
--- a/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/web/controller/FooController.java
+++ b/spring-web-modules/spring-rest-testing/src/main/java/com/baeldung/web/controller/FooController.java
@@ -2,7 +2,7 @@ package com.baeldung.web.controller;
import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import com.baeldung.persistence.model.Foo;
import com.baeldung.persistence.service.IFooService;
diff --git a/spring-web-modules/spring-rest-testing/src/test/java/com/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java b/spring-web-modules/spring-rest-testing/src/test/java/com/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java
index e66e9d49e2..89f76b2990 100644
--- a/spring-web-modules/spring-rest-testing/src/test/java/com/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java
+++ b/spring-web-modules/spring-rest-testing/src/test/java/com/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java
@@ -6,7 +6,7 @@ import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.Serializable;
import java.util.List;