diff --git a/apache-olingo/olingo2/src/main/resources/application.yml b/apache-olingo/olingo2/src/main/resources/application.yml
index 71df0c4166..3e09ea8dd5 100644
--- a/apache-olingo/olingo2/src/main/resources/application.yml
+++ b/apache-olingo/olingo2/src/main/resources/application.yml
@@ -6,7 +6,12 @@ spring:
     application-path: /odata
     
   jpa:
+    defer-datasource-initialization: true
     show-sql: true
     open-in-view: false
     hibernate:
-      ddl-auto: update
\ No newline at end of file
+      ddl-auto: update
+
+  sql:
+    init:
+      mode: always
\ No newline at end of file
diff --git a/jta/pom.xml b/jta/pom.xml
index b8b5570226..1937f55a20 100644
--- a/jta/pom.xml
+++ b/jta/pom.xml
@@ -36,4 +36,8 @@
         </dependency>
     </dependencies>
 
+    <properties>
+        <spring-boot.version>2.4.7</spring-boot.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml
index c67842e313..fcc4175369 100644
--- a/parent-boot-2/pom.xml
+++ b/parent-boot-2/pom.xml
@@ -81,7 +81,7 @@
         <rest-assured.version>3.3.0</rest-assured.version>
         <!-- plugins -->
         <thin.version>1.0.22.RELEASE</thin.version>
-        <spring-boot.version>2.4.3</spring-boot.version>
+        <spring-boot.version>2.5.1</spring-boot.version>
         <aspectjweaver.version>1.9.1</aspectjweaver.version>
         <!-- this property can be removed once we update Mockito version in the main pom.xml -->
         <mockito.version>3.4.0</mockito.version>
diff --git a/persistence-modules/spring-boot-persistence-h2/src/main/resources/application.properties b/persistence-modules/spring-boot-persistence-h2/src/main/resources/application.properties
index 0466eaac79..134cda6628 100644
--- a/persistence-modules/spring-boot-persistence-h2/src/main/resources/application.properties
+++ b/persistence-modules/spring-boot-persistence-h2/src/main/resources/application.properties
@@ -2,10 +2,11 @@ spring.datasource.url=jdbc:h2:mem:mydb
 spring.datasource.driverClassName=org.h2.Driver
 spring.datasource.username=sa
 spring.datasource.password=
+spring.jpa.defer-datasource-initialization=true
 spring.jpa.hibernate.ddl-auto=create-drop
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.format_sql=true
 spring.jpa.properties.hibernate.validator.apply_to_ddl=false
 #spring.jpa.properties.hibernate.check_nullability=true
 spring.h2.console.enabled=true
-spring.h2.console.path=/h2-console
\ No newline at end of file
+spring.h2.console.path=/h2-console
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/mongodb/ManualEmbeddedMongoDbIntegrationTest.java b/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/mongodb/ManualEmbeddedMongoDbIntegrationTest.java
index 21cf56172e..354aa6fe56 100644
--- a/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/mongodb/ManualEmbeddedMongoDbIntegrationTest.java
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/mongodb/ManualEmbeddedMongoDbIntegrationTest.java
@@ -5,8 +5,8 @@ import com.mongodb.DBObject;
 import com.mongodb.client.MongoClients;
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodStarter;
-import de.flapdoodle.embed.mongo.config.IMongodConfig;
-import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
+import de.flapdoodle.embed.mongo.config.ImmutableMongodConfig;
+import de.flapdoodle.embed.mongo.config.MongodConfig;
 import de.flapdoodle.embed.mongo.config.Net;
 import de.flapdoodle.embed.mongo.distribution.Version;
 import de.flapdoodle.embed.process.runtime.Network;
@@ -36,7 +36,9 @@ class ManualEmbeddedMongoDbIntegrationTest {
         String ip = "localhost";
         int randomPort = SocketUtils.findAvailableTcpPort();
 
-        IMongodConfig mongodConfig = new MongodConfigBuilder().version(Version.Main.PRODUCTION)
+        ImmutableMongodConfig mongodConfig = MongodConfig
+            .builder()
+            .version(Version.Main.PRODUCTION)
             .net(new Net(ip, randomPort, Network.localhostIsIPv6()))
             .build();
 
diff --git a/persistence-modules/spring-data-dynamodb/pom.xml b/persistence-modules/spring-data-dynamodb/pom.xml
index 28127179c2..148215b68a 100644
--- a/persistence-modules/spring-data-dynamodb/pom.xml
+++ b/persistence-modules/spring-data-dynamodb/pom.xml
@@ -183,6 +183,7 @@
         <dynamodblocal.version>1.11.86</dynamodblocal.version>
         <dynamodblocal.repository.url>https://s3-us-west-2.amazonaws.com/dynamodb-local/release</dynamodblocal.repository.url>
         <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
+        <spring-boot.version>2.4.7</spring-boot.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-query-2/src/main/resources/application.properties b/persistence-modules/spring-data-jpa-query-2/src/main/resources/application.properties
new file mode 100644
index 0000000000..f37cce0b29
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-query-2/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.jpa.defer-datasource-initialization=true
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-query/src/main/resources/application.properties b/persistence-modules/spring-data-jpa-query/src/main/resources/application.properties
index 72fc330767..9bb870895d 100644
--- a/persistence-modules/spring-data-jpa-query/src/main/resources/application.properties
+++ b/persistence-modules/spring-data-jpa-query/src/main/resources/application.properties
@@ -1 +1,2 @@
-spring.jpa.show-sql=true
\ No newline at end of file
+spring.jpa.show-sql=true
+spring.jpa.defer-datasource-initialization=true
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-repo/src/main/resources/application.properties b/persistence-modules/spring-data-jpa-repo/src/main/resources/application.properties
index 65d7b0bf29..ae1afe6e98 100644
--- a/persistence-modules/spring-data-jpa-repo/src/main/resources/application.properties
+++ b/persistence-modules/spring-data-jpa-repo/src/main/resources/application.properties
@@ -1,4 +1,5 @@
 spring.jpa.show-sql=true
+spring.jpa.defer-datasource-initialization=true
 #MySql
 #spring.datasource.url=jdbc:mysql://localhost:3306/baeldung
 #spring.datasource.username=baeldung
diff --git a/spring-batch/pom.xml b/spring-batch/pom.xml
index b195ff8d13..9879a4777f 100644
--- a/spring-batch/pom.xml
+++ b/spring-batch/pom.xml
@@ -17,6 +17,11 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson-datatype.version}</version>
+        </dependency>
         <!-- JAXB APIs & runtime no longer provided in JDK 11 -->
         <!-- see http://openjdk.java.net/jeps/320 -->
         <dependency>
@@ -91,6 +96,7 @@
         <sqlite.version>3.15.1</sqlite.version>
         <opencsv.version>4.1</opencsv.version>
         <jaxb.version>2.3.1</jaxb.version>
+        <jackson-datatype.version>2.12.3</jackson-datatype.version>
         <awaitility.version>3.1.1</awaitility.version>
     </properties>
 
diff --git a/spring-batch/src/main/java/com/baeldung/taskletsvschunks/model/Line.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/model/Line.java
index 2d7d3ff63f..62cc74abbd 100644
--- a/spring-batch/src/main/java/com/baeldung/taskletsvschunks/model/Line.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/model/Line.java
@@ -1,5 +1,10 @@
 package com.baeldung.taskletsvschunks.model;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -7,6 +12,8 @@ import java.time.format.DateTimeFormatter;
 public class Line implements Serializable {
 
     private String name;
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    @JsonSerialize(using = LocalDateSerializer.class)
     private LocalDate dob;
     private Long age;
 
diff --git a/spring-boot-modules/spring-boot-basic-customization/src/main/java/com/baeldung/errorhandling/controllers/MyErrorController.java b/spring-boot-modules/spring-boot-basic-customization/src/main/java/com/baeldung/errorhandling/controllers/MyErrorController.java
index 8a7a3d6e45..be27f099db 100644
--- a/spring-boot-modules/spring-boot-basic-customization/src/main/java/com/baeldung/errorhandling/controllers/MyErrorController.java
+++ b/spring-boot-modules/spring-boot-basic-customization/src/main/java/com/baeldung/errorhandling/controllers/MyErrorController.java
@@ -11,8 +11,6 @@ import javax.servlet.http.HttpServletRequest;
 @Controller
 public class MyErrorController implements ErrorController {
 
-    public MyErrorController() {}
-
     @GetMapping(value = "/error")
     public String handleError(HttpServletRequest request) {
         
@@ -31,10 +29,4 @@ public class MyErrorController implements ErrorController {
         }
         return "error";
     }
-
-    @Override
-    public String getErrorPath() {
-        return null;
-    }
-
 }
diff --git a/spring-boot-modules/spring-boot-keycloak/pom.xml b/spring-boot-modules/spring-boot-keycloak/pom.xml
index b80dbfa191..1d7dedf127 100644
--- a/spring-boot-modules/spring-boot-keycloak/pom.xml
+++ b/spring-boot-modules/spring-boot-keycloak/pom.xml
@@ -77,6 +77,7 @@
 
     <properties>
         <keycloak-adapter-bom.version>13.0.1</keycloak-adapter-bom.version>
+        <spring-boot.version>2.4.7</spring-boot.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-properties/pom.xml b/spring-boot-modules/spring-boot-properties/pom.xml
index adeb41e976..0ef44e0546 100644
--- a/spring-boot-modules/spring-boot-properties/pom.xml
+++ b/spring-boot-modules/spring-boot-properties/pom.xml
@@ -122,16 +122,8 @@
         </profile>
     </profiles>
 
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-
     <properties>
-        <spring-cloud.version>2020.0.0-M5</spring-cloud.version>
+        <spring-cloud.version>2020.0.3</spring-cloud.version>
         <commons-configuration.version>1.10</commons-configuration.version>
         <guava.version>20.0</guava.version>
         <resource.delimiter>@</resource.delimiter>
diff --git a/spring-boot-modules/spring-boot/src/main/java/com/baeldung/common/error/MyCustomErrorController.java b/spring-boot-modules/spring-boot/src/main/java/com/baeldung/common/error/MyCustomErrorController.java
index 373ae8f745..55543b0ba7 100644
--- a/spring-boot-modules/spring-boot/src/main/java/com/baeldung/common/error/MyCustomErrorController.java
+++ b/spring-boot-modules/spring-boot/src/main/java/com/baeldung/common/error/MyCustomErrorController.java
@@ -7,18 +7,9 @@ public class MyCustomErrorController implements ErrorController {
 
     private static final String PATH = "/error";
 
-    public MyCustomErrorController() {
-        // TODO Auto-generated constructor stub
-    }
-
     @GetMapping(value = PATH)
     public String error() {
         return "Error haven";
     }
 
-    @Override
-    public String getErrorPath() {
-        return PATH;
-    }
-
 }
diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml
index 938d6d4bb8..88bb766047 100644
--- a/spring-cloud-bus/pom.xml
+++ b/spring-cloud-bus/pom.xml
@@ -34,7 +34,7 @@
     </dependencyManagement>
 
     <properties>
-        <spring-cloud-dependencies.version>2020.0.0</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml
index 83e7175869..76320fe54a 100644
--- a/spring-cloud/pom.xml
+++ b/spring-cloud/pom.xml
@@ -79,13 +79,13 @@
     </dependencyManagement>
 
     <properties>
-        <spring-cloud-dependencies.version>2020.0.1</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
         <spring-cloud-starter-config.version>2.2.3.RELEASE</spring-cloud-starter-config.version>
         <spring-cloud-config-server.version>2.2.3.RELEASE</spring-cloud-config-server.version>
         <spring-cloud-starter-eureka.version>1.4.7.RELEASE</spring-cloud-starter-eureka.version>
         <spring-cloud-starter-feign.version>1.4.7.RELEASE</spring-cloud-starter-feign.version>
         <spring-cloud-starter-hystrix.version>1.4.7.RELEASE</spring-cloud-starter-hystrix.version>
-        <spring-cloud-stream.version>3.0.6.RELEASE</spring-cloud-stream.version>
+        <spring-cloud-stream.version>3.1.3</spring-cloud-stream.version>
 
     </properties>
 
diff --git a/spring-cloud/spring-cloud-archaius/pom.xml b/spring-cloud/spring-cloud-archaius/pom.xml
index 56d7f0bc93..9edd5d24c5 100644
--- a/spring-cloud/spring-cloud-archaius/pom.xml
+++ b/spring-cloud/spring-cloud-archaius/pom.xml
@@ -60,7 +60,7 @@
     </dependencies>
 
     <properties>
-        <spring-cloud-dependencies.version>2.0.1.RELEASE</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2.0.3.RELEASE</spring-cloud-dependencies.version>
         <junit.platform.version>1.2.0</junit.platform.version>
     </properties>
 
diff --git a/spring-cloud/spring-cloud-config/pom.xml b/spring-cloud/spring-cloud-config/pom.xml
index 1e46b9accb..4eda3dda0a 100644
--- a/spring-cloud/spring-cloud-config/pom.xml
+++ b/spring-cloud/spring-cloud-config/pom.xml
@@ -34,7 +34,7 @@
     </dependencyManagement>
 
     <properties>
-        <spring-cloud-dependencies.version>2020.0.0</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-kubernetes/pom.xml b/spring-cloud/spring-cloud-kubernetes/pom.xml
index 1a3e3826d4..ba57100804 100644
--- a/spring-cloud/spring-cloud-kubernetes/pom.xml
+++ b/spring-cloud/spring-cloud-kubernetes/pom.xml
@@ -38,6 +38,6 @@
     </modules>
 
     <properties>
-        <spring-cloud-dependencies.version>2020.0.1</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-ribbon-client/pom.xml b/spring-cloud/spring-cloud-ribbon-client/pom.xml
index 77c25b2f6b..2c2bce4bcd 100644
--- a/spring-cloud/spring-cloud-ribbon-client/pom.xml
+++ b/spring-cloud/spring-cloud-ribbon-client/pom.xml
@@ -47,7 +47,7 @@
     </dependencies>
 
     <properties>
-        <spring-cloud-dependencies.version>2020.0.1</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-security/pom.xml b/spring-cloud/spring-cloud-security/pom.xml
index 0227989f99..d9072af91b 100644
--- a/spring-cloud/spring-cloud-security/pom.xml
+++ b/spring-cloud/spring-cloud-security/pom.xml
@@ -34,7 +34,7 @@
     </modules>
 
     <properties>
-        <spring-cloud-dependencies.version>2020.0.1</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-task/pom.xml b/spring-cloud/spring-cloud-task/pom.xml
index bf43799d2d..0cfc62bdbb 100644
--- a/spring-cloud/spring-cloud-task/pom.xml
+++ b/spring-cloud/spring-cloud-task/pom.xml
@@ -48,8 +48,8 @@
     </dependencyManagement>
 
     <properties>
-        <spring-cloud-dependencies.version>Hoxton.SR4</spring-cloud-dependencies.version>
-        <spring-cloud-task.version>2.2.3.RELEASE</spring-cloud-task.version>
+        <spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
+        <spring-cloud-task.version>2.3.3</spring-cloud-task.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/pom.xml b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/pom.xml
index cfee3ce656..0ba93282b9 100644
--- a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/pom.xml
+++ b/spring-cloud/spring-cloud-zuul-fallback/api-gateway/pom.xml
@@ -42,6 +42,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
+            <version>${spring-cloud-netflix-zuul.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud/spring-cloud-zuul-fallback/pom.xml b/spring-cloud/spring-cloud-zuul-fallback/pom.xml
index 1c426503e5..1aa29e867d 100644
--- a/spring-cloud/spring-cloud-zuul-fallback/pom.xml
+++ b/spring-cloud/spring-cloud-zuul-fallback/pom.xml
@@ -21,7 +21,8 @@
     </modules>
 
     <properties>
-        <spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
+        <spring-cloud-netflix-zuul.version>2.2.7.RELEASE</spring-cloud-netflix-zuul.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
     </properties>
 
diff --git a/spring-cloud/spring-cloud-zuul/pom.xml b/spring-cloud/spring-cloud-zuul/pom.xml
index fc3a127e90..0590774bef 100644
--- a/spring-cloud/spring-cloud-zuul/pom.xml
+++ b/spring-cloud/spring-cloud-zuul/pom.xml
@@ -81,8 +81,8 @@
     </build>
 
     <properties>
-        <spring-cloud.version>2020.0.0</spring-cloud.version>
-        <spring-cloud-netflix-zuul.version>2.2.2.RELEASE</spring-cloud-netflix-zuul.version>
+        <spring-cloud.version>2020.0.3</spring-cloud.version>
+        <spring-cloud-netflix-zuul.version>2.2.7.RELEASE</spring-cloud-netflix-zuul.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml b/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml
index e09fcd3711..d2b28643fa 100644
--- a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml
+++ b/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml
@@ -42,6 +42,7 @@
 
     <properties>
         <rate.limit.version>2.2.0.RELEASE</rate.limit.version>
+        <spring-boot.version>2.4.7</spring-boot.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-data-rest/src/main/java/com/baeldung/books/config/RestConfig.java b/spring-data-rest/src/main/java/com/baeldung/books/config/RestConfig.java
index 1c6f04331e..8d9ab5952c 100644
--- a/spring-data-rest/src/main/java/com/baeldung/books/config/RestConfig.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/config/RestConfig.java
@@ -2,18 +2,19 @@ package com.baeldung.books.config;
 
 import com.baeldung.books.models.WebsiteUser;
 import com.baeldung.books.projections.CustomBook;
-
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.data.rest.core.mapping.ExposureConfiguration;
 import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer;
 import org.springframework.http.HttpMethod;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 
 @Configuration
 public class RestConfig implements RepositoryRestConfigurer {
 
     @Override
-    public void configureRepositoryRestConfiguration(RepositoryRestConfiguration repositoryRestConfiguration) {
+    public void configureRepositoryRestConfiguration(RepositoryRestConfiguration repositoryRestConfiguration,
+                                                     CorsRegistry cors) {
         repositoryRestConfiguration.getProjectionConfiguration().addProjection(CustomBook.class);
         ExposureConfiguration config = repositoryRestConfiguration.getExposureConfiguration();
         config.forDomainType(WebsiteUser.class).withItemExposure((metadata, httpMethods) -> httpMethods.disable(HttpMethod.PATCH));
diff --git a/spring-jenkins-pipeline/pom.xml b/spring-jenkins-pipeline/pom.xml
index f2fd4191fd..6f00dd5820 100644
--- a/spring-jenkins-pipeline/pom.xml
+++ b/spring-jenkins-pipeline/pom.xml
@@ -81,7 +81,7 @@
 
     <properties>
         <checkstyle.version>2.17</checkstyle.version>
-        <de.flapdoodle.embed.mongo.version>2.0.0</de.flapdoodle.embed.mongo.version>
+        <de.flapdoodle.embed.mongo.version>3.0.0</de.flapdoodle.embed.mongo.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-kafka/pom.xml b/spring-kafka/pom.xml
index 235dd75966..1382195de6 100644
--- a/spring-kafka/pom.xml
+++ b/spring-kafka/pom.xml
@@ -43,8 +43,8 @@
     </dependencies>
 
     <properties>
-        <spring-kafka.version>2.5.8.RELEASE</spring-kafka.version>
-        <testcontainers-kafka.version>1.15.0</testcontainers-kafka.version>
+        <spring-kafka.version>2.7.2</spring-kafka.version>
+        <testcontainers-kafka.version>1.15.3</testcontainers-kafka.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-legacy-oidc/pom.xml b/spring-security-modules/spring-security-legacy-oidc/pom.xml
index 148b836137..ca54a6765d 100644
--- a/spring-security-modules/spring-security-legacy-oidc/pom.xml
+++ b/spring-security-modules/spring-security-legacy-oidc/pom.xml
@@ -49,6 +49,7 @@
         <spring-security-oauth2.version>2.2.1.RELEASE</spring-security-oauth2.version>
         <spring-security-jwt.version>1.0.9.RELEASE</spring-security-jwt.version>
         <jwks-rsa.version>0.3.0</jwks-rsa.version>
+        <spring-boot.version>2.4.7</spring-boot.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-modules/spring-social-login/src/main/resources/application.properties b/spring-security-modules/spring-social-login/src/main/resources/application.properties
index 22e6acf9e2..57348051ac 100644
--- a/spring-security-modules/spring-social-login/src/main/resources/application.properties
+++ b/spring-security-modules/spring-social-login/src/main/resources/application.properties
@@ -1,4 +1,6 @@
 spring.social.facebook.appId=1715784745414888
 spring.social.facebook.appSecret=abefd6497e9cc01ad03be28509617bf0
 spring.thymeleaf.cache=false
-server.servlet.register-default-servlet=true
\ No newline at end of file
+server.servlet.register-default-servlet=true
+spring.sql.init.mode=always
+spring.jpa.defer-datasource-initialization=true
\ No newline at end of file
diff --git a/spring-web-modules/spring-mvc-java/pom.xml b/spring-web-modules/spring-mvc-java/pom.xml
index b8f5ec7910..68b4c74dce 100644
--- a/spring-web-modules/spring-mvc-java/pom.xml
+++ b/spring-web-modules/spring-mvc-java/pom.xml
@@ -226,7 +226,6 @@
         <!-- testing -->
         <httpcore.version>4.4.5</httpcore.version>
         <httpclient.version>4.5.2</httpclient.version>
-        <rest-assured.version>3.0.7</rest-assured.version>
         <net.sourceforge.htmlunit>2.23</net.sourceforge.htmlunit>
         <!-- maven plugins -->
         <maven-war-plugin.version>3.2.2</maven-war-plugin.version>
diff --git a/spring-web-modules/spring-rest-angular/src/main/resources/application.properties b/spring-web-modules/spring-rest-angular/src/main/resources/application.properties
index cfa27938c9..d6355dd416 100644
--- a/spring-web-modules/spring-rest-angular/src/main/resources/application.properties
+++ b/spring-web-modules/spring-rest-angular/src/main/resources/application.properties
@@ -2,4 +2,6 @@ server.servlet.contextPath=/
 spring.h2.console.enabled=true
 logging.level.org.hibernate.SQL=info
 spring.jpa.generate-ddl=true
-spring.jpa.hibernate.ddl-auto=create
\ No newline at end of file
+spring.jpa.hibernate.ddl-auto=create
+spring.sql.init.mode=always
+spring.jpa.defer-datasource-initialization=true
\ No newline at end of file
diff --git a/spring-web-modules/spring-rest-query-language/src/main/resources/application.properties b/spring-web-modules/spring-rest-query-language/src/main/resources/application.properties
index 4bbf3ed4fc..c432c45970 100644
--- a/spring-web-modules/spring-rest-query-language/src/main/resources/application.properties
+++ b/spring-web-modules/spring-rest-query-language/src/main/resources/application.properties
@@ -1,2 +1,4 @@
 server.port=8082
-server.servlet.context-path=/spring-rest-query-language
\ No newline at end of file
+server.servlet.context-path=/spring-rest-query-language
+spring.sql.init.mode=always
+spring.jpa.defer-datasource-initialization=true
\ No newline at end of file
diff --git a/testing-modules/rest-assured/pom.xml b/testing-modules/rest-assured/pom.xml
index bd4c1456c1..3bb351f123 100644
--- a/testing-modules/rest-assured/pom.xml
+++ b/testing-modules/rest-assured/pom.xml
@@ -126,11 +126,6 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-            <version>${groovy.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock</artifactId>
@@ -180,7 +175,6 @@
         <joda-time.version>2.9.6</joda-time.version>
         <msg-simple.version>1.1</msg-simple.version>
         <btf.version>1.2</btf.version>
-        <groovy.version>2.4.7</groovy.version>
         <wiremock.version>2.4.1</wiremock.version>
         <scribejava.version>2.5.3</scribejava.version>
     </properties>
diff --git a/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/BasicPreemtiveAuthenticationLiveTest.java b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/BasicPreemtiveAuthenticationLiveTest.java
index 02138f22e3..3d19d08ba3 100644
--- a/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/BasicPreemtiveAuthenticationLiveTest.java
+++ b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/BasicPreemtiveAuthenticationLiveTest.java
@@ -25,7 +25,7 @@ public class BasicPreemtiveAuthenticationLiveTest {
         get(SVC_URL).then()
             .assertThat()
             .statusCode(HttpStatus.OK.value())
-            .content(containsString("<form"), containsString("action=\"login\""));
+            .body(containsString("<form"), containsString("action=\"login\""));
     }
 
     @Test
@@ -37,7 +37,7 @@ public class BasicPreemtiveAuthenticationLiveTest {
             .then()
             .assertThat()
             .statusCode(HttpStatus.OK.value())
-            .content(containsString("<form"), containsString("action=\"login\""));
+            .body(containsString("<form"), containsString("action=\"login\""));
     }
 
     @Test
diff --git a/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/DigestAuthenticationLiveTest.java b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/DigestAuthenticationLiveTest.java
index 45c2e9e7e0..84d15f3c3e 100644
--- a/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/DigestAuthenticationLiveTest.java
+++ b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/DigestAuthenticationLiveTest.java
@@ -35,6 +35,6 @@ public class DigestAuthenticationLiveTest {
             .then()
             .assertThat()
             .statusCode(HttpStatus.OK.value())
-            .content(containsString("This is the body of the sample view"));
+            .body(containsString("This is the body of the sample view"));
     }
 }
diff --git a/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/FormAuthenticationLiveTest.java b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/FormAuthenticationLiveTest.java
index 66ae9fb162..a415f25c7f 100644
--- a/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/FormAuthenticationLiveTest.java
+++ b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/FormAuthenticationLiveTest.java
@@ -27,7 +27,7 @@ public class FormAuthenticationLiveTest {
         get(SVC_URL).then()
             .assertThat()
             .statusCode(HttpStatus.OK.value())
-            .content(containsString("<form"), containsString("action=\"perform_login\""));
+            .body(containsString("<form"), containsString("action=\"perform_login\""));
     }
 
     @Test
@@ -40,7 +40,7 @@ public class FormAuthenticationLiveTest {
             .then()
             .assertThat()
             .statusCode(HttpStatus.OK.value())
-            .content(containsString("<form"), containsString("action=\"perform_login\""));
+            .body(containsString("<form"), containsString("action=\"perform_login\""));
     }
 
     @Test
@@ -52,6 +52,6 @@ public class FormAuthenticationLiveTest {
             .then()
             .assertThat()
             .statusCode(HttpStatus.OK.value())
-            .content(isEmptyString());
+            .body(isEmptyString());
     }
 }
diff --git a/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/FormAutoconfAuthenticationLiveTest.java b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/FormAutoconfAuthenticationLiveTest.java
index 6ce3a41ca5..eafc9a3b6d 100644
--- a/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/FormAutoconfAuthenticationLiveTest.java
+++ b/testing-modules/rest-assured/src/test/java/com/baeldung/restassured/authentication/FormAutoconfAuthenticationLiveTest.java
@@ -25,7 +25,7 @@ public class FormAutoconfAuthenticationLiveTest {
         get(SVC_URL).then()
             .assertThat()
             .statusCode(HttpStatus.OK.value())
-            .content(containsString("<form"), containsString("action=\"login\""));
+            .body(containsString("<form"), containsString("action=\"login\""));
     }
 
     @Test