diff --git a/azure/pom.xml b/azure/pom.xml
index 04438710a0..555efeef70 100644
--- a/azure/pom.xml
+++ b/azure/pom.xml
@@ -10,10 +10,10 @@
     <description>Demo project for Spring Boot on Azure</description>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/jib/pom.xml b/jib/pom.xml
index d7bdcf0b34..e71250f157 100644
--- a/jib/pom.xml
+++ b/jib/pom.xml
@@ -6,10 +6,10 @@
     <name>jib</name>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-5-data-reactive/pom.xml b/spring-5-data-reactive/pom.xml
index 53e46b526d..aa73cf11ae 100644
--- a/spring-5-data-reactive/pom.xml
+++ b/spring-5-data-reactive/pom.xml
@@ -7,10 +7,10 @@
     <packaging>jar</packaging>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-5-data-reactive/src/main/kotlin/com/baeldung/Application.kt b/spring-5-data-reactive/src/main/kotlin/com/baeldung/Application.kt
index af29a429a4..5a59d11de0 100644
--- a/spring-5-data-reactive/src/main/kotlin/com/baeldung/Application.kt
+++ b/spring-5-data-reactive/src/main/kotlin/com/baeldung/Application.kt
@@ -2,8 +2,9 @@ package com.baeldung
 
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.autoconfigure.data.mongo.MongoReactiveDataAutoConfiguration
 
-@SpringBootApplication
+@SpringBootApplication(exclude = arrayOf(MongoReactiveDataAutoConfiguration::class))
 class Application
 
 fun main(args: Array<String>) {
diff --git a/spring-5/pom.xml b/spring-5/pom.xml
index 6337f7d417..58c14475e0 100644
--- a/spring-5/pom.xml
+++ b/spring-5/pom.xml
@@ -12,9 +12,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
@@ -135,7 +135,8 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- this surefire configuration allows concurrent execution; do not remove -->
+            <!-- this surefire configuration allows concurrent execution; 
+                do not remove -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -143,14 +144,6 @@
                 <configuration>
                     <parallel>methods</parallel>
                     <useUnlimitedThreads>true</useUnlimitedThreads>
-                    <excludes>
-                        <exclude>**/*IntegrationTest.java</exclude>
-                        <exclude>**/*IntTest.java</exclude>
-                        <exclude>**/*LongRunningUnitTest.java</exclude>
-                        <exclude>**/*ManualTest.java</exclude>
-                        <exclude>**/JdbcTest.java</exclude>
-                        <exclude>**/*LiveTest.java</exclude>
-                    </excludes>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/spring-5/src/main/java/com/baeldung/exception/SpringExceptionApplication.java b/spring-5/src/main/java/com/baeldung/exception/SpringExceptionApplication.java
index ed163f7fa7..82a5fe083b 100644
--- a/spring-5/src/main/java/com/baeldung/exception/SpringExceptionApplication.java
+++ b/spring-5/src/main/java/com/baeldung/exception/SpringExceptionApplication.java
@@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfi
 import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication(exclude = SecurityAutoConfiguration.class)
-@ComponentScan(basePackages = { "com.baeldung.execption" })
+@ComponentScan(basePackages = { "com.baeldung.exception" })
 public class SpringExceptionApplication {
     public static void main(String[] args) {
         SpringApplication.run(SpringExceptionApplication.class, args);
diff --git a/spring-5/src/main/java/com/baeldung/jsonb/Spring5Application.java b/spring-5/src/main/java/com/baeldung/jsonb/Spring5Application.java
index 00fce06834..540992b4bc 100644
--- a/spring-5/src/main/java/com/baeldung/jsonb/Spring5Application.java
+++ b/spring-5/src/main/java/com/baeldung/jsonb/Spring5Application.java
@@ -6,12 +6,13 @@ import java.util.Collection;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.JsonbHttpMessageConverter;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = SecurityAutoConfiguration.class)
 @ComponentScan(basePackages = { "com.baeldung.jsonb" })
 public class Spring5Application {
 
diff --git a/spring-5/src/main/java/com/baeldung/restdocs/SpringRestDocsApplication.java b/spring-5/src/main/java/com/baeldung/restdocs/SpringRestDocsApplication.java
index 02332ee7b6..f512b52af4 100644
--- a/spring-5/src/main/java/com/baeldung/restdocs/SpringRestDocsApplication.java
+++ b/spring-5/src/main/java/com/baeldung/restdocs/SpringRestDocsApplication.java
@@ -2,8 +2,9 @@ package com.baeldung.restdocs;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = SecurityAutoConfiguration.class)
 public class SpringRestDocsApplication {
 
     public static void main(String[] args) {
diff --git a/spring-5/src/test/java/com/baeldung/Example1IntegrationTest.java b/spring-5/src/test/java/com/baeldung/Example1IntegrationTest.java
index ecc677465e..8b9e66213f 100644
--- a/spring-5/src/test/java/com/baeldung/Example1IntegrationTest.java
+++ b/spring-5/src/test/java/com/baeldung/Example1IntegrationTest.java
@@ -3,12 +3,10 @@ package com.baeldung;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@EnableJpaRepositories("com.baeldung.persistence")
 public class Example1IntegrationTest {
 
     @Test
diff --git a/spring-5/src/test/java/com/baeldung/Example2IntegrationTest.java b/spring-5/src/test/java/com/baeldung/Example2IntegrationTest.java
index e1d56c2fc3..6ed53ca4e9 100644
--- a/spring-5/src/test/java/com/baeldung/Example2IntegrationTest.java
+++ b/spring-5/src/test/java/com/baeldung/Example2IntegrationTest.java
@@ -3,12 +3,10 @@ package com.baeldung;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@EnableJpaRepositories("com.baeldung.persistence")
 public class Example2IntegrationTest {
 
     @Test
diff --git a/spring-5/src/test/java/com/baeldung/functional/BeanRegistrationIntegrationTest.java b/spring-5/src/test/java/com/baeldung/functional/BeanRegistrationIntegrationTest.java
index fba01726f4..9c462e0412 100644
--- a/spring-5/src/test/java/com/baeldung/functional/BeanRegistrationIntegrationTest.java
+++ b/spring-5/src/test/java/com/baeldung/functional/BeanRegistrationIntegrationTest.java
@@ -1,12 +1,11 @@
 package com.baeldung.functional;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.context.support.GenericWebApplicationContext;
 
@@ -14,7 +13,6 @@ import com.baeldung.Spring5Application;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Spring5Application.class)
-@EnableJpaRepositories("com.baeldung.persistence")
 public class BeanRegistrationIntegrationTest {
 
     @Autowired