diff --git a/.gitignore b/.gitignore
index 50cb889e5b..2edea19340 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 */bin/*
+bin/
 
 *.class
 
@@ -21,6 +22,9 @@
 *.iws
 out/
 
+# VSCode
+.vscode/
+
 # Mac
 .DS_Store
 
@@ -77,4 +81,5 @@ apache-avro/src/main/java/com/baeldung/avro/model/
 jta/transaction-logs/
 software-security/sql-injection-samples/derby.log
 spring-soap/src/main/java/com/baeldung/springsoap/gen/
-/report-*.json
\ No newline at end of file
+/report-*.json
+transaction.log
\ No newline at end of file
diff --git a/README.md b/README.md
index 1030cbb09c..4cad075cc3 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,16 @@
 
-The "REST with Spring" Classes
+The Courses
 ==============================
 
-Here's the Master Class of REST With Spring (along with the newly announced Boot 2 material): <br/>
-**[>> THE REST WITH SPRING - MASTER CLASS](http://www.baeldung.com/rest-with-spring-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=rws#master-class)**
 
-And here's the Master Class of Learn Spring Security: <br/>
-**[>> LEARN SPRING SECURITY - MASTER CLASS](http://www.baeldung.com/learn-spring-security-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=lss#master-class)**
+Here's the new "Learn Spring" course: <br/>
+**[>> LEARN SPRING - THE MASTER CLASS](https://www.baeldung.com/learn-spring-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=ls#master-class)**
+
+Here's the Master Class of "REST With Spring" (along with the new announced Boot 2 material): <br/>
+**[>> THE REST WITH SPRING - MASTER CLASS](https://www.baeldung.com/rest-with-spring-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=rws#master-class)**
+
+And here's the Master Class of "Learn Spring Security": <br/>
+**[>> LEARN SPRING SECURITY - MASTER CLASS](https://www.baeldung.com/learn-spring-security-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=lss#master-class)**
 
 
 
@@ -15,7 +19,7 @@ Java and Spring Tutorials
 
 This project is **a collection of small and focused tutorials** - each covering a single and well defined area of development in the Java ecosystem. 
 A strong focus of these is, of course, the Spring Framework - Spring, Spring Boot and Spring Security. 
-In additional to Spring, the following technologies are in focus: `core Java`, `Jackson`, `HttpClient`, `Guava`. 
+In additional to Spring, the modules here are covering a number of aspects in Java. 
 
 
 Building the project
@@ -32,8 +36,15 @@ Running a Spring Boot module
 ====================
 To run a Spring Boot module run the command: `mvn spring-boot:run` in the module directory
 
-#Running Tests
 
+Working with the IDE
+====================
+This repo contains a large number of modules. 
+When you're working with an individual module, there's no need to import all of them (or build all of them) - you can simply import that particular module in either Eclipse or IntelliJ. 
+
+
+Running Tests
+=============
 The command `mvn clean install` will run the unit tests in a module.
 To run the integration tests, use the command `mvn clean install -Pintegration-lite-first`
 
diff --git a/algorithms-miscellaneous-1/pom.xml b/algorithms-miscellaneous-1/pom.xml
index 30130208f8..affa66f147 100644
--- a/algorithms-miscellaneous-1/pom.xml
+++ b/algorithms-miscellaneous-1/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.github.dpaukov</groupId>
             <artifactId>combinatoricslib3</artifactId>
-            <version>3.3.0</version>
+            <version>${combinatoricslib3.version}</version>
          </dependency>
     </dependencies>
 
@@ -83,6 +83,7 @@
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
         <commons-codec.version>1.11</commons-codec.version>
         <guava.version>27.0.1-jre</guava.version>
+        <combinatoricslib3.version>3.3.0</combinatoricslib3.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/algorithms-miscellaneous-3/README.md b/algorithms-miscellaneous-3/README.md
index 4dd4b66ff2..cd3711d573 100644
--- a/algorithms-miscellaneous-3/README.md
+++ b/algorithms-miscellaneous-3/README.md
@@ -4,3 +4,6 @@
 - [Implementing Simple State Machines with Java Enums](https://www.baeldung.com/java-enum-simple-state-machine)
 - [Converting Between Roman and Arabic Numerals in Java](http://www.baeldung.com/java-convert-roman-arabic)
 - [Practical Java Examples of the Big O Notation](http://www.baeldung.com/java-algorithm-complexity)
+- [Checking If a List Is Sorted in Java](https://www.baeldung.com/java-check-if-list-sorted)
+- [Checking if a Java Graph has a Cycle](https://www.baeldung.com/java-graph-has-a-cycle)
+- [A Guide to the Folding Technique in Java](https://www.baeldung.com/folding-hashing-technique)
diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/SortedListChecker.java b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/SortedListChecker.java
index d2aa159e6d..ab6eb6bc14 100644
--- a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/SortedListChecker.java
+++ b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checksortedlist/SortedListChecker.java
@@ -27,6 +27,7 @@ public class SortedListChecker {
             if (previous.compareTo(current) > 0) {
                 return false;
             }
+            previous = current;
         }
         return true;
     }
@@ -43,6 +44,7 @@ public class SortedListChecker {
             if (employeeComparator.compare(previous, current) > 0) {
                 return false;
             }
+            previous = current;
         }
         return true;
     }
diff --git a/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/stringsortingbynumber/NaturalOrderComparators.java b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/stringsortingbynumber/NaturalOrderComparators.java
new file mode 100644
index 0000000000..376b196aa1
--- /dev/null
+++ b/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/stringsortingbynumber/NaturalOrderComparators.java
@@ -0,0 +1,30 @@
+package com.baeldung.algorithms.stringsortingbynumber;
+
+import java.util.Comparator;
+
+public final class NaturalOrderComparators {
+
+    private static final String DIGIT_AND_DECIMAL_REGEX = "[^\\d.]";
+
+    private NaturalOrderComparators() {
+        throw new AssertionError("Let's keep this static");
+    }
+
+    public static Comparator<String> createNaturalOrderRegexComparator() {
+        return Comparator.comparingDouble(NaturalOrderComparators::parseStringToNumber);
+    }
+
+    private static double parseStringToNumber(String input){
+
+        final String digitsOnly = input.replaceAll(DIGIT_AND_DECIMAL_REGEX, "");
+
+        if("".equals(digitsOnly)) return 0;
+
+        try{
+            return Double.parseDouble(digitsOnly);
+        }catch (NumberFormatException nfe){
+            return 0;
+        }
+    }
+
+}
diff --git a/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/stringsortingbynumber/NaturalOrderComparatorsUnitTest.java b/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/stringsortingbynumber/NaturalOrderComparatorsUnitTest.java
new file mode 100644
index 0000000000..549151bc93
--- /dev/null
+++ b/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/stringsortingbynumber/NaturalOrderComparatorsUnitTest.java
@@ -0,0 +1,79 @@
+package com.baeldung.algorithms.stringsortingbynumber;
+
+import com.baeldung.algorithms.stringsortingbynumber.NaturalOrderComparators;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class NaturalOrderComparatorsUnitTest {
+
+    @Test
+    public void givenSimpleStringsContainingIntsAndDoubles_whenSortedByRegex_checkSortingCorrect() {
+
+        List<String> testStrings = Arrays.asList("a1", "b3", "c4", "d2.2", "d2.4", "d2.3d");
+
+        testStrings.sort(NaturalOrderComparators.createNaturalOrderRegexComparator());
+
+        List<String> expected = Arrays.asList("a1", "d2.2", "d2.3d", "d2.4", "b3", "c4");
+
+        assertEquals(expected, testStrings);
+
+
+    }
+
+    @Test
+    public void givenSimpleStringsContainingIntsAndDoublesWithAnInvalidNumber_whenSortedByRegex_checkSortingCorrect() {
+
+        List<String> testStrings = Arrays.asList("a1", "b3", "c4", "d2.2", "d2.4", "d2.3.3d");
+
+        testStrings.sort(NaturalOrderComparators.createNaturalOrderRegexComparator());
+
+        List<String> expected = Arrays.asList("d2.3.3d", "a1", "d2.2", "d2.4", "b3", "c4");
+
+        assertEquals(expected, testStrings);
+
+
+    }
+
+    @Test
+    public void givenAllForseenProblems_whenSortedByRegex_checkSortingCorrect() {
+
+        List<String> testStrings = Arrays.asList("a1", "b3", "c4", "d2.2", "d2.f4", "d2.3.3d");
+
+        testStrings.sort(NaturalOrderComparators.createNaturalOrderRegexComparator());
+
+        List<String> expected = Arrays.asList("d2.3.3d", "a1", "d2.2", "d2.f4", "b3", "c4");
+
+        assertEquals(expected, testStrings);
+
+
+    }
+
+    @Test
+    public void givenComplexStringsContainingSeparatedNumbers_whenSortedByRegex_checkNumbersCondensedAndSorted() {
+
+        List<String> testStrings = Arrays.asList("a1b2c5", "b3ght3.2", "something65.thensomething5"); //125, 33.2, 65.5
+
+        List<String> expected = Arrays.asList("b3ght3.2", "something65.thensomething5", "a1b2c5" );
+
+        testStrings.sort(NaturalOrderComparators.createNaturalOrderRegexComparator());
+
+        assertEquals(expected, testStrings);
+
+    }
+
+    @Test
+    public void givenStringsNotContainingNumbers_whenSortedByRegex_checkOrderNotChanged() {
+
+        List<String> testStrings = Arrays.asList("a", "c", "d", "e");
+        List<String> expected = new ArrayList<>(testStrings);
+
+        testStrings.sort(NaturalOrderComparators.createNaturalOrderRegexComparator());
+
+        assertEquals(expected, testStrings);
+    }
+}
\ No newline at end of file
diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java b/algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java
new file mode 100644
index 0000000000..c130e2d866
--- /dev/null
+++ b/algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java
@@ -0,0 +1,20 @@
+package com.baeldung.algorithms.shellsort;
+
+public class ShellSort {
+
+    public static void sort(int arrayToSort[]) {
+        int n = arrayToSort.length;
+
+        for (int gap = n / 2; gap > 0; gap /= 2) {
+            for (int i = gap; i < n; i++) {
+                int key = arrayToSort[i];
+                int j = i;
+                while (j >= gap && arrayToSort[j - gap] > key) {
+                    arrayToSort[j] = arrayToSort[j - gap];
+                    j -= gap;
+                }
+                arrayToSort[j] = key;
+            }
+        }
+    }
+}
diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java b/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java
new file mode 100644
index 0000000000..91a27c41d0
--- /dev/null
+++ b/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java
@@ -0,0 +1,17 @@
+package com.baeldung.algorithms.shellsort;
+
+import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+
+import org.junit.Test;
+
+public class ShellSortUnitTest {
+
+    @Test
+    public void givenUnsortedArray_whenShellSort_thenSortedAsc() {
+        int[] input = {41, 15, 82, 5, 65, 19, 32, 43, 8};
+        ShellSort.sort(input);
+        int[] expected = {5, 8, 15, 19, 32, 41, 43, 65, 82};
+        assertArrayEquals("the two arrays are not equal", expected, input);
+    }
+}
diff --git a/apache-avro/pom.xml b/apache-avro/pom.xml
index 5d170f0a81..e6fb4d24ff 100644
--- a/apache-avro/pom.xml
+++ b/apache-avro/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/apache-olingo/olingo2/pom.xml b/apache-olingo/olingo2/pom.xml
index 1efd4ea602..24e7b4e0b2 100644
--- a/apache-olingo/olingo2/pom.xml
+++ b/apache-olingo/olingo2/pom.xml
@@ -3,37 +3,28 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.3.RELEASE</version>
-		<relativePath /> <!-- lookup parent from repository -->
-	</parent>
 	<groupId>org.baeldung.examples.olingo2</groupId>
 	<artifactId>olingo2-sample</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>olingo2-sample</name>
 	<description>Sample Olingo 2 Project</description>
 
-	<properties>
-		<java.version>1.8</java.version>
-		<olingo2.version>2.0.11</olingo2.version>
-	</properties>
+    <parent>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-2</relativePath>
+    </parent>
 
 	<dependencies>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jersey</artifactId>
 		</dependency>
-
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
-
-
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
@@ -90,4 +81,8 @@
 		</plugins>
 	</build>
 
+	<properties>
+		<olingo2.version>2.0.11</olingo2.version>
+	</properties>
+
 </project>
diff --git a/apache-olingo/olingo2/src/test/java/org/baeldung/examples/olingo2/Olingo2SampleApplicationTests.java b/apache-olingo/olingo2/src/test/java/org/baeldung/examples/olingo2/Olingo2SampleApplicationUnitTest.java
similarity index 86%
rename from apache-olingo/olingo2/src/test/java/org/baeldung/examples/olingo2/Olingo2SampleApplicationTests.java
rename to apache-olingo/olingo2/src/test/java/org/baeldung/examples/olingo2/Olingo2SampleApplicationUnitTest.java
index 687f6ab1ff..7cb685e3e9 100644
--- a/apache-olingo/olingo2/src/test/java/org/baeldung/examples/olingo2/Olingo2SampleApplicationTests.java
+++ b/apache-olingo/olingo2/src/test/java/org/baeldung/examples/olingo2/Olingo2SampleApplicationUnitTest.java
@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class Olingo2SampleApplicationTests {
+public class Olingo2SampleApplicationUnitTest {
 
 	@Test
 	public void contextLoads() {
diff --git a/apache-pulsar/pom.xml b/apache-pulsar/pom.xml
index 11df6d0b87..8a0882dae1 100644
--- a/apache-pulsar/pom.xml
+++ b/apache-pulsar/pom.xml
@@ -7,6 +7,13 @@
     <version>0.0.1</version>
     <name>apache-pulsar</name>
 
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.pulsar</groupId>
diff --git a/apache-pulsar/src/main/java/com/baeldung/ConsumerTest.java b/apache-pulsar/src/main/java/com/baeldung/ConsumerUnitTest.java
old mode 100755
new mode 100644
similarity index 98%
rename from apache-pulsar/src/main/java/com/baeldung/ConsumerTest.java
rename to apache-pulsar/src/main/java/com/baeldung/ConsumerUnitTest.java
index 72dc10b542..82a0028837
--- a/apache-pulsar/src/main/java/com/baeldung/ConsumerTest.java
+++ b/apache-pulsar/src/main/java/com/baeldung/ConsumerUnitTest.java
@@ -7,7 +7,7 @@ import org.apache.pulsar.client.api.Message;
 import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.client.api.SubscriptionType;
 
-public class ConsumerTest {
+public class ConsumerUnitTest {
 
     private static final String SERVICE_URL = "pulsar://localhost:6650";
     private static final String TOPIC_NAME = "test-topic";
diff --git a/apache-pulsar/src/main/java/com/baeldung/ProducerTest.java b/apache-pulsar/src/main/java/com/baeldung/ProducerUnitTest.java
old mode 100755
new mode 100644
similarity index 98%
rename from apache-pulsar/src/main/java/com/baeldung/ProducerTest.java
rename to apache-pulsar/src/main/java/com/baeldung/ProducerUnitTest.java
index 08ee0e89b9..10a4b46c4d
--- a/apache-pulsar/src/main/java/com/baeldung/ProducerTest.java
+++ b/apache-pulsar/src/main/java/com/baeldung/ProducerUnitTest.java
@@ -11,7 +11,7 @@ import org.apache.pulsar.client.api.PulsarClientException;
 import java.io.IOException;
 import java.util.stream.IntStream;
 
-public class ProducerTest {
+public class ProducerUnitTest {
 
     private static final String SERVICE_URL = "pulsar://localhost:6650";
     private static final String TOPIC_NAME = "test-topic";
diff --git a/apache-pulsar/src/main/java/com/baeldung/subscriptions/ExclusiveSubscriptionTest.java b/apache-pulsar/src/main/java/com/baeldung/subscriptions/ExclusiveSubscriptionUnitTest.java
similarity index 98%
rename from apache-pulsar/src/main/java/com/baeldung/subscriptions/ExclusiveSubscriptionTest.java
rename to apache-pulsar/src/main/java/com/baeldung/subscriptions/ExclusiveSubscriptionUnitTest.java
index efb898eaf4..79121347e7 100644
--- a/apache-pulsar/src/main/java/com/baeldung/subscriptions/ExclusiveSubscriptionTest.java
+++ b/apache-pulsar/src/main/java/com/baeldung/subscriptions/ExclusiveSubscriptionUnitTest.java
@@ -10,7 +10,7 @@ import org.apache.pulsar.client.api.SubscriptionType;
 
 import java.util.stream.IntStream;
 
-public class ExclusiveSubscriptionTest {
+public class ExclusiveSubscriptionUnitTest {
     private static final String SERVICE_URL = "pulsar://localhost:6650";
     private static final String TOPIC_NAME = "test-topic";
     private static final String SUBSCRIPTION_NAME = "test-subscription";
diff --git a/apache-pulsar/src/main/java/com/baeldung/subscriptions/FailoverSubscriptionTest.java b/apache-pulsar/src/main/java/com/baeldung/subscriptions/FailoverSubscriptionUnitTest.java
similarity index 98%
rename from apache-pulsar/src/main/java/com/baeldung/subscriptions/FailoverSubscriptionTest.java
rename to apache-pulsar/src/main/java/com/baeldung/subscriptions/FailoverSubscriptionUnitTest.java
index 545661e0c3..1d13b4b83a 100644
--- a/apache-pulsar/src/main/java/com/baeldung/subscriptions/FailoverSubscriptionTest.java
+++ b/apache-pulsar/src/main/java/com/baeldung/subscriptions/FailoverSubscriptionUnitTest.java
@@ -11,7 +11,7 @@ import org.apache.pulsar.client.api.SubscriptionType;
 
 import java.util.stream.IntStream;
 
-public class FailoverSubscriptionTest {
+public class FailoverSubscriptionUnitTest {
     private static final String SERVICE_URL = "pulsar://localhost:6650";
     private static final String TOPIC_NAME = "failover-subscription-test-topic";
     private static final String SUBSCRIPTION_NAME = "test-subscription";
diff --git a/apache-spark/pom.xml b/apache-spark/pom.xml
index f0f002a7e9..b8c1962dd4 100644
--- a/apache-spark/pom.xml
+++ b/apache-spark/pom.xml
@@ -49,6 +49,7 @@
 			<version>${com.datastax.spark.spark-cassandra-connector-java.version}</version>
 		</dependency>
     </dependencies>
+
 	<build>
     	<plugins>
     	  	<plugin>
@@ -78,6 +79,7 @@
       		</plugin>
    		</plugins>
   	</build>
+
     <properties>
         <org.apache.spark.spark-core.version>2.3.0</org.apache.spark.spark-core.version>
         <org.apache.spark.spark-sql.version>2.3.0</org.apache.spark.spark-sql.version>
diff --git a/autovalue/README.md b/autovalue/README.md
index c6a08359ef..f33ff6899f 100644
--- a/autovalue/README.md
+++ b/autovalue/README.md
@@ -1,3 +1,4 @@
 ### Relevant Articles:
 - [Introduction to AutoValue](http://www.baeldung.com/introduction-to-autovalue)
 - [Introduction to AutoFactory](http://www.baeldung.com/autofactory)
+- [Google AutoService](https://www.baeldung.com/google-autoservice)
diff --git a/aws/pom.xml b/aws/pom.xml
index 560f9145f9..75d5aac1eb 100644
--- a/aws/pom.xml
+++ b/aws/pom.xml
@@ -112,7 +112,6 @@
     </repositories>
 
     <properties>
-        <commons-io.version>2.5</commons-io.version>
         <aws-lambda-java-events.version>1.3.0</aws-lambda-java-events.version>
         <aws-lambda-java-core.version>1.1.0</aws-lambda-java-core.version>
         <gson.version>2.8.0</gson.version>
diff --git a/axon/pom.xml b/axon/pom.xml
index 2b9ac1fcdd..3d30cceb83 100644
--- a/axon/pom.xml
+++ b/axon/pom.xml
@@ -18,12 +18,6 @@
             <groupId>org.axonframework</groupId>
             <artifactId>axon-spring-boot-starter</artifactId>
             <version>${axon.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.axonframework</groupId>
-                    <artifactId>axon-server-connector</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -58,7 +52,7 @@
     </dependencies>
 
     <properties>
-        <axon.version>4.0.3</axon.version>
+        <axon.version>4.1.2</axon.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/axon/src/main/java/com/baeldung/axon/commandmodel/OrderAggregate.java b/axon/src/main/java/com/baeldung/axon/commandmodel/OrderAggregate.java
index b37b2fdd66..4ef02e6b54 100644
--- a/axon/src/main/java/com/baeldung/axon/commandmodel/OrderAggregate.java
+++ b/axon/src/main/java/com/baeldung/axon/commandmodel/OrderAggregate.java
@@ -13,6 +13,7 @@ import com.baeldung.axon.coreapi.commands.ShipOrderCommand;
 import com.baeldung.axon.coreapi.events.OrderConfirmedEvent;
 import com.baeldung.axon.coreapi.events.OrderPlacedEvent;
 import com.baeldung.axon.coreapi.events.OrderShippedEvent;
+import com.baeldung.axon.coreapi.exceptions.UnconfirmedOrderException;
 
 @Aggregate
 public class OrderAggregate {
@@ -34,7 +35,7 @@ public class OrderAggregate {
     @CommandHandler
     public void handle(ShipOrderCommand command) {
         if (!orderConfirmed) {
-            throw new IllegalStateException("Cannot ship an order which has not been confirmed yet.");
+            throw new UnconfirmedOrderException();
         }
 
         apply(new OrderShippedEvent(orderId));
@@ -43,12 +44,12 @@ public class OrderAggregate {
     @EventSourcingHandler
     public void on(OrderPlacedEvent event) {
         this.orderId = event.getOrderId();
-        orderConfirmed = false;
+        this.orderConfirmed = false;
     }
 
     @EventSourcingHandler
     public void on(OrderConfirmedEvent event) {
-        orderConfirmed = true;
+        this.orderConfirmed = true;
     }
 
     protected OrderAggregate() {
diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/exceptions/UnconfirmedOrderException.java b/axon/src/main/java/com/baeldung/axon/coreapi/exceptions/UnconfirmedOrderException.java
new file mode 100644
index 0000000000..1873bc6893
--- /dev/null
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/exceptions/UnconfirmedOrderException.java
@@ -0,0 +1,8 @@
+package com.baeldung.axon.coreapi.exceptions;
+
+public class UnconfirmedOrderException extends IllegalStateException {
+
+    public UnconfirmedOrderException() {
+        super("Cannot ship an order which has not been confirmed yet.");
+    }
+}
diff --git a/axon/src/main/java/com/baeldung/axon/querymodel/OrderedProductsEventHandler.java b/axon/src/main/java/com/baeldung/axon/querymodel/OrderedProductsEventHandler.java
index d4cf3d999b..a37f0111ed 100644
--- a/axon/src/main/java/com/baeldung/axon/querymodel/OrderedProductsEventHandler.java
+++ b/axon/src/main/java/com/baeldung/axon/querymodel/OrderedProductsEventHandler.java
@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.axonframework.config.ProcessingGroup;
 import org.axonframework.eventhandling.EventHandler;
 import org.axonframework.queryhandling.QueryHandler;
 import org.springframework.stereotype.Service;
@@ -16,6 +17,7 @@ import com.baeldung.axon.coreapi.queries.FindAllOrderedProductsQuery;
 import com.baeldung.axon.coreapi.queries.OrderedProduct;
 
 @Service
+@ProcessingGroup("ordered-products")
 public class OrderedProductsEventHandler {
 
     private final Map<String, OrderedProduct> orderedProducts = new HashMap<>();
diff --git a/axon/src/main/resources/application.properties b/axon/src/main/resources/application.properties
new file mode 100644
index 0000000000..7c51eb8e1e
--- /dev/null
+++ b/axon/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.application.name=Order Management Service
\ No newline at end of file
diff --git a/axon/src/test/java/com/baeldung/axon/commandmodel/OrderAggregateUnitTest.java b/axon/src/test/java/com/baeldung/axon/commandmodel/OrderAggregateUnitTest.java
index 9beedbaa19..aaefe49fb1 100644
--- a/axon/src/test/java/com/baeldung/axon/commandmodel/OrderAggregateUnitTest.java
+++ b/axon/src/test/java/com/baeldung/axon/commandmodel/OrderAggregateUnitTest.java
@@ -2,6 +2,7 @@ package com.baeldung.axon.commandmodel;
 
 import java.util.UUID;
 
+import com.baeldung.axon.coreapi.exceptions.UnconfirmedOrderException;
 import org.axonframework.test.aggregate.AggregateTestFixture;
 import org.axonframework.test.aggregate.FixtureConfiguration;
 import org.junit.*;
@@ -41,12 +42,12 @@ public class OrderAggregateUnitTest {
     }
 
     @Test
-    public void givenOrderPlacedEvent_whenShipOrderCommand_thenShouldThrowIllegalStateException() {
+    public void givenOrderPlacedEvent_whenShipOrderCommand_thenShouldThrowUnconfirmedOrderException() {
         String orderId = UUID.randomUUID().toString();
         String product = "Deluxe Chair";
         fixture.given(new OrderPlacedEvent(orderId, product))
                .when(new ShipOrderCommand(orderId))
-               .expectException(IllegalStateException.class);
+               .expectException(UnconfirmedOrderException.class);
     }
 
     @Test
diff --git a/bootique/pom.xml b/bootique/pom.xml
index 4ae8703074..4dd9ba4833 100644
--- a/bootique/pom.xml
+++ b/bootique/pom.xml
@@ -65,7 +65,6 @@
     <properties>
         <main.class>com.baeldung.bootique.App</main.class>
         <bootique-bom.version>0.23</bootique-bom.version>
-
         <maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
     </properties>
 
diff --git a/core-groovy-2/README.md b/core-groovy-2/README.md
index 1d35669cd7..33df8b107b 100644
--- a/core-groovy-2/README.md
+++ b/core-groovy-2/README.md
@@ -5,4 +5,6 @@
 - [String Matching in Groovy](http://www.baeldung.com/)
 - [Template Engines in Groovy](https://www.baeldung.com/groovy-template-engines)
 - [Groovy def Keyword](https://www.baeldung.com/groovy-def-keyword)
-- [Pattern Matching in Strings in Groovy](https://www.baeldung.com/groovy-pattern-matching)
\ No newline at end of file
+- [Pattern Matching in Strings in Groovy](https://www.baeldung.com/groovy-pattern-matching)
+- [Working with XML in Groovy](https://www.baeldung.com/groovy-xml)
+- [Integrating Groovy into Java Applications](https://www.baeldung.com/groovy-java-applications)
diff --git a/core-groovy-2/pom.xml b/core-groovy-2/pom.xml
index b945546c8a..ba3fd0802b 100644
--- a/core-groovy-2/pom.xml
+++ b/core-groovy-2/pom.xml
@@ -157,27 +157,24 @@
     </repositories>
 
     <pluginRepositories>
-                <pluginRepository>
-                    <id>bintray</id>
-                    <name>Groovy Bintray</name>
-                    <url>https://dl.bintray.com/groovy/maven</url>
-                    <releases>
-                        <!-- avoid automatic updates -->
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-
+        <pluginRepository>
+            <id>bintray</id>
+            <name>Groovy Bintray</name>
+            <url>https://dl.bintray.com/groovy/maven</url>
+            <releases>
+                <!-- avoid automatic updates -->
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
 
     <properties>
         <junit.platform.version>1.0.0</junit.platform.version>
         <hsqldb.version>2.4.0</hsqldb.version>
         <spock-core.version>1.1-groovy-2.4</spock-core.version>
-        <commons-lang3.version>3.9</commons-lang3.version>
-        <java.version>1.8</java.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <logback.version>1.2.3</logback.version>
         <groovy.version>2.5.7</groovy.version>
diff --git a/core-groovy-2/src/main/groovy/com/baeldung/concatenate/Wonder.groovy b/core-groovy-2/src/main/groovy/com/baeldung/concatenate/Wonder.groovy
new file mode 100644
index 0000000000..1d7527726e
--- /dev/null
+++ b/core-groovy-2/src/main/groovy/com/baeldung/concatenate/Wonder.groovy
@@ -0,0 +1,52 @@
+package com.baeldung.concatenate
+
+class Wonder {
+
+    String numOfWonder = 'seven'
+
+    String operator_plus() {
+        return 'The ' + numOfWonder + ' wonders of the world'
+    }
+
+    String operator_left() {
+        return 'The ' << numOfWonder << ' wonders of ' << 'the world'
+    }
+
+    String interpolation_one() {
+        return "The $numOfWonder wonders of the world"
+
+    }
+
+    String interpolation_two() {
+        return "The ${numOfWonder} wonders of the world"
+    }
+
+    String multilineString() {
+        return """
+            There are $numOfWonder wonders of the world.
+            Can you name them all? 
+            1. The Great Pyramid of Giza
+            2. Hanging Gardens of Babylon
+            3. Colossus of Rhode
+            4. Lighthouse of Alexendra
+            5. Temple of Artemis
+            6. Status of Zeus at Olympia
+            7. Mausoleum at Halicarnassus
+        """
+    }
+
+    String method_concat() {
+        return 'The '.concat(numOfWonder).concat(' wonders of the world')
+
+    }
+
+    String method_builder() {
+        return new StringBuilder()
+                .append('The ').append(numOfWonder).append(' wonders of the world')
+    }
+
+    String method_buffer() {
+        return new StringBuffer()
+                .append('The ').append(numOfWonder).append(' wonders of the world')
+    }
+}
\ No newline at end of file
diff --git a/core-groovy-2/src/test/groovy/com/baeldung/concatenate/WonderUnitTest.groovy b/core-groovy-2/src/test/groovy/com/baeldung/concatenate/WonderUnitTest.groovy
new file mode 100644
index 0000000000..5fc74abd69
--- /dev/null
+++ b/core-groovy-2/src/test/groovy/com/baeldung/concatenate/WonderUnitTest.groovy
@@ -0,0 +1,69 @@
+package com.baeldung.concatenate
+
+import org.junit.Before
+import org.junit.Test
+
+import static org.junit.Assert.*
+
+class WonderUnitTest {
+
+    static final String EXPECTED_SINGLE_LINE = "The seven wonders of the world"
+
+    Wonder wonder
+
+    @Before
+    void before() {
+        wonder = new Wonder()
+    }
+
+    @Test
+    void whenUsingOperatorPlus_thenConcatCorrectly() {
+        assertEquals(EXPECTED_SINGLE_LINE, wonder.operator_plus())
+    }
+
+    @Test
+    void whenUsingOperatorLeft_thenConcatCorrectly() {
+        assertEquals(EXPECTED_SINGLE_LINE, wonder.operator_left())
+    }
+
+    @Test
+    void whenUsingInterpolationOne_thenConcatCorrectly() {
+        assertEquals(EXPECTED_SINGLE_LINE, wonder.interpolation_one())
+    }
+
+    @Test
+    void whenUsingInterpolationTwo_thenConcatCorrectly() {
+        assertEquals(EXPECTED_SINGLE_LINE, wonder.interpolation_two())
+    }
+
+    @Test
+    void whenUsingMultiline_thenConcatCorrectly() {
+        def expectedMultiline = """
+            There are seven wonders of the world.
+            Can you name them all? 
+            1. The Great Pyramid of Giza
+            2. Hanging Gardens of Babylon
+            3. Colossus of Rhode
+            4. Lighthouse of Alexendra
+            5. Temple of Artemis
+            6. Status of Zeus at Olympia
+            7. Mausoleum at Halicarnassus
+        """
+        assertEquals(expectedMultiline, wonder.multilineString())
+    }
+
+    @Test
+    void whenUsingMethodConcat_thenConcatCorrectly() {
+        assertEquals(EXPECTED_SINGLE_LINE, wonder.method_concat())
+    }
+
+    @Test
+    void whenUsingMethodBuilder_thenConcatCorrectly() {
+        assertEquals(EXPECTED_SINGLE_LINE, wonder.method_builder())
+    }
+
+    @Test
+    void whenUsingMethodBuffer_thenConcatCorrectly() {
+        assertEquals(EXPECTED_SINGLE_LINE, wonder.method_buffer())
+    }
+}
diff --git a/core-java-modules/README.md b/core-java-modules/README.md
index 7a7d0a7a1b..9ce6057f32 100644
--- a/core-java-modules/README.md
+++ b/core-java-modules/README.md
@@ -3,3 +3,4 @@
 - [Multi-Module Maven Application with Java Modules](https://www.baeldung.com/maven-multi-module-project-java-jpms)
 - [Guide to Java FileChannel](https://www.baeldung.com/java-filechannel)
 - [Understanding the NumberFormatException in Java](https://www.baeldung.com/java-number-format-exception)
+- [Will an Error Be Caught by Catch Block in Java?](https://www.baeldung.com/java-error-catch)
diff --git a/core-java-modules/core-java-10/README.md b/core-java-modules/core-java-10/README.md
index f0a25712a7..8fb4f8a7dd 100644
--- a/core-java-modules/core-java-10/README.md
+++ b/core-java-modules/core-java-10/README.md
@@ -5,3 +5,4 @@
 - [Guide to Java 10](http://www.baeldung.com/java-10-overview)
 - [Copy a List to Another List in Java](http://www.baeldung.com/java-copy-list-to-another)
 - [Deep Dive Into the New Java JIT Compiler – Graal](https://www.baeldung.com/graal-java-jit-compiler)
+- [Copying Sets in Java](https://www.baeldung.com/java-copy-sets)
diff --git a/core-java-modules/core-java-11/src/main/java/com/baeldung/predicate/not/README.md b/core-java-modules/core-java-11/src/main/java/com/baeldung/predicate/not/README.md
new file mode 100644
index 0000000000..6f8f95970e
--- /dev/null
+++ b/core-java-modules/core-java-11/src/main/java/com/baeldung/predicate/not/README.md
@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Negate a Predicate Method Reference with Java 11](https://www.baeldung.com/java-negate-predicate-method-reference)
diff --git a/core-java-modules/core-java-12/README.md b/core-java-modules/core-java-12/README.md
new file mode 100644
index 0000000000..6c603e4dea
--- /dev/null
+++ b/core-java-modules/core-java-12/README.md
@@ -0,0 +1,4 @@
+## Relevant Articles:
+
+
+- [String API Updates in Java 12](https://www.baeldung.com/java12-string-api)
diff --git a/core-java-modules/core-java-8-2/README.md b/core-java-modules/core-java-8-2/README.md
index d53b731878..245fa93ba7 100644
--- a/core-java-modules/core-java-8-2/README.md
+++ b/core-java-modules/core-java-8-2/README.md
@@ -6,3 +6,4 @@
 - [Anonymous Classes in Java](http://www.baeldung.com/)
 - [How to Delay Code Execution in Java](https://www.baeldung.com/java-delay-code-execution)
 - [Run JAR Application With Command Line Arguments](https://www.baeldung.com/java-run-jar-with-arguments)
+- [Java 8 Stream skip() vs limit()](https://www.baeldung.com/java-stream-skip-vs-limit)
diff --git a/core-java-modules/core-java-8-2/pom.xml b/core-java-modules/core-java-8-2/pom.xml
index cc184de529..07bb3b7543 100644
--- a/core-java-modules/core-java-8-2/pom.xml
+++ b/core-java-modules/core-java-8-2/pom.xml
@@ -9,7 +9,6 @@
     <name>core-java-8-2</name>
     <packaging>jar</packaging>
 
-
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-java</artifactId>
@@ -17,19 +16,18 @@
         <relativePath>../../parent-java</relativePath>
     </parent>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <icu.version>64.2</icu.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.ibm.icu</groupId>
             <artifactId>icu4j</artifactId>
             <version>${icu.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -44,6 +42,13 @@
                 </configuration>
             </plugin>
         </plugins>
-
     </build>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <icu.version>64.2</icu.version>
+        <assertj.version>3.12.2</assertj.version>
+    </properties>
 </project>
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/forEach/ReverseList.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/forEach/ReverseList.java
similarity index 100%
rename from core-java-modules/core-java-8/src/main/java/com/baeldung/forEach/ReverseList.java
rename to core-java-modules/core-java-8-2/src/main/java/com/baeldung/forEach/ReverseList.java
diff --git a/core-java-modules/core-java-8-2/src/test/java/com/baeldung/bifunction/BiFunctionalInterfacesUnitTest.java b/core-java-modules/core-java-8-2/src/test/java/com/baeldung/bifunction/BiFunctionalInterfacesUnitTest.java
new file mode 100644
index 0000000000..ea63409c88
--- /dev/null
+++ b/core-java-modules/core-java-8-2/src/test/java/com/baeldung/bifunction/BiFunctionalInterfacesUnitTest.java
@@ -0,0 +1,164 @@
+package com.baeldung.bifunction;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class BiFunctionalInterfacesUnitTest {
+    @Test
+    public void givenStreamValues_whenMappedToNewValues() {
+        List<String> mapped = Stream.of("hello", "world")
+                .map(word -> word + "!")
+                .collect(Collectors.toList());
+
+        assertThat(mapped).containsExactly("hello!", "world!");
+    }
+
+    @Test
+    public void givenStreamValues_whenReducedWithPrefixingOperation() {
+        String result = Stream.of("hello", "world")
+                .reduce("", (a, b) -> b + "-" + a);
+
+        assertThat(result).isEqualTo("world-hello-");
+    }
+
+    @Test
+    public void givenStreamValues_whenReducedWithPrefixingLambda_thenHasNoTrailingDash() {
+        String result = Stream.of("hello", "world")
+                .reduce("", (a, b) -> combineWithoutTrailingDash(a, b));
+
+        assertThat(result).isEqualTo("world-hello");
+    }
+
+    private String combineWithoutTrailingDash(String a, String b) {
+        if (a.isEmpty()) {
+            return b;
+        }
+        return b + "-" + a;
+    }
+
+    @Test
+    public void givenStreamValues_whenReducedWithPrefixingMethodReference_thenHasNoTrailingDash() {
+        String result = Stream.of("hello", "world")
+                .reduce("", this::combineWithoutTrailingDash);
+
+        assertThat(result).isEqualTo("world-hello");
+    }
+
+    @Test
+    public void givenTwoLists_whenCombined() {
+        List<String> list1 = Arrays.asList("a", "b", "c");
+        List<Integer> list2 = Arrays.asList(1, 2, 3);
+
+        List<String> result = new ArrayList<>();
+        for (int i=0; i < list1.size(); i++) {
+            result.add(list1.get(i) + list2.get(i));
+        }
+
+        assertThat(result).containsExactly("a1", "b2", "c3");
+    }
+
+    @Test
+    public void givenTwoLists_whenCombinedWithGeneralPurposeCombiner() {
+        List<String> list1 = Arrays.asList("a", "b", "c");
+        List<Integer> list2 = Arrays.asList(1, 2, 3);
+
+        List<String> result = listCombiner(list1, list2, (a, b) -> a + b);
+
+        assertThat(result).containsExactly("a1", "b2", "c3");
+    }
+
+    private static <T, U, R> List<R> listCombiner(List<T> list1,
+                                                  List<U> list2,
+                                                  BiFunction<T, U, R> combiner) {
+        List<R> result = new ArrayList<>();
+        for (int i = 0; i < list1.size(); i++) {
+            result.add(combiner.apply(list1.get(i), list2.get(i)));
+        }
+        return result;
+    }
+
+    @Test
+    public void givenTwoLists_whenComparedWithCombiningFunction() {
+        List<Double> list1 = Arrays.asList(1.0d, 2.1d, 3.3d);
+        List<Float> list2 = Arrays.asList(0.1f, 0.2f, 4f);
+
+        // algorithm to determine if the value in list1 > value in list 2
+        List<Boolean> result = listCombiner(list1, list2, (a, b) -> a > b);
+
+        assertThat(result).containsExactly(true, true, false);
+    }
+
+    @Test
+    public void givenTwoLists_whenComparedWithCombiningFunctionByMethodReference() {
+        List<Double> list1 = Arrays.asList(1.0d, 2.1d, 3.3d);
+        List<Float> list2 = Arrays.asList(0.1f, 0.2f, 4f);
+
+        // algorithm to determine if the value in list1 > value in list 2
+        List<Boolean> result = listCombiner(list1, list2, this::firstIsGreaterThanSecond);
+
+        assertThat(result).containsExactly(true, true, false);
+    }
+
+    private boolean firstIsGreaterThanSecond(Double a, Float b) {
+        return a > b;
+    }
+
+    @Test
+    public void givenTwoLists_whenComparedForEqualityByCombiningFunction() {
+        List<Float> list1 = Arrays.asList(0.1f, 0.2f, 4f);
+        List<Float> list2 = Arrays.asList(0.1f, 0.2f, 4f);
+
+        List<Boolean> result = listCombiner(list1, list2, (a, b) -> a.equals(b));
+
+        assertThat(result).containsExactly(true, true, true);
+    }
+
+    @Test
+    public void givenTwoLists_whenComparedForEqualityByCombiningFunctionWithMethodReference() {
+        List<Float> list1 = Arrays.asList(0.1f, 0.2f, 4f);
+        List<Float> list2 = Arrays.asList(0.1f, 0.2f, 4f);
+
+        List<Boolean> result = listCombiner(list1, list2, Float::equals);
+
+        assertThat(result).containsExactly(true, true, true);
+    }
+
+    @Test
+    public void givenTwoLists_whenComparedWithCombiningFunctionWithCompareTo() {
+        List<Double> list1 = Arrays.asList(1.0d, 2.1d, 3.3d);
+        List<Double> list2 = Arrays.asList(0.1d, 0.2d, 4d);
+
+        List<Integer> result = listCombiner(list1, list2, Double::compareTo);
+
+        assertThat(result).containsExactly(1, 1, -1);
+    }
+
+    /**
+     * Allows you to to pass in a lambda or method reference and then
+     * get access to the BiFunction it is meant to become
+     */
+    private static <T, U, R> BiFunction<T, U, R> asBiFunction(BiFunction<T, U, R> function) {
+        return function;
+    }
+
+    @Test
+    public void givenTwoLists_whenComparedWithCombiningFunctionWithComposedBiFunction() {
+        List<Double> list1 = Arrays.asList(1.0d, 2.1d, 3.3d);
+        List<Double> list2 = Arrays.asList(0.1d, 0.2d, 4d);
+
+        List<Boolean> result = listCombiner(list1, list2,
+                asBiFunction(Double::compareTo)
+                    .andThen(i -> i > 0));
+
+        assertThat(result).containsExactly(true, true, false);
+    }
+}
diff --git a/core-java-modules/core-java-8/README.md b/core-java-modules/core-java-8/README.md
index d11d2debce..b2ae48ea11 100644
--- a/core-java-modules/core-java-8/README.md
+++ b/core-java-modules/core-java-8/README.md
@@ -40,3 +40,4 @@
 - [Java 8 Predicate Chain](https://www.baeldung.com/java-predicate-chain)
 - [Method References in Java](https://www.baeldung.com/java-method-references)
 - [Creating a Custom Annotation in Java](https://www.baeldung.com/java-custom-annotation)
+- [The Difference Between Collection.stream().forEach() and Collection.forEach()](https://www.baeldung.com/java-collection-stream-foreach)
diff --git a/core-java-modules/core-java-8/pom.xml b/core-java-modules/core-java-8/pom.xml
index c09c970e07..28182e515b 100644
--- a/core-java-modules/core-java-8/pom.xml
+++ b/core-java-modules/core-java-8/pom.xml
@@ -175,7 +175,6 @@
 
     <properties>
         <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
         <commons-math3.version>3.6.1</commons-math3.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <collections-generic.version>4.01</collections-generic.version>
diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/groupingby/Tuple.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/groupingby/Tuple.java
new file mode 100644
index 0000000000..7a9f62341e
--- /dev/null
+++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/java_8_features/groupingby/Tuple.java
@@ -0,0 +1,34 @@
+package com.baeldung.java_8_features.groupingby;
+
+public class Tuple {
+
+    private BlogPostType type;
+    private String author;
+    
+    public Tuple(BlogPostType type, String author) {
+        super();
+        this.type = type;
+        this.author = author;
+    }
+
+    public BlogPostType getType() {
+        return type;
+    }
+
+    public void setType(BlogPostType type) {
+        this.type = type;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    @Override
+    public String toString() {
+        return "Tuple [type=" + type + ", author=" + author + ", getType()=" + getType() + ", getAuthor()=" + getAuthor() + ", getClass()=" + getClass() + ", hashCode()=" + hashCode() + ", toString()=" + super.toString() + "]";
+    }
+}
diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java
index bd7943c77b..bf594610bb 100644
--- a/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java
+++ b/core-java-modules/core-java-8/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java
@@ -259,4 +259,15 @@ public class OptionalUnitTest {
         LOG.debug("Getting default value...");
         return "Default Value";
     }
+    
+//    Uncomment code when code base is compatiable with Java 11     
+//    @Test
+//    public void givenAnEmptyOptional_thenIsEmptyBehavesAsExpected() {
+//        Optional<String> opt = Optional.of("Baeldung");
+//        assertFalse(opt.isEmpty());
+//     
+//        opt = Optional.ofNullable(null);
+//        assertTrue(opt.isEmpty());
+//    }
+
 }
\ No newline at end of file
diff --git a/core-java-modules/core-java-arrays-2/.gitignore b/core-java-modules/core-java-arrays-2/.gitignore
new file mode 100644
index 0000000000..374c8bf907
--- /dev/null
+++ b/core-java-modules/core-java-arrays-2/.gitignore
@@ -0,0 +1,25 @@
+*.class
+
+0.*
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+.resourceCache
+
+# Packaged files #
+*.jar
+*.war
+*.ear
+
+# Files generated by integration tests
+backup-pom.xml
+/bin/
+/temp
+
+#IntelliJ specific
+.idea/
+*.iml
\ No newline at end of file
diff --git a/core-java-arrays/README.MD b/core-java-modules/core-java-arrays-2/README.MD
similarity index 100%
rename from core-java-arrays/README.MD
rename to core-java-modules/core-java-arrays-2/README.MD
diff --git a/core-java-modules/core-java-arrays-2/pom.xml b/core-java-modules/core-java-arrays-2/pom.xml
new file mode 100644
index 0000000000..bfe8a349e1
--- /dev/null
+++ b/core-java-modules/core-java-arrays-2/pom.xml
@@ -0,0 +1,50 @@
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>core-java-arrays-2</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-arrays-2</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-arrays-2</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <properties>
+
+        <!-- util -->
+        <commons-lang3.version>3.9</commons-lang3.version>
+        <!-- testing -->
+        <assertj-core.version>3.10.0</assertj-core.version>
+    </properties>
+
+</project>
diff --git a/core-java-arrays/src/main/java/com/baeldung/array/conversions/StreamArrayConversion.java b/core-java-modules/core-java-arrays-2/src/main/java/com/baeldung/array/conversions/StreamArrayConversion.java
similarity index 100%
rename from core-java-arrays/src/main/java/com/baeldung/array/conversions/StreamArrayConversion.java
rename to core-java-modules/core-java-arrays-2/src/main/java/com/baeldung/array/conversions/StreamArrayConversion.java
diff --git a/core-java-modules/core-java-arrays-2/src/main/java/com/baeldung/array/looping/LoopDiagonally.java b/core-java-modules/core-java-arrays-2/src/main/java/com/baeldung/array/looping/LoopDiagonally.java
new file mode 100644
index 0000000000..71e2840f45
--- /dev/null
+++ b/core-java-modules/core-java-arrays-2/src/main/java/com/baeldung/array/looping/LoopDiagonally.java
@@ -0,0 +1,45 @@
+package com.baeldung.array.looping;
+
+public class LoopDiagonally {
+
+
+    public String loopDiagonally(String[][] twoDArray) {
+
+        int length = twoDArray.length;
+        int diagonalLines = (length + length) - 1;
+        int itemsInDiagonal = 0;
+        int midPoint = (diagonalLines / 2) + 1;
+        StringBuilder output = new StringBuilder();
+
+        for (int i = 1; i <= diagonalLines; i++) {
+
+            StringBuilder items = new StringBuilder();
+            int rowIndex;
+            int columnIndex;
+
+            if (i <= midPoint) {
+                itemsInDiagonal++;
+                for (int j = 0; j < itemsInDiagonal; j++) {
+                    rowIndex = (i - j) - 1;
+                    columnIndex = j;
+                    items.append(twoDArray[rowIndex][columnIndex]);
+                }
+            } else {
+                itemsInDiagonal--;
+                for (int j = 0; j < itemsInDiagonal; j++) {
+                    rowIndex = (length - 1) - j;
+                    columnIndex = (i - length) + j;
+                    items.append(twoDArray[rowIndex][columnIndex]);
+                }
+            }
+
+            if (i != diagonalLines) {
+                output.append(items).append(" ");
+            } else {
+                output.append(items);
+            }
+        }
+
+        return output.toString();
+    }
+}
diff --git a/core-java-arrays/src/test/java/com/baeldung/array/conversions/StreamArrayConversionUnitTest.java b/core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/array/conversions/StreamArrayConversionUnitTest.java
similarity index 100%
rename from core-java-arrays/src/test/java/com/baeldung/array/conversions/StreamArrayConversionUnitTest.java
rename to core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/array/conversions/StreamArrayConversionUnitTest.java
diff --git a/core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/array/looping/LoopDiagonallyUnitTest.java b/core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/array/looping/LoopDiagonallyUnitTest.java
new file mode 100644
index 0000000000..5f670f4a59
--- /dev/null
+++ b/core-java-modules/core-java-arrays-2/src/test/java/com/baeldung/array/looping/LoopDiagonallyUnitTest.java
@@ -0,0 +1,20 @@
+package com.baeldung.array.looping;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class LoopDiagonallyUnitTest {
+
+    @Test
+    public void twoArrayIsLoopedDiagonallyAsExpected() {
+
+        LoopDiagonally loopDiagonally = new LoopDiagonally();
+        String[][] twoDArray = {{"a", "b", "c"},
+                                {"d", "e", "f"},
+                                {"g", "h", "i"}};
+
+        String output = loopDiagonally.loopDiagonally(twoDArray);
+        assertEquals("a db gec hf i", output);
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-arrays/pom.xml b/core-java-modules/core-java-arrays/pom.xml
index b713c196b5..23db608abc 100644
--- a/core-java-modules/core-java-arrays/pom.xml
+++ b/core-java-modules/core-java-arrays/pom.xml
@@ -389,7 +389,7 @@
     <properties>
 
         <!-- util -->
-        <commons-lang3.version>3.8.1</commons-lang3.version>
+        <commons-lang3.version>3.9</commons-lang3.version>
         
         <jmh-core.version>1.19</jmh-core.version>
         <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
diff --git a/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/JaggedArray.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/JaggedArray.java
deleted file mode 100644
index 36cfc88b95..0000000000
--- a/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/JaggedArray.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.baeldung.array;
-
-import java.util.Arrays;
-import java.util.Scanner;
-
-public class JaggedArray {
-
-    int[][] shortHandFormInitialization() {
-        int[][] jaggedArr = { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } };
-        return jaggedArr;
-    }
-
-    int[][] declarationAndThenInitialization() {
-        int[][] jaggedArr = new int[3][];
-        jaggedArr[0] = new int[] { 1, 2 };
-        jaggedArr[1] = new int[] { 3, 4, 5 };
-        jaggedArr[2] = new int[] { 6, 7, 8, 9 };
-        return jaggedArr;
-    }
-
-    int[][] declarationAndThenInitializationUsingUserInputs() {
-        int[][] jaggedArr = new int[3][];
-        jaggedArr[0] = new int[2];
-        jaggedArr[1] = new int[3];
-        jaggedArr[2] = new int[4];
-        initializeElements(jaggedArr);
-        return jaggedArr;
-    }
-
-    void initializeElements(int[][] jaggedArr) {
-        Scanner sc = new Scanner(System.in);
-        for (int outer = 0; outer < jaggedArr.length; outer++) {
-            for (int inner = 0; inner < jaggedArr[outer].length; inner++) {
-                jaggedArr[outer][inner] = sc.nextInt();
-            }
-        }
-    }
-
-    void printElements(int[][] jaggedArr) {
-        for (int index = 0; index < jaggedArr.length; index++) {
-            System.out.println(Arrays.toString(jaggedArr[index]));
-        }
-    }
-
-    int[] getElementAtGivenIndex(int[][] jaggedArr, int index) {
-        return jaggedArr[index];
-    }
-
-}
diff --git a/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/MultiDimensionalArray.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/MultiDimensionalArray.java
new file mode 100644
index 0000000000..4e01b99a14
--- /dev/null
+++ b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/MultiDimensionalArray.java
@@ -0,0 +1,83 @@
+package com.baeldung.array;
+
+import java.util.Arrays;
+import java.util.Scanner;
+
+public class MultiDimensionalArray {
+
+    int[][] shortHandFormInitialization() {
+        int[][] multiDimensionalArray = { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } };
+        return multiDimensionalArray;
+    }
+
+    int[][] declarationAndThenInitialization() {
+        int[][] multiDimensionalArray = new int[3][];
+        multiDimensionalArray[0] = new int[] { 1, 2 };
+        multiDimensionalArray[1] = new int[] { 3, 4, 5 };
+        multiDimensionalArray[2] = new int[] { 6, 7, 8, 9 };
+        return multiDimensionalArray;
+    }
+
+    int[][] declarationAndThenInitializationUsingUserInputs() {
+        int[][] multiDimensionalArray = new int[3][];
+        multiDimensionalArray[0] = new int[2];
+        multiDimensionalArray[1] = new int[3];
+        multiDimensionalArray[2] = new int[4];
+        initializeElements(multiDimensionalArray);
+        return multiDimensionalArray;
+    }
+
+    void initializeElements(int[][] multiDimensionalArray) {
+        Scanner sc = new Scanner(System.in);
+        for (int outer = 0; outer < multiDimensionalArray.length; outer++) {
+            for (int inner = 0; inner < multiDimensionalArray[outer].length; inner++) {
+                multiDimensionalArray[outer][inner] = sc.nextInt();
+            }
+        }
+    }
+
+    void initialize2DArray(int[][] multiDimensionalArray) {
+        for (int[] array : multiDimensionalArray) {
+            Arrays.fill(array, 7);
+        }
+    }
+
+    void printElements(int[][] multiDimensionalArray) {
+        for (int index = 0; index < multiDimensionalArray.length; index++) {
+            System.out.println(Arrays.toString(multiDimensionalArray[index]));
+        }
+    }
+
+    int[] getElementAtGivenIndex(int[][] multiDimensionalArray, int index) {
+        return multiDimensionalArray[index];
+    }
+
+    int[] findLengthOfElements(int[][] multiDimensionalArray) {
+        int[] arrayOfLengths = new int[multiDimensionalArray.length];
+        for (int i = 0; i < multiDimensionalArray.length; i++) {
+            arrayOfLengths[i] = multiDimensionalArray[i].length;
+        }
+        return arrayOfLengths;
+    }
+
+    Integer[] findLengthOfElements(Integer[][] multiDimensionalArray) {
+        return Arrays.stream(multiDimensionalArray)
+          .map(array -> array.length)
+          .toArray(Integer[]::new);
+    }
+
+    int[][] copy2DArray(int[][] arrayOfArrays) {
+        int[][] copied2DArray = new int[arrayOfArrays.length][];
+        for (int i = 0; i < arrayOfArrays.length; i++) {
+            int[] array = arrayOfArrays[i];
+            copied2DArray[i] = Arrays.copyOf(array, array.length);
+        }
+        return copied2DArray;
+    }
+
+    Integer[][] copy2DArray(Integer[][] arrayOfArrays) {
+        return Arrays.stream(arrayOfArrays)
+          .map(array -> Arrays.copyOf(array, array.length))
+          .toArray(Integer[][]::new);
+    }
+}
diff --git a/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/RemoveElementFromAnArray.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/RemoveElementFromAnArray.java
new file mode 100644
index 0000000000..62a1a0ee58
--- /dev/null
+++ b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/RemoveElementFromAnArray.java
@@ -0,0 +1,27 @@
+package com.baeldung.array;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+public class RemoveElementFromAnArray {
+
+    public int[] removeAnElementWithAGivenIndex(int[] array, int index) {
+        return ArrayUtils.remove(array, index);
+    }
+
+    public int[] removeAllElementsWithGivenIndices(int[] array, int... indicies) {
+        return ArrayUtils.removeAll(array, indicies);
+    }
+
+    public int[] removeFirstOccurrenceOfGivenElement(int[] array, int element) {
+        return ArrayUtils.removeElement(array, element);
+    }
+
+    public int[] removeAllGivenElements(int[] array, int... elements) {
+        return ArrayUtils.removeElements(array, elements);
+    }
+
+    public int[] removeAllOccurrencesOfAGivenElement(int[] array, int element) {
+        return ArrayUtils.removeAllOccurences(array, element);
+    }
+
+}
diff --git a/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/SortedArrayChecker.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/SortedArrayChecker.java
new file mode 100644
index 0000000000..78a9a8f4d1
--- /dev/null
+++ b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/array/SortedArrayChecker.java
@@ -0,0 +1,65 @@
+package com.baeldung.array;
+
+import com.baeldung.arraycopy.model.Employee;
+
+import java.util.Comparator;
+
+public class SortedArrayChecker {
+
+    boolean isSorted(int[] array, int length) {
+        if (array == null || length < 2)
+            return true;
+
+        if (array[length - 2] > array[length - 1])
+            return false;
+
+        return isSorted(array, length - 1);
+    }
+
+    boolean isSorted(int[] array) {
+        for (int i = 0; i < array.length - 1; i++) {
+            if (array[i] > array[i + 1])
+                return false;
+        }
+
+        return true;
+    }
+
+    boolean isSorted(Comparable[] array, int length) {
+        if (array == null || length < 2)
+            return true;
+
+        if (array[length - 2].compareTo(array[length - 1]) > 0)
+            return false;
+
+        return isSorted(array, length - 1);
+    }
+
+    boolean isSorted(Comparable[] array) {
+        for (int i = 0; i < array.length - 1; ++i) {
+            if (array[i].compareTo(array[i + 1]) > 0)
+                return false;
+        }
+
+        return true;
+    }
+
+    boolean isSorted(Object[] array, Comparator comparator) {
+        for (int i = 0; i < array.length - 1; ++i) {
+            if (comparator.compare(array[i], (array[i + 1])) > 0)
+                return false;
+        }
+
+        return true;
+    }
+
+    boolean isSorted(Object[] array, Comparator comparator, int length) {
+        if (array == null || length < 2)
+            return true;
+
+        if (comparator.compare(array[length - 2], array[length - 1]) > 0)
+            return false;
+
+        return isSorted(array, comparator, length - 1);
+    }
+}
diff --git a/core-java-modules/core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Employee.java b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Employee.java
index a7592574d9..eba39d5716 100644
--- a/core-java-modules/core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Employee.java
+++ b/core-java-modules/core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Employee.java
@@ -6,6 +6,7 @@ public class Employee implements Serializable {
     private static final long serialVersionUID = -2454619097207585825L;
     private int id;
     private String name;
+    private int age;
 
     public Employee() {
     }
@@ -15,10 +16,24 @@ public class Employee implements Serializable {
         this.name = name;
     }
 
+    public Employee(int id, String name, int age) {
+        this.id = id;
+        this.name = name;
+        this.age = age;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
     public int getId() {
         return id;
     }
 
+    public void setAge(int age) {
+        this.age = age;
+    }
+
     public void setId(int id) {
         this.id = id;
     }
diff --git a/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/JaggedArrayUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/JaggedArrayUnitTest.java
deleted file mode 100644
index a4dd7e25c3..0000000000
--- a/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/JaggedArrayUnitTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.baeldung.array;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.PrintStream;
-
-import org.junit.Test;
-
-public class JaggedArrayUnitTest {
-
-    private JaggedArray obj = new JaggedArray();
-
-    @Test
-    public void whenInitializedUsingShortHandForm_thenCorrect() {
-        assertArrayEquals(new int[][] { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } }, obj.shortHandFormInitialization());
-    }
-
-    @Test
-    public void whenInitializedWithDeclarationAndThenInitalization_thenCorrect() {
-        assertArrayEquals(new int[][] { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } }, obj.declarationAndThenInitialization());
-    }
-
-    @Test
-    public void whenInitializedWithDeclarationAndThenInitalizationUsingUserInputs_thenCorrect() {
-        InputStream is = new ByteArrayInputStream("1 2 3 4 5 6 7 8 9".getBytes());
-        System.setIn(is);
-        assertArrayEquals(new int[][] { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } }, obj.declarationAndThenInitializationUsingUserInputs());
-        System.setIn(System.in);
-    }
-
-    @Test
-    public void givenJaggedArrayAndAnIndex_thenReturnArrayAtGivenIndex() {
-        int[][] jaggedArr = { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } };
-        assertArrayEquals(new int[] { 1, 2 }, obj.getElementAtGivenIndex(jaggedArr, 0));
-        assertArrayEquals(new int[] { 3, 4, 5 }, obj.getElementAtGivenIndex(jaggedArr, 1));
-        assertArrayEquals(new int[] { 6, 7, 8, 9 }, obj.getElementAtGivenIndex(jaggedArr, 2));
-    }
-
-    @Test
-    public void givenJaggedArray_whenUsingArraysAPI_thenVerifyPrintedElements() {
-        int[][] jaggedArr = { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } };
-        ByteArrayOutputStream outContent = new ByteArrayOutputStream();
-        System.setOut(new PrintStream(outContent));
-        obj.printElements(jaggedArr);
-        assertEquals("[1, 2][3, 4, 5][6, 7, 8, 9]", outContent.toString().replace("\r", "").replace("\n", ""));
-        System.setOut(System.out);
-    }
-
-}
diff --git a/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/MultiDimensionalArrayUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/MultiDimensionalArrayUnitTest.java
new file mode 100644
index 0000000000..8980eaa9dc
--- /dev/null
+++ b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/MultiDimensionalArrayUnitTest.java
@@ -0,0 +1,86 @@
+package com.baeldung.array;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.PrintStream;
+
+import org.junit.Test;
+
+public class MultiDimensionalArrayUnitTest {
+
+    private MultiDimensionalArray obj = new MultiDimensionalArray();
+
+    @Test
+    public void whenInitializedUsingShortHandForm_thenCorrect() {
+        assertArrayEquals(new int[][] { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } }, obj.shortHandFormInitialization());
+    }
+
+    @Test
+    public void whenInitializedWithDeclarationAndThenInitalization_thenCorrect() {
+        assertArrayEquals(new int[][] { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } }, obj.declarationAndThenInitialization());
+    }
+
+    @Test
+    public void whenInitializedWithDeclarationAndThenInitalizationUsingUserInputs_thenCorrect() {
+        InputStream is = new ByteArrayInputStream("1 2 3 4 5 6 7 8 9".getBytes());
+        System.setIn(is);
+        assertArrayEquals(new int[][] { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } }, obj.declarationAndThenInitializationUsingUserInputs());
+        System.setIn(System.in);
+    }
+
+    @Test
+    public void givenMultiDimensionalArrayAndAnIndex_thenReturnArrayAtGivenIndex() {
+        int[][] multiDimensionalArr = { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } };
+        assertArrayEquals(new int[] { 1, 2 }, obj.getElementAtGivenIndex(multiDimensionalArr, 0));
+        assertArrayEquals(new int[] { 3, 4, 5 }, obj.getElementAtGivenIndex(multiDimensionalArr, 1));
+        assertArrayEquals(new int[] { 6, 7, 8, 9 }, obj.getElementAtGivenIndex(multiDimensionalArr, 2));
+    }
+
+    @Test
+    public void givenMultiDimensionalArray_whenUsingArraysAPI_thenVerifyPrintedElements() {
+        int[][] multiDimensionalArr = { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } };
+        ByteArrayOutputStream outContent = new ByteArrayOutputStream();
+        System.setOut(new PrintStream(outContent));
+        obj.printElements(multiDimensionalArr);
+        assertEquals("[1, 2][3, 4, 5][6, 7, 8, 9]", outContent.toString().replace("\r", "").replace("\n", ""));
+        System.setOut(System.out);
+    }
+
+    @Test
+    public void givenMultiDimensionalArray_whenUsingArraysFill_thenVerifyInitialize2DArray() {
+        int[][] multiDimensionalArr = new int[3][];
+        multiDimensionalArr[0] = new int[2];
+        multiDimensionalArr[1] = new int[3];
+        multiDimensionalArr[2] = new int[4];
+        obj.initialize2DArray(multiDimensionalArr);
+        assertArrayEquals(new int[][] {{7,7}, {7,7,7}, {7,7,7,7}}, multiDimensionalArr);
+    }
+    
+    @Test
+    public void givenMultiDimensionalArray_whenUsingIteration_thenVerifyFindLengthOfElements() {
+        int[][] multiDimensionalArr = { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } };
+        assertArrayEquals(new int[]{2,3,4}, obj.findLengthOfElements(multiDimensionalArr));
+    }
+    
+    @Test
+    public void givenMultiDimensionalArray_whenUsingArraysStream_thenVerifyFindLengthOfElements() {
+        Integer[][] multiDimensionalArr = { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } };
+        assertArrayEquals(new Integer[]{2,3,4}, obj.findLengthOfElements(multiDimensionalArr));
+    }
+    
+    @Test
+    public void givenMultiDimensionalArray_whenUsingArraysCopyOf_thenVerifyCopy2DArray() {
+        int[][] multiDimensionalArr = { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } };
+        assertArrayEquals(multiDimensionalArr, obj.copy2DArray(multiDimensionalArr));
+    }
+    
+    @Test
+    public void givenMultiDimensionalArray_whenUsingArraysStream_thenVerifyCopy2DArray() {
+        Integer[][] multiDimensionalArr = { { 1, 2 }, { 3, 4, 5 }, { 6, 7, 8, 9 } };
+        assertArrayEquals(multiDimensionalArr, obj.copy2DArray(multiDimensionalArr));
+    }
+}
diff --git a/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/RemoveElementFromAnArrayUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/RemoveElementFromAnArrayUnitTest.java
new file mode 100644
index 0000000000..ea52cd17d9
--- /dev/null
+++ b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/RemoveElementFromAnArrayUnitTest.java
@@ -0,0 +1,85 @@
+package com.baeldung.array;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.junit.jupiter.api.Test;
+
+class RemoveElementFromAnArrayUnitTest {
+
+    private final RemoveElementFromAnArray sut = new RemoveElementFromAnArray();
+    private final int[] inputArray = new int[] { 40, 10, 20, 30, 40, 50 };
+
+    @Test
+    void testRemoveAnElementWithAGivenIndex() {
+        int index = 2;
+        int[] modifiedArray = sut.removeAnElementWithAGivenIndex(inputArray, index);
+
+        assertFalse(ArrayUtils.contains(modifiedArray, inputArray[index]));
+    }
+
+    @Test
+    void testRemoveAllElementsWithGivenIndices() {
+        int first = 0;
+        int last = inputArray.length - 1;
+        int[] modifiedArray = sut.removeAllElementsWithGivenIndices(inputArray, first, last);
+
+        assertFalse(ArrayUtils.contains(modifiedArray, inputArray[first]) && ArrayUtils.contains(modifiedArray, inputArray[last]));
+    }
+
+    @Test
+    void testRemoveElement_WhenArrayIsNull_ThrowsIndexOutOfBoundEx() {
+        int index = 2;
+
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            sut.removeAnElementWithAGivenIndex(null, index);
+        });
+
+        assertThrows(IndexOutOfBoundsException.class, () -> {
+            sut.removeAllElementsWithGivenIndices(null, index);
+        });
+    }
+
+    @Test
+    void testRemoveFirstOccurrenceOfGivenElement() {
+        int element = 40;
+        int[] modifiedArray = sut.removeFirstOccurrenceOfGivenElement(inputArray, element);
+
+        int indexInInputArray = ArrayUtils.indexOf(inputArray, element);
+        int indexInModifiedArray = ArrayUtils.indexOf(modifiedArray, element);
+        assertFalse(indexInInputArray == indexInModifiedArray);
+    }
+
+    @Test
+    void testRemoveAllGivenElements() {
+        int duplicateElement = 40;
+        int[] elements = new int[] { duplicateElement, 10, 50 };
+        int[] modifiedArray = sut.removeAllGivenElements(inputArray, elements);
+
+        assertTrue(ArrayUtils.contains(modifiedArray, duplicateElement));
+        assertFalse(ArrayUtils.contains(modifiedArray, elements[1]));
+        assertFalse(ArrayUtils.contains(modifiedArray, elements[2]));
+    }
+
+    @Test
+    void testRemoveAllOccurrencesOfAGivenElement() {
+        int element = 40;
+        int[] modifiedArray = sut.removeAllOccurrencesOfAGivenElement(inputArray, element);
+
+        assertFalse(ArrayUtils.contains(modifiedArray, element));
+    }
+
+    @Test
+    void testRemoveElement_WhenArrayIsNull_ReturnsNull() {
+        int element = 20;
+
+        assertEquals(null, sut.removeFirstOccurrenceOfGivenElement(null, element));
+        assertEquals(null, sut.removeAllGivenElements(null, element));
+        assertEquals(null, sut.removeAllOccurrencesOfAGivenElement(null, element));
+
+    }
+
+}
diff --git a/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/SortedArrayCheckerUnitTest.java b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/SortedArrayCheckerUnitTest.java
new file mode 100644
index 0000000000..7971e0eab7
--- /dev/null
+++ b/core-java-modules/core-java-arrays/src/test/java/com/baeldung/array/SortedArrayCheckerUnitTest.java
@@ -0,0 +1,79 @@
+package com.baeldung.array;
+
+import com.baeldung.arraycopy.model.Employee;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Comparator;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class SortedArrayCheckerUnitTest {
+    private static final int[] INTEGER_SORTED = {1, 3, 5, 7, 9};
+    private static final int[] INTEGER_NOT_SORTED = {1, 3, 11, 7};
+
+    private static final String[] STRING_SORTED = {"abc", "cde", "fgh"};
+    private static final String[] STRING_NOT_SORTED = {"abc", "fgh", "cde", "ijk"};
+
+    private static final Employee[] EMPLOYEES_SORTED_BY_NAME = {
+            new Employee(1, "Carlos", 26),
+            new Employee(2, "Daniel", 31),
+            new Employee(3, "Marta", 27)};
+
+    private static final Employee[] EMPLOYEES_NOT_SORTED_BY_NAME = {
+            new Employee(1, "Daniel", 31),
+            new Employee(2, "Carlos", 26),
+            new Employee(3, "Marta", 27)};
+
+    private static final Employee[] EMPLOYEES_SORTED_BY_AGE = {
+            new Employee(1, "Carlos", 26),
+            new Employee(2, "Marta", 27),
+            new Employee(3, "Daniel", 31)};
+
+    private static final Employee[] EMPLOYEES_NOT_SORTED_BY_AGE = {
+            new Employee(1, "Marta", 27),
+            new Employee(2, "Carlos", 26),
+            new Employee(3, "Daniel", 31)};
+
+    private SortedArrayChecker sortedArrayChecker;
+
+    @Before
+    public void setup() {
+        sortedArrayChecker = new SortedArrayChecker();
+    }
+
+    @Test
+    public void givenIntegerArray_thenReturnIfItIsSortedOrNot() {
+        assertThat(sortedArrayChecker.isSorted(INTEGER_SORTED)).isEqualTo(true);
+        assertThat(sortedArrayChecker.isSorted(INTEGER_NOT_SORTED)).isEqualTo(false);
+
+        assertThat(sortedArrayChecker.isSorted(INTEGER_SORTED, INTEGER_SORTED.length)).isEqualTo(true);
+        assertThat(sortedArrayChecker.isSorted(INTEGER_NOT_SORTED, INTEGER_NOT_SORTED.length)).isEqualTo(false);
+    }
+
+    @Test
+    public void givenStringArray_thenReturnIfItIsSortedOrNot() {
+        assertThat(sortedArrayChecker.isSorted(STRING_SORTED)).isEqualTo(true);
+        assertThat(sortedArrayChecker.isSorted(STRING_NOT_SORTED)).isEqualTo(false);
+
+        assertThat(sortedArrayChecker.isSorted(STRING_SORTED, STRING_SORTED.length)).isEqualTo(true);
+        assertThat(sortedArrayChecker.isSorted(STRING_NOT_SORTED, STRING_NOT_SORTED.length)).isEqualTo(false);
+    }
+
+    @Test
+    public void givenEmployeeArray_thenReturnIfItIsSortedOrNot() {
+        assertThat(sortedArrayChecker.isSorted(EMPLOYEES_SORTED_BY_NAME, Comparator.comparing(Employee::getName))).isEqualTo(true);
+        assertThat(sortedArrayChecker.isSorted(EMPLOYEES_NOT_SORTED_BY_NAME, Comparator.comparing(Employee::getName))).isEqualTo(false);
+
+        assertThat(sortedArrayChecker.isSorted(EMPLOYEES_SORTED_BY_AGE, Comparator.comparingInt(Employee::getAge))).isEqualTo(true);
+        assertThat(sortedArrayChecker.isSorted(EMPLOYEES_NOT_SORTED_BY_AGE, Comparator.comparingInt(Employee::getAge))).isEqualTo(false);
+
+        assertThat(sortedArrayChecker
+                .isSorted(EMPLOYEES_SORTED_BY_AGE, Comparator.comparingInt(Employee::getAge), EMPLOYEES_SORTED_BY_AGE.length))
+                .isEqualTo(true);
+        assertThat(sortedArrayChecker
+                .isSorted(EMPLOYEES_NOT_SORTED_BY_AGE, Comparator.comparingInt(Employee::getAge), EMPLOYEES_NOT_SORTED_BY_AGE.length))
+                .isEqualTo(false);
+    }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-array-list/src/test/java/org/baeldung/java/collections/CoreJavaCollectionsUnitTest.java b/core-java-modules/core-java-collections-array-list/src/test/java/org/baeldung/java/collections/CoreJavaCollectionsUnitTest.java
index ecf68e0b2c..5f7fe356c5 100644
--- a/core-java-modules/core-java-collections-array-list/src/test/java/org/baeldung/java/collections/CoreJavaCollectionsUnitTest.java
+++ b/core-java-modules/core-java-collections-array-list/src/test/java/org/baeldung/java/collections/CoreJavaCollectionsUnitTest.java
@@ -42,7 +42,7 @@ public class CoreJavaCollectionsUnitTest {
     @Test(expected = UnsupportedOperationException.class)
     public final void givenUsingGuavaBuilder_whenUnmodifiableListIsCreatedFromOriginal_thenNoLongerModifiable() {
         final List<String> list = new ArrayList<String>(Arrays.asList("one", "two", "three"));
-        final ImmutableList<Object> unmodifiableList = ImmutableList.builder().addAll(list).build();
+        final ImmutableList<String> unmodifiableList = ImmutableList.<String>builder().addAll(list).build();
         unmodifiableList.add("four");
     }
 
diff --git a/core-java-modules/core-java-collections-set/README.md b/core-java-modules/core-java-collections-set/README.md
index 2e09e920dc..618b4e932c 100644
--- a/core-java-modules/core-java-collections-set/README.md
+++ b/core-java-modules/core-java-collections-set/README.md
@@ -10,3 +10,4 @@
 - [Initializing HashSet at the Time of Construction](http://www.baeldung.com/java-initialize-hashset)
 - [Guide to EnumSet](https://www.baeldung.com/java-enumset)
 - [Set Operations in Java](https://www.baeldung.com/java-set-operations)
+- [Copying Sets in Java](https://www.baeldung.com/java-copy-sets)
diff --git a/core-java-modules/core-java-collections-set/pom.xml b/core-java-modules/core-java-collections-set/pom.xml
index 4435f8b151..101ed79de0 100644
--- a/core-java-modules/core-java-collections-set/pom.xml
+++ b/core-java-modules/core-java-collections-set/pom.xml
@@ -14,30 +14,31 @@
     </parent>
 
     <dependencies>
-    <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>${guava.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-collections4</artifactId>
-        <version>${commons-collections4.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-        <version>2.8.5</version>
-    </dependency>
-    <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-        <version>2.6</version>
-    </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>${commons-collections4.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>${commons-lang.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>
         <commons-collections4.version>4.3</commons-collections4.version>
         <guava.version>27.1-jre</guava.version>
+        <gson.version>2.8.5</gson.version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-concurrency-advanced/pom.xml b/core-java-modules/core-java-concurrency-advanced/pom.xml
index a3ac7aa88a..5d41909ed3 100644
--- a/core-java-modules/core-java-concurrency-advanced/pom.xml
+++ b/core-java-modules/core-java-concurrency-advanced/pom.xml
@@ -72,7 +72,6 @@
     <properties>
         <!-- util -->
         <guava.version>21.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <commons-math3.version>3.6.1</commons-math3.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <collections-generic.version>4.01</collections-generic.version>
diff --git a/core-java-modules/core-java-concurrency-basic/README.md b/core-java-modules/core-java-concurrency-basic/README.md
index 6fa702fbe7..c498bed315 100644
--- a/core-java-modules/core-java-concurrency-basic/README.md
+++ b/core-java-modules/core-java-concurrency-basic/README.md
@@ -17,3 +17,4 @@
 - [Runnable vs. Callable in Java](http://www.baeldung.com/java-runnable-callable)
 - [What is Thread-Safety and How to Achieve it?](https://www.baeldung.com/java-thread-safety)
 - [How to Start a Thread in Java](https://www.baeldung.com/java-start-thread)
+- [How to Delay Code Execution in Java](https://www.baeldung.com/java-delay-code-execution)
diff --git a/core-java-modules/core-java-concurrency-basic/pom.xml b/core-java-modules/core-java-concurrency-basic/pom.xml
index aea4bef6a7..96b3ef76f7 100644
--- a/core-java-modules/core-java-concurrency-basic/pom.xml
+++ b/core-java-modules/core-java-concurrency-basic/pom.xml
@@ -45,8 +45,6 @@
     </build>
 
     <properties>
-        <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
         <avaitility.version>1.7.0</avaitility.version>
diff --git a/core-java-modules/core-java-concurrency-collections/pom.xml b/core-java-modules/core-java-concurrency-collections/pom.xml
index 27aae4ea6c..ea3bbe44f3 100644
--- a/core-java-modules/core-java-concurrency-collections/pom.xml
+++ b/core-java-modules/core-java-concurrency-collections/pom.xml
@@ -62,7 +62,6 @@
     <properties>
         <!-- util -->
         <guava.version>21.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <commons-math3.version>3.6.1</commons-math3.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <collections-generic.version>4.01</collections-generic.version>
diff --git a/core-java-modules/core-java-exceptions/README.md b/core-java-modules/core-java-exceptions/README.md
new file mode 100644
index 0000000000..79e5bad23a
--- /dev/null
+++ b/core-java-modules/core-java-exceptions/README.md
@@ -0,0 +1,3 @@
+## Relevant Articles:
+
+- [Will an Error Be Caught by Catch Block in Java?](https://www.baeldung.com/java-error-catch)
diff --git a/core-java-modules/core-java-exceptions/pom.xml b/core-java-modules/core-java-exceptions/pom.xml
index 37f65882c3..2e5200944a 100644
--- a/core-java-modules/core-java-exceptions/pom.xml
+++ b/core-java-modules/core-java-exceptions/pom.xml
@@ -14,15 +14,11 @@
 		<relativePath>../../parent-java</relativePath>
 	</parent>
 
-	<properties>
-		<commons-lang3.version>3.9</commons-lang3.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -32,4 +28,8 @@
 		</dependency>
 	</dependencies>
 
+	<properties>
+		<commons-lang3.version>3.9</commons-lang3.version>
+	</properties>
+
 </project>
diff --git a/core-java-modules/core-java-io/pom.xml b/core-java-modules/core-java-io/pom.xml
index 44c703ee68..1a133d2cbe 100644
--- a/core-java-modules/core-java-io/pom.xml
+++ b/core-java-modules/core-java-io/pom.xml
@@ -248,7 +248,6 @@
     <properties>
 
         <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
         <bouncycastle.version>1.55</bouncycastle.version>
         <commons-codec.version>1.10</commons-codec.version>
         <commons-math3.version>3.6.1</commons-math3.version>
diff --git a/core-java-modules/core-java-io/src/main/java/com/baeldung/files/Main.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/files/Main.java
new file mode 100644
index 0000000000..c3bcd048a4
--- /dev/null
+++ b/core-java-modules/core-java-io/src/main/java/com/baeldung/files/Main.java
@@ -0,0 +1,24 @@
+package com.baeldung.files;
+
+import static com.baeldung.files.NumberOfLineFinder.getTotalNumberOfLinesUsingApacheCommonsIO;
+import static com.baeldung.files.NumberOfLineFinder.getTotalNumberOfLinesUsingBufferedReader;
+import static com.baeldung.files.NumberOfLineFinder.getTotalNumberOfLinesUsingGoogleGuava;
+import static com.baeldung.files.NumberOfLineFinder.getTotalNumberOfLinesUsingLineNumberReader;
+import static com.baeldung.files.NumberOfLineFinder.getTotalNumberOfLinesUsingNIOFileChannel;
+import static com.baeldung.files.NumberOfLineFinder.getTotalNumberOfLinesUsingNIOFiles;
+import static com.baeldung.files.NumberOfLineFinder.getTotalNumberOfLinesUsingScanner;
+
+public class Main {
+
+    private static final String INPUT_FILE_NAME = "src/main/resources/input.txt";
+
+    public static void main(String... args) throws Exception {
+        System.out.printf("Total Number of Lines Using BufferedReader: %s%n", getTotalNumberOfLinesUsingBufferedReader(INPUT_FILE_NAME));
+        System.out.printf("Total Number of Lines Using LineNumberReader: %s%n", getTotalNumberOfLinesUsingLineNumberReader(INPUT_FILE_NAME));
+        System.out.printf("Total Number of Lines Using Scanner: %s%n", getTotalNumberOfLinesUsingScanner(INPUT_FILE_NAME));
+        System.out.printf("Total Number of Lines Using NIO Files: %s%n", getTotalNumberOfLinesUsingNIOFiles(INPUT_FILE_NAME));
+        System.out.printf("Total Number of Lines Using NIO FileChannel: %s%n", getTotalNumberOfLinesUsingNIOFileChannel(INPUT_FILE_NAME));
+        System.out.printf("Total Number of Lines Using Apache Commons IO: %s%n", getTotalNumberOfLinesUsingApacheCommonsIO(INPUT_FILE_NAME));
+        System.out.printf("Total Number of Lines Using NIO Google Guava: %s%n", getTotalNumberOfLinesUsingGoogleGuava(INPUT_FILE_NAME));
+    }
+}
diff --git a/core-java-modules/core-java-io/src/main/java/com/baeldung/files/NumberOfLineFinder.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/files/NumberOfLineFinder.java
new file mode 100644
index 0000000000..076825d76c
--- /dev/null
+++ b/core-java-modules/core-java-io/src/main/java/com/baeldung/files/NumberOfLineFinder.java
@@ -0,0 +1,112 @@
+package com.baeldung.files;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.List;
+import java.util.Scanner;
+import java.util.stream.Stream;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.LineIterator;
+
+public class NumberOfLineFinder {
+
+    public static int getTotalNumberOfLinesUsingBufferedReader(String fileName) {
+        int lines = 0;
+        try (BufferedReader reader = new BufferedReader(new FileReader(fileName))) {
+            while (reader.readLine() != null) {
+                lines++;
+            }
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return lines;
+    }
+
+    public static int getTotalNumberOfLinesUsingLineNumberReader(String fileName) {
+        int lines = 0;
+        try (LineNumberReader reader = new LineNumberReader(new FileReader(fileName))) {
+            reader.skip(Integer.MAX_VALUE);
+            lines = reader.getLineNumber() + 1;
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return lines;
+    }
+
+    public static int getTotalNumberOfLinesUsingScanner(String fileName) {
+        int lines = 0;
+        try (Scanner scanner = new Scanner(new FileReader(fileName))) {
+            while (scanner.hasNextLine()) {
+                scanner.nextLine();
+                lines++;
+            }
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return lines;
+    }
+
+    public static int getTotalNumberOfLinesUsingNIOFiles(String fileName) {
+        int lines = 0;
+        try (Stream<String> fileStream = Files.lines(Paths.get(fileName))) {
+            lines = (int) fileStream.count();
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return lines;
+    }
+
+    public static int getTotalNumberOfLinesUsingNIOFileChannel(String fileName) {
+        int lines = 1;
+        try (FileChannel channel = FileChannel.open(Paths.get(fileName), StandardOpenOption.READ)) {
+            ByteBuffer byteBuffer = channel.map(MapMode.READ_ONLY, 0, channel.size());
+            while (byteBuffer.hasRemaining()) {
+                byte currentChar = byteBuffer.get();
+                if (currentChar == '\n') {
+                    lines++;
+                }
+            }
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return lines;
+    }
+
+    public static int getTotalNumberOfLinesUsingApacheCommonsIO(String fileName) {
+        int lines = 0;
+        try {
+            LineIterator lineIterator = FileUtils.lineIterator(new File(fileName));
+            while (lineIterator.hasNext()) {
+                lineIterator.nextLine();
+                lines++;
+            }
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return lines;
+    }
+
+    public static int getTotalNumberOfLinesUsingGoogleGuava(String fileName) {
+        int lines = 0;
+        try {
+            List<String> lineItems = com.google.common.io.Files.readLines(Paths.get(fileName)
+                .toFile(), Charset.defaultCharset());
+            lines = lineItems.size();
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return lines;
+    }
+
+}
diff --git a/core-java-modules/core-java-io/src/test/java/com/baeldung/file/NumberOfLineFinderUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/file/NumberOfLineFinderUnitTest.java
new file mode 100644
index 0000000000..6f0427ebd2
--- /dev/null
+++ b/core-java-modules/core-java-io/src/test/java/com/baeldung/file/NumberOfLineFinderUnitTest.java
@@ -0,0 +1,60 @@
+package com.baeldung.file;
+
+import static com.baeldung.files.NumberOfLineFinder.getTotalNumberOfLinesUsingApacheCommonsIO;
+import static com.baeldung.files.NumberOfLineFinder.getTotalNumberOfLinesUsingBufferedReader;
+import static com.baeldung.files.NumberOfLineFinder.getTotalNumberOfLinesUsingGoogleGuava;
+import static com.baeldung.files.NumberOfLineFinder.getTotalNumberOfLinesUsingLineNumberReader;
+import static com.baeldung.files.NumberOfLineFinder.getTotalNumberOfLinesUsingNIOFileChannel;
+import static com.baeldung.files.NumberOfLineFinder.getTotalNumberOfLinesUsingNIOFiles;
+import static com.baeldung.files.NumberOfLineFinder.getTotalNumberOfLinesUsingScanner;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class NumberOfLineFinderUnitTest {
+    private static final String INPUT_FILE_NAME = "src/main/resources/input.txt";
+    private static final int ACTUAL_LINE_COUNT = 45;
+
+    @Test
+    public void whenUsingBufferedReader_thenReturnTotalNumberOfLines() {
+        int lines = getTotalNumberOfLinesUsingBufferedReader(INPUT_FILE_NAME);
+        assertEquals(ACTUAL_LINE_COUNT, lines);
+    }
+
+    @Test
+    public void whenUsingLineNumberReader_thenReturnTotalNumberOfLines() {
+        int lines = getTotalNumberOfLinesUsingLineNumberReader(INPUT_FILE_NAME);
+        assertEquals(ACTUAL_LINE_COUNT, lines);
+    }
+
+    @Test
+    public void whenUsingScanner_thenReturnTotalNumberOfLines() {
+        int lines = getTotalNumberOfLinesUsingScanner(INPUT_FILE_NAME);
+        assertEquals(ACTUAL_LINE_COUNT, lines);
+    }
+
+    @Test
+    public void whenUsingNIOFiles_thenReturnTotalNumberOfLines() {
+        int lines = getTotalNumberOfLinesUsingNIOFiles(INPUT_FILE_NAME);
+        assertEquals(ACTUAL_LINE_COUNT, lines);
+    }
+
+    @Test
+    public void whenUsingNIOFileChannel_thenReturnTotalNumberOfLines() {
+        int lines = getTotalNumberOfLinesUsingNIOFileChannel(INPUT_FILE_NAME);
+        assertEquals(ACTUAL_LINE_COUNT, lines);
+    }
+
+    @Test
+    public void whenUsingApacheCommonsIO_thenReturnTotalNumberOfLines() {
+        int lines = getTotalNumberOfLinesUsingApacheCommonsIO(INPUT_FILE_NAME);
+        assertEquals(ACTUAL_LINE_COUNT, lines);
+    }
+
+    @Test
+    public void whenUsingGoogleGuava_thenReturnTotalNumberOfLines() {
+        int lines = getTotalNumberOfLinesUsingGoogleGuava(INPUT_FILE_NAME);
+        assertEquals(ACTUAL_LINE_COUNT, lines);
+    }
+
+}
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule/pom.xml b/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule/pom.xml
index 6a41ec0d1a..059075318a 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule/pom.xml
+++ b/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule/pom.xml
@@ -11,6 +11,14 @@
         <version>1.0</version>
     </parent>
     
+    <dependencies>
+        <dependency>
+            <groupId>com.baeldung.servicemodule</groupId>
+            <artifactId>servicemodule</artifactId>
+            <version>1.0</version>           
+        </dependency>
+    </dependencies>
+    
     <build>
         <plugins>
             <plugin>
@@ -19,12 +27,4 @@
             </plugin>
         </plugins>
     </build>
-    
-    <dependencies>
-        <dependency>
-            <groupId>com.baeldung.servicemodule</groupId>
-            <artifactId>servicemodule</artifactId>
-            <version>1.0</version>           
-        </dependency>
-    </dependencies>
 </project>
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/pom.xml b/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/pom.xml
index 828fe7de6a..757d9229df 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/pom.xml
+++ b/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/pom.xml
@@ -2,17 +2,18 @@
 <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/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>com.baeldung.decoupling-pattern2</artifactId>
-        <groupId>decoupling-pattern2</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.baeldung.consumermodule</groupId>
     <artifactId>consumermodule</artifactId>
     <version>1.0</version>
 
+    <parent>
+        <artifactId>com.baeldung.decoupling-pattern2</artifactId>
+        <groupId>decoupling-pattern2</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
     <dependencies>
         <dependency>
             <groupId>com.baeldung.servicemodule</groupId>
diff --git a/core-java-modules/core-java-jvm/pom.xml b/core-java-modules/core-java-jvm/pom.xml
index 6c700cd005..b1860322a6 100644
--- a/core-java-modules/core-java-jvm/pom.xml
+++ b/core-java-modules/core-java-jvm/pom.xml
@@ -35,7 +35,6 @@
     </dependencies>
 
     <properties>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <assertj.version>3.6.1</assertj.version>
     </properties>
 </project>
diff --git a/core-java-modules/core-java-lambdas/README.md b/core-java-modules/core-java-lambdas/README.md
new file mode 100644
index 0000000000..10b876735e
--- /dev/null
+++ b/core-java-modules/core-java-lambdas/README.md
@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Why Do Local Variables Used in Lambdas Have to Be Final or Effectively Final?](https://www.baeldung.com/java-lambda-effectively-final-local-variables)
diff --git a/core-java-modules/core-java-lang-oop-2/README.md b/core-java-modules/core-java-lang-oop-2/README.md
index 2e36d251ca..72c3c6742b 100644
--- a/core-java-modules/core-java-lang-oop-2/README.md
+++ b/core-java-modules/core-java-lang-oop-2/README.md
@@ -6,3 +6,4 @@
 - [Generic Constructors in Java](https://www.baeldung.com/java-generic-constructors)
 - [Cannot Reference “X” Before Supertype Constructor Has Been Called](https://www.baeldung.com/java-cannot-reference-x-before-supertype-constructor-error)
 - [Anonymous Classes in Java](https://www.baeldung.com/java-anonymous-classes)
+- [Raw Types in Java](https://www.baeldung.com/raw-types-java)
diff --git a/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/aggregation/Car.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/aggregation/Car.java
new file mode 100644
index 0000000000..6be9a18781
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/aggregation/Car.java
@@ -0,0 +1,9 @@
+package com.baeldung.relationships.aggregation;
+
+import java.util.List;
+
+public class Car {
+
+    private List<Wheel> wheels;
+    
+}
diff --git a/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/aggregation/CarWithStaticInnerWheel.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/aggregation/CarWithStaticInnerWheel.java
new file mode 100644
index 0000000000..96c07f13a4
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/aggregation/CarWithStaticInnerWheel.java
@@ -0,0 +1,13 @@
+package com.baeldung.relationships.aggregation;
+
+import java.util.List;
+
+public class CarWithStaticInnerWheel {
+
+    private List<Wheel> wheels;
+
+    public static class Wheel {
+
+    }
+
+}
diff --git a/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/aggregation/Wheel.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/aggregation/Wheel.java
new file mode 100644
index 0000000000..1f38ea85ad
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/aggregation/Wheel.java
@@ -0,0 +1,7 @@
+package com.baeldung.relationships.aggregation;
+
+public class Wheel {
+
+    private Car car;
+    
+}
diff --git a/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/association/Child.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/association/Child.java
new file mode 100644
index 0000000000..4c748e8084
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/association/Child.java
@@ -0,0 +1,7 @@
+package com.baeldung.relationships.association;
+
+public class Child {
+
+    private Mother mother;
+
+}
diff --git a/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/association/Mother.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/association/Mother.java
new file mode 100644
index 0000000000..0e8edef125
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/association/Mother.java
@@ -0,0 +1,9 @@
+package com.baeldung.relationships.association;
+
+import java.util.List;
+
+public class Mother {
+
+    private List<Child> children;
+
+}
diff --git a/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/composition/Building.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/composition/Building.java
new file mode 100644
index 0000000000..1ab44f73fa
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/composition/Building.java
@@ -0,0 +1,18 @@
+package com.baeldung.relationships.composition;
+
+import java.util.List;
+
+public class Building {
+
+    private String address;
+    private List<Room> rooms;
+    
+    public class Room {
+        
+        public String getBuildingAddress() {
+            return Building.this.address;
+        }
+        
+    }
+    
+}
diff --git a/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/composition/BuildingWithDefinitionRoomInMethod.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/composition/BuildingWithDefinitionRoomInMethod.java
new file mode 100644
index 0000000000..4e3411cf30
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/composition/BuildingWithDefinitionRoomInMethod.java
@@ -0,0 +1,28 @@
+package com.baeldung.relationships.composition;
+
+public class BuildingWithDefinitionRoomInMethod {
+
+    public Room createAnonymousRoom() {
+        return new Room() {
+            @Override
+            public void doInRoom() {}
+        };
+    }
+
+    public Room createInlineRoom() {
+        class InlineRoom implements Room {
+            @Override
+            public void doInRoom() {}
+        }
+        return new InlineRoom();
+    }
+    
+    public Room createLambdaRoom() {
+        return () -> {};
+    }
+
+    public interface Room {
+        void doInRoom();
+    }
+
+}
diff --git a/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/university/Department.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/university/Department.java
new file mode 100644
index 0000000000..63cfd1b89e
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/university/Department.java
@@ -0,0 +1,9 @@
+package com.baeldung.relationships.university;
+
+import java.util.List;
+
+public class Department {
+
+    private List<Professor> professors;
+
+}
diff --git a/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/university/Professor.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/university/Professor.java
new file mode 100644
index 0000000000..8e1258c3e6
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/university/Professor.java
@@ -0,0 +1,10 @@
+package com.baeldung.relationships.university;
+
+import java.util.List;
+
+public class Professor {
+
+    private List<Department> department;
+    private List<Professor> friends;
+    
+}
diff --git a/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/university/University.java b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/university/University.java
new file mode 100644
index 0000000000..e5e518e0f1
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-2/src/main/java/com/baeldung/relationships/university/University.java
@@ -0,0 +1,9 @@
+package com.baeldung.relationships.university;
+
+import java.util.List;
+
+public class University {
+
+    private List<Department> department;
+    
+}
diff --git a/core-java-modules/core-java-lang-oop/pom.xml b/core-java-modules/core-java-lang-oop/pom.xml
index c9bb3b3e5a..46003b132b 100644
--- a/core-java-modules/core-java-lang-oop/pom.xml
+++ b/core-java-modules/core-java-lang-oop/pom.xml
@@ -75,13 +75,7 @@
     </build>
 
     <properties>
-        
-        <!-- marshalling -->
-        <jackson.version>2.8.5</jackson.version>
         <gson.version>2.8.2</gson.version>
-
-        <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
         <!-- testing -->
         <assertj-core.version>3.10.0</assertj-core.version>
         <equalsverifier.version>3.0.3</equalsverifier.version>
diff --git a/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/constructors/BankAccount.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/constructors/BankAccount.java
index 3d50e85245..b78b5937e1 100644
--- a/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/constructors/BankAccount.java
+++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/constructors/BankAccount.java
@@ -54,3 +54,15 @@ class BankAccountCopyConstructor extends BankAccount {
         this.balance = 0.0f;
     }
 }
+
+class BankAccountChainedConstructors extends BankAccount {
+    public BankAccountChainedConstructors(String name, LocalDateTime opened, double balance) {
+        this.name = name;
+        this.opened = opened;
+        this.balance = balance;
+    }
+
+    public BankAccountChainedConstructors(String name) {
+        this(name, LocalDateTime.now(), 0.0f);
+    }
+}
diff --git a/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/constructors/ConstructorUnitTest.java b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/constructors/ConstructorUnitTest.java
index 2cd8832fbf..66c8520e34 100644
--- a/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/constructors/ConstructorUnitTest.java
+++ b/core-java-modules/core-java-lang-oop/src/test/java/com/baeldung/constructors/ConstructorUnitTest.java
@@ -1,15 +1,14 @@
 package com.baeldung.constructors;
 
-import com.baeldung.constructors.*;
+import com.google.common.collect.Comparators;
+import org.junit.Test;
 
-import java.util.logging.Logger;
 import java.time.LocalDateTime;
 import java.time.Month;
+import java.util.ArrayList;
+import java.util.logging.Logger;
 
-import org.junit.Test;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.*;
 
 public class ConstructorUnitTest {
     final static Logger LOGGER = Logger.getLogger(ConstructorUnitTest.class.getName());
@@ -17,26 +16,28 @@ public class ConstructorUnitTest {
     @Test
     public void givenNoExplicitContructor_whenUsed_thenFails() {
         BankAccount account = new BankAccount();
-        assertThatThrownBy(() -> { account.toString(); }).isInstanceOf(Exception.class);
+        assertThatThrownBy(() -> {
+            account.toString();
+        }).isInstanceOf(Exception.class);
     }
 
     @Test
     public void givenNoArgumentConstructor_whenUsed_thenSucceeds() {
         BankAccountEmptyConstructor account = new BankAccountEmptyConstructor();
         assertThatCode(() -> {
-                account.toString();
-            }).doesNotThrowAnyException();
+            account.toString();
+        }).doesNotThrowAnyException();
     }
 
     @Test
     public void givenParameterisedConstructor_whenUsed_thenSucceeds() {
         LocalDateTime opened = LocalDateTime.of(2018, Month.JUNE, 29, 06, 30, 00);
         BankAccountParameterizedConstructor account =
-            new BankAccountParameterizedConstructor("Tom", opened, 1000.0f);
-        
+                new BankAccountParameterizedConstructor("Tom", opened, 1000.0f);
+
         assertThatCode(() -> {
-                account.toString();
-            }).doesNotThrowAnyException();
+            account.toString();
+        }).doesNotThrowAnyException();
     }
 
     @Test
@@ -47,7 +48,16 @@ public class ConstructorUnitTest {
 
         assertThat(account.getName()).isEqualTo(newAccount.getName());
         assertThat(account.getOpened()).isNotEqualTo(newAccount.getOpened());
-        
+
         assertThat(newAccount.getBalance()).isEqualTo(0.0f);
     }
+
+    @Test
+    public void givenChainedConstructor_whenUsed_thenMaintainsLogic() {
+        BankAccountChainedConstructors account = new BankAccountChainedConstructors("Tim");
+        BankAccountChainedConstructors newAccount = new BankAccountChainedConstructors("Tim", LocalDateTime.now(), 0.0f);
+
+        assertThat(account.getName()).isEqualTo(newAccount.getName());
+        assertThat(account.getBalance()).isEqualTo(newAccount.getBalance());
+    }
 }
diff --git a/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/breakloop/LoopBreaking.java b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/breakloop/LoopBreaking.java
new file mode 100644
index 0000000000..90b99f57cb
--- /dev/null
+++ b/core-java-modules/core-java-lang-syntax/src/main/java/com/baeldung/breakloop/LoopBreaking.java
@@ -0,0 +1,47 @@
+package com.baeldung.breakloop;
+
+public class LoopBreaking {
+
+    public String simpleBreak() {
+        String result = "";
+        for (int outerCounter = 0; outerCounter < 2; outerCounter++) {
+            result += "outer" + outerCounter;
+            for (int innerCounter = 0; innerCounter < 2; innerCounter++) {
+                result += "inner" + innerCounter;
+                if (innerCounter == 0) {
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
+    public String labelBreak() {
+        String result = "";
+        myBreakLabel:
+        for (int outerCounter = 0; outerCounter < 2; outerCounter++) {
+            result += "outer" + outerCounter;
+            for (int innerCounter = 0; innerCounter < 2; innerCounter++) {
+                result += "inner" + innerCounter;
+                if (innerCounter == 0) {
+                    break myBreakLabel;
+                }
+            }
+        }
+        return result;
+    }
+
+    public String usingReturn() {
+        String result = "";
+        for (int outerCounter = 0; outerCounter < 2; outerCounter++) {
+            result += "outer" + outerCounter;
+            for (int innerCounter = 0; innerCounter < 2; innerCounter++) {
+                result += "inner" + innerCounter;
+                if (innerCounter == 0) {
+                    return result;
+                }
+            }
+        }
+        return "failed";
+    }
+}
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/breakloop/LoopBreakingUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/breakloop/LoopBreakingUnitTest.java
new file mode 100644
index 0000000000..c4b6573c86
--- /dev/null
+++ b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/breakloop/LoopBreakingUnitTest.java
@@ -0,0 +1,25 @@
+package com.baeldung.breakloop;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class LoopBreakingUnitTest {
+
+    private LoopBreaking loopBreaking = new LoopBreaking();
+
+    @Test
+    void whenUsingBreak_shouldBreakInnerLoop() {
+        assertEquals("outer0inner0outer1inner0", loopBreaking.simpleBreak());
+    }
+
+    @Test
+    void whenUsingLabeledBreak_shouldBreakInnerLoopAndOuterLoop() {
+        assertEquals("outer0inner0", loopBreaking.labelBreak());
+    }
+
+    @Test
+    void whenUsingReturn_shouldBreakInnerLoopAndOuterLoop() {
+        assertEquals("outer0inner0", loopBreaking.usingReturn());
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/incrementdecrementunaryoperator/IncrementDecrementUnaryOperatorUnitTest.java b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/incrementdecrementunaryoperator/IncrementDecrementUnaryOperatorUnitTest.java
new file mode 100644
index 0000000000..ee17c1e8ea
--- /dev/null
+++ b/core-java-modules/core-java-lang-syntax/src/test/java/com/baeldung/incrementdecrementunaryoperator/IncrementDecrementUnaryOperatorUnitTest.java
@@ -0,0 +1,63 @@
+package com.baeldung.incrementdecrementunaryoperator;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class IncrementDecrementUnaryOperatorUnitTest {
+
+    @Test
+    public void givenAnOperand_whenUsingPreIncrementUnaryOperator_thenOperandIsIncrementedByOne() {
+        int operand = 1;
+        ++operand;
+        assertThat(operand).isEqualTo(2);
+    }
+
+    @Test
+    public void givenANumber_whenUsingPreIncrementUnaryOperatorInEvaluation_thenNumberIsIncrementedByOne() {
+        int operand = 1;
+        int number = ++operand;
+        assertThat(number).isEqualTo(2);
+    }
+
+    @Test
+    public void givenAnOperand_whenUsingPreDecrementUnaryOperator_thenOperandIsDecrementedByOne() {
+        int operand = 1;
+        --operand;
+        assertThat(operand).isEqualTo(0);
+    }
+
+    @Test
+    public void givenANumber_whenUsingPreDecrementUnaryOperatorInEvaluation_thenNumberIsDecrementedByOne() {
+        int operand = 1;
+        int number = --operand;
+        assertThat(number).isEqualTo(0);
+    }
+
+    @Test
+    public void givenAnOperand_whenUsingPostIncrementUnaryOperator_thenOperandIsIncrementedByOne() {
+        int operand = 1;
+        operand++;
+        assertThat(operand).isEqualTo(2);
+    }
+
+    @Test
+    public void givenANumber_whenUsingPostIncrementUnaryOperatorInEvaluation_thenNumberIsSameAsOldValue() {
+        int operand = 1;
+        int number = operand++;
+        assertThat(number).isEqualTo(1);
+    }
+
+    @Test
+    public void givenAnOperand_whenUsingPostDecrementUnaryOperator_thenOperandIsDecrementedByOne() {
+        int operand = 1;
+        operand--;
+        assertThat(operand).isEqualTo(0);
+    }
+
+    @Test
+    public void givenANumber_whenUsingPostDecrementUnaryOperatorInEvaluation_thenNumberIsSameAsOldValue() {
+        int operand = 1;
+        int number = operand--;
+        assertThat(number).isEqualTo(1);
+    }
+}
diff --git a/core-java-modules/core-java-lang/README.md b/core-java-modules/core-java-lang/README.md
index e9169a5820..74936eac21 100644
--- a/core-java-modules/core-java-lang/README.md
+++ b/core-java-modules/core-java-lang/README.md
@@ -18,7 +18,6 @@
 - [A Guide to Inner Interfaces in Java](http://www.baeldung.com/java-inner-interfaces)
 - [Recursion In Java](http://www.baeldung.com/java-recursion)
 - [A Guide to the finalize Method in Java](http://www.baeldung.com/java-finalize)
-- [A Guide to Java Enums](http://www.baeldung.com/a-guide-to-java-enums)
 - [Infinite Loops in Java](http://www.baeldung.com/infinite-loops-java)
 - [Quick Guide to java.lang.System](http://www.baeldung.com/java-lang-system)
 - [Using Java Assertions](http://www.baeldung.com/java-assert)
diff --git a/core-java-modules/core-java-lang/pom.xml b/core-java-modules/core-java-lang/pom.xml
index 45ccc8d0f5..8311636873 100644
--- a/core-java-modules/core-java-lang/pom.xml
+++ b/core-java-modules/core-java-lang/pom.xml
@@ -75,9 +75,6 @@
 
     <properties>
         <gson.version>2.8.2</gson.version>
-
-        <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
         
         <javax.mail.version>1.5.0-b01</javax.mail.version>
         
diff --git a/core-java-modules/core-java-networking-2/pom.xml b/core-java-modules/core-java-networking-2/pom.xml
new file mode 100644
index 0000000000..8a26f6ab9f
--- /dev/null
+++ b/core-java-modules/core-java-networking-2/pom.xml
@@ -0,0 +1,20 @@
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-java-networking-2</artifactId>
+    <name>core-java-networking-2</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-networking-2</finalName>
+    </build>	
+</project>
diff --git a/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/url/UrlChecker.java b/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/url/UrlChecker.java
new file mode 100644
index 0000000000..b99e74f8bf
--- /dev/null
+++ b/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/url/UrlChecker.java
@@ -0,0 +1,25 @@
+package com.baeldung.url;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class UrlChecker {
+
+    public int getResponseCodeForURL(String address) throws IOException {
+        return getResponseCodeForURLUsing(address, "GET");
+    }
+
+    public int getResponseCodeForURLUsingHead(String address) throws IOException {
+        return getResponseCodeForURLUsing(address, "HEAD");
+    }
+
+    private int getResponseCodeForURLUsing(String address, String method) throws IOException {
+        HttpURLConnection.setFollowRedirects(false); // Set follow redirects to false
+        final URL url = new URL(address);
+        HttpURLConnection huc = (HttpURLConnection) url.openConnection();
+        huc.setRequestMethod(method);
+        return huc.getResponseCode();
+    }
+
+}
diff --git a/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/url/UrlCheckerUnitTest.java b/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/url/UrlCheckerUnitTest.java
new file mode 100644
index 0000000000..5e295e65a0
--- /dev/null
+++ b/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/url/UrlCheckerUnitTest.java
@@ -0,0 +1,39 @@
+package com.baeldung.url;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+public class UrlCheckerUnitTest {
+
+    @Test
+    public void givenValidUrl_WhenUsingHEAD_ThenReturn200() throws IOException {
+        UrlChecker tester = new UrlChecker();
+        int responseCode = tester.getResponseCodeForURLUsingHead("http://www.example.com");
+        assertEquals(200, responseCode);
+    }
+    
+    @Test
+    public void givenInvalidIUrl_WhenUsingHEAD_ThenReturn404() throws IOException {
+        UrlChecker tester = new UrlChecker();
+        int responseCode = tester.getResponseCodeForURLUsingHead("http://www.example.com/unkownurl");
+        assertEquals(404, responseCode);
+    }
+    
+    @Test
+    public void givenValidUrl_WhenUsingGET_ThenReturn200() throws IOException {
+        UrlChecker tester = new UrlChecker();
+        int responseCode = tester.getResponseCodeForURL("http://www.example.com");
+        assertEquals(200, responseCode);
+    }
+    
+    @Test
+    public void givenInvalidIUrl_WhenUsingGET_ThenReturn404() throws IOException {
+        UrlChecker tester = new UrlChecker();
+        int responseCode = tester.getResponseCodeForURL("http://www.example.com/unkownurl");
+        assertEquals(404, responseCode);
+    }
+    
+}
diff --git a/core-java-modules/core-java-networking/pom.xml b/core-java-modules/core-java-networking/pom.xml
index 550ebdb4ff..e2ee7b2fcc 100644
--- a/core-java-modules/core-java-networking/pom.xml
+++ b/core-java-modules/core-java-networking/pom.xml
@@ -42,8 +42,6 @@
 
     <properties>
         <javax.mail.version>1.5.0-b01</javax.mail.version>
-        <commons-io.version>2.5</commons-io.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <springframework.spring-web.version>4.3.4.RELEASE</springframework.spring-web.version>
     </properties>	
 </project>
diff --git a/core-java-modules/core-java-nio/README.md b/core-java-modules/core-java-nio/README.md
index e73a9850ad..9034c3b3b1 100644
--- a/core-java-modules/core-java-nio/README.md
+++ b/core-java-modules/core-java-nio/README.md
@@ -1,3 +1,3 @@
 ## Relevant articles:
 
-- [Determine File Creating Date in Java](https://www.baeldung.com/file-creation-date-java)
+- [Determine File Creating Date in Java](https://www.baeldung.com/java-file-creation-date)
diff --git a/core-java-modules/core-java-nio/pom.xml b/core-java-modules/core-java-nio/pom.xml
index 36d6848998..31433e632f 100644
--- a/core-java-modules/core-java-nio/pom.xml
+++ b/core-java-modules/core-java-nio/pom.xml
@@ -8,9 +8,9 @@
     <packaging>jar</packaging>
 
     <parent>
-      <groupId>com.baeldung</groupId>
-      <artifactId>parent-java</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-      <relativePath>../../parent-java</relativePath>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-java</relativePath>
     </parent>
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-optional/README.md b/core-java-modules/core-java-optional/README.md
index 12a6fd1a56..b6848b5d33 100644
--- a/core-java-modules/core-java-optional/README.md
+++ b/core-java-modules/core-java-optional/README.md
@@ -2,4 +2,5 @@
 
 ## Core Java Optional
 
-### Relevant Articles: 
\ No newline at end of file
+### Relevant Articles: 
+- [Java Optional as Return Type](https://www.baeldung.com/java-optional-return)
diff --git a/core-java-modules/core-java-optional/pom.xml b/core-java-modules/core-java-optional/pom.xml
index f2478c2c87..eb981c0907 100644
--- a/core-java-modules/core-java-optional/pom.xml
+++ b/core-java-modules/core-java-optional/pom.xml
@@ -1,22 +1,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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.baeldung.core-java-modules</groupId>
-    <artifactId>core-java-modules</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>core-java-optional</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <hibernate.core.version>5.4.0.Final</hibernate.core.version>
-        <h2database.version>1.4.197</h2database.version>
-        <jackson.databind.version>2.9.8</jackson.databind.version>
-    </properties>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-java-optional</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+	
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
   
     <dependencies>
         <dependency>
@@ -27,12 +19,12 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2database.version}</version>
+            <version>${h2.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.databind.version}</version>
+            <version>${jackson.version}</version>
         </dependency>
     </dependencies>
 
@@ -50,4 +42,11 @@
         </plugins>
 
     </build>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <hibernate.core.version>5.4.0.Final</hibernate.core.version>
+    </properties>
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-os/pom.xml b/core-java-modules/core-java-os/pom.xml
index 85194b176e..f6c5ef04a5 100644
--- a/core-java-modules/core-java-os/pom.xml
+++ b/core-java-modules/core-java-os/pom.xml
@@ -68,7 +68,6 @@
 
     <properties>
         <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <collections-generic.version>4.01</collections-generic.version>
     
diff --git a/core-java-modules/core-java-os/src/main/java/com/baeldung/core/pwd/CurrentDirectoryFetcher.java b/core-java-modules/core-java-os/src/main/java/com/baeldung/core/pwd/CurrentDirectoryFetcher.java
new file mode 100644
index 0000000000..8f022d2cc7
--- /dev/null
+++ b/core-java-modules/core-java-os/src/main/java/com/baeldung/core/pwd/CurrentDirectoryFetcher.java
@@ -0,0 +1,40 @@
+package com.baeldung.core.pwd;
+
+import java.io.File;
+import java.nio.file.FileSystems;
+import java.nio.file.Paths;
+
+public final class CurrentDirectoryFetcher {
+
+    public static void main(String[] args) {
+        System.out.printf("Current Directory Using Java System API: %s%n", currentDirectoryUsingSystemProperties());
+
+        System.out.printf("Current Directory Using Java IO File API: %s%n", currentDirectoryUsingFile());
+
+        System.out.printf("Current Directory Using Java NIO FileSystems API: %s%n", currentDirectoryUsingFileSystems());
+
+        System.out.printf("Current Directory Using Java NIO Paths API: %s%n", currentDirectoryUsingPaths());
+    }
+
+    public static String currentDirectoryUsingSystemProperties() {
+        return System.getProperty("user.dir");
+    }
+
+    public static String currentDirectoryUsingPaths() {
+        return Paths.get("")
+            .toAbsolutePath()
+            .toString();
+    }
+
+    public static String currentDirectoryUsingFileSystems() {
+        return FileSystems.getDefault()
+            .getPath("")
+            .toAbsolutePath()
+            .toString();
+    }
+
+    public static String currentDirectoryUsingFile() {
+        return new File("").getAbsolutePath();
+    }
+
+}
diff --git a/core-java-modules/core-java-os/src/test/java/com/baeldung/core/pwd/CurrentDirectoryFetcherTest.java b/core-java-modules/core-java-os/src/test/java/com/baeldung/core/pwd/CurrentDirectoryFetcherTest.java
new file mode 100644
index 0000000000..dbaad211d9
--- /dev/null
+++ b/core-java-modules/core-java-os/src/test/java/com/baeldung/core/pwd/CurrentDirectoryFetcherTest.java
@@ -0,0 +1,34 @@
+package com.baeldung.core.pwd;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class CurrentDirectoryFetcherTest {
+
+    private static final String CURRENT_DIR = "core-java-os";
+
+    @Test
+    public void whenUsingSystemProperties_thenReturnCurrentDirectory() {
+        assertTrue(CurrentDirectoryFetcher.currentDirectoryUsingSystemProperties()
+            .endsWith(CURRENT_DIR));
+    }
+
+    @Test
+    public void whenUsingJavaNioPaths_thenReturnCurrentDirectory() {
+        assertTrue(CurrentDirectoryFetcher.currentDirectoryUsingPaths()
+            .endsWith(CURRENT_DIR));
+    }
+
+    @Test
+    public void whenUsingJavaNioFileSystems_thenReturnCurrentDirectory() {
+        assertTrue(CurrentDirectoryFetcher.currentDirectoryUsingFileSystems()
+            .endsWith(CURRENT_DIR));
+    }
+
+    @Test
+    public void whenUsingJavaIoFile_thenReturnCurrentDirectory() {
+        assertTrue(CurrentDirectoryFetcher.currentDirectoryUsingFile()
+            .endsWith(CURRENT_DIR));
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-perf/pom.xml b/core-java-modules/core-java-perf/pom.xml
index f225a9554b..b9c9d30ac0 100644
--- a/core-java-modules/core-java-perf/pom.xml
+++ b/core-java-modules/core-java-perf/pom.xml
@@ -23,11 +23,4 @@
        
     </dependencies>
 
-    <properties>
-
-        <!-- util -->
-        <commons-lang3.version>3.8.1</commons-lang3.version>
-      
-    </properties>
-
 </project>
diff --git a/core-java-modules/core-java-security/pom.xml b/core-java-modules/core-java-security/pom.xml
index ed82a5209a..d3efb26fe8 100644
--- a/core-java-modules/core-java-security/pom.xml
+++ b/core-java-modules/core-java-security/pom.xml
@@ -43,7 +43,6 @@
     <properties>
 
         <!-- util -->
-        <commons-lang3.version>3.8.1</commons-lang3.version>
         <bouncycastle.version>1.60</bouncycastle.version>
         <commons-codec.version>1.11</commons-codec.version>
 
diff --git a/core-java-modules/core-java-security/src/main/java/com/baeldung/random/SecureRandomDemo.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/random/SecureRandomDemo.java
new file mode 100644
index 0000000000..02f815f5a7
--- /dev/null
+++ b/core-java-modules/core-java-security/src/main/java/com/baeldung/random/SecureRandomDemo.java
@@ -0,0 +1,36 @@
+package com.baeldung.random;
+
+import java.security.SecureRandom;
+import java.security.NoSuchAlgorithmException;
+import java.util.stream.IntStream;
+import java.util.stream.LongStream;
+import java.util.stream.DoubleStream;
+
+public interface SecureRandomDemo {
+
+    public static void generateSecureRandomValues() {
+        SecureRandom sr = new SecureRandom();
+
+        int randomInt = sr.nextInt();
+        long randomLong = sr.nextLong();
+        float randomFloat = sr.nextFloat();
+        double randomDouble = sr.nextDouble();
+        boolean randomBoolean = sr.nextBoolean();
+
+        IntStream randomIntStream = sr.ints();
+        LongStream randomLongStream = sr.longs();
+        DoubleStream randomDoubleStream = sr.doubles();
+
+        byte[] values = new byte[124];
+        sr.nextBytes(values);
+    }
+
+    public static SecureRandom getSecureRandomForAlgorithm(String algorithm) throws NoSuchAlgorithmException {
+        if (algorithm == null || algorithm.isEmpty()) {
+            return new SecureRandom();
+        }
+
+        return SecureRandom.getInstance(algorithm);
+    }
+
+}
diff --git a/core-java-modules/core-java-security/src/main/java/com/baeldung/sasl/ClientCallbackHandler.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/sasl/ClientCallbackHandler.java
new file mode 100644
index 0000000000..d73f2a2708
--- /dev/null
+++ b/core-java-modules/core-java-security/src/main/java/com/baeldung/sasl/ClientCallbackHandler.java
@@ -0,0 +1,29 @@
+package com.baeldung.sasl;
+
+import java.io.IOException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.sasl.RealmCallback;
+
+public class ClientCallbackHandler implements CallbackHandler {
+
+    @Override
+    public void handle(Callback[] cbs) throws IOException, UnsupportedCallbackException {
+        for (Callback cb : cbs) {
+            if (cb instanceof NameCallback) {
+                NameCallback nc = (NameCallback) cb;
+                nc.setName("username");
+            } else if (cb instanceof PasswordCallback) {
+                PasswordCallback pc = (PasswordCallback) cb;
+                pc.setPassword("password".toCharArray());
+            } else if (cb instanceof RealmCallback) {
+                RealmCallback rc = (RealmCallback) cb;
+                rc.setText("myServer");
+            }
+        }
+    }
+}
diff --git a/core-java-modules/core-java-security/src/main/java/com/baeldung/sasl/ServerCallbackHandler.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/sasl/ServerCallbackHandler.java
new file mode 100644
index 0000000000..3e071d68cc
--- /dev/null
+++ b/core-java-modules/core-java-security/src/main/java/com/baeldung/sasl/ServerCallbackHandler.java
@@ -0,0 +1,34 @@
+package com.baeldung.sasl;
+
+import java.io.IOException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.sasl.AuthorizeCallback;
+import javax.security.sasl.RealmCallback;
+
+public class ServerCallbackHandler implements CallbackHandler {
+
+    @Override
+    public void handle(Callback[] cbs) throws IOException, UnsupportedCallbackException {
+        for (Callback cb : cbs) {
+            if (cb instanceof AuthorizeCallback) {
+                AuthorizeCallback ac = (AuthorizeCallback) cb;
+                ac.setAuthorized(true);
+            } else if (cb instanceof NameCallback) {
+                NameCallback nc = (NameCallback) cb;
+                nc.setName("username");
+
+            } else if (cb instanceof PasswordCallback) {
+                PasswordCallback pc = (PasswordCallback) cb;
+                pc.setPassword("password".toCharArray());
+            } else if (cb instanceof RealmCallback) {
+                RealmCallback rc = (RealmCallback) cb;
+                rc.setText("myServer");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-security/src/test/java/com/baeldung/sasl/SaslUnitTest.java b/core-java-modules/core-java-security/src/test/java/com/baeldung/sasl/SaslUnitTest.java
new file mode 100644
index 0000000000..6601654781
--- /dev/null
+++ b/core-java-modules/core-java-security/src/test/java/com/baeldung/sasl/SaslUnitTest.java
@@ -0,0 +1,76 @@
+package com.baeldung.sasl;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.sasl.Sasl;
+import javax.security.sasl.SaslClient;
+import javax.security.sasl.SaslException;
+import javax.security.sasl.SaslServer;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SaslUnitTest {
+
+    private static final String MECHANISM = "DIGEST-MD5";
+    private static final String SERVER_NAME = "myServer";
+    private static final String PROTOCOL = "myProtocol";
+    private static final String AUTHORIZATION_ID = null;
+    private static final String QOP_LEVEL = "auth-conf";
+
+    private SaslServer saslServer;
+    private SaslClient saslClient;
+
+    @Before
+    public void setUp() throws SaslException {
+
+        ServerCallbackHandler serverHandler = new ServerCallbackHandler();
+        ClientCallbackHandler clientHandler = new ClientCallbackHandler();
+
+        Map<String, String> props = new HashMap<>();
+        props.put(Sasl.QOP, QOP_LEVEL);
+
+        saslServer = Sasl.createSaslServer(MECHANISM, PROTOCOL, SERVER_NAME, props, serverHandler);
+        saslClient = Sasl.createSaslClient(new String[] { MECHANISM }, AUTHORIZATION_ID, PROTOCOL, SERVER_NAME, props, clientHandler);
+
+    }
+
+    @Test
+    public void givenHandlers_whenStarted_thenAutenticationWorks() throws SaslException {
+
+        byte[] challenge;
+        byte[] response;
+
+        challenge = saslServer.evaluateResponse(new byte[0]);
+        response = saslClient.evaluateChallenge(challenge);
+
+        challenge = saslServer.evaluateResponse(response);
+        response = saslClient.evaluateChallenge(challenge);
+
+        assertTrue(saslServer.isComplete());
+        assertTrue(saslClient.isComplete());
+
+        String qop = (String) saslClient.getNegotiatedProperty(Sasl.QOP);
+        assertEquals("auth-conf", qop);
+
+        byte[] outgoing = "Baeldung".getBytes();
+        byte[] secureOutgoing = saslClient.wrap(outgoing, 0, outgoing.length);
+
+        byte[] secureIncoming = secureOutgoing;
+        byte[] incoming = saslServer.unwrap(secureIncoming, 0, secureIncoming.length);
+        assertEquals("Baeldung", new String(incoming, StandardCharsets.UTF_8));
+    }
+
+    @After
+    public void tearDown() throws SaslException {
+        saslClient.dispose();
+        saslServer.dispose();
+    }
+
+}
diff --git a/core-java-modules/core-java-sun/pom.xml b/core-java-modules/core-java-sun/pom.xml
index da27564d96..ab5f945114 100644
--- a/core-java-modules/core-java-sun/pom.xml
+++ b/core-java-modules/core-java-sun/pom.xml
@@ -264,7 +264,6 @@
 
         <!-- util -->
         <guava.version>23.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <bouncycastle.version>1.55</bouncycastle.version>
         <commons-codec.version>1.10</commons-codec.version>
         <commons-math3.version>3.6.1</commons-math3.version>
diff --git a/core-java-modules/core-java/README.md b/core-java-modules/core-java/README.md
index b32b5d5cd9..436a481803 100644
--- a/core-java-modules/core-java/README.md
+++ b/core-java-modules/core-java/README.md
@@ -37,7 +37,6 @@
 - [Common Java Exceptions](http://www.baeldung.com/java-common-exceptions)
 - [Throw Exception in Optional in Java 8](https://www.baeldung.com/java-optional-throw-exception)
 - [Merging java.util.Properties Objects](https://www.baeldung.com/java-merging-properties)
-- [Merging java.util.Properties Objects](https://www.baeldung.com/java-merging-properties)
 - [Java – Try with Resources](https://www.baeldung.com/java-try-with-resources)
 - [Abstract Classes in Java](https://www.baeldung.com/java-abstract-class)
 - [Guide to Character Encoding](https://www.baeldung.com/java-char-encoding)
diff --git a/core-java-modules/core-java/pom.xml b/core-java-modules/core-java/pom.xml
index 7942f3e7e2..2a2cb3a6af 100644
--- a/core-java-modules/core-java/pom.xml
+++ b/core-java-modules/core-java/pom.xml
@@ -13,7 +13,6 @@
         <relativePath>../../parent-java</relativePath>
     </parent>
 
-
     <dependencies>
         <dependency>
             <groupId>commons-io</groupId>
@@ -114,7 +113,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2database.version}</version>
+            <version>${h2.version}</version>
         </dependency>
         <!-- instrumentation -->
         <dependency>
@@ -454,8 +453,6 @@
         <gson.version>2.8.2</gson.version>
 
         <!-- util -->
-        <commons-lang3.version>3.9</commons-lang3.version>
-        <commons-io.version>2.5</commons-io.version>
         <commons-math3.version>3.6.1</commons-math3.version>
         <decimal4j.version>1.0.3</decimal4j.version>
         <unix4j.version>0.4</unix4j.version>
@@ -472,7 +469,6 @@
         <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         
         <javamoney.moneta.version>1.1</javamoney.moneta.version>
-        <h2database.version>1.4.197</h2database.version>
         <esapi.version>2.1.0.1</esapi.version>
         <jmh-core.version>1.19</jmh-core.version>
        
diff --git a/core-java-modules/multimodulemavenproject/README.md b/core-java-modules/multimodulemavenproject/README.md
new file mode 100644
index 0000000000..fc4ca60b6b
--- /dev/null
+++ b/core-java-modules/multimodulemavenproject/README.md
@@ -0,0 +1,3 @@
+## Relevant Articles
+
+- [Multi-Module Maven Application with Java Modules](https://www.baeldung.com/maven-multi-module-project-java-jpms)
diff --git a/core-java-modules/multimodulemavenproject/daomodule/pom.xml b/core-java-modules/multimodulemavenproject/daomodule/pom.xml
index a260e15e6d..e98c48aa76 100644
--- a/core-java-modules/multimodulemavenproject/daomodule/pom.xml
+++ b/core-java-modules/multimodulemavenproject/daomodule/pom.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.daomodule</groupId>
+    <artifactId>daomodule</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    
     <parent>
         <groupId>com.baeldung.multimodulemavenproject</groupId>
         <artifactId>multimodulemavenproject</artifactId>
         <version>1.0</version>
     </parent>
-    <groupId>com.baeldung.daomodule</groupId>
-    <artifactId>daomodule</artifactId>
-    <version>1.0</version>
-    <packaging>jar</packaging>
     
     <build>
         <plugins>
diff --git a/core-java-modules/multimodulemavenproject/entitymodule/pom.xml b/core-java-modules/multimodulemavenproject/entitymodule/pom.xml
index 1fd672d03e..b90a7ed068 100644
--- a/core-java-modules/multimodulemavenproject/entitymodule/pom.xml
+++ b/core-java-modules/multimodulemavenproject/entitymodule/pom.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.entitymodule</groupId>
+    <artifactId>entitymodule</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+
     <parent>
         <groupId>com.baeldung.multimodulemavenproject</groupId>
         <artifactId>multimodulemavenproject</artifactId>
         <version>1.0</version>
     </parent>
-    <groupId>com.baeldung.entitymodule</groupId>
-    <artifactId>entitymodule</artifactId>
-    <version>1.0</version>
-    <packaging>jar</packaging>
     
     <build>
         <plugins>
diff --git a/core-java-modules/multimodulemavenproject/mainappmodule/pom.xml b/core-java-modules/multimodulemavenproject/mainappmodule/pom.xml
index 26e6a15b1e..1f44a1690c 100644
--- a/core-java-modules/multimodulemavenproject/mainappmodule/pom.xml
+++ b/core-java-modules/multimodulemavenproject/mainappmodule/pom.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.mainappmodule</groupId>
+    <artifactId>mainappmodule</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+
     <parent>
         <groupId>com.baeldung.multimodulemavenproject</groupId>
         <artifactId>multimodulemavenproject</artifactId>
         <version>1.0</version>
     </parent>
-    <groupId>com.baeldung.mainappmodule</groupId>
-    <artifactId>mainappmodule</artifactId>
-    <version>1.0</version>
-    <packaging>jar</packaging>
     
     <dependencies>
         <dependency>
diff --git a/core-java-modules/multimodulemavenproject/pom.xml b/core-java-modules/multimodulemavenproject/pom.xml
index 3d56f1356b..ad347a4179 100644
--- a/core-java-modules/multimodulemavenproject/pom.xml
+++ b/core-java-modules/multimodulemavenproject/pom.xml
@@ -14,18 +14,25 @@
         <relativePath>../../</relativePath>
     </parent>
     
+    <modules>
+        <module>entitymodule</module>
+        <module>daomodule</module>
+        <module>userdaomodule</module>
+        <module>mainappmodule</module>
+    </modules>
+    
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.12</version>
+                <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
-                <version>3.12.2</version>
+                <version>${assertj-core.version}</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
@@ -49,14 +56,8 @@
         </pluginManagement>
     </build>
     
-    <modules>
-        <module>entitymodule</module>
-        <module>daomodule</module>
-        <module>userdaomodule</module>
-        <module>mainappmodule</module>
-    </modules>
-    
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <assertj-core.version>3.12.2</assertj-core.version>
     </properties>
 </project>
diff --git a/core-java-modules/multimodulemavenproject/userdaomodule/pom.xml b/core-java-modules/multimodulemavenproject/userdaomodule/pom.xml
index 63968452db..d3543d5864 100644
--- a/core-java-modules/multimodulemavenproject/userdaomodule/pom.xml
+++ b/core-java-modules/multimodulemavenproject/userdaomodule/pom.xml
@@ -1,24 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.userdaomodule</groupId>
+    <artifactId>userdaomodule</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+
     <parent>
         <groupId>com.baeldung.multimodulemavenproject</groupId>
         <artifactId>multimodulemavenproject</artifactId>
         <version>1.0</version>
     </parent>
-    <groupId>com.baeldung.userdaomodule</groupId>
-    <artifactId>userdaomodule</artifactId>
-    <version>1.0</version>
-    <packaging>jar</packaging>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
     
     <dependencies>
         <dependency>
@@ -33,6 +25,15 @@
         </dependency>
     </dependencies>
     
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    
     <properties>
         <maven.compiler.source>9</maven.compiler.source>
         <maven.compiler.target>9</maven.compiler.target>
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index 11a1003460..2dca62005d 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -17,6 +17,7 @@
         <module>pre-jpms</module>
         <module>core-java-exceptions</module>
         <module>core-java-optional</module>
+        <module>core-java-networking-2</module>
     </modules>
     
 </project>
diff --git a/core-java-modules/pre-jpms/pom.xml b/core-java-modules/pre-jpms/pom.xml
index 169cd21f3e..380d94fbf1 100644
--- a/core-java-modules/pre-jpms/pom.xml
+++ b/core-java-modules/pre-jpms/pom.xml
@@ -18,9 +18,10 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.25</version>
+			<version>${org.slf4j.version}</version>
 		</dependency>
 	</dependencies>
+
 	<build>
 		<finalName>pre-jpms</finalName>
 		<plugins>
@@ -65,9 +66,9 @@
 					</archive>
 				</configuration>
 			</plugin>
-
 		</plugins>
 	</build>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
diff --git a/core-kotlin-io/pom.xml b/core-kotlin-io/pom.xml
index a0b688a223..78b36626d6 100644
--- a/core-kotlin-io/pom.xml
+++ b/core-kotlin-io/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>${junit.jupiter.version}</version>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -88,7 +88,7 @@
 
     <properties>
         <kotlin.version>1.3.30</kotlin.version>
-        <junit.jupiter.version>5.4.2</junit.jupiter.version>
+        <junit-jupiter.version>5.4.2</junit-jupiter.version>
         <mockito.version>2.27.0</mockito.version>
         <byte-buddy.version>1.9.12</byte-buddy.version>
         <assertj.version>3.10.0</assertj.version>
diff --git a/core-kotlin/pom.xml b/core-kotlin/pom.xml
index 5de986b49e..e4d243360a 100644
--- a/core-kotlin/pom.xml
+++ b/core-kotlin/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2database.version}</version>
+            <version>${h2.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.kittinunf.fuel</groupId>
@@ -76,11 +76,9 @@
 
     <properties>
         <commons-math3.version>3.6.1</commons-math3.version>
-        <commons-lang3.version>3.8.1</commons-lang3.version>
         <junit.platform.version>1.1.1</junit.platform.version>
         <junit.vintage.version>5.2.0</junit.vintage.version>
         <assertj.version>3.10.0</assertj.version>
-        <h2database.version>1.4.197</h2database.version>
         <fuel.version>1.15.0</fuel.version>
 		<kovenant.version>3.3.0</kovenant.version>
 		<injekt-core.version>1.16.1</injekt-core.version>
diff --git a/couchbase/pom.xml b/couchbase/pom.xml
index 31e6a53388..fc40749c61 100644
--- a/couchbase/pom.xml
+++ b/couchbase/pom.xml
@@ -69,7 +69,6 @@
     <properties>
         <couchbase.client.version>2.5.0</couchbase.client.version>
         <spring-framework.version>4.3.5.RELEASE</spring-framework.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
     </properties>
 
 </project>
diff --git a/custom-pmd-0.0.1.jar b/custom-pmd-0.0.1.jar
index e19bce6e52..3ae5e8e41a 100644
Binary files a/custom-pmd-0.0.1.jar and b/custom-pmd-0.0.1.jar differ
diff --git a/custom-pmd/pom.xml b/custom-pmd/pom.xml
index 74e6d9593b..9964bf2bb4 100644
--- a/custom-pmd/pom.xml
+++ b/custom-pmd/pom.xml
@@ -7,6 +7,12 @@
     <name>custom-pmd</name>
     <packaging>jar</packaging>
     <url>http://maven.apache.org</url>
+    
+    <parent>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
 
     <dependencies>
         <dependency>
diff --git a/custom-pmd/src/main/java/org/baeldung/pmd/UnitTestNamingConventionRule.java b/custom-pmd/src/main/java/org/baeldung/pmd/UnitTestNamingConventionRule.java
index 3b73f9c21c..2cbab782ee 100644
--- a/custom-pmd/src/main/java/org/baeldung/pmd/UnitTestNamingConventionRule.java
+++ b/custom-pmd/src/main/java/org/baeldung/pmd/UnitTestNamingConventionRule.java
@@ -22,6 +22,10 @@ public class UnitTestNamingConventionRule extends AbstractJavaRule {
         String className = node.getImage();
         Objects.requireNonNull(className);
 
+        if (className.endsWith("SpringContextTest")) {
+            return data;
+        }
+        
         if (className.endsWith("Tests")
                 || (className.endsWith("Test") && allowedEndings.stream().noneMatch(className::endsWith))) {
             addViolation(data, node);
diff --git a/data-structures/src/main/java/com/baeldung/graph/Graph.java b/data-structures/src/main/java/com/baeldung/graph/Graph.java
new file mode 100644
index 0000000000..40df2c713a
--- /dev/null
+++ b/data-structures/src/main/java/com/baeldung/graph/Graph.java
@@ -0,0 +1,74 @@
+package com.baeldung.graph;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
+public class Graph {
+
+    private Map<Integer, List<Integer>> adjVertices;
+
+    public Graph() {
+        this.adjVertices = new HashMap<Integer, List<Integer>>();
+    }
+
+    public void addVertex(int vertex) {
+        adjVertices.putIfAbsent(vertex, new ArrayList<>());
+    }
+
+    public void addEdge(int src, int dest) {
+        adjVertices.get(src).add(dest);
+    }
+
+    public void dfsWithoutRecursion(int start) {
+        Stack<Integer> stack = new Stack<Integer>();
+        boolean[] isVisited = new boolean[adjVertices.size()];
+        stack.push(start);
+        while (!stack.isEmpty()) {
+            int current = stack.pop();
+            isVisited[current] = true;
+            visit(current);
+            for (int dest : adjVertices.get(current)) {
+                if (!isVisited[dest])
+                    stack.push(dest);
+            }
+        }
+    }
+
+    public void dfs(int start) {
+        boolean[] isVisited = new boolean[adjVertices.size()];
+        dfsRecursive(start, isVisited);
+    }
+
+    private void dfsRecursive(int current, boolean[] isVisited) {
+        isVisited[current] = true;
+        visit(current);
+        for (int dest : adjVertices.get(current)) {
+            if (!isVisited[dest])
+                dfsRecursive(dest, isVisited);
+        }
+    }
+
+    public List<Integer> topologicalSort(int start) {
+        LinkedList<Integer> result = new LinkedList<Integer>();
+        boolean[] isVisited = new boolean[adjVertices.size()];
+        topologicalSortRecursive(start, isVisited, result);
+        return result;
+    }
+
+    private void topologicalSortRecursive(int current, boolean[] isVisited, LinkedList<Integer> result) {
+        isVisited[current] = true;
+        for (int dest : adjVertices.get(current)) {
+            if (!isVisited[dest])
+                topologicalSortRecursive(dest, isVisited, result);
+        }
+        result.addFirst(current);
+    }
+
+    private void visit(int value) {
+        System.out.print(" " + value);        
+    }
+}
diff --git a/data-structures/src/main/java/com/baeldung/tree/BinaryTree.java b/data-structures/src/main/java/com/baeldung/tree/BinaryTree.java
index f435e41afa..bb62714006 100644
--- a/data-structures/src/main/java/com/baeldung/tree/BinaryTree.java
+++ b/data-structures/src/main/java/com/baeldung/tree/BinaryTree.java
@@ -2,6 +2,7 @@ package com.baeldung.tree;
 
 import java.util.LinkedList;
 import java.util.Queue;
+import java.util.Stack;
 
 public class BinaryTree {
 
@@ -102,14 +103,14 @@ public class BinaryTree {
     public void traverseInOrder(Node node) {
         if (node != null) {
             traverseInOrder(node.left);
-            System.out.print(" " + node.value);
+            visit(node.value);
             traverseInOrder(node.right);
         }
     }
 
     public void traversePreOrder(Node node) {
         if (node != null) {
-            System.out.print(" " + node.value);
+            visit(node.value);
             traversePreOrder(node.left);
             traversePreOrder(node.right);
         }
@@ -119,7 +120,7 @@ public class BinaryTree {
         if (node != null) {
             traversePostOrder(node.left);
             traversePostOrder(node.right);
-            System.out.print(" " + node.value);
+            visit(node.value);
         }
     }
 
@@ -147,6 +148,71 @@ public class BinaryTree {
         }
     }
 
+    
+    public void traverseInOrderWithoutRecursion() {
+        Stack<Node> stack = new Stack<Node>();
+        Node current = root;
+        stack.push(root);
+        while(! stack.isEmpty()) {
+            while(current.left != null) {
+                current = current.left;                
+                stack.push(current);                
+            }
+            current = stack.pop();
+            visit(current.value);
+            if(current.right != null) {
+                current = current.right;                
+                stack.push(current);
+            }
+        }
+    }
+    
+    public void traversePreOrderWithoutRecursion() {
+        Stack<Node> stack = new Stack<Node>();
+        Node current = root;
+        stack.push(root);
+        while(! stack.isEmpty()) {
+            current = stack.pop();
+            visit(current.value);
+            
+            if(current.right != null)
+                stack.push(current.right);
+                
+            if(current.left != null)
+                stack.push(current.left);
+        }        
+    }
+    
+    public void traversePostOrderWithoutRecursion() {
+        Stack<Node> stack = new Stack<Node>();
+        Node prev = root;
+        Node current = root;
+        stack.push(root);
+
+        while (!stack.isEmpty()) {
+            current = stack.peek();
+            boolean hasChild = (current.left != null || current.right != null);
+            boolean isPrevLastChild = (prev == current.right || (prev == current.left && current.right == null));
+
+            if (!hasChild || isPrevLastChild) {
+                current = stack.pop();
+                visit(current.value);
+                prev = current;
+            } else {
+                if (current.right != null) {
+                    stack.push(current.right);
+                }
+                if (current.left != null) {
+                    stack.push(current.left);
+                }
+            }
+        }   
+    }    
+    
+    private void visit(int value) {
+        System.out.print(" " + value);        
+    }
+    
     class Node {
         int value;
         Node left;
diff --git a/data-structures/src/test/java/com/baeldung/graph/GraphUnitTest.java b/data-structures/src/test/java/com/baeldung/graph/GraphUnitTest.java
new file mode 100644
index 0000000000..09b92115d2
--- /dev/null
+++ b/data-structures/src/test/java/com/baeldung/graph/GraphUnitTest.java
@@ -0,0 +1,40 @@
+package com.baeldung.graph;
+
+import java.util.List;
+
+import org.junit.Test;
+
+public class GraphUnitTest {
+
+    @Test
+    public void givenDirectedGraph_whenDFS_thenPrintAllValues() {
+        Graph graph = createDirectedGraph();
+        graph.dfs(0);
+        System.out.println();
+        graph.dfsWithoutRecursion(0);
+    }
+
+    @Test
+    public void givenDirectedGraph_whenGetTopologicalSort_thenPrintValuesSorted() {
+        Graph graph = createDirectedGraph();
+        List<Integer> list = graph.topologicalSort(0);
+        System.out.println(list);
+    }
+
+    private Graph createDirectedGraph() {
+        Graph graph = new Graph();
+        graph.addVertex(0);
+        graph.addVertex(1);
+        graph.addVertex(2);
+        graph.addVertex(3);
+        graph.addVertex(4);
+        graph.addVertex(5);
+        graph.addEdge(0, 1);
+        graph.addEdge(0, 2);
+        graph.addEdge(1, 3);
+        graph.addEdge(2, 3);
+        graph.addEdge(3, 4);
+        graph.addEdge(4, 5);
+        return graph;
+    }
+}
diff --git a/data-structures/src/test/java/com/baeldung/tree/BinaryTreeUnitTest.java b/data-structures/src/test/java/com/baeldung/tree/BinaryTreeUnitTest.java
index f81247b74d..f99cb52ed7 100644
--- a/data-structures/src/test/java/com/baeldung/tree/BinaryTreeUnitTest.java
+++ b/data-structures/src/test/java/com/baeldung/tree/BinaryTreeUnitTest.java
@@ -87,6 +87,8 @@ public class BinaryTreeUnitTest {
         BinaryTree bt = createBinaryTree();
 
         bt.traverseInOrder(bt.root);
+        System.out.println();
+        bt.traverseInOrderWithoutRecursion();
     }
 
     @Test
@@ -95,6 +97,8 @@ public class BinaryTreeUnitTest {
         BinaryTree bt = createBinaryTree();
 
         bt.traversePreOrder(bt.root);
+        System.out.println();
+        bt.traversePreOrderWithoutRecursion();
     }
 
     @Test
@@ -103,6 +107,8 @@ public class BinaryTreeUnitTest {
         BinaryTree bt = createBinaryTree();
 
         bt.traversePostOrder(bt.root);
+        System.out.println();
+        bt.traversePostOrderWithoutRecursion();
     }
 
     @Test
diff --git a/disruptor/pom.xml b/disruptor/pom.xml
index 296704f546..e1d78e7ed6 100644
--- a/disruptor/pom.xml
+++ b/disruptor/pom.xml
@@ -115,7 +115,6 @@
 
     <properties>
         <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
         <disruptor.version>3.3.6</disruptor.version>
         <!-- testing -->
         <testng.version>6.10</testng.version>
diff --git a/dozer/pom.xml b/dozer/pom.xml
index 5720001acf..8234eb4c79 100644
--- a/dozer/pom.xml
+++ b/dozer/pom.xml
@@ -26,7 +26,6 @@
     </dependencies>
 
     <properties>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <dozer.version>5.5.1</dozer.version>
     </properties>
 
diff --git a/flyway-cdi-extension/pom.xml b/flyway-cdi-extension/pom.xml
index f49a51ea4b..e8b327e35f 100644
--- a/flyway-cdi-extension/pom.xml
+++ b/flyway-cdi-extension/pom.xml
@@ -8,6 +8,13 @@
     <version>1.0-SNAPSHOT</version>
     <name>flyway-cdi-extension</name>
 
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
     <dependencies>
         <dependency>
             <groupId>javax.enterprise</groupId>
@@ -51,6 +58,5 @@
 		<flyway-core.version>5.1.4</flyway-core.version>
 		<tomcat-jdbc.version>8.5.33</tomcat-jdbc.version>
 		<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
-		<h2.version>1.4.197</h2.version>
     </properties>
 </project>
diff --git a/gson/pom.xml b/gson/pom.xml
index a21d783c39..9d2cf630d0 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -64,7 +64,6 @@
         <!-- marshalling -->
         <gson.version>2.8.0</gson.version>
         <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <joda-time.version>2.9.6</joda-time.version>
     </properties>
diff --git a/guava-collections/pom.xml b/guava-collections/pom.xml
index a717023156..ecda3c9595 100644
--- a/guava-collections/pom.xml
+++ b/guava-collections/pom.xml
@@ -55,7 +55,6 @@
     <properties>
         <!-- util -->
         <guava.version>24.0-jre</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <commons-collections4.version>4.1</commons-collections4.version>
 
         <!-- testing -->
diff --git a/guava/pom.xml b/guava/pom.xml
index 1d37a79ab6..34eb7eafa6 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -49,7 +49,6 @@
     <properties>
         <!-- util -->
         <guava.version>24.0-jre</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
 
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
diff --git a/httpclient-simple/pom.xml b/httpclient-simple/pom.xml
index efcf0452e2..7dd54c8fc4 100644
--- a/httpclient-simple/pom.xml
+++ b/httpclient-simple/pom.xml
@@ -297,7 +297,6 @@
     <properties>
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <commons-codec.version>1.10</commons-codec.version>
         <httpasyncclient.version>4.1.4</httpasyncclient.version>
         <!-- testing -->
@@ -305,7 +304,6 @@
         <httpcore.version>4.4.11</httpcore.version>
         <httpclient.version>4.5.8</httpclient.version> <!-- 4.3.6 --> <!-- 4.4-beta1 -->
         <!-- maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
     </properties>
 
diff --git a/httpclient/pom.xml b/httpclient/pom.xml
index def3a05816..8cd483cfc6 100644
--- a/httpclient/pom.xml
+++ b/httpclient/pom.xml
@@ -120,7 +120,6 @@
     <properties>
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <commons-codec.version>1.10</commons-codec.version>
         <httpasyncclient.version>4.1.4</httpasyncclient.version>
         <!-- testing -->
diff --git a/hystrix/pom.xml b/hystrix/pom.xml
index 7bb3e98246..e08af2c40f 100644
--- a/hystrix/pom.xml
+++ b/hystrix/pom.xml
@@ -65,7 +65,6 @@
         <hystrix-core.version>1.5.8</hystrix-core.version>
         <rxjava-core.version>0.20.7</rxjava-core.version>
         <!-- maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
         <hystrix-metrics-event-stream.version>1.5.8</hystrix-metrics-event-stream.version>
         <hystrix-dashboard.version>1.5.8</hystrix-dashboard.version>
diff --git a/jackson-2/README.md b/jackson-2/README.md
index ee9f8458a0..d8c233a00e 100644
--- a/jackson-2/README.md
+++ b/jackson-2/README.md
@@ -9,4 +9,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Mapping Multiple JSON Fields to a Single Java Field](https://www.baeldung.com/json-multiple-fields-single-java-field)
 - [How to Process YAML with Jackson](https://www.baeldung.com/jackson-yaml)
 - [Working with Tree Model Nodes in Jackson](https://www.baeldung.com/jackson-json-node-tree-model)
-
+- [Converting JSON to CSV in Java](https://www.baeldung.com/java-converting-json-to-csv)
diff --git a/jackson-2/pom.xml b/jackson-2/pom.xml
index 6a975f1de7..2fff1f8706 100644
--- a/jackson-2/pom.xml
+++ b/jackson-2/pom.xml
@@ -26,21 +26,21 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.9.8</version>
+            <version>${jackson.version}</version>
         </dependency>
         
         <!-- CSV -->
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-csv</artifactId>
-            <version>2.9.8</version>
+            <version>${jackson.version}</version>
         </dependency>        
 
         <!-- Allow use of LocalDate -->
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.9.8</version>
+            <version>${jackson.version}</version>
         </dependency>
 
 
diff --git a/jackson-2/src/test/java/com/baeldung/jackson/json/compare/JsonCompareUnitTest.java b/jackson-2/src/test/java/com/baeldung/jackson/json/compare/JsonCompareUnitTest.java
new file mode 100644
index 0000000000..03d7c63e36
--- /dev/null
+++ b/jackson-2/src/test/java/com/baeldung/jackson/json/compare/JsonCompareUnitTest.java
@@ -0,0 +1,126 @@
+package com.baeldung.jackson.json.compare;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.Comparator;
+
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.NumericNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+
+public class JsonCompareUnitTest {
+
+    @Test
+    public void givenTwoSameJsonDataObjects_whenCompared_thenAreEqual() throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+
+        String s1 = "{\"employee\": {\"id\": \"1212\",\"fullName\": \"John Miles\", \"age\": 34 }}";
+        String s2 = "{\"employee\": {\"id\": \"1212\",\"age\": 34, \"fullName\": \"John Miles\" }}";
+
+        JsonNode actualObj1 = mapper.readTree(s1);
+        JsonNode actualObj2 = mapper.readTree(s2);
+
+        assertEquals(actualObj1, actualObj2);
+
+    }
+
+    @Test
+    public void givenTwoSameNestedJsonDataObjects_whenCompared_thenEqual() throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+
+        String s1 = "{\"employee\": {\"id\": \"1212\",\"fullName\": \"John Miles\",\"age\": 34, \"contact\":{\"email\": \"john@xyz.com\",\"phone\": \"9999999999\"} }}";
+        String s2 = "{\"employee\": {\"id\": \"1212\",\"fullName\": \"John Miles\",\"age\": 34, \"contact\":{\"email\": \"john@xyz.com\",\"phone\": \"9999999999\"} }}";
+
+        JsonNode actualObj1 = mapper.readTree(s1);
+        JsonNode actualObj2 = mapper.readTree(s2);
+
+        assertEquals(actualObj1, actualObj2);
+
+    }
+
+    @Test
+    public void givenTwoSameListJsonDataObjects_whenCompared_thenEqual() throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+
+        String s1 = "{\"employee\": {\"id\": \"1212\",\"fullName\": \"John Miles\",\"age\": 34, \"skills\":[\"Java\", \"C++\", \"Python\"] }}";
+        String s2 = "{\"employee\": {\"id\": \"1212\",\"fullName\": \"John Miles\",\"age\": 34, \"skills\":[\"Java\", \"C++\", \"Python\"] }}";
+
+        JsonNode actualObj1 = mapper.readTree(s1);
+        JsonNode actualObj2 = mapper.readTree(s2);
+
+        assertEquals(actualObj1, actualObj2);
+
+    }
+
+    @Test
+    public void givenTwoJsonDataObjects_whenComparedUsingCustomNumericNodeComparator_thenEqual() throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+
+        String s1 = "{\"name\": \"John\",\"score\":5.0}";
+        String s2 = "{\"name\": \"John\",\"score\":5}";
+        JsonNode actualObj1 = mapper.readTree(s1);
+        JsonNode actualObj2 = mapper.readTree(s2);
+
+        NumericNodeComparator cmp = new NumericNodeComparator();
+
+        assertNotEquals(actualObj1, actualObj2);
+        assertTrue(actualObj1.equals(cmp, actualObj2));
+
+    }
+    
+    public class NumericNodeComparator implements Comparator<JsonNode> {
+        @Override
+        public int compare(JsonNode o1, JsonNode o2) {
+            if (o1.equals(o2)) {
+                return 0;
+            }
+            if ((o1 instanceof NumericNode) && (o2 instanceof NumericNode)) {
+                Double d1 = ((NumericNode) o1).asDouble();
+                Double d2 = ((NumericNode) o2).asDouble();
+                if (d1.compareTo(d2) == 0) {
+                    return 0;
+                }
+            }
+            return 1;
+        }
+    }
+    
+    @Test
+    public void givenTwoJsonDataObjects_whenComparedUsingCustomTextNodeComparator_thenEqual() throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+
+        String s1 = "{\"name\": \"JOHN\",\"score\":5}";
+        String s2 = "{\"name\": \"John\",\"score\":5}";
+        JsonNode actualObj1 = mapper.readTree(s1);
+        JsonNode actualObj2 = mapper.readTree(s2);
+
+        TextNodeComparator cmp = new TextNodeComparator();
+
+        assertNotEquals(actualObj1, actualObj2);
+        assertTrue(actualObj1.equals(cmp, actualObj2));
+
+    }
+    
+    public class TextNodeComparator implements Comparator<JsonNode> {
+        @Override
+        public int compare(JsonNode o1, JsonNode o2) {
+            if (o1.equals(o2)) {
+                return 0;
+            }
+            if ((o1 instanceof TextNode) && (o2 instanceof TextNode)) {
+                String s1 = ((TextNode) o1).asText();
+                String s2 = ((TextNode) o2).asText();
+                if (s1.equalsIgnoreCase(s2)) {
+                    return 0;
+                }
+            }
+            return 1;
+        }
+    }
+}
diff --git a/jackson-simple/pom.xml b/jackson-simple/pom.xml
index 5023ad87b6..05c1ef4595 100644
--- a/jackson-simple/pom.xml
+++ b/jackson-simple/pom.xml
@@ -118,7 +118,6 @@
 
     <properties>
         <!-- util -->
-        <commons-lang3.version>3.8</commons-lang3.version>
         <joda-time.version>2.10</joda-time.version>
         <gson.version>2.8.5</gson.version>
         <commons-collections4.version>4.2</commons-collections4.version>
diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/test/JacksonSerializationIgnoreUnitTest.java b/jackson-simple/src/test/java/com/baeldung/jackson/test/JacksonSerializationIgnoreUnitTest.java
index 4230420132..146f274380 100644
--- a/jackson-simple/src/test/java/com/baeldung/jackson/test/JacksonSerializationIgnoreUnitTest.java
+++ b/jackson-simple/src/test/java/com/baeldung/jackson/test/JacksonSerializationIgnoreUnitTest.java
@@ -165,7 +165,7 @@ public class JacksonSerializationIgnoreUnitTest {
     }
 
     @Test
-    public final void givenIgnoringNullFieldsOnClass_whenWritingObjectWithNullField_thenFieldIsIgnored() throws JsonProcessingException {
+    public final void givenNullsIgnoredOnClass_whenWritingObjectWithNullField_thenIgnored() throws JsonProcessingException {
         final ObjectMapper mapper = new ObjectMapper();
         final MyDtoIgnoreNull dtoObject = new MyDtoIgnoreNull();
 
@@ -178,7 +178,7 @@ public class JacksonSerializationIgnoreUnitTest {
     }
 
     @Test
-    public final void givenIgnoringNullFieldsGlobally_whenWritingObjectWithNullField_thenIgnored() throws JsonProcessingException {
+    public final void givenNullsIgnoredGlobally_whenWritingObjectWithNullField_thenIgnored() throws JsonProcessingException {
         final ObjectMapper mapper = new ObjectMapper();
         mapper.setSerializationInclusion(Include.NON_NULL);
         final MyDto dtoObject = new MyDto();
diff --git a/jackson/pom.xml b/jackson/pom.xml
index 948248d255..8a083525a2 100644
--- a/jackson/pom.xml
+++ b/jackson/pom.xml
@@ -118,7 +118,6 @@
 
     <properties>
         <!-- util -->
-        <commons-lang3.version>3.8</commons-lang3.version>
         <joda-time.version>2.10</joda-time.version>
         <gson.version>2.8.5</gson.version>
         <commons-collections4.version>4.2</commons-collections4.version>
diff --git a/java-collections-conversions/README.md b/java-collections-conversions/README.md
index 31fead3c42..614f20f186 100644
--- a/java-collections-conversions/README.md
+++ b/java-collections-conversions/README.md
@@ -10,4 +10,7 @@
 - [Converting a List to String in Java](http://www.baeldung.com/java-list-to-string)
 - [How to Convert List to Map in Java](http://www.baeldung.com/java-list-to-map)
 - [Array to String Conversions](https://www.baeldung.com/java-array-to-string)
-- [Converting a Collection to ArrayList in Java](https://www.baeldung.com/java-convert-collection-arraylist)
\ No newline at end of file
+- [Converting a Collection to ArrayList in Java](https://www.baeldung.com/java-convert-collection-arraylist)
+- [Java 8 Collectors toMap](https://www.baeldung.com/java-collectors-tomap)
+- [Converting Iterable to Collection in Java](https://www.baeldung.com/java-iterable-to-collection)
+- [Converting Iterator to List](https://www.baeldung.com/java-convert-iterator-to-list)
diff --git a/java-collections-conversions/pom.xml b/java-collections-conversions/pom.xml
index ee7221b25e..24d918d105 100644
--- a/java-collections-conversions/pom.xml
+++ b/java-collections-conversions/pom.xml
@@ -33,7 +33,6 @@
     </dependencies>
 
     <properties>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <assertj.version>3.6.1</assertj.version>
     </properties>
diff --git a/java-collections-conversions/src/test/java/org/baeldung/java/collections/IterableToCollectionUnitTest.java b/java-collections-conversions/src/test/java/com/baeldung/java/collections/IterableToCollectionUnitTest.java
similarity index 98%
rename from java-collections-conversions/src/test/java/org/baeldung/java/collections/IterableToCollectionUnitTest.java
rename to java-collections-conversions/src/test/java/com/baeldung/java/collections/IterableToCollectionUnitTest.java
index f2c80429d1..0283191b74 100644
--- a/java-collections-conversions/src/test/java/org/baeldung/java/collections/IterableToCollectionUnitTest.java
+++ b/java-collections-conversions/src/test/java/com/baeldung/java/collections/IterableToCollectionUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java.collections;
+package com.baeldung.java.collections;
 
 import static org.hamcrest.Matchers.contains;
 import static org.junit.Assert.assertThat;
diff --git a/java-collections-maps-2/pom.xml b/java-collections-maps-2/pom.xml
index 5f27eaa2d8..e242a8655e 100644
--- a/java-collections-maps-2/pom.xml
+++ b/java-collections-maps-2/pom.xml
@@ -54,7 +54,6 @@
         <trove4j.version>3.0.2</trove4j.version>
         <fastutil.version>8.1.0</fastutil.version>
         <colt.version>1.2.0</colt.version>
-        <commons-lang3.version>3.8.1</commons-lang3.version>
         <assertj.version>3.11.1</assertj.version>
     </properties>
 
diff --git a/java-collections-maps/pom.xml b/java-collections-maps/pom.xml
index b5eba31437..83cc97a21e 100644
--- a/java-collections-maps/pom.xml
+++ b/java-collections-maps/pom.xml
@@ -44,7 +44,6 @@
     </dependencies>
 
     <properties>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <collections-generic.version>4.01</collections-generic.version>
         <avaitility.version>1.7.0</avaitility.version>
diff --git a/java-dates-2/pom.xml b/java-dates-2/pom.xml
index 9307a794b9..c1419514ef 100644
--- a/java-dates-2/pom.xml
+++ b/java-dates-2/pom.xml
@@ -20,6 +20,13 @@
             <artifactId>joda-time</artifactId>
             <version>${joda-time.version}</version>
         </dependency>
+        
+        <!-- https://mvnrepository.com/artifact/commons-validator/commons-validator -->
+        <dependency>
+            <groupId>commons-validator</groupId>
+            <artifactId>commons-validator</artifactId>
+            <version>${commons-validator.version}</version>
+        </dependency>
 
         <!-- test scoped -->
         <dependency>
@@ -56,6 +63,7 @@
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
         <joda-time.version>2.10</joda-time.version>
+        <commons-validator.version>1.6</commons-validator.version>
         <maven.compiler.source>1.9</maven.compiler.source>
         <maven.compiler.target>1.9</maven.compiler.target>
     </properties>
diff --git a/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidator.java b/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidator.java
new file mode 100644
index 0000000000..b774edab43
--- /dev/null
+++ b/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidator.java
@@ -0,0 +1,5 @@
+package com.baeldung.date.validation;
+
+public interface DateValidator {
+   boolean isValid(String dateStr);
+}
diff --git a/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingApacheValidator.java b/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingApacheValidator.java
new file mode 100644
index 0000000000..f7b2f48d2d
--- /dev/null
+++ b/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingApacheValidator.java
@@ -0,0 +1,11 @@
+package com.baeldung.date.validation;
+
+import org.apache.commons.validator.GenericValidator;
+
+public class DateValidatorUsingApacheValidator implements DateValidator {
+
+    @Override
+    public boolean isValid(String dateStr) {
+        return GenericValidator.isDate(dateStr, "yyyy-MM-dd", true); 
+    }
+}
diff --git a/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingDateFormat.java b/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingDateFormat.java
new file mode 100644
index 0000000000..eb0fbdb086
--- /dev/null
+++ b/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingDateFormat.java
@@ -0,0 +1,25 @@
+package com.baeldung.date.validation;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+public class DateValidatorUsingDateFormat implements DateValidator {
+    private String dateFormat;
+
+    public DateValidatorUsingDateFormat(String dateFormat) {
+        this.dateFormat = dateFormat;
+    }
+
+    @Override
+    public boolean isValid(String dateStr) {
+        DateFormat sdf = new SimpleDateFormat(this.dateFormat);
+        sdf.setLenient(false);
+        try {
+            sdf.parse(dateStr);
+        } catch (ParseException e) {
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingDateTimeFormatter.java b/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingDateTimeFormatter.java
new file mode 100644
index 0000000000..0f68baf06e
--- /dev/null
+++ b/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingDateTimeFormatter.java
@@ -0,0 +1,22 @@
+package com.baeldung.date.validation;
+
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+public class DateValidatorUsingDateTimeFormatter implements DateValidator {
+    private DateTimeFormatter dateFormatter;
+    
+    public DateValidatorUsingDateTimeFormatter(DateTimeFormatter dateFormatter) {
+        this.dateFormatter = dateFormatter;
+    }
+
+    @Override
+    public boolean isValid(String dateStr) {
+        try {
+            this.dateFormatter.parse(dateStr);
+        } catch (DateTimeParseException e) {
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingLocalDate.java b/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingLocalDate.java
new file mode 100644
index 0000000000..f04c2e4185
--- /dev/null
+++ b/java-dates-2/src/main/java/com/baeldung/date/validation/DateValidatorUsingLocalDate.java
@@ -0,0 +1,23 @@
+package com.baeldung.date.validation;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+public class DateValidatorUsingLocalDate implements DateValidator {
+    private DateTimeFormatter dateFormatter;
+    
+    public DateValidatorUsingLocalDate(DateTimeFormatter dateFormatter) {
+        this.dateFormatter = dateFormatter;
+    }
+
+    @Override
+    public boolean isValid(String dateStr) {
+        try {
+            LocalDate.parse(dateStr, this.dateFormatter);
+        } catch (DateTimeParseException e) {
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingApacheValidatorUnitTest.java b/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingApacheValidatorUnitTest.java
new file mode 100644
index 0000000000..daa464722a
--- /dev/null
+++ b/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingApacheValidatorUnitTest.java
@@ -0,0 +1,20 @@
+package com.baeldung.date.validation;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.commons.validator.GenericValidator;
+import org.junit.Test;
+
+public class DateValidatorUsingApacheValidatorUnitTest {
+
+    @Test
+    public void whenValidDatePassed_ThenTrue() {
+        assertTrue(GenericValidator.isDate("2019-02-28", "yyyy-MM-dd", true));
+    }
+
+    @Test
+    public void whenInvalidDatePassed_ThenFalse() {
+        assertFalse(GenericValidator.isDate("2019-02-29", "yyyy-MM-dd", true));
+    }
+}
diff --git a/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingDateFormatUnitTest.java b/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingDateFormatUnitTest.java
new file mode 100644
index 0000000000..9b86b3381c
--- /dev/null
+++ b/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingDateFormatUnitTest.java
@@ -0,0 +1,23 @@
+package com.baeldung.date.validation;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class DateValidatorUsingDateFormatUnitTest {
+    
+    @Test
+    public void givenValidator_whenValidDatePassed_ThenTrue() {
+        DateValidator validator = new DateValidatorUsingDateFormat("MM/dd/yyyy");
+        
+        assertTrue(validator.isValid("02/28/2019"));
+    }
+    
+    @Test
+    public void givenValidator_whenInvalidDatePassed_ThenFalse() {
+        DateValidator validator = new DateValidatorUsingDateFormat("MM/dd/yyyy");
+        
+        assertFalse(validator.isValid("02/30/2019"));
+    }
+}
diff --git a/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingDateTimeFormatterUnitTest.java b/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingDateTimeFormatterUnitTest.java
new file mode 100644
index 0000000000..368b04f8e3
--- /dev/null
+++ b/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingDateTimeFormatterUnitTest.java
@@ -0,0 +1,32 @@
+package com.baeldung.date.validation;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.time.format.DateTimeFormatter;
+import java.time.format.ResolverStyle;
+import java.util.Locale;
+
+import org.junit.Test;
+
+public class DateValidatorUsingDateTimeFormatterUnitTest {
+    
+    @Test
+    public void givenValidator_whenValidDatePassed_ThenTrue() {
+        DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("uuuu-MM-dd", Locale.US)
+            .withResolverStyle(ResolverStyle.STRICT);
+        DateValidator validator = new DateValidatorUsingDateTimeFormatter(dateFormatter);
+        
+        assertTrue(validator.isValid("2019-02-28"));
+    }
+    
+    @Test
+    public void givenValidator_whenInValidDatePassed_ThenFalse() {
+        DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("uuuu-MM-dd", Locale.US)
+            .withResolverStyle(ResolverStyle.STRICT);
+        DateValidator validator = new DateValidatorUsingDateTimeFormatter(dateFormatter);
+        
+        assertFalse(validator.isValid("2019-02-30"));
+    }
+
+}
diff --git a/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingLocalDateUnitTest.java b/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingLocalDateUnitTest.java
new file mode 100644
index 0000000000..63296359db
--- /dev/null
+++ b/java-dates-2/src/test/java/com/baeldung/date/validation/DateValidatorUsingLocalDateUnitTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.date.validation;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.time.format.DateTimeFormatter;
+
+import org.junit.Test;
+
+public class DateValidatorUsingLocalDateUnitTest {
+    
+    @Test
+    public void givenValidator_whenValidDatePassed_ThenTrue() {
+        DateTimeFormatter dateFormatter = DateTimeFormatter.BASIC_ISO_DATE;
+        DateValidator validator = new DateValidatorUsingLocalDate(dateFormatter);
+        
+        assertTrue(validator.isValid("20190228"));
+    }
+    
+    @Test
+    public void givenValidator_whenInValidDatePassed_ThenFalse() {
+        DateTimeFormatter dateFormatter = DateTimeFormatter.BASIC_ISO_DATE;
+        DateValidator validator = new DateValidatorUsingLocalDate(dateFormatter);
+        
+        assertFalse(validator.isValid("20190230"));
+    }
+}
diff --git a/java-dates/pom.xml b/java-dates/pom.xml
index d4f690d894..3fddf3f0f8 100644
--- a/java-dates/pom.xml
+++ b/java-dates/pom.xml
@@ -74,8 +74,6 @@
     </build>
 
     <properties>
-        <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
         <joda-time.version>2.10</joda-time.version>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
diff --git a/java-ee-8-security-api/pom.xml b/java-ee-8-security-api/pom.xml
index 9b8356714f..4d4e2ba3b3 100644
--- a/java-ee-8-security-api/pom.xml
+++ b/java-ee-8-security-api/pom.xml
@@ -72,8 +72,6 @@
         <javaee-version>8.0</javaee-version>
         <liberty-maven-plugin.version>2.3</liberty-maven-plugin.version>
         <openliberty-runtime.version>18.0.0.1</openliberty-runtime.version>
-        
-        <maven-war-plugin.version>3.2.2</maven-war-plugin.version>
     </properties>
 
 </project>
diff --git a/java-math/pom.xml b/java-math/pom.xml
index 159d053df3..f71577b707 100644
--- a/java-math/pom.xml
+++ b/java-math/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.github.dpaukov</groupId>
             <artifactId>combinatoricslib3</artifactId>
-            <version>3.3.0</version>
+            <version>${combinatoricslib3.version}</version>
          </dependency>
     </dependencies>
 
@@ -63,6 +63,7 @@
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
         <commons-codec.version>1.11</commons-codec.version>
         <guava.version>27.0.1-jre</guava.version>
+        <combinatoricslib3.version>3.3.0</combinatoricslib3.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/java-numbers-2/pom.xml b/java-numbers-2/pom.xml
new file mode 100644
index 0000000000..57f1154f53
--- /dev/null
+++ b/java-numbers-2/pom.xml
@@ -0,0 +1,135 @@
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>java-numbers-2</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>java-numbers-2</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${org.slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${jmh-core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${jmh-generator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math3</artifactId>
+            <version>${commons-math3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.decimal4j</groupId>
+            <artifactId>decimal4j</artifactId>
+            <version>${decimal4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>java-numbers-2</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>${maven-javadoc-plugin.version}</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>integration</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <includes>
+                                        <include>**/*IntegrationTest.java</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <test.mime>json</test.mime>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <properties>
+        <commons-math3.version>3.6.1</commons-math3.version>
+        <decimal4j.version>1.0.3</decimal4j.version>
+        <commons-lang3.version>3.5</commons-lang3.version>
+
+        <assertj.version>3.6.1</assertj.version>
+
+        <org.slf4j.version>1.7.21</org.slf4j.version>
+        <logback.version>1.1.7</logback.version>
+
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+        <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
+        <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
+    </properties>
+</project>
diff --git a/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java b/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java
new file mode 100644
index 0000000000..effdee07ad
--- /dev/null
+++ b/java-numbers-2/src/main/java/com/baeldung/binarynumbers/BinaryNumbers.java
@@ -0,0 +1,148 @@
+package com.baeldung.binarynumbers;
+
+public class BinaryNumbers {
+
+    /**
+     * This method takes a decimal number and convert it into a binary number.
+     * example:- input:10, output:1010
+     *
+     * @param decimalNumber
+     * @return binary number
+     */
+    public Integer convertDecimalToBinary(Integer decimalNumber) {
+
+        if (decimalNumber == 0) {
+            return decimalNumber;
+        }
+
+        StringBuilder binaryNumber = new StringBuilder();
+
+        while (decimalNumber > 0) {
+
+            int remainder = decimalNumber % 2;
+            int result = decimalNumber / 2;
+
+            binaryNumber.append(remainder);
+            decimalNumber = result;
+        }
+
+        binaryNumber = binaryNumber.reverse();
+
+        return Integer.valueOf(binaryNumber.toString());
+    }
+
+    /**
+     * This method takes a binary number and convert it into a decimal number.
+     * example:- input:101, output:5
+     *
+     * @param binary number
+     * @return decimal Number
+     */
+    public Integer convertBinaryToDecimal(Integer binaryNumber) {
+
+        Integer result = 0;
+        Integer base = 1;
+
+        while (binaryNumber > 0) {
+
+            int lastDigit = binaryNumber % 10;
+            binaryNumber = binaryNumber / 10;
+
+            result += lastDigit * base;
+
+            base = base * 2;
+        }
+        return result;
+    }
+
+    /**
+     * This method accepts two binary numbers and returns sum of input numbers.
+     * Example:- firstNum: 101, secondNum: 100, output: 1001
+     *
+     * @param firstNum
+     * @param secondNum
+     * @return addition of input numbers
+     */
+    public Integer addBinaryNumber(Integer firstNum, Integer secondNum) {
+
+        StringBuilder output = new StringBuilder();
+
+        int carry = 0;
+        int temp;
+
+        while (firstNum != 0 || secondNum != 0) {
+
+            temp = (firstNum % 10 + secondNum % 10 + carry) % 2;
+            output.append(temp);
+
+            carry = (firstNum % 10 + secondNum % 10 + carry) / 2;
+
+            firstNum = firstNum / 10;
+            secondNum = secondNum / 10;
+        }
+
+        if (carry != 0) {
+            output.append(carry);
+        }
+
+        return Integer.valueOf(output.reverse()
+            .toString());
+    }
+
+    /**
+    * This method takes two binary number as input and subtract second number from the first number.
+    * example:- firstNum: 1000, secondNum: 11, output: 101
+    * @param firstNum
+    * @param secondNum
+    * @return Result of subtraction of secondNum from first
+    */
+    public Integer substractBinaryNumber(Integer firstNum, Integer secondNum) {
+
+        int onesComplement = Integer.valueOf(getOnesComplement(secondNum));
+
+        StringBuilder output = new StringBuilder();
+
+        int carry = 0;
+        int temp;
+
+        while (firstNum != 0 || onesComplement != 0) {
+
+            temp = (firstNum % 10 + onesComplement % 10 + carry) % 2;
+            output.append(temp);
+
+            carry = (firstNum % 10 + onesComplement % 10 + carry) / 2;
+
+            firstNum = firstNum / 10;
+            onesComplement = onesComplement / 10;
+        }
+
+        String additionOfFirstNumAndOnesComplement = output.reverse()
+            .toString();
+
+        if (carry == 1) {
+            return addBinaryNumber(Integer.valueOf(additionOfFirstNumAndOnesComplement), carry);
+        } else {
+            return getOnesComplement(Integer.valueOf(additionOfFirstNumAndOnesComplement));
+        }
+
+    }
+
+    public Integer getOnesComplement(Integer num) {
+
+        StringBuilder onesComplement = new StringBuilder();
+
+        while (num > 0) {
+            int lastDigit = num % 10;
+            if (lastDigit == 0) {
+                onesComplement.append(1);
+            } else {
+                onesComplement.append(0);
+            }
+            num = num / 10;
+        }
+
+        return Integer.valueOf(onesComplement.reverse()
+            .toString());
+    }
+
+}
diff --git a/java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java b/java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java
new file mode 100644
index 0000000000..ca6022261d
--- /dev/null
+++ b/java-numbers-2/src/test/java/com/baeldung/binarynumbers/BinaryNumbersUnitTest.java
@@ -0,0 +1,73 @@
+package com.baeldung.binarynumbers;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class BinaryNumbersUnitTest {
+
+    private BinaryNumbers binaryNumbers = new BinaryNumbers();
+
+    @Test
+    public void given_decimalNumber_then_returnBinaryNumber() {
+        assertEquals(Integer.valueOf(1000), binaryNumbers.convertDecimalToBinary(8));
+        assertEquals(Integer.valueOf(10100), binaryNumbers.convertDecimalToBinary(20));
+    }
+
+    @Test
+    public void given_decimalNumber_then_convertToBinaryNumber() {
+        assertEquals("1000", Integer.toBinaryString(8));
+        assertEquals("10100", Integer.toBinaryString(20));
+    }
+
+    @Test
+    public void given_binaryNumber_then_ConvertToDecimalNumber() {
+        assertEquals(8, Integer.parseInt("1000", 2));
+        assertEquals(20, Integer.parseInt("10100", 2));
+    }
+
+    @Test
+    public void given_binaryNumber_then_returnDecimalNumber() {
+        assertEquals(Integer.valueOf(8), binaryNumbers.convertBinaryToDecimal(1000));
+        assertEquals(Integer.valueOf(20), binaryNumbers.convertBinaryToDecimal(10100));
+    }
+
+    @Test
+    public void given_twoBinaryNumber_then_returnAddition() {
+        // adding 4 and 10
+        assertEquals(Integer.valueOf(1110), binaryNumbers.addBinaryNumber(100, 1010));
+
+        // adding 26 and 14
+        assertEquals(Integer.valueOf(101000), binaryNumbers.addBinaryNumber(11010, 1110));
+    }
+
+    @Test
+    public void given_twoBinaryNumber_then_returnSubtraction() {
+        // subtracting 16 from 25
+        assertEquals(Integer.valueOf(1001), binaryNumbers.substractBinaryNumber(11001, 10000));
+
+        // subtracting 29 from 16, the output here is negative
+        assertEquals(Integer.valueOf(1101), binaryNumbers.substractBinaryNumber(10000, 11101));
+    }
+
+    @Test
+    public void given_binaryLiteral_thenReturnDecimalValue() {
+
+        byte five = 0b101;
+        assertEquals((byte) 5, five);
+
+        short three = 0b11;
+        assertEquals((short) 3, three);
+
+        int nine = 0B1001;
+        assertEquals(9, nine);
+
+        long twentyNine = 0B11101;
+        assertEquals(29, twentyNine);
+
+        int minusThirtySeven = -0B100101;
+        assertEquals(-37, minusThirtySeven);
+
+    }
+
+}
diff --git a/java-numbers-2/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java b/java-numbers-2/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java
new file mode 100644
index 0000000000..2001f39359
--- /dev/null
+++ b/java-numbers-2/src/test/java/com/baeldung/lossyconversion/ConversionTechniquesUnitTest.java
@@ -0,0 +1,68 @@
+package com.baeldung.lossyconversion;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+public class ConversionTechniquesUnitTest {
+
+    @Test
+    public void testPrimitiveConversion() {
+        
+        long longNum = 24;
+        short shortNum = (short) longNum;
+        assertEquals(24, shortNum);
+
+        double doubleNum = 15.6;
+        int integerNum = (int) doubleNum;
+        assertEquals(15, integerNum);
+        
+        long largeLongNum = 32768;
+        short minShortNum = (short) largeLongNum;
+        assertEquals(-32768, minShortNum);
+        
+        long smallLongNum = -32769;
+        short maxShortNum = (short) smallLongNum;
+        assertEquals(32767, maxShortNum);
+        
+        long maxLong = Long.MAX_VALUE;
+        int minInt = (int) maxLong;
+        assertEquals(-1, minInt);
+        
+        long minLong = Long.MIN_VALUE;
+        int maxInt = (int) minLong;
+        assertEquals(0, maxInt);
+    }
+
+    @Test
+    public void testWrapperToPrimitiveConversion() {
+
+        Float floatNum = 17.564f;
+        long longNum = floatNum.longValue();
+        assertEquals(17, longNum);
+
+        Double doubleNum = 15.9999;
+        longNum = doubleNum.longValue();
+        assertEquals(15, longNum);
+    }
+
+    @Test
+    public void testWrapperToPrimitiveConversionUsingMathRound() {
+
+        Double doubleNum = 15.9999;
+        long longNum = Math.round(doubleNum);
+        assertEquals(16, longNum);
+    }
+    
+    @Test
+    public void testWrapperConversion() {
+
+        Double doubleNum = 10.3;
+        double dbl = doubleNum.doubleValue(); //unboxing
+        int intgr = (int) dbl; //downcasting
+        Integer intNum = Integer.valueOf(intgr);
+        assertEquals(Integer.valueOf(10), intNum);
+    }
+    
+}
diff --git a/java-numbers/pom.xml b/java-numbers/pom.xml
index daed356f66..ac3ca2680f 100644
--- a/java-numbers/pom.xml
+++ b/java-numbers/pom.xml
@@ -121,7 +121,6 @@
     <properties>
         <commons-math3.version>3.6.1</commons-math3.version>
         <decimal4j.version>1.0.3</decimal4j.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
 
         <assertj.version>3.6.1</assertj.version>
 
diff --git a/java-numbers/src/main/java/com/baeldung/random/SecureRandomDemo.java b/java-numbers/src/main/java/com/baeldung/random/SecureRandomDemo.java
new file mode 100644
index 0000000000..02f815f5a7
--- /dev/null
+++ b/java-numbers/src/main/java/com/baeldung/random/SecureRandomDemo.java
@@ -0,0 +1,36 @@
+package com.baeldung.random;
+
+import java.security.SecureRandom;
+import java.security.NoSuchAlgorithmException;
+import java.util.stream.IntStream;
+import java.util.stream.LongStream;
+import java.util.stream.DoubleStream;
+
+public interface SecureRandomDemo {
+
+    public static void generateSecureRandomValues() {
+        SecureRandom sr = new SecureRandom();
+
+        int randomInt = sr.nextInt();
+        long randomLong = sr.nextLong();
+        float randomFloat = sr.nextFloat();
+        double randomDouble = sr.nextDouble();
+        boolean randomBoolean = sr.nextBoolean();
+
+        IntStream randomIntStream = sr.ints();
+        LongStream randomLongStream = sr.longs();
+        DoubleStream randomDoubleStream = sr.doubles();
+
+        byte[] values = new byte[124];
+        sr.nextBytes(values);
+    }
+
+    public static SecureRandom getSecureRandomForAlgorithm(String algorithm) throws NoSuchAlgorithmException {
+        if (algorithm == null || algorithm.isEmpty()) {
+            return new SecureRandom();
+        }
+
+        return SecureRandom.getInstance(algorithm);
+    }
+
+}
diff --git a/java-streams-2/README.md b/java-streams-2/README.md
index 83ef97686f..851d3d71e2 100644
--- a/java-streams-2/README.md
+++ b/java-streams-2/README.md
@@ -1,3 +1,4 @@
 ### Relevant Articles:
 - [Guide to Stream.reduce()](https://www.baeldung.com/java-stream-reduce)
-
+- [How to Break from Java Stream forEach](https://www.baeldung.com/java-break-stream-foreach)
+- [Java IntStream Conversions](https://www.baeldung.com/java-intstream-convert)
diff --git a/java-streams-2/src/test/java/com/baeldung/convert.instreams/IntStreamsConversionsUnitTest.java b/java-streams-2/src/test/java/com/baeldung/convert/intstreams/IntStreamsConversionsUnitTest.java
similarity index 100%
rename from java-streams-2/src/test/java/com/baeldung/convert.instreams/IntStreamsConversionsUnitTest.java
rename to java-streams-2/src/test/java/com/baeldung/convert/intstreams/IntStreamsConversionsUnitTest.java
diff --git a/java-streams/pom.xml b/java-streams/pom.xml
index b0c56ecdf9..bd0123e01d 100644
--- a/java-streams/pom.xml
+++ b/java-streams/pom.xml
@@ -106,7 +106,6 @@
 
     <properties>
         <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
         <vavr.version>0.9.0</vavr.version>
         <protonpack.version>1.15</protonpack.version>
         <streamex.version>0.6.5</streamex.version>
diff --git a/java-strings-2/README.MD b/java-strings-2/README.MD
index 85832fde37..b4b16fbaef 100644
--- a/java-strings-2/README.MD
+++ b/java-strings-2/README.MD
@@ -3,3 +3,20 @@
 - [Java Localization – Formatting Messages](https://www.baeldung.com/java-localization-messages-formatting)
 - [Check If a String Contains a Substring](https://www.baeldung.com/java-string-contains-substring)
 - [Removing Stopwords from a String in Java](https://www.baeldung.com/java-string-remove-stopwords)
+- [Java – Generate Random String](http://www.baeldung.com/java-random-string)
+- [Image to Base64 String Conversion](http://www.baeldung.com/java-base64-image-string)
+- [Java Base64 Encoding and Decoding](https://www.baeldung.com/java-base64-encode-and-decode)
+- [Generate a Secure Random Password in Java](https://www.baeldung.com/java-generate-secure-password)
+- [Removing Repeated Characters from a String](https://www.baeldung.com/java-remove-repeated-char)
+- [Join Array of Primitives with Separator in Java](https://www.baeldung.com/java-join-primitive-array)
+- [Pad a String with Zeros or Spaces in Java](https://www.baeldung.com/java-pad-string)
+- [Remove Emojis from a Java String](https://www.baeldung.com/java-string-remove-emojis)
+- [Convert a Comma Separated String to a List in Java](https://www.baeldung.com/java-string-with-separator-to-list)
+- [Guide to java.util.Formatter](http://www.baeldung.com/java-string-formatter)
+- [Remove Leading and Trailing Characters from a String](https://www.baeldung.com/java-remove-trailing-characters)
+- [Concatenating Strings In Java](https://www.baeldung.com/java-strings-concatenation)
+- [Java String Interview Questions and Answers](https://www.baeldung.com/java-string-interview-questions)
+- [Check if a String is a Pangram in Java](https://www.baeldung.com/java-string-pangram)
+- [Check If a String Contains Multiple Keywords](https://www.baeldung.com/string-contains-multiple-words)
+- [Blank and Empty Strings in Java](https://www.baeldung.com/java-blank-empty-strings)
+- [String Initialization in Java](https://www.baeldung.com/java-string-initialization)
diff --git a/java-strings-2/pom.xml b/java-strings-2/pom.xml
index 9c27429139..be47b1ec89 100755
--- a/java-strings-2/pom.xml
+++ b/java-strings-2/pom.xml
@@ -40,6 +40,16 @@
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>${commons-codec.version}</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -52,12 +62,54 @@
             <version>${org.hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Added for password generation -->
+        <dependency>
+            <groupId>org.passay</groupId>
+            <artifactId>passay</artifactId>
+            <version>${passay.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
             <version>${commons-text.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.vdurmont</groupId>
+            <artifactId>emoji-java</artifactId>
+            <version>${emoji-java.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ahocorasick</groupId>
+            <artifactId>ahocorasick</artifactId>
+            <version>${ahocorasick.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>${validation-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate-validator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.el</groupId>
+            <artifactId>javax.el-api</artifactId>
+            <version>${javax.el-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.web</groupId>
+            <artifactId>javax.el</artifactId>
+            <version>${javax.el.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -85,9 +137,19 @@
 
     <properties>
         <commons-lang3.version>3.8.1</commons-lang3.version>
+        <commons-codec.version>1.10</commons-codec.version>
+        <passay.version>1.3.1</passay.version>
+        <!-- testing -->
+        <assertj.version>3.6.1</assertj.version>
+        <emoji-java.version>4.0.0</emoji-java.version>
+        <ahocorasick.version>0.4.0</ahocorasick.version>
         <icu4j.version>61.1</icu4j.version>
-        <guava.version>27.0.1-jre</guava.version>
+        <guava.version>28.0-jre</guava.version>
         <commons-text.version>1.4</commons-text.version>
+        <validation-api.version>2.0.0.Final</validation-api.version>
+        <hibernate-validator.version>6.0.2.Final</hibernate-validator.version>
+        <javax.el-api.version>3.0.0</javax.el-api.version>
+        <javax.el.version>2.2.6</javax.el.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/java-strings/src/main/java/com/baeldung/string/MatchWords.java b/java-strings-2/src/main/java/com/baeldung/string/MatchWords.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/MatchWords.java
rename to java-strings-2/src/main/java/com/baeldung/string/MatchWords.java
diff --git a/java-strings/src/main/java/com/baeldung/string/Pangram.java b/java-strings-2/src/main/java/com/baeldung/string/Pangram.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/Pangram.java
rename to java-strings-2/src/main/java/com/baeldung/string/Pangram.java
diff --git a/java-strings-2/src/main/java/com/baeldung/string/emptystrings/EmptyStringCheck.java b/java-strings-2/src/main/java/com/baeldung/string/emptystrings/EmptyStringCheck.java
new file mode 100644
index 0000000000..6d3234a4ec
--- /dev/null
+++ b/java-strings-2/src/main/java/com/baeldung/string/emptystrings/EmptyStringCheck.java
@@ -0,0 +1,8 @@
+package com.baeldung.string.emptystrings;
+
+class EmptyStringCheck {
+
+    boolean isEmptyString(String string) {
+        return string == null || string.isEmpty();
+    }
+}
diff --git a/java-strings-2/src/main/java/com/baeldung/string/emptystrings/Java5EmptyStringCheck.java b/java-strings-2/src/main/java/com/baeldung/string/emptystrings/Java5EmptyStringCheck.java
new file mode 100644
index 0000000000..096b83acea
--- /dev/null
+++ b/java-strings-2/src/main/java/com/baeldung/string/emptystrings/Java5EmptyStringCheck.java
@@ -0,0 +1,8 @@
+package com.baeldung.string.emptystrings;
+
+class Java5EmptyStringCheck {
+
+    boolean isEmptyString(String string) {
+        return string == null || string.length() == 0;
+    }
+}
diff --git a/java-strings-2/src/main/java/com/baeldung/string/emptystrings/PlainJavaBlankStringCheck.java b/java-strings-2/src/main/java/com/baeldung/string/emptystrings/PlainJavaBlankStringCheck.java
new file mode 100644
index 0000000000..26e281c9b7
--- /dev/null
+++ b/java-strings-2/src/main/java/com/baeldung/string/emptystrings/PlainJavaBlankStringCheck.java
@@ -0,0 +1,8 @@
+package com.baeldung.string.emptystrings;
+
+class PlainJavaBlankStringCheck {
+
+    boolean isBlankString(String string) {
+        return string == null || string.trim().isEmpty();
+    }
+}
diff --git a/java-strings-2/src/main/java/com/baeldung/string/emptystrings/SomeClassWithValidations.java b/java-strings-2/src/main/java/com/baeldung/string/emptystrings/SomeClassWithValidations.java
new file mode 100644
index 0000000000..8c484efb43
--- /dev/null
+++ b/java-strings-2/src/main/java/com/baeldung/string/emptystrings/SomeClassWithValidations.java
@@ -0,0 +1,14 @@
+package com.baeldung.string.emptystrings;
+
+import javax.validation.constraints.Pattern;
+
+class SomeClassWithValidations {
+
+    @Pattern(regexp = "\\A(?!\\s*\\Z).+")
+    private String someString;
+
+    SomeClassWithValidations setSomeString(String someString) {
+        this.someString = someString;
+        return this;
+    }
+}
diff --git a/java-strings-2/src/main/java/com/baeldung/string/multiline/MultiLineString.java b/java-strings-2/src/main/java/com/baeldung/string/multiline/MultiLineString.java
new file mode 100644
index 0000000000..1bde2dcb63
--- /dev/null
+++ b/java-strings-2/src/main/java/com/baeldung/string/multiline/MultiLineString.java
@@ -0,0 +1,67 @@
+package com.baeldung.string.multiline;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableList;
+
+public class MultiLineString {
+    
+    String newLine = System.getProperty("line.separator");
+    
+    public String stringConcatenation() {
+        return "Get busy living"
+                .concat(newLine)
+                .concat("or")
+                .concat(newLine)
+                .concat("get busy dying.")
+                .concat(newLine)
+                .concat("--Stephen King");
+    }
+    
+    public String stringJoin() {
+        return String.join(newLine,
+                           "Get busy living",
+                           "or",
+                           "get busy dying.",
+                           "--Stephen King");
+    }
+    
+    public String stringBuilder() {
+        return new StringBuilder()
+                .append("Get busy living")
+                .append(newLine)
+                .append("or")
+                .append(newLine)
+                .append("get busy dying.")
+                .append(newLine)
+                .append("--Stephen King")
+                .toString();
+    }
+    
+    public String stringWriter() {
+        StringWriter stringWriter = new StringWriter();
+        PrintWriter printWriter = new PrintWriter(stringWriter);
+        printWriter.println("Get busy living");
+        printWriter.println("or");
+        printWriter.println("get busy dying.");
+        printWriter.println("--Stephen King");
+        return stringWriter.toString();
+    }
+    
+    public String guavaJoiner() {
+        return Joiner.on(newLine).join(ImmutableList.of("Get busy living",
+            "or",
+            "get busy dying.",
+            "--Stephen King"));
+    }
+    
+    public String loadFromFile() throws IOException {
+        return new String(Files.readAllBytes(Paths.get("src/main/resources/stephenking.txt")));
+    }
+
+}
diff --git a/java-strings/src/main/java/com/baeldung/string/padding/StringPaddingUtil.java b/java-strings-2/src/main/java/com/baeldung/string/padding/StringPaddingUtil.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/padding/StringPaddingUtil.java
rename to java-strings-2/src/main/java/com/baeldung/string/padding/StringPaddingUtil.java
diff --git a/java-strings/src/main/java/com/baeldung/string/password/RandomPasswordGenerator.java b/java-strings-2/src/main/java/com/baeldung/string/password/RandomPasswordGenerator.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/password/RandomPasswordGenerator.java
rename to java-strings-2/src/main/java/com/baeldung/string/password/RandomPasswordGenerator.java
diff --git a/java-strings/src/main/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroes.java b/java-strings-2/src/main/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroes.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroes.java
rename to java-strings-2/src/main/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroes.java
diff --git a/java-strings-2/src/main/java/com/baeldung/string/reverse/ReverseStringExamples.java b/java-strings-2/src/main/java/com/baeldung/string/reverse/ReverseStringExamples.java
new file mode 100644
index 0000000000..1a58d09598
--- /dev/null
+++ b/java-strings-2/src/main/java/com/baeldung/string/reverse/ReverseStringExamples.java
@@ -0,0 +1,56 @@
+package com.baeldung.string.reverse;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class ReverseStringExamples {
+
+    public static String reverse(String input) {
+        if (input == null) {
+            return null;
+        }
+
+        String output = "";
+
+        for (int i = input.length() - 1; i >= 0; i--) {
+            output = output + input.charAt(i);
+        }
+
+        return output;
+    }
+
+    public static String reverseUsingStringBuilder(String input) {
+        if (input == null) {
+            return null;
+        }
+
+        StringBuilder output = new StringBuilder(input).reverse();
+
+        return output.toString();
+    }
+
+    public static String reverseUsingApacheCommons(String input) {
+        return StringUtils.reverse(input);
+    }
+
+    public static String reverseTheOrderOfWords(String sentence) {
+        if (sentence == null) {
+            return null;
+        }
+
+        StringBuilder output = new StringBuilder();
+        String[] words = sentence.split(" ");
+
+        for (int i = words.length - 1; i >= 0; i--) {
+            output.append(words[i]);
+            output.append(" ");
+        }
+
+        return output.toString()
+            .trim();
+    }
+
+    public static String reverseTheOrderOfWordsUsingApacheCommons(String sentence) {
+        return StringUtils.reverseDelimited(sentence, ' ');
+    }
+
+}
diff --git a/java-strings/src/main/java/com/baeldung/stringduplicates/RemoveDuplicateFromString.java b/java-strings-2/src/main/java/com/baeldung/stringduplicates/RemoveDuplicateFromString.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/stringduplicates/RemoveDuplicateFromString.java
rename to java-strings-2/src/main/java/com/baeldung/stringduplicates/RemoveDuplicateFromString.java
diff --git a/java-strings-2/src/main/resources/stephenking.txt b/java-strings-2/src/main/resources/stephenking.txt
new file mode 100644
index 0000000000..f31b4a28bd
--- /dev/null
+++ b/java-strings-2/src/main/resources/stephenking.txt
@@ -0,0 +1,4 @@
+Get busy living
+or
+get busy dying.
+--Stephen King
\ No newline at end of file
diff --git a/java-strings/src/test/java/com/baeldung/ConvertStringToListUnitTest.java b/java-strings-2/src/test/java/com/baeldung/ConvertStringToListUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/ConvertStringToListUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/ConvertStringToListUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/StringConcatenationUnitTest.java b/java-strings-2/src/test/java/com/baeldung/StringConcatenationUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/StringConcatenationUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/StringConcatenationUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java b/java-strings-2/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/java8/base64/ApacheCommonsEncodeDecodeUnitTest.java b/java-strings-2/src/test/java/com/baeldung/java8/base64/ApacheCommonsEncodeDecodeUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/java8/base64/ApacheCommonsEncodeDecodeUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/java8/base64/ApacheCommonsEncodeDecodeUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/java8/base64/Java8EncodeDecodeUnitTest.java b/java-strings-2/src/test/java/com/baeldung/java8/base64/Java8EncodeDecodeUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/java8/base64/Java8EncodeDecodeUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/java8/base64/Java8EncodeDecodeUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/java8/base64/StringToByteArrayUnitTest.java b/java-strings-2/src/test/java/com/baeldung/java8/base64/StringToByteArrayUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/java8/base64/StringToByteArrayUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/java8/base64/StringToByteArrayUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/MatchWordsUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/MatchWordsUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/MatchWordsUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/MatchWordsUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/PangramUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/PangramUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/PangramUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/PangramUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/RemovingEmojiFromStringUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/RemovingEmojiFromStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/RemovingEmojiFromStringUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/RemovingEmojiFromStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/StringFromPrimitiveArrayUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/StringFromPrimitiveArrayUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/StringFromPrimitiveArrayUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/StringFromPrimitiveArrayUnitTest.java
diff --git a/java-strings-2/src/test/java/com/baeldung/string/changecase/ToLowerCaseUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/changecase/ToLowerCaseUnitTest.java
new file mode 100644
index 0000000000..c395b61068
--- /dev/null
+++ b/java-strings-2/src/test/java/com/baeldung/string/changecase/ToLowerCaseUnitTest.java
@@ -0,0 +1,29 @@
+package com.baeldung.string.changecase;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Locale;
+
+import org.junit.Test;
+
+public class ToLowerCaseUnitTest {
+
+    private static final Locale TURKISH = new Locale("tr");
+    private String name = "John Doe";
+    private String foreignUppercase = "\u0049";
+
+    @Test
+    public void givenMixedCaseString_WhenToLowerCase_ThenResultIsLowerCase() {
+        assertEquals("john doe", name.toLowerCase());
+    }
+
+    @Test
+    public void givenForeignString_WhenToLowerCaseWithoutLocale_ThenResultIsLowerCase() {
+        assertEquals("\u0069", foreignUppercase.toLowerCase());
+    }
+
+    @Test
+    public void givenForeignString_WhenToLowerCaseWithLocale_ThenResultIsLowerCase() {
+        assertEquals("\u0131", foreignUppercase.toLowerCase(TURKISH));
+    }
+}
diff --git a/java-strings-2/src/test/java/com/baeldung/string/changecase/ToUpperCaseUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/changecase/ToUpperCaseUnitTest.java
new file mode 100644
index 0000000000..1807f854b2
--- /dev/null
+++ b/java-strings-2/src/test/java/com/baeldung/string/changecase/ToUpperCaseUnitTest.java
@@ -0,0 +1,29 @@
+package com.baeldung.string.changecase;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Locale;
+
+import org.junit.Test;
+
+public class ToUpperCaseUnitTest {
+
+    private static final Locale TURKISH = new Locale("tr");
+    private String name = "John Doe";
+    private String foreignLowercase = "\u0069";
+
+    @Test
+    public void givenMixedCaseString_WhenToUpperCase_ThenResultIsUpperCase() {
+        assertEquals("JOHN DOE", name.toUpperCase());
+    }
+
+    @Test
+    public void givenForeignString_WhenToUpperCaseWithoutLocale_ThenResultIsUpperCase() {
+        assertEquals("\u0049", foreignLowercase.toUpperCase());
+    }
+
+    @Test
+    public void givenForeignString_WhenToUpperCaseWithLocale_ThenResultIsUpperCase() {
+        assertEquals("\u0130", foreignLowercase.toUpperCase(TURKISH));
+    }
+}
diff --git a/java-strings-2/src/test/java/com/baeldung/string/emptystrings/EmptyStringsUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/emptystrings/EmptyStringsUnitTest.java
new file mode 100644
index 0000000000..96b1d681dd
--- /dev/null
+++ b/java-strings-2/src/test/java/com/baeldung/string/emptystrings/EmptyStringsUnitTest.java
@@ -0,0 +1,142 @@
+package com.baeldung.string.emptystrings;
+
+import static org.hamcrest.Matchers.iterableWithSize;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Set;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.Validation;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
+
+import com.google.common.base.Strings;
+
+public class EmptyStringsUnitTest {
+
+    private String emptyString = "";
+    private String blankString = "  \n\t  ";
+    private String nonEmptyString = "   someString   ";
+
+    /*
+     * EmptyStringCheck
+     */
+    @Test
+    public void givenSomeEmptyString_thenEmptyStringCheckIsEmptyStringReturnsTrue() {
+        assertTrue(new EmptyStringCheck().isEmptyString(emptyString));
+    }
+
+    @Test
+    public void givenSomeNonEmptyString_thenEmptyStringCheckIsEmptyStringReturnsFalse() {
+        assertFalse(new EmptyStringCheck().isEmptyString(nonEmptyString));
+    }
+
+    @Test
+    public void givenSomeBlankString_thenEmptyStringCheckIsEmptyStringReturnsFalse() {
+        assertFalse(new EmptyStringCheck().isEmptyString(blankString));
+    }
+
+    /*
+     * Java5EmptyStringCheck
+     */
+    @Test
+    public void givenSomeEmptyString_thenJava5EmptyStringCheckIsEmptyStringReturnsTrue() {
+        assertTrue(new Java5EmptyStringCheck().isEmptyString(emptyString));
+    }
+
+    @Test
+    public void givenSomeNonEmptyString_thenJava5EmptyStringCheckIsEmptyStringReturnsFalse() {
+        assertFalse(new Java5EmptyStringCheck().isEmptyString(nonEmptyString));
+    }
+
+    @Test
+    public void givenSomeBlankString_thenJava5EmptyStringCheckIsEmptyStringReturnsFalse() {
+        assertFalse(new Java5EmptyStringCheck().isEmptyString(blankString));
+    }
+
+    /*
+     * PlainJavaBlankStringCheck
+     */
+    @Test
+    public void givenSomeEmptyString_thenPlainJavaBlankStringCheckIsBlankStringReturnsTrue() {
+        assertTrue(new PlainJavaBlankStringCheck().isBlankString(emptyString));
+    }
+
+    @Test
+    public void givenSomeNonEmptyString_thenPlainJavaBlankStringCheckIsBlankStringReturnsFalse() {
+        assertFalse(new PlainJavaBlankStringCheck().isBlankString(nonEmptyString));
+    }
+
+    @Test
+    public void givenSomeBlankString_thenPlainJavaBlankStringCheckIsBlankStringReturnsTrue() {
+        assertTrue(new PlainJavaBlankStringCheck().isBlankString(blankString));
+    }
+
+    /*
+     * Apache Commons Lang StringUtils
+     */
+    @Test
+    public void givenSomeEmptyString_thenStringUtilsIsBlankReturnsTrue() {
+        assertTrue(StringUtils.isBlank(emptyString));
+    }
+
+    @Test
+    public void givenSomeNonEmptyString_thenStringUtilsIsBlankReturnsFalse() {
+        assertFalse(StringUtils.isBlank(nonEmptyString));
+    }
+
+    @Test
+    public void givenSomeBlankString_thenStringUtilsIsBlankReturnsTrue() {
+        assertTrue(StringUtils.isBlank(blankString));
+    }
+
+    /*
+     * Google Guava Strings
+     */
+    @Test
+    public void givenSomeEmptyString_thenStringsIsNullOrEmptyStringReturnsTrue() {
+        assertTrue(Strings.isNullOrEmpty(emptyString));
+    }
+
+    @Test
+    public void givenSomeNonEmptyString_thenStringsIsNullOrEmptyStringReturnsFalse() {
+        assertFalse(Strings.isNullOrEmpty(nonEmptyString));
+    }
+
+    @Test
+    public void givenSomeBlankString_thenStringsIsNullOrEmptyStringReturnsFalse() {
+        assertFalse(Strings.isNullOrEmpty(blankString));
+    }
+
+    /*
+     * Bean Validation
+     */
+    private ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
+    private Validator validator = factory.getValidator();
+
+    @Test
+    public void givenSomeEmptyString_thenBeanValidationReturnsViolations() {
+        SomeClassWithValidations someClassWithValidations = new SomeClassWithValidations().setSomeString(emptyString);
+        Set<ConstraintViolation<SomeClassWithValidations>> violations = validator.validate(someClassWithValidations);
+        assertThat(violations, iterableWithSize(1));
+    }
+
+    @Test
+    public void givenSomeNonEmptyString_thenBeanValidationValidatesWithoutViolations() {
+        SomeClassWithValidations someClassWithValidations = new SomeClassWithValidations().setSomeString(nonEmptyString);
+        Set<ConstraintViolation<SomeClassWithValidations>> violations = validator.validate(someClassWithValidations);
+        assertThat(violations, iterableWithSize(0));
+    }
+
+    @Test
+    public void givenSomeBlankString_thenBeanValidationReturnsViolations() {
+        SomeClassWithValidations someClassWithValidations = new SomeClassWithValidations().setSomeString(blankString);
+        Set<ConstraintViolation<SomeClassWithValidations>> violations = validator.validate(someClassWithValidations);
+        assertThat(violations, iterableWithSize(1));
+    }
+}
diff --git a/java-strings/src/test/java/com/baeldung/string/formatter/DateToStringFormatterUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/formatter/DateToStringFormatterUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/formatter/DateToStringFormatterUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/formatter/DateToStringFormatterUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/formatter/StringFormatterExampleUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/formatter/StringFormatterExampleUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/formatter/StringFormatterExampleUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/formatter/StringFormatterExampleUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/LocaleUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/LocaleUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/LocaleUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/LocaleUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringAnagramUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringAnagramUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringAnagramUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringAnagramUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringChangeCaseUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringChangeCaseUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringChangeCaseUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringChangeCaseUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringCountOccurrencesUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringCountOccurrencesUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringCountOccurrencesUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringCountOccurrencesUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringFormatUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringFormatUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringFormatUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringFormatUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringInternUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringInternUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringInternUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringInternUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringJoinerUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringJoinerUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringJoinerUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringJoinerUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringPalindromeUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringPalindromeUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringPalindromeUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringPalindromeUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringReverseUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringReverseUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringReverseUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringReverseUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringSplitUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringSplitUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringSplitUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringSplitUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringToByteArrayUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringToByteArrayUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringToByteArrayUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringToByteArrayUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringToCharArrayUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringToCharArrayUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringToCharArrayUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringToCharArrayUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/interview/StringToIntegerUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/interview/StringToIntegerUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/interview/StringToIntegerUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/interview/StringToIntegerUnitTest.java
diff --git a/java-strings-2/src/test/java/com/baeldung/string/multiline/MultiLineStringUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/multiline/MultiLineStringUnitTest.java
new file mode 100644
index 0000000000..3ebee9b5d1
--- /dev/null
+++ b/java-strings-2/src/test/java/com/baeldung/string/multiline/MultiLineStringUnitTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.string.multiline;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+
+import com.baeldung.string.multiline.MultiLineString;
+
+public class MultiLineStringUnitTest {
+
+    
+    @Test
+    public void whenCompareMultiLineStrings_thenTheyAreAllTheSame() throws IOException {
+        MultiLineString ms = new MultiLineString();
+        assertEquals(ms.stringConcatenation(), ms.stringJoin());
+        assertEquals(ms.stringJoin(), ms.stringBuilder());
+        assertEquals(ms.stringBuilder(), ms.guavaJoiner());
+        assertEquals(ms.guavaJoiner(), ms.loadFromFile());
+    }
+    
+}
diff --git a/java-strings/src/test/java/com/baeldung/string/padding/StringPaddingUtilUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/padding/StringPaddingUtilUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/padding/StringPaddingUtilUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/padding/StringPaddingUtilUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/password/StringPasswordUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/password/StringPasswordUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/password/StringPasswordUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/password/StringPasswordUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroesUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroesUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroesUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/string/removeleadingtrailingchar/RemoveLeadingAndTrailingZeroesUnitTest.java
diff --git a/java-strings-2/src/test/java/com/baeldung/string/repetition/SubstringRepetitionUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/repetition/SubstringRepetitionUnitTest.java
index fbd948d2be..f382a24a7f 100644
--- a/java-strings-2/src/test/java/com/baeldung/string/repetition/SubstringRepetitionUnitTest.java
+++ b/java-strings-2/src/test/java/com/baeldung/string/repetition/SubstringRepetitionUnitTest.java
@@ -9,11 +9,11 @@ public class SubstringRepetitionUnitTest {
 
     private String validString = "aa";
     private String validStringTwo = "ababab";
-    private String validStringThree = "aabcaabcaabcaabc";
+    private String validStringThree = "baeldungbaeldung";
 
     private String invalidString = "aca";
     private String invalidStringTwo = "ababa";
-    private String invalidStringThree = "abcdab";
+    private String invalidStringThree = "baeldungnonrepeatedbaeldung";
 
     @Test
     public void givenValidStrings_whenCheckIfContainsOnlySubstrings_thenReturnsTrue() {
diff --git a/java-strings-2/src/test/java/com/baeldung/string/reverse/ReverseStringExamplesUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/reverse/ReverseStringExamplesUnitTest.java
new file mode 100644
index 0000000000..020ead02db
--- /dev/null
+++ b/java-strings-2/src/test/java/com/baeldung/string/reverse/ReverseStringExamplesUnitTest.java
@@ -0,0 +1,70 @@
+package com.baeldung.string.reverse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class ReverseStringExamplesUnitTest {
+
+    private static final String STRING_INPUT = "cat";
+    private static final String STRING_INPUT_REVERSED = "tac";
+    private static final String SENTENCE = "The quick brown fox jumps over the lazy dog";
+    private static final String REVERSED_WORDS_SENTENCE = "dog lazy the over jumps fox brown quick The";
+
+    @Test
+    public void whenReverseIsCalled_ThenCorrectStringIsReturned() {
+        String reversed = ReverseStringExamples.reverse(STRING_INPUT);
+        String reversedNull = ReverseStringExamples.reverse(null);
+        String reversedEmpty = ReverseStringExamples.reverse(StringUtils.EMPTY);
+
+        assertEquals(STRING_INPUT_REVERSED, reversed);
+        assertEquals(null, reversedNull);
+        assertEquals(StringUtils.EMPTY, reversedEmpty);
+    }
+
+    @Test
+    public void whenReverseUsingStringBuilderIsCalled_ThenCorrectStringIsReturned() throws Exception {
+        String reversed = ReverseStringExamples.reverseUsingStringBuilder(STRING_INPUT);
+        String reversedNull = ReverseStringExamples.reverseUsingStringBuilder(null);
+        String reversedEmpty = ReverseStringExamples.reverseUsingStringBuilder(StringUtils.EMPTY);
+
+        assertEquals(STRING_INPUT_REVERSED, reversed);
+        assertEquals(null, reversedNull);
+        assertEquals(StringUtils.EMPTY, reversedEmpty);
+    }
+
+    @Test
+    public void whenReverseUsingApacheCommonsIsCalled_ThenCorrectStringIsReturned() throws Exception {
+        String reversed = ReverseStringExamples.reverseUsingApacheCommons(STRING_INPUT);
+        String reversedNull = ReverseStringExamples.reverseUsingApacheCommons(null);
+        String reversedEmpty = ReverseStringExamples.reverseUsingApacheCommons(StringUtils.EMPTY);
+
+        assertEquals(STRING_INPUT_REVERSED, reversed);
+        assertEquals(null, reversedNull);
+        assertEquals(StringUtils.EMPTY, reversedEmpty);
+    }
+
+    @Test
+    public void whenReverseTheOrderOfWordsIsCalled_ThenCorrectStringIsReturned() {
+        String reversed = ReverseStringExamples.reverseTheOrderOfWords(SENTENCE);
+        String reversedNull = ReverseStringExamples.reverseTheOrderOfWords(null);
+        String reversedEmpty = ReverseStringExamples.reverseTheOrderOfWords(StringUtils.EMPTY);
+
+        assertEquals(REVERSED_WORDS_SENTENCE, reversed);
+        assertEquals(null, reversedNull);
+        assertEquals(StringUtils.EMPTY, reversedEmpty);
+    }
+
+    @Test
+    public void whenReverseTheOrderOfWordsUsingApacheCommonsIsCalled_ThenCorrectStringIsReturned() {
+        String reversed = ReverseStringExamples.reverseTheOrderOfWordsUsingApacheCommons(SENTENCE);
+        String reversedNull = ReverseStringExamples.reverseTheOrderOfWordsUsingApacheCommons(null);
+        String reversedEmpty = ReverseStringExamples.reverseTheOrderOfWordsUsingApacheCommons(StringUtils.EMPTY);
+
+        assertEquals(REVERSED_WORDS_SENTENCE, reversed);
+        assertEquals(null, reversedNull);
+        assertEquals(StringUtils.EMPTY, reversedEmpty);
+    }
+
+}
diff --git a/java-strings-2/src/test/java/com/baeldung/string/todouble/StringToDoubleConversionUnitTest.java b/java-strings-2/src/test/java/com/baeldung/string/todouble/StringToDoubleConversionUnitTest.java
new file mode 100644
index 0000000000..9abb7ac453
--- /dev/null
+++ b/java-strings-2/src/test/java/com/baeldung/string/todouble/StringToDoubleConversionUnitTest.java
@@ -0,0 +1,56 @@
+package com.baeldung.string.todouble;
+
+import static org.junit.Assert.assertEquals;
+
+import java.text.DecimalFormat;
+import java.text.ParseException;
+
+import org.junit.Test;
+
+public class StringToDoubleConversionUnitTest {
+
+    @Test
+    public void givenValidString_WhenParseDouble_ThenResultIsPrimitiveDouble() {
+        assertEquals(1.23, Double.parseDouble("1.23"), 0.000001);
+    }
+    
+    @Test(expected = NullPointerException.class)
+    public void givenNullString_WhenParseDouble_ThenNullPointerExceptionIsThrown() {
+        Double.parseDouble(null);
+    }
+    
+    @Test(expected = NumberFormatException.class)
+    public void givenInalidString_WhenParseDouble_ThenNumberFormatExceptionIsThrown() {
+        Double.parseDouble("&");
+    }
+    
+    @Test
+    public void givenValidString_WhenValueOf_ThenResultIsPrimitiveDouble() {
+        assertEquals(1.23, Double.valueOf("1.23"), 0.000001);
+    }
+    
+    @Test(expected = NullPointerException.class)
+    public void givenNullString_WhenValueOf_ThenNullPointerExceptionIsThrown() {
+        Double.valueOf(null);
+    }
+    
+    @Test(expected = NumberFormatException.class)
+    public void givenInalidString_WhenValueOf_ThenNumberFormatExceptionIsThrown() {
+        Double.valueOf("&");
+    }
+    
+    @Test
+    public void givenValidString_WhenDecimalFormat_ThenResultIsValidDouble() throws ParseException {
+        assertEquals(1.23, new DecimalFormat("#").parse("1.23").doubleValue(), 0.000001);
+    }
+    
+    @Test(expected = NullPointerException.class)
+    public void givenNullString_WhenDecimalFormat_ThenNullPointerExceptionIsThrown() throws ParseException {
+        new DecimalFormat("#").parse(null);
+    }
+    
+    @Test(expected = ParseException.class)
+    public void givenInvalidString_WhenDecimalFormat_ThenParseExceptionIsThrown() throws ParseException {
+        new DecimalFormat("#").parse("&");
+    }
+}
diff --git a/java-strings/src/test/java/com/baeldung/stringduplicates/RemoveDuplicateFromStringUnitTest.java b/java-strings-2/src/test/java/com/baeldung/stringduplicates/RemoveDuplicateFromStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/stringduplicates/RemoveDuplicateFromStringUnitTest.java
rename to java-strings-2/src/test/java/com/baeldung/stringduplicates/RemoveDuplicateFromStringUnitTest.java
diff --git a/java-strings/src/test/resources/test_image.jpg b/java-strings-2/src/test/resources/test_image.jpg
similarity index 100%
rename from java-strings/src/test/resources/test_image.jpg
rename to java-strings-2/src/test/resources/test_image.jpg
diff --git a/java-strings-ops/README.md b/java-strings-ops/README.md
new file mode 100644
index 0000000000..d909f171a7
--- /dev/null
+++ b/java-strings-ops/README.md
@@ -0,0 +1,22 @@
+=========
+
+## Java Strings Cookbooks and Examples
+
+### Relevant Articles:
+- [Convert char to String in Java](http://www.baeldung.com/java-convert-char-to-string)
+- [Convert String to int or Integer in Java](http://www.baeldung.com/java-convert-string-to-int-or-integer)
+- [Java String Conversions](https://www.baeldung.com/java-string-conversions)
+- [Check if a String is a Palindrome](http://www.baeldung.com/java-palindrome)
+- [Comparing Strings in Java](http://www.baeldung.com/java-compare-strings)
+- [Check If a String Is Numeric in Java](http://www.baeldung.com/java-check-string-number)
+- [Get Substring from String in Java](https://www.baeldung.com/java-substring)
+- [How to Remove the Last Character of a String?](http://www.baeldung.com/java-remove-last-character-of-string)
+- [Add a Character to a String at a Given Position](https://www.baeldung.com/java-add-character-to-string)
+- [Count Occurrences of a Char in a String](http://www.baeldung.com/java-count-chars)
+- [Guide to Java String Pool](http://www.baeldung.com/java-string-pool)
+- [Split a String in Java](http://www.baeldung.com/java-split-string)
+- [Common String Operations in Java](https://www.baeldung.com/java-string-operations)
+- [Convert String to Byte Array and Reverse in Java](https://www.baeldung.com/java-string-to-byte-array)
+- [Java toString() Method](https://www.baeldung.com/java-tostring)
+- [CharSequence vs. String in Java](http://www.baeldung.com/java-char-sequence-string)
+- [StringBuilder and StringBuffer in Java](http://www.baeldung.com/java-string-builder-string-buffer)
\ No newline at end of file
diff --git a/java-strings-ops/pom.xml b/java-strings-ops/pom.xml
new file mode 100644
index 0000000000..b6a7ea2728
--- /dev/null
+++ b/java-strings-ops/pom.xml
@@ -0,0 +1,99 @@
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>java-strings-ops</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>java-strings-ops</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${jmh-core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${jmh-generator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter-api.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>${org.hamcrest.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>java-strings-ops</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <compilerArgument>-parameters</compilerArgument>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <!-- util -->
+        <commons-lang3.version>3.8.1</commons-lang3.version>
+        <!-- testing -->
+        <assertj.version>3.6.1</assertj.version>
+        <guava.version>27.0.1-jre</guava.version>
+		<junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
+    </properties>
+
+</project>
diff --git a/java-strings/src/main/java/com/baeldung/datetime/UseLocalDateTime.java b/java-strings-ops/src/main/java/com/baeldung/datetime/UseLocalDateTime.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/datetime/UseLocalDateTime.java
rename to java-strings-ops/src/main/java/com/baeldung/datetime/UseLocalDateTime.java
diff --git a/java-strings/src/main/java/com/baeldung/string/AppendCharAtPositionX.java b/java-strings-ops/src/main/java/com/baeldung/string/AppendCharAtPositionX.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/AppendCharAtPositionX.java
rename to java-strings-ops/src/main/java/com/baeldung/string/AppendCharAtPositionX.java
diff --git a/java-strings/src/main/java/com/baeldung/string/Palindrome.java b/java-strings-ops/src/main/java/com/baeldung/string/Palindrome.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/Palindrome.java
rename to java-strings-ops/src/main/java/com/baeldung/string/Palindrome.java
diff --git a/java-strings/src/main/java/com/baeldung/string/StringHelper.java b/java-strings-ops/src/main/java/com/baeldung/string/StringHelper.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/StringHelper.java
rename to java-strings-ops/src/main/java/com/baeldung/string/StringHelper.java
diff --git a/java-strings/src/main/java/com/baeldung/string/tostring/Customer.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/Customer.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/tostring/Customer.java
rename to java-strings-ops/src/main/java/com/baeldung/string/tostring/Customer.java
diff --git a/java-strings/src/main/java/com/baeldung/string/tostring/CustomerArrayToString.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerArrayToString.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/tostring/CustomerArrayToString.java
rename to java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerArrayToString.java
diff --git a/java-strings/src/main/java/com/baeldung/string/tostring/CustomerComplexObjectToString.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerComplexObjectToString.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/tostring/CustomerComplexObjectToString.java
rename to java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerComplexObjectToString.java
diff --git a/java-strings/src/main/java/com/baeldung/string/tostring/CustomerPrimitiveToString.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerPrimitiveToString.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/tostring/CustomerPrimitiveToString.java
rename to java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerPrimitiveToString.java
diff --git a/java-strings/src/main/java/com/baeldung/string/tostring/CustomerReflectionToString.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerReflectionToString.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/tostring/CustomerReflectionToString.java
rename to java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerReflectionToString.java
diff --git a/java-strings/src/main/java/com/baeldung/string/tostring/CustomerWrapperCollectionToString.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerWrapperCollectionToString.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/tostring/CustomerWrapperCollectionToString.java
rename to java-strings-ops/src/main/java/com/baeldung/string/tostring/CustomerWrapperCollectionToString.java
diff --git a/java-strings/src/main/java/com/baeldung/string/tostring/Order.java b/java-strings-ops/src/main/java/com/baeldung/string/tostring/Order.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/tostring/Order.java
rename to java-strings-ops/src/main/java/com/baeldung/string/tostring/Order.java
diff --git a/JGit/src/main/resources/logback.xml b/java-strings-ops/src/main/resources/logback.xml
similarity index 100%
rename from JGit/src/main/resources/logback.xml
rename to java-strings-ops/src/main/resources/logback.xml
diff --git a/java-strings/src/test/java/com/baeldung/CharToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/CharToStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/CharToStringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/CharToStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/java/conversion/README.md b/java-strings-ops/src/test/java/com/baeldung/java/conversion/README.md
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/java/conversion/README.md
rename to java-strings-ops/src/test/java/com/baeldung/java/conversion/README.md
diff --git a/java-strings/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/AppendCharAtPositionXUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/AppendCharAtPositionXUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/AppendCharAtPositionXUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/AppendCharAtPositionXUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/CharSequenceVsStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/CharSequenceVsStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/CharSequenceVsStringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/CharSequenceVsStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/PalindromeUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/PalindromeUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/PalindromeUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/PalindromeUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/SplitUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/SplitUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/SplitUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/SplitUnitTest.java
diff --git a/java-strings/src/main/java/com/baeldung/string/StringBufferStringBuilder.java b/java-strings-ops/src/test/java/com/baeldung/string/StringBufferStringBuilder.java
similarity index 100%
rename from java-strings/src/main/java/com/baeldung/string/StringBufferStringBuilder.java
rename to java-strings-ops/src/test/java/com/baeldung/string/StringBufferStringBuilder.java
diff --git a/java-strings/src/test/java/com/baeldung/string/StringComparisonUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/StringComparisonUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/StringComparisonUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/StringComparisonUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/StringHelperUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/StringHelperUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/StringHelperUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/StringHelperUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/SubstringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/SubstringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/SubstringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/SubstringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/conversion/ByteArrayToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/conversion/ByteArrayToStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/conversion/ByteArrayToStringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/conversion/ByteArrayToStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/conversion/StringToByteArrayUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/conversion/StringToByteArrayUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/conversion/StringToByteArrayUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/conversion/StringToByteArrayUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/stringisnumeric/CoreJavaIsNumericUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/stringisnumeric/CoreJavaIsNumericUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/stringisnumeric/CoreJavaIsNumericUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/stringisnumeric/CoreJavaIsNumericUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java b/java-strings-ops/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java
similarity index 100%
rename from java-strings/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java
rename to java-strings-ops/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java
diff --git a/spring-security-mvc-session/.gitignore b/java-strings-ops/src/test/resources/.gitignore
similarity index 100%
rename from spring-security-mvc-session/.gitignore
rename to java-strings-ops/src/test/resources/.gitignore
diff --git a/java-strings/README.md b/java-strings/README.md
index b342f53918..ef536b4099 100644
--- a/java-strings/README.md
+++ b/java-strings/README.md
@@ -6,51 +6,18 @@
 - [String Operations with Java Streams](http://www.baeldung.com/java-stream-operations-on-strings)
 - [Converting String to Stream of chars](http://www.baeldung.com/java-string-to-stream)
 - [Java 8 StringJoiner](http://www.baeldung.com/java-string-joiner)
-- [Image to Base64 String Conversion](http://www.baeldung.com/java-base64-image-string)
-- [Java – Generate Random String](http://www.baeldung.com/java-random-string)
-- [Convert char to String in Java](http://www.baeldung.com/java-convert-char-to-string)
-- [Convert String to int or Integer in Java](http://www.baeldung.com/java-convert-string-to-int-or-integer)
-- [Java String Conversions](https://www.baeldung.com/java-string-conversions)
 - [Converting Strings to Enums in Java](http://www.baeldung.com/java-string-to-enum)
 - [Quick Guide to the Java StringTokenizer](http://www.baeldung.com/java-stringtokenizer)
-- [Count Occurrences of a Char in a String](http://www.baeldung.com/java-count-chars)
-- [Split a String in Java](http://www.baeldung.com/java-split-string)
-- [How to Remove the Last Character of a String?](http://www.baeldung.com/java-remove-last-character-of-string)
-- [CharSequence vs. String in Java](http://www.baeldung.com/java-char-sequence-string)
-- [StringBuilder and StringBuffer in Java](http://www.baeldung.com/java-string-builder-string-buffer)
-- [Guide to Java String Pool](http://www.baeldung.com/java-string-pool)
-- [Check if a String is a Palindrome](http://www.baeldung.com/java-palindrome)
-- [Comparing Strings in Java](http://www.baeldung.com/java-compare-strings)
-- [Check If a String Is Numeric in Java](http://www.baeldung.com/java-check-string-number)
 - [Use char[] Array Over a String for Manipulating Passwords in Java?](http://www.baeldung.com/java-storing-passwords)
 - [Convert a String to Title Case](http://www.baeldung.com/java-string-title-case)
 - [Compact Strings in Java 9](http://www.baeldung.com/java-9-compact-string)
 - [Java Check a String for Lowercase/Uppercase Letter, Special Character and Digit](https://www.baeldung.com/java-lowercase-uppercase-special-character-digit-regex)
 - [Convert java.util.Date to String](https://www.baeldung.com/java-util-date-to-string)
-- [Get Substring from String in Java](https://www.baeldung.com/java-substring)
 - [Converting a Stack Trace to a String in Java](https://www.baeldung.com/java-stacktrace-to-string)
 - [Sorting a String Alphabetically in Java](https://www.baeldung.com/java-sort-string-alphabetically)
-- [Remove Emojis from a Java String](https://www.baeldung.com/java-string-remove-emojis)
 - [String Not Empty Test Assertions in Java](https://www.baeldung.com/java-assert-string-not-empty)
 - [String Performance Hints](https://www.baeldung.com/java-string-performance)
 - [Using indexOf to Find All Occurrences of a Word in a String](https://www.baeldung.com/java-indexOf-find-string-occurrences)
-- [Convert String to Byte Array and Reverse in Java](https://www.baeldung.com/java-string-to-byte-array)
-- [Java Base64 Encoding and Decoding](https://www.baeldung.com/java-base64-encode-and-decode)
-- [Generate a Secure Random Password in Java](https://www.baeldung.com/java-generate-secure-password)
-- [Removing Repeated Characters from a String](https://www.baeldung.com/java-remove-repeated-char)
-- [Join Array of Primitives with Separator in Java](https://www.baeldung.com/java-join-primitive-array)
-- [Convert String to Byte Array and Reverse in Java](https://www.baeldung.com/java-string-to-byte-array)
-- [Pad a String with Zeros or Spaces in Java](https://www.baeldung.com/java-pad-string)
 - [Adding a Newline Character to a String in Java](https://www.baeldung.com/java-string-newline)
 - [Remove or Replace part of a String in Java](https://www.baeldung.com/java-remove-replace-string-part)
-- [Replace a Character at a Specific Index in a String in Java](https://www.baeldung.com/java-replace-character-at-index)
-- [Convert a Comma Separated String to a List in Java](https://www.baeldung.com/java-string-with-separator-to-list)
-- [Guide to java.util.Formatter](http://www.baeldung.com/java-string-formatter)
-- [Add a Character to a String at a Given Position](https://www.baeldung.com/java-add-character-to-string)
-- [Remove Leading and Trailing Characters from a String](https://www.baeldung.com/java-remove-trailing-characters)
-- [Concatenating Strings In Java](https://www.baeldung.com/java-strings-concatenation)
-- [Java toString() Method](https://www.baeldung.com/java-tostring)
-- [Java String Interview Questions and Answers](https://www.baeldung.com/java-string-interview-questions)
-- [Check if a String is a Pangram in Java](https://www.baeldung.com/java-string-pangram)
-- [Check If a String Contains Multiple Keywords](https://www.baeldung.com/string-contains-multiple-words)
-- [Common String Operations in Java](https://www.baeldung.com/java-string-operations)
+- [Replace a Character at a Specific Index in a String in Java](https://www.baeldung.com/java-replace-character-at-index)
\ No newline at end of file
diff --git a/java-strings/pom.xml b/java-strings/pom.xml
index 7f66b95355..42a57bfb42 100755
--- a/java-strings/pom.xml
+++ b/java-strings/pom.xml
@@ -62,12 +62,6 @@
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
-        
-        <dependency>
-            <groupId>com.vdurmont</groupId>
-            <artifactId>emoji-java</artifactId>
-            <version>${emoji-java.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -83,24 +77,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- Added for password generation -->
-        <dependency>
-            <groupId>org.passay</groupId>
-            <artifactId>passay</artifactId>
-            <version>${passay.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>${commons-text.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.ahocorasick</groupId>
-            <artifactId>ahocorasick</artifactId>
-            <version>${ahocorasick.version}</version>
-        </dependency>
-
     </dependencies>
 
     <build>
@@ -134,11 +110,8 @@
         <assertj.version>3.6.1</assertj.version>
         <icu4j.version>61.1</icu4j.version>
         <guava.version>27.0.1-jre</guava.version>
-		<emoji-java.version>4.0.0</emoji-java.version>
 		<junit-jupiter-api.version>5.3.1</junit-jupiter-api.version>
-		<passay.version>1.3.1</passay.version>
 		<commons-text.version>1.4</commons-text.version>
-		<ahocorasick.version>0.4.0</ahocorasick.version>
     </properties>
 
 </project>
diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml
index e3d8a430d9..096b1bb229 100644
--- a/javax-servlets/pom.xml
+++ b/javax-servlets/pom.xml
@@ -88,7 +88,6 @@
         <assertj.version>3.9.1</assertj.version>
         <mockito.version>2.21.0</mockito.version>
         <commons-fileupload.version>1.3.3</commons-fileupload.version>
-        <commons-io.version>2.6</commons-io.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
     </properties>
 </project>
diff --git a/javax-servlets/src/main/java/com/baeldung/servlets/MyHttpServlet.java b/javax-servlets/src/main/java/com/baeldung/servlets/MyHttpServlet.java
new file mode 100644
index 0000000000..b4d80db0ab
--- /dev/null
+++ b/javax-servlets/src/main/java/com/baeldung/servlets/MyHttpServlet.java
@@ -0,0 +1,57 @@
+package com.baeldung.servlets;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(name = "MyHttpServlet", urlPatterns = "/servlet-mapping")
+public class MyHttpServlet extends HttpServlet {
+
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        PrintWriter writer = response.getWriter();
+        writer.println(request.getParameter("function"));
+        if ("getContextPath".equals(request.getParameter("function"))) {
+            writer.println(request.getContextPath());
+        } else if ("getLocalAddr".equals(request.getParameter("function"))) {
+            writer.println(request.getLocalAddr());
+        } else if ("getLocalName".equals(request.getParameter("function"))) {
+            writer.println(request.getLocalName());
+        } else if ("getLocalAPort".equals(request.getParameter("function"))) {
+            writer.println(request.getLocalPort());
+        } else if ("getMethod".equals(request.getParameter("function"))) {
+            writer.println(request.getMethod());
+        } else if ("getParameterNames".equals(request.getParameter("function"))) {
+            writer.println(request.getParameterNames());
+        } else if ("getPathInfo".equals(request.getParameter("function"))) {
+            writer.println(request.getPathInfo());
+        } else if ("getProtocol".equals(request.getParameter("function"))) {
+            writer.println(request.getProtocol());
+        } else if ("getQueryString".equals(request.getParameter("function"))) {
+            writer.println(request.getQueryString());
+        } else if ("getRequestedSessionId".equals(request.getParameter("function"))) {
+            writer.println(request.getRequestedSessionId());
+        } else if ("getRequestURI".equals(request.getParameter("function"))) {
+            writer.println(request.getRequestURI());
+        } else if ("getRequestURL".equals(request.getParameter("function"))) {
+            writer.println(request.getRequestURL());
+        } else if ("getScheme".equals(request.getParameter("function"))) {
+            writer.println(request.getScheme());
+        } else if ("getServerName".equals(request.getParameter("function"))) {
+            writer.println(request.getServerName());
+        } else if ("getServerPort".equals(request.getParameter("function"))) {
+            writer.println(request.getServerPort());
+        } else if ("getServletPath".equals(request.getParameter("function"))) {
+            writer.println(request.getServletPath());
+        } else {
+            writer.println("INVALID FUNCTION");
+        }
+        writer.flush();
+    }
+    
+}
+
+
diff --git a/javaxval/src/main/java/org/baeldung/javabeanconstraints/bigdecimal/Invoice.java b/javaxval/src/main/java/org/baeldung/javabeanconstraints/bigdecimal/Invoice.java
new file mode 100644
index 0000000000..6df1b79a60
--- /dev/null
+++ b/javaxval/src/main/java/org/baeldung/javabeanconstraints/bigdecimal/Invoice.java
@@ -0,0 +1,19 @@
+package org.baeldung.javabeanconstraints.bigdecimal;
+
+import java.math.BigDecimal;
+
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.Digits;
+
+public class Invoice {
+	
+	@DecimalMin(value = "0.0", inclusive = false)
+	@Digits(integer=3, fraction=2)
+    private BigDecimal price;
+    private String description;
+    
+	public Invoice(BigDecimal price, String description) {
+		this.price = price;
+		this.description = description;
+	}
+}
diff --git a/javaxval/src/test/java/org/baeldung/javabeanconstraints/bigdecimal/InvoiceUnitTest.java b/javaxval/src/test/java/org/baeldung/javabeanconstraints/bigdecimal/InvoiceUnitTest.java
new file mode 100644
index 0000000000..525dd7d1ad
--- /dev/null
+++ b/javaxval/src/test/java/org/baeldung/javabeanconstraints/bigdecimal/InvoiceUnitTest.java
@@ -0,0 +1,62 @@
+package org.baeldung.javabeanconstraints.bigdecimal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.math.BigDecimal;
+import java.util.Set;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.Validation;
+import javax.validation.Validator;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class InvoiceUnitTest {
+	
+	private static Validator validator;
+
+    @BeforeClass
+    public static void setupValidatorInstance() {
+        validator = Validation.buildDefaultValidatorFactory().getValidator();
+    }
+    
+    @Test
+    public void whenPriceIntegerDigitLessThanThreeWithDecimalValue_thenShouldGiveConstraintViolations() {
+    	Invoice invoice = new Invoice(new BigDecimal(10.21), "Book purchased");
+        Set<ConstraintViolation<Invoice>> violations = validator.validate(invoice);
+        assertThat(violations.size()).isEqualTo(1);
+        violations.forEach(action-> assertThat(action.getMessage()).isEqualTo("numeric value out of bounds (<3 digits>.<2 digits> expected)"));
+    }
+    
+    @Test
+    public void whenPriceIntegerDigitLessThanThreeWithIntegerValue_thenShouldNotGiveConstraintViolations() {
+    	Invoice invoice = new Invoice(new BigDecimal(10), "Book purchased");
+        Set<ConstraintViolation<Invoice>> violations = validator.validate(invoice);
+        assertThat(violations.size()).isEqualTo(0);
+    }
+    
+    @Test
+    public void whenPriceIntegerDigitGreaterThanThree_thenShouldGiveConstraintViolations() {
+    	Invoice invoice = new Invoice(new BigDecimal(1021.21), "Book purchased");
+        Set<ConstraintViolation<Invoice>> violations = validator.validate(invoice);
+        assertThat(violations.size()).isEqualTo(1);
+        violations.forEach(action-> assertThat(action.getMessage()).isEqualTo("numeric value out of bounds (<3 digits>.<2 digits> expected)"));
+    }
+    
+    @Test
+    public void whenPriceIsZero_thenShouldGiveConstraintViolations() {
+    	Invoice invoice = new Invoice(new BigDecimal(000.00), "Book purchased");
+        Set<ConstraintViolation<Invoice>> violations = validator.validate(invoice);
+        assertThat(violations.size()).isEqualTo(1);
+        violations.forEach(action-> assertThat(action.getMessage()).isEqualTo("must be greater than 0.0"));
+    }
+    
+    @Test
+    public void whenPriceIsGreaterThanZero_thenShouldNotGiveConstraintViolations() {
+    	Invoice invoice = new Invoice(new BigDecimal(100.50), "Book purchased");
+        Set<ConstraintViolation<Invoice>> violations = validator.validate(invoice);
+        assertThat(violations.size()).isEqualTo(0);
+    }
+
+}
diff --git a/jaxb/pom.xml b/jaxb/pom.xml
index 3ed6d9b21a..d575f12c7b 100644
--- a/jaxb/pom.xml
+++ b/jaxb/pom.xml
@@ -130,8 +130,6 @@
         <!-- maven plugins -->
         <jaxb2-maven-plugin.version>2.3</jaxb2-maven-plugin.version>
         <istack-commons-runtime.version>3.0.2</istack-commons-runtime.version>
-        <commons-io.version>2.5</commons-io.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version>
 
         <javax.activation.version>1.1</javax.activation.version>
diff --git a/jee-7/pom.xml b/jee-7/pom.xml
index d389b57cd5..9432801fd9 100644
--- a/jee-7/pom.xml
+++ b/jee-7/pom.xml
@@ -519,11 +519,9 @@
 		<tyrus.version>1.13</tyrus.version>
 		<jersey.version>2.25</jersey.version>
 		<arquillian-glassfish.version>1.0.0.Final</arquillian-glassfish.version>
-		<maven-war-plugin.version>2.6</maven-war-plugin.version>
 		<org.springframework.security.version>4.2.3.RELEASE</org.springframework.security.version>
 		<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
 		<taglibs.standard.version>1.1.2</taglibs.standard.version>
-		<commons-io.version>2.4</commons-io.version>
 		<com.sun.faces.jsf.version>2.2.14</com.sun.faces.jsf.version>
 		<httpclient.version>4.5</httpclient.version>
 		<arquillian-drone-bom.version>2.0.1.Final</arquillian-drone-bom.version>
diff --git a/jee-kotlin/README.md b/jee-kotlin/README.md
new file mode 100644
index 0000000000..7d843af9ea
--- /dev/null
+++ b/jee-kotlin/README.md
@@ -0,0 +1 @@
+### Relevant Articles:
diff --git a/jee-kotlin/pom.xml b/jee-kotlin/pom.xml
new file mode 100644
index 0000000000..17163ba23c
--- /dev/null
+++ b/jee-kotlin/pom.xml
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jee-kotlin</artifactId>
+    <name>jee-kotlin</name>
+    <packaging>war</packaging>
+	
+    <parent>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+            <version>${javaee-api.version}</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.arquillian.junit</groupId>
+            <artifactId>arquillian-junit-container</artifactId>
+            <version>${arquillian_core.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-depchain</artifactId>
+            <version>${shrinkwrap.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.arquillian.extension</groupId>
+            <artifactId>arquillian-rest-client-impl-jersey</artifactId>
+            <version>${arquillian-rest-client.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>src/test/kotlin</testSourceDirectory>
+
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <jvmTarget>1.8</jvmTarget>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
+                <configuration>
+                    <warSourceDirectory>webapp</warSourceDirectory>
+                    <warName>kotlin</warName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>default-testCompile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>testCompile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.arquillian</groupId>
+                <artifactId>arquillian-bom</artifactId>
+                <version>${arquillian_core.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.arquillian.extension</groupId>
+                <artifactId>arquillian-drone-bom</artifactId>
+                <version>${arquillian-drone-bom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <profiles>
+        <profile>
+            <id>wildfly-managed-arquillian</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.wildfly</groupId>
+                    <artifactId>wildfly-arquillian-container-embedded</artifactId>
+                    <version>${wildfly.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.wildfly</groupId>
+                    <artifactId>wildfly-embedded</artifactId>
+                    <version>${wildfly.version}</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <!-- You need the maven dependency plugin to download locally a zip with the server,
+                    unless you provide your own, it will download under the /target directory -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>${maven-dependency-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>unpack</id>
+                                <phase>process-test-classes</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.wildfly</groupId>
+                                            <artifactId>wildfly-dist</artifactId>
+                                            <version>${wildfly.version}</version>
+                                            <type>zip</type>
+                                            <overWrite>false</overWrite>
+                                            <outputDirectory>target</outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven-surefire-plugin.version}</version>
+                        <configuration>
+                            <!-- Fork every test because it will launch a separate AS instance -->
+                            <forkMode>always</forkMode>
+                            <systemPropertyVariables>
+                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                                <jboss.home>${project.basedir}/target/wildfly-${wildfly.version}</jboss.home>
+                                <module.path>${project.basedir}/target/wildfly-${wildfly.version}/modules</module.path>
+                            </systemPropertyVariables>
+                            <redirectTestOutputToFile>false</redirectTestOutputToFile>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>wildfly-remote-arquillian</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-client</artifactId>
+                    <version>${resteasy.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-jaxb-provider</artifactId>
+                    <version>${resteasy.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-json-p-provider</artifactId>
+                    <version>${resteasy.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.wildfly.arquillian</groupId>
+                    <artifactId>wildfly-arquillian-container-remote</artifactId>
+                    <version>2.2.0.Final</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <failOnMissingWebXml>false</failOnMissingWebXml>
+        <javaee-api.version>8.0</javaee-api.version>
+
+
+        <kotlin.version>1.3.41</kotlin.version>
+        <kotlin.code.style>official</kotlin.code.style>
+        <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
+
+
+        <wildfly.version>8.2.1.Final</wildfly.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+        <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
+
+        <arquillian_core.version>1.4.1.Final</arquillian_core.version>
+        <arquillian-drone-bom.version>2.0.1.Final</arquillian-drone-bom.version>
+        <arquillian-rest-client.version>1.0.0.Alpha4</arquillian-rest-client.version>
+
+        <resteasy.version>3.8.0.Final</resteasy.version>
+        <shrinkwrap.version>3.1.3</shrinkwrap.version>
+
+    </properties>
+</project>
diff --git a/jee-kotlin/src/main/kotlin/com/baeldung/jeekotlin/entity/Student.kt b/jee-kotlin/src/main/kotlin/com/baeldung/jeekotlin/entity/Student.kt
new file mode 100644
index 0000000000..07f54a39d1
--- /dev/null
+++ b/jee-kotlin/src/main/kotlin/com/baeldung/jeekotlin/entity/Student.kt
@@ -0,0 +1,22 @@
+package com.baeldung.jeekotlin.entity
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import javax.persistence.*
+
+@Entity
+data class Student constructor (
+
+    @SequenceGenerator(name = "student_id_seq", sequenceName = "student_id_seq", allocationSize = 1)
+    @GeneratedValue(generator = "student_id_seq", strategy = GenerationType.SEQUENCE)
+    @Id
+    var id: Long?,
+
+    var firstName: String,
+
+    var lastName: String
+
+) {
+    constructor() : this(null, "", "")
+
+    constructor(firstName: String, lastName: String) : this(null, firstName, lastName)
+}
diff --git a/jee-kotlin/src/main/kotlin/com/baeldung/jeekotlin/rest/ApplicationConfig.kt b/jee-kotlin/src/main/kotlin/com/baeldung/jeekotlin/rest/ApplicationConfig.kt
new file mode 100644
index 0000000000..12511ed320
--- /dev/null
+++ b/jee-kotlin/src/main/kotlin/com/baeldung/jeekotlin/rest/ApplicationConfig.kt
@@ -0,0 +1,9 @@
+package com.baeldung.jeekotlin.rest
+
+import javax.ws.rs.ApplicationPath
+import javax.ws.rs.core.Application
+
+@ApplicationPath("/")
+class ApplicationConfig : Application() {
+    override fun getClasses() = setOf(StudentResource::class.java)
+}
diff --git a/jee-kotlin/src/main/kotlin/com/baeldung/jeekotlin/rest/StudentResource.kt b/jee-kotlin/src/main/kotlin/com/baeldung/jeekotlin/rest/StudentResource.kt
new file mode 100644
index 0000000000..91fa3ff62b
--- /dev/null
+++ b/jee-kotlin/src/main/kotlin/com/baeldung/jeekotlin/rest/StudentResource.kt
@@ -0,0 +1,42 @@
+package com.baeldung.jeekotlin.rest
+
+import com.baeldung.jeekotlin.entity.Student
+import com.baeldung.jeekotlin.service.StudentService
+import javax.inject.Inject
+import javax.ws.rs.*
+import javax.ws.rs.core.MediaType
+import javax.ws.rs.core.Response
+
+@Path("/student")
+open class StudentResource {
+
+    @Inject
+    private lateinit var service: StudentService
+
+    @POST
+    open fun create(student: Student): Response {
+        service.create(student)
+        return Response.ok().build()
+    }
+
+    @GET
+    @Path("/{id}")
+    open fun read(@PathParam("id") id: Long): Response {
+        val student  = service.read(id)
+        return Response.ok(student, MediaType.APPLICATION_JSON_TYPE).build()
+    }
+
+    @PUT
+    open fun update(student: Student): Response {
+        service.update(student)
+        return Response.ok(student, MediaType.APPLICATION_JSON_TYPE).build()
+    }
+
+    @DELETE
+    @Path("/{id}")
+    open fun delete(@PathParam("id") id: Long): Response {
+        service.delete(id)
+        return Response.noContent().build()
+    }
+
+}
\ No newline at end of file
diff --git a/jee-kotlin/src/main/kotlin/com/baeldung/jeekotlin/service/StudentService.kt b/jee-kotlin/src/main/kotlin/com/baeldung/jeekotlin/service/StudentService.kt
new file mode 100644
index 0000000000..3977a45e96
--- /dev/null
+++ b/jee-kotlin/src/main/kotlin/com/baeldung/jeekotlin/service/StudentService.kt
@@ -0,0 +1,21 @@
+package com.baeldung.jeekotlin.service
+
+import com.baeldung.jeekotlin.entity.Student
+import javax.ejb.Stateless
+import javax.persistence.EntityManager
+import javax.persistence.PersistenceContext
+
+@Stateless
+open class StudentService {
+
+    @PersistenceContext
+    private lateinit var entityManager: EntityManager
+
+    open fun create(student: Student) = entityManager.persist(student)
+
+    open fun read(id: Long): Student? = entityManager.find(Student::class.java, id)
+
+    open fun update(student: Student) = entityManager.merge(student)
+
+    open fun delete(id: Long) = entityManager.remove(read(id))
+}
\ No newline at end of file
diff --git a/jee-kotlin/src/main/resources/META-INF/persistence.xml b/jee-kotlin/src/main/resources/META-INF/persistence.xml
new file mode 100644
index 0000000000..daac86868b
--- /dev/null
+++ b/jee-kotlin/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
+
+  <persistence-unit name="pu" transaction-type="JTA">
+
+    <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+
+    <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
+
+    <class>com.enpy.entity.Student</class>
+
+    <properties>
+      <property name="hibernate.hbm2ddl.auto" value="create"/>
+    </properties>
+
+  </persistence-unit>
+
+</persistence>
diff --git a/jee-kotlin/src/main/webapp/WEB-INF/beans.xml b/jee-kotlin/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 0000000000..ae0f4bf2ee
--- /dev/null
+++ b/jee-kotlin/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans
+    xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
+                      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+    bean-discovery-mode="all">
+</beans>
\ No newline at end of file
diff --git a/jee-kotlin/src/test/kotlin/com/baeldung/jeekotlin/StudentResourceIntegrationTest.java b/jee-kotlin/src/test/kotlin/com/baeldung/jeekotlin/StudentResourceIntegrationTest.java
new file mode 100644
index 0000000000..b91b47cb1f
--- /dev/null
+++ b/jee-kotlin/src/test/kotlin/com/baeldung/jeekotlin/StudentResourceIntegrationTest.java
@@ -0,0 +1,108 @@
+package com.baeldung.jeekotlin;
+
+import com.baeldung.jeekotlin.entity.Student;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.resolver.api.maven.Maven;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(Arquillian.class)
+public class StudentResourceIntegrationTest {
+
+    @Deployment
+    public static WebArchive createDeployment() {
+        JavaArchive[] kotlinRuntime = Maven.configureResolver()
+                .workOffline()
+                .withMavenCentralRepo(true)
+                .withClassPathResolution(true)
+                .loadPomFromFile("pom.xml")
+                .resolve("org.jetbrains.kotlin:kotlin-stdlib")
+                .withTransitivity()
+                .as(JavaArchive.class);
+
+        return ShrinkWrap.create(WebArchive.class, "kotlin.war")
+                .addPackages(true, Filters.exclude(".*Test*"),
+                        "com.baeldung.jeekotlin"
+                )
+                .addAsLibraries(kotlinRuntime)
+                .addAsResource("META-INF/persistence.xml")
+                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+    }
+
+    @Test
+    @RunAsClient
+    public void when_post__then_return_ok(@ArquillianResource URL url) throws URISyntaxException, JsonProcessingException {
+        String student = new ObjectMapper().writeValueAsString(new Student("firstName", "lastName"));
+        WebTarget webTarget = ClientBuilder.newClient().target(url.toURI());
+
+        Response response = webTarget
+                .path("/student")
+                .request(MediaType.APPLICATION_JSON)
+                .post(Entity.json(student));
+
+        assertEquals(200, response.getStatus());
+    }
+
+    @Test
+    @RunAsClient
+    public void when_get__then_return_ok(@ArquillianResource URL url) throws URISyntaxException, JsonProcessingException {
+        WebTarget webTarget = ClientBuilder.newClient().target(url.toURI());
+
+        Response response = webTarget
+                .path("/student/1")
+                .request(MediaType.APPLICATION_JSON)
+                .get();
+
+        assertEquals(200, response.getStatus());
+    }
+
+    @Test
+    @RunAsClient
+    public void when_put__then_return_ok(@ArquillianResource URL url) throws URISyntaxException, JsonProcessingException {
+        Student student = new Student("firstName", "lastName");
+        student.setId(1L);
+        String studentJson = new ObjectMapper().writeValueAsString(student);
+        WebTarget webTarget = ClientBuilder.newClient().target(url.toURI());
+
+        Response response = webTarget
+                .path("/student")
+                .request(MediaType.APPLICATION_JSON)
+                .put(Entity.json(studentJson));
+
+        assertEquals(200, response.getStatus());
+    }
+
+    @Test
+    @RunAsClient
+    public void when_delete__then_return_ok(@ArquillianResource URL url) throws URISyntaxException, JsonProcessingException {
+        WebTarget webTarget = ClientBuilder.newClient().target(url.toURI());
+
+        Response response = webTarget
+                .path("/student/1")
+                .request()
+                .delete();
+
+        assertEquals(204, response.getStatus());
+    }
+
+}
\ No newline at end of file
diff --git a/jee-kotlin/src/test/resources/arquillian.xml b/jee-kotlin/src/test/resources/arquillian.xml
new file mode 100644
index 0000000000..5e6d7c54e8
--- /dev/null
+++ b/jee-kotlin/src/test/resources/arquillian.xml
@@ -0,0 +1,22 @@
+<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+    <container qualifier="wildfly-managed">
+        <configuration>
+            <property name="jbossHome">target/wildfly-8.2.1.Final</property>
+            <property name="serverConfig">standalone.xml</property>
+            <property name="outputToConsole">true</property>
+            <property name="managementPort">9990</property>
+        </configuration>
+    </container>
+
+    <container qualifier="wildfly-remote" default="true">
+        <configuration>
+            <property name="managementAddress">127.0.0.1</property>
+            <property name="managementPort">9990</property>
+            <property name="username">admin</property>
+            <property name="password">pass</property>
+            <property name="allowConnectingToRunningServer">true</property>
+        </configuration>
+    </container>
+
+</arquillian>
\ No newline at end of file
diff --git a/jersey/pom.xml b/jersey/pom.xml
index a3adb4cf5a..708b36ce41 100644
--- a/jersey/pom.xml
+++ b/jersey/pom.xml
@@ -80,7 +80,6 @@
 
     <properties>
         <jersey.version>2.26</jersey.version>
-        <maven-war-plugin.version>3.2.0</maven-war-plugin.version>
     </properties>
 
 </project>
diff --git a/JGit/README.md b/jgit/README.md
similarity index 100%
rename from JGit/README.md
rename to jgit/README.md
diff --git a/JGit/pom.xml b/jgit/pom.xml
similarity index 100%
rename from JGit/pom.xml
rename to jgit/pom.xml
diff --git a/JGit/src/main/java/com/baeldung/jgit/CreateNewRepository.java b/jgit/src/main/java/com/baeldung/jgit/CreateNewRepository.java
similarity index 100%
rename from JGit/src/main/java/com/baeldung/jgit/CreateNewRepository.java
rename to jgit/src/main/java/com/baeldung/jgit/CreateNewRepository.java
diff --git a/JGit/src/main/java/com/baeldung/jgit/OpenRepository.java b/jgit/src/main/java/com/baeldung/jgit/OpenRepository.java
similarity index 100%
rename from JGit/src/main/java/com/baeldung/jgit/OpenRepository.java
rename to jgit/src/main/java/com/baeldung/jgit/OpenRepository.java
diff --git a/JGit/src/main/java/com/baeldung/jgit/helper/Helper.java b/jgit/src/main/java/com/baeldung/jgit/helper/Helper.java
similarity index 100%
rename from JGit/src/main/java/com/baeldung/jgit/helper/Helper.java
rename to jgit/src/main/java/com/baeldung/jgit/helper/Helper.java
diff --git a/JGit/src/main/java/com/baeldung/jgit/porcelain/AddFile.java b/jgit/src/main/java/com/baeldung/jgit/porcelain/AddFile.java
similarity index 100%
rename from JGit/src/main/java/com/baeldung/jgit/porcelain/AddFile.java
rename to jgit/src/main/java/com/baeldung/jgit/porcelain/AddFile.java
diff --git a/JGit/src/main/java/com/baeldung/jgit/porcelain/CommitAll.java b/jgit/src/main/java/com/baeldung/jgit/porcelain/CommitAll.java
similarity index 100%
rename from JGit/src/main/java/com/baeldung/jgit/porcelain/CommitAll.java
rename to jgit/src/main/java/com/baeldung/jgit/porcelain/CommitAll.java
diff --git a/JGit/src/main/java/com/baeldung/jgit/porcelain/CreateAndDeleteTag.java b/jgit/src/main/java/com/baeldung/jgit/porcelain/CreateAndDeleteTag.java
similarity index 100%
rename from JGit/src/main/java/com/baeldung/jgit/porcelain/CreateAndDeleteTag.java
rename to jgit/src/main/java/com/baeldung/jgit/porcelain/CreateAndDeleteTag.java
diff --git a/JGit/src/main/java/com/baeldung/jgit/porcelain/Log.java b/jgit/src/main/java/com/baeldung/jgit/porcelain/Log.java
similarity index 100%
rename from JGit/src/main/java/com/baeldung/jgit/porcelain/Log.java
rename to jgit/src/main/java/com/baeldung/jgit/porcelain/Log.java
diff --git a/Twitter4J/src/main/resources/logback.xml b/jgit/src/main/resources/logback.xml
similarity index 100%
rename from Twitter4J/src/main/resources/logback.xml
rename to jgit/src/main/resources/logback.xml
diff --git a/JGit/src/test/java/com/baeldung/jgit/JGitBugIntegrationTest.java b/jgit/src/test/java/com/baeldung/jgit/JGitBugIntegrationTest.java
similarity index 100%
rename from JGit/src/test/java/com/baeldung/jgit/JGitBugIntegrationTest.java
rename to jgit/src/test/java/com/baeldung/jgit/JGitBugIntegrationTest.java
diff --git a/JGit/src/test/java/com/baeldung/jgit/porcelain/PorcelainUnitTest.java b/jgit/src/test/java/com/baeldung/jgit/porcelain/PorcelainUnitTest.java
similarity index 100%
rename from JGit/src/test/java/com/baeldung/jgit/porcelain/PorcelainUnitTest.java
rename to jgit/src/test/java/com/baeldung/jgit/porcelain/PorcelainUnitTest.java
diff --git a/jhipster/README.md b/jhipster/README.md
deleted file mode 100644
index 289bfac754..0000000000
--- a/jhipster/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Relevant articles:
-
-- [JHipster with a Microservice Architecture](http://www.baeldung.com/jhipster-microservices)
-- [Intro to JHipster](http://www.baeldung.com/jhipster)
-- [Building a Basic UAA-Secured JHipster Microservice](https://www.baeldung.com/jhipster-uaa-secured-micro-service)
-- [Creating New Roles and Authorities in JHipster](https://www.baeldung.com/jhipster-new-roles)
diff --git a/jhipster/jhipster-microservice/README.md b/jhipster/jhipster-microservice/README.md
new file mode 100644
index 0000000000..7abe3204c4
--- /dev/null
+++ b/jhipster/jhipster-microservice/README.md
@@ -0,0 +1,3 @@
+## Relevant Articles
+
+- [JHipster with a Microservice Architecture](https://www.baeldung.com/jhipster-microservices)
diff --git a/jhipster/jhipster-monolithic/README.md b/jhipster/jhipster-monolithic/README.md
index a2c267b74d..65cc51ad88 100644
--- a/jhipster/jhipster-monolithic/README.md
+++ b/jhipster/jhipster-monolithic/README.md
@@ -1,4 +1,6 @@
-### Relevant articles
+## Relevant Articles
+
+- [Intro to JHipster](https://www.baeldung.com/jhipster)
 
 
 # baeldung
diff --git a/jhipster/jhipster-uaa/README.md b/jhipster/jhipster-uaa/README.md
new file mode 100644
index 0000000000..3971e3c8c6
--- /dev/null
+++ b/jhipster/jhipster-uaa/README.md
@@ -0,0 +1,3 @@
+## Relevant Articles
+
+- [Building a Basic UAA-Secured JHipster Microservice](https://www.baeldung.com/jhipster-uaa-secured-micro-service)
diff --git a/jsf/pom.xml b/jsf/pom.xml
index 19f1265250..31362a8809 100644
--- a/jsf/pom.xml
+++ b/jsf/pom.xml
@@ -99,9 +99,6 @@
         <com.sun.faces.version>2.2.14</com.sun.faces.version>
         <javax.el.version>3.0.0</javax.el.version>
 
-        <!-- maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
-
         <primefaces.version>6.2</primefaces.version>
     </properties>
 
diff --git a/jws/pom.xml b/jws/pom.xml
index 2c89b687f8..5c19c887d3 100644
--- a/jws/pom.xml
+++ b/jws/pom.xml
@@ -34,6 +34,7 @@
     </dependencies>
 
     <build>
+        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -78,12 +79,10 @@
                 </configuration>
             </plugin>
         </plugins>
-        <finalName>${project.artifactId}</finalName>
     </build>
 
     <properties>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
-        <maven-war-plugin.version>3.0.0</maven-war-plugin.version>
         <jnlp-jardiff.version>1.6.0</jnlp-jardiff.version>
         <jnlp-servlet.version>1.6.0</jnlp-servlet.version>
     </properties>
diff --git a/kotlin-libraries/pom.xml b/kotlin-libraries/pom.xml
index b75c77f358..e252329426 100644
--- a/kotlin-libraries/pom.xml
+++ b/kotlin-libraries/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2database.version}</version>
+            <version>${h2.version}</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/io.arrow-kt/arrow-core -->
         <dependency>
@@ -184,7 +184,6 @@
         <junit.platform.version>1.1.1</junit.platform.version>
         <junit.vintage.version>5.2.0</junit.vintage.version>
         <assertj.version>3.10.0</assertj.version>
-        <h2database.version>1.4.197</h2database.version>
         <exposed.version>0.10.4</exposed.version>
         <mockk.version>1.9.3</mockk.version>
     </properties>
diff --git a/kotlin-quasar/README.md b/kotlin-quasar/README.md
new file mode 100644
index 0000000000..b3b84e0446
--- /dev/null
+++ b/kotlin-quasar/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles
+
+- [Introduction to Quasar in Kotlin](https://www.baeldung.com/kotlin-quasar)
diff --git a/kotlin-quasar/pom.xml b/kotlin-quasar/pom.xml
index 44feabd183..231b02b0c7 100644
--- a/kotlin-quasar/pom.xml
+++ b/kotlin-quasar/pom.xml
@@ -8,6 +8,12 @@
     <name>kotlin-quasar</name>
     <packaging>jar</packaging>
 
+    <parent>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
@@ -45,6 +51,27 @@
             <artifactId>junit</artifactId>
             <version>4.12</version>
         </dependency>
+		<!-- logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${org.slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>${logback.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>${org.slf4j.version}</version>
+		</dependency>
     </dependencies>
 
     <build>
@@ -116,5 +143,7 @@
     <properties>
         <quasar.version>0.8.0</quasar.version>
         <kotlin.version>1.3.31</kotlin.version>
+		<org.slf4j.version>1.7.21</org.slf4j.version>
+		<logback.version>1.1.7</logback.version>
     </properties>
 </project>
diff --git a/kotlin-quasar/src/test/kotlin/com/baeldung/quasar/ActorsBehaviorTest.kt b/kotlin-quasar/src/test/kotlin/com/baeldung/quasar/ActorsBehaviorTest.kt
new file mode 100644
index 0000000000..b4d0288a64
--- /dev/null
+++ b/kotlin-quasar/src/test/kotlin/com/baeldung/quasar/ActorsBehaviorTest.kt
@@ -0,0 +1,157 @@
+package com.baeldung.quasar
+
+import co.paralleluniverse.actors.Actor
+import co.paralleluniverse.actors.ActorRef
+import co.paralleluniverse.actors.behaviors.*
+import co.paralleluniverse.fibers.Suspendable
+import co.paralleluniverse.strands.SuspendableCallable
+import org.junit.Test
+import org.slf4j.LoggerFactory
+import java.lang.Exception
+
+class ActorsBehaviorTest {
+    companion object {
+        private val LOG = LoggerFactory.getLogger(ActorsBehaviorTest::class.java)
+    }
+
+    @Test
+    fun requestReplyHelper() {
+        data class TestMessage(val input: Int) : RequestMessage<Int>()
+
+        val actor = object : Actor<TestMessage, Void>("requestReplyActor", null) {
+            @Suspendable
+            override fun doRun(): Void? {
+                while (true) {
+                    val msg = receive()
+                    LOG.info("Processing message: {}", msg)
+
+                    RequestReplyHelper.reply(msg, msg.input * 100)
+                }
+            }
+        }
+
+        val actorRef = actor.spawn()
+
+        val result = RequestReplyHelper.call(actorRef, TestMessage(50))
+        LOG.info("Received reply: {}", result)
+    }
+
+    @Test
+    fun server() {
+        val actor = ServerActor(object : AbstractServerHandler<Int, String, Float>() {
+            @Suspendable
+            override fun handleCall(from: ActorRef<*>?, id: Any?, m: Int?): String {
+                LOG.info("Called with message: {} from {} with ID {}", m, from, id)
+                return m.toString() ?: "None"
+            }
+
+            @Suspendable
+            override fun handleCast(from: ActorRef<*>?, id: Any?, m: Float?) {
+                LOG.info("Cast message: {} from {} with ID {}", m, from, id)
+            }
+        })
+
+        val server = actor.spawn()
+
+        LOG.info("Call result: {}", server.call(5))
+        server.cast(2.5f)
+
+        server.shutdown()
+    }
+
+    interface Summer {
+        fun sum(a: Int, b: Int) : Int
+    }
+
+    @Test
+    fun proxyServer() {
+        val actor = ProxyServerActor(false, object : Summer {
+            @Synchronized
+            override fun sum(a: Int, b: Int): Int {
+                Exception().printStackTrace()
+                LOG.info("Adding together {} and {}", a, b)
+                return a + b
+            }
+        })
+
+        val summerActor = actor.spawn()
+
+        val result = (summerActor as Summer).sum(1, 2)
+        LOG.info("Result: {}", result)
+
+        summerActor.shutdown()
+    }
+
+    @Test
+    fun eventSource() {
+        val actor = EventSourceActor<String>()
+        val eventSource = actor.spawn()
+
+        eventSource.addHandler { msg ->
+            LOG.info("Sent message: {}", msg)
+        }
+
+        val name = "Outside Value"
+        eventSource.addHandler { msg ->
+            LOG.info("Also Sent message: {} {}", msg, name)
+        }
+
+        eventSource.send("Hello")
+
+        eventSource.shutdown()
+    }
+
+    @Test
+    fun finiteStateMachine() {
+        val actor = object : FiniteStateMachineActor() {
+            @Suspendable
+            override fun initialState(): SuspendableCallable<SuspendableCallable<*>> {
+                LOG.info("Starting")
+                return SuspendableCallable { lockedState() }
+            }
+
+            @Suspendable
+            fun lockedState() : SuspendableCallable<SuspendableCallable<*>> {
+                return receive {msg ->
+                    when (msg) {
+                        "PUSH" -> {
+                            LOG.info("Still locked")
+                            lockedState()
+                        }
+                        "COIN" -> {
+                            LOG.info("Unlocking...")
+                            unlockedState()
+                        }
+                        else -> TERMINATE
+                    }
+                }
+            }
+
+            @Suspendable
+            fun unlockedState() : SuspendableCallable<SuspendableCallable<*>> {
+                return receive {msg ->
+                    when (msg) {
+                        "PUSH" -> {
+                            LOG.info("Locking")
+                            lockedState()
+                        }
+                        "COIN" -> {
+                            LOG.info("Unlocked")
+                            unlockedState()
+                        }
+                        else -> TERMINATE
+                    }
+                }
+            }
+        }
+
+        val actorRef = actor.spawn()
+
+        listOf("PUSH", "COIN", "COIN", "PUSH", "PUSH").forEach {
+            LOG.info(it)
+            actorRef.sendSync(it)
+        }
+
+        actorRef.shutdown()
+    }
+}
diff --git a/kotlin-quasar/src/test/kotlin/com/baeldung/quasar/ActorsTest.kt b/kotlin-quasar/src/test/kotlin/com/baeldung/quasar/ActorsTest.kt
new file mode 100644
index 0000000000..819a149af3
--- /dev/null
+++ b/kotlin-quasar/src/test/kotlin/com/baeldung/quasar/ActorsTest.kt
@@ -0,0 +1,298 @@
+package com.baeldung.quasar
+
+import co.paralleluniverse.actors.*
+import co.paralleluniverse.fibers.Suspendable
+import co.paralleluniverse.strands.channels.Channels
+import org.junit.Assert
+import org.junit.Test
+import org.slf4j.LoggerFactory
+import java.util.concurrent.TimeUnit
+
+class ActorsTest {
+    companion object {
+        private val LOG = LoggerFactory.getLogger(ActorsTest::class.java)
+    }
+
+    @Test
+    fun createNoopActor() {
+        val actor = object : Actor<Int, String>("noopActor", MailboxConfig(5, Channels.OverflowPolicy.THROW)) {
+            @Suspendable
+            override fun doRun(): String {
+                return "Hello"
+            }
+        }
+
+        actor.spawn()
+
+        println("Noop Actor: ${actor.get()}")
+    }
+
+    @Test
+    fun registerActor() {
+        val actor = object : Actor<Int, String>("registerActor", null) {
+            @Suspendable
+            override fun doRun(): String {
+                return "Hello"
+            }
+        }
+
+        val actorRef = actor.spawn()
+        actor.register()
+
+        val retrievedRef = ActorRegistry.getActor<ActorRef<Int>>("registerActor")
+
+        Assert.assertEquals(actorRef, retrievedRef)
+        actor.join()
+    }
+
+    @Test
+    fun registerActorNewName() {
+        val actor = object : Actor<Int, String>(null, null) {
+            @Suspendable
+            override fun doRun(): String {
+                return "Hello"
+            }
+        }
+
+        val actorRef = actor.spawn()
+        actor.register("renamedActor")
+
+        val retrievedRef = ActorRegistry.getActor<ActorRef<Int>>("renamedActor")
+
+        Assert.assertEquals(actorRef, retrievedRef)
+        actor.join()
+    }
+
+    @Test
+    fun retrieveUnknownActor() {
+        val retrievedRef = ActorRegistry.getActor<ActorRef<Int>>("unknownActor", 1, TimeUnit.SECONDS)
+
+        Assert.assertNull(retrievedRef)
+    }
+
+    @Test
+    fun createSimpleActor() {
+        val actor = object : Actor<Int, Void?>("simpleActor", null) {
+            @Suspendable
+            override fun doRun(): Void? {
+                val msg = receive()
+                LOG.info("SimpleActor Received Message: {}", msg)
+
+                return null
+            }
+        }
+
+        val actorRef = actor.spawn()
+
+        actorRef.send(1)
+
+        actor.join()
+    }
+
+    @Test
+    fun createLoopingActor() {
+        val actor = object : Actor<Int, Void?>("loopingActor", null) {
+            @Suspendable
+            override fun doRun(): Void? {
+                while (true) {
+                    val msg = receive()
+
+                    if (msg > 0) {
+                        LOG.info("LoopingActor Received Message: {}", msg)
+                    } else {
+                        break
+                    }
+                }
+
+                return null
+            }
+        }
+
+        val actorRef = actor.spawn()
+
+        actorRef.send(3)
+        actorRef.send(2)
+        actorRef.send(1)
+        actorRef.send(0)
+
+        actor.join()
+    }
+
+    @Test
+    fun actorBacklog() {
+        val actor = object : Actor<Int, String>("backlogActor", MailboxConfig(1, Channels.OverflowPolicy.THROW)) {
+            @Suspendable
+            override fun doRun(): String {
+                TimeUnit.MILLISECONDS.sleep(500);
+                LOG.info("Backlog Actor Received: {}", receive())
+
+                try {
+                    receive()
+                } catch (e: Throwable) {
+                    LOG.info("==== Exception throws by receive() ====")
+                    e.printStackTrace()
+                }
+
+                return "No Exception"
+            }
+        }
+
+        val actorRef = actor.spawn()
+
+        actorRef.send(1)
+        actorRef.send(2)
+
+        try {
+            LOG.info("Backlog Actor: {}", actor.get())
+        } catch (e: Exception) {
+            // Expected
+            LOG.info("==== Exception throws by get() ====")
+            e.printStackTrace()
+        }
+    }
+
+    @Test
+    fun actorBacklogTrySend() {
+        val actor = object : Actor<Int, String>("backlogTrySendActor", MailboxConfig(1, Channels.OverflowPolicy.THROW)) {
+            @Suspendable
+            override fun doRun(): String {
+                TimeUnit.MILLISECONDS.sleep(500);
+                LOG.info("Backlog TrySend Actor Received: {}", receive())
+
+                return "No Exception"
+            }
+        }
+
+        val actorRef = actor.spawn()
+
+        LOG.info("Backlog TrySend 1: {}", actorRef.trySend(1))
+        LOG.info("Backlog TrySend 1: {}", actorRef.trySend(2))
+
+        actor.join()
+    }
+
+    @Test
+    fun actorTimeoutReceive() {
+        val actor = object : Actor<Int, String>("TimeoutReceiveActor", MailboxConfig(1, Channels.OverflowPolicy.THROW)) {
+            @Suspendable
+            override fun doRun(): String {
+                LOG.info("Timeout Actor Received: {}", receive(500, TimeUnit.MILLISECONDS))
+
+                return "Finished"
+            }
+        }
+
+        val actorRef = actor.spawn()
+
+        TimeUnit.MILLISECONDS.sleep(300)
+        actorRef.trySend(1)
+
+        actor.join()
+    }
+
+
+    @Test
+    fun actorNonBlockingReceive() {
+        val actor = object : Actor<Int, String>("NonBlockingReceiveActor", MailboxConfig(1, Channels.OverflowPolicy.THROW)) {
+            @Suspendable
+            override fun doRun(): String {
+                LOG.info("NonBlocking Actor Received #1: {}", tryReceive())
+                TimeUnit.MILLISECONDS.sleep(500)
+                LOG.info("NonBlocking Actor Received #2: {}", tryReceive())
+
+                return "Finished"
+            }
+        }
+
+        val actorRef = actor.spawn()
+
+        TimeUnit.MILLISECONDS.sleep(300)
+        actorRef.trySend(1)
+
+        actor.join()
+    }
+
+    @Test
+    fun evenActor() {
+        val actor = object : Actor<Int, Void?>("EvenActor", null) {
+            @Suspendable
+            override fun filterMessage(m: Any?): Int? {
+                return when (m) {
+                    is Int -> {
+                        if (m % 2 == 0) {
+                            m * 10
+                        } else {
+                            null
+                        }
+                    }
+                    else -> super.filterMessage(m)
+                }
+            }
+
+            @Suspendable
+            override fun doRun(): Void? {
+                while (true) {
+                    val msg = receive()
+
+                    if (msg > 0) {
+                        LOG.info("EvenActor Received Message: {}", msg)
+                    } else {
+                        break
+                    }
+                }
+
+                return null
+            }
+        }
+
+        val actorRef = actor.spawn()
+
+        actorRef.send(3)
+        actorRef.send(2)
+        actorRef.send(1)
+        actorRef.send(0)
+
+        actor.join()
+    }
+
+    @Test
+    fun watchingActors() {
+        val watched = object : Actor<Int, Void?>("WatchedActor", null) {
+            @Suspendable
+            override fun doRun(): Void? {
+                LOG.info("WatchedActor Starting")
+                receive(500, TimeUnit.MILLISECONDS)
+                LOG.info("WatchedActor Finishing")
+                return null
+            }
+        }
+
+        val watcher = object : Actor<Int, Void?>("WatcherActor", null) {
+            @Suspendable
+            override fun doRun(): Void? {
+                LOG.info("WatcherActor Listening")
+                try {
+                    LOG.info("WatcherActor received Message: {}", receive(2, TimeUnit.SECONDS))
+                } catch (e: Exception) {
+                    LOG.info("WatcherActor Received Exception", e)
+                }
+                return null
+            }
+
+            @Suspendable
+            override fun handleLifecycleMessage(m: LifecycleMessage?): Int? {
+                LOG.info("WatcherActor Received Lifecycle Message: {}", m)
+                return super.handleLifecycleMessage(m)
+            }
+        }
+
+        val watcherRef = watcher.spawn()
+        TimeUnit.MILLISECONDS.sleep(200)
+
+        val watchedRef = watched.spawn()
+        watcher.link(watchedRef)
+
+        watched.join()
+        watcher.join()
+    }
+}
diff --git a/kotlin-quasar/src/test/kotlin/com/baeldung/quasar/ReactiveStreamsTest.kt b/kotlin-quasar/src/test/kotlin/com/baeldung/quasar/ReactiveStreamsTest.kt
new file mode 100644
index 0000000000..83e06bf7d6
--- /dev/null
+++ b/kotlin-quasar/src/test/kotlin/com/baeldung/quasar/ReactiveStreamsTest.kt
@@ -0,0 +1,135 @@
+package com.baeldung.quasar
+
+import co.paralleluniverse.fibers.Suspendable
+import co.paralleluniverse.kotlin.fiber
+import co.paralleluniverse.strands.channels.Channels
+import co.paralleluniverse.strands.channels.Topic
+import co.paralleluniverse.strands.channels.reactivestreams.ReactiveStreams
+import org.junit.Test
+import org.reactivestreams.Subscriber
+import org.reactivestreams.Subscription
+import org.slf4j.LoggerFactory
+import java.util.concurrent.TimeUnit
+
+class ReactiveStreamsTest {
+    companion object {
+        private val LOG = LoggerFactory.getLogger(ReactiveStreamsTest::class.java)
+    }
+
+    @Test
+    fun publisher() {
+        val inputChannel = Channels.newChannel<String>(1);
+
+        val publisher = ReactiveStreams.toPublisher(inputChannel)
+        publisher.subscribe(object : Subscriber<String> {
+            @Suspendable
+            override fun onComplete() {
+                LOG.info("onComplete")
+            }
+
+            @Suspendable
+            override fun onSubscribe(s: Subscription) {
+                LOG.info("onSubscribe: {}", s)
+                s.request(2)
+            }
+
+            @Suspendable
+            override fun onNext(t: String?) {
+                LOG.info("onNext: {}", t)
+            }
+
+            @Suspendable
+            override fun onError(t: Throwable?) {
+                LOG.info("onError: {}", t)
+            }
+        })
+
+        inputChannel.send("Hello")
+        inputChannel.send("World")
+
+        TimeUnit.SECONDS.sleep(1)
+
+        inputChannel.close()
+    }
+
+    @Test
+    fun publisherTopic() {
+        val inputTopic = Topic<String>()
+
+        val publisher = ReactiveStreams.toPublisher(inputTopic)
+        publisher.subscribe(object : Subscriber<String> {
+            @Suspendable
+            override fun onComplete() {
+                LOG.info("onComplete 1")
+            }
+
+            @Suspendable
+            override fun onSubscribe(s: Subscription) {
+                LOG.info("onSubscribe 1: {}", s)
+                s.request(2)
+            }
+
+            @Suspendable
+            override fun onNext(t: String?) {
+                LOG.info("onNext 1: {}", t)
+            }
+
+            @Suspendable
+            override fun onError(t: Throwable?) {
+                LOG.info("onError 1: {}", t)
+            }
+        })
+        publisher.subscribe(object : Subscriber<String> {
+            @Suspendable
+            override fun onComplete() {
+                LOG.info("onComplete 2")
+            }
+
+            @Suspendable
+            override fun onSubscribe(s: Subscription) {
+                LOG.info("onSubscribe 2: {}", s)
+                s.request(2)
+            }
+
+            @Suspendable
+            override fun onNext(t: String?) {
+                LOG.info("onNext 2: {}", t)
+            }
+
+            @Suspendable
+            override fun onError(t: Throwable?) {
+                LOG.info("onError 2: {}", t)
+            }
+        })
+
+        inputTopic.send("Hello")
+        inputTopic.send("World")
+
+        TimeUnit.SECONDS.sleep(1)
+
+        inputTopic.close()
+    }
+
+    @Test
+    fun subscribe() {
+        val inputChannel = Channels.newChannel<String>(10);
+        val publisher = ReactiveStreams.toPublisher(inputChannel)
+
+        val channel = ReactiveStreams.subscribe(10, Channels.OverflowPolicy.THROW, publisher)
+
+        fiber @Suspendable {
+            while (!channel.isClosed) {
+                val message = channel.receive()
+                LOG.info("Received: {}", message)
+            }
+            LOG.info("Stopped receiving messages")
+        }
+
+        inputChannel.send("Hello")
+        inputChannel.send("World")
+
+        TimeUnit.SECONDS.sleep(1)
+
+        inputChannel.close()
+    }
+}
diff --git a/libraries-2/README.md b/libraries-2/README.md
index 8243b9f82c..1b042ac3c5 100644
--- a/libraries-2/README.md
+++ b/libraries-2/README.md
@@ -4,4 +4,7 @@
 - [A Guide to jBPM with Java](https://www.baeldung.com/jbpm-java)
 - [Guide to Classgraph Library](https://www.baeldung.com/classgraph)
 - [Create a Java Command Line Program with Picocli](https://www.baeldung.com/java-picocli-create-command-line-program)
-
+- [Guide to Java Parallel Collectors Library](https://www.baeldung.com/java-parallel-collectors)
+- [Templating with Handlebars](https://www.baeldung.com/handlebars)
+- [A Guide to Crawler4j](https://www.baeldung.com/crawler4j)
+- [Decode an OkHttp JSON Response](https://www.baeldung.com/okhttp-json-response)
diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml
index c18b4aae64..ff73888b69 100644
--- a/libraries-2/pom.xml
+++ b/libraries-2/pom.xml
@@ -1,65 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>libraries2</artifactId>
+    <name>libraries2</name>
 
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>libraries2</artifactId>
-	<name>libraries2</name>
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
 
-	<parent>
-		<groupId>com.baeldung</groupId>
-		<artifactId>parent-modules</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
+    <repositories>
+        <repository>
+            <id>jboss-public-repository-group</id>
+            <name>JBoss Public Repository Group</name>
+            <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
 
-	<repositories>
-		<repository>
-			<id>jboss-public-repository-group</id>
-			<name>JBoss Public Repository Group</name>
-			<url>http://repository.jboss.org/nexus/content/groups/public/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-core</artifactId>
-			<version>${assertj.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.github.classgraph</groupId>
-			<artifactId>classgraph</artifactId>
-			<version>${classgraph.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jbpm</groupId>
-			<artifactId>jbpm-test</artifactId>
-			<version>${jbpm.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>info.picocli</groupId>
-			<artifactId>picocli</artifactId>
-			<version>${picocli.version}</version>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>org.mapdb</groupId>
+            <artifactId>mapdb</artifactId>
+            <version>${mapdb.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.pivovarit</groupId>
+            <artifactId>parallel-collectors</artifactId>
+            <version>${parallel-collectors.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.classgraph</groupId>
+            <artifactId>classgraph</artifactId>
+            <version>${classgraph.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jbpm</groupId>
+            <artifactId>jbpm-test</artifactId>
+            <version>${jbpm.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>info.picocli</groupId>
+            <artifactId>picocli</artifactId>
+            <version>${picocli.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.ejml</groupId>
             <artifactId>ejml-all</artifactId>
             <version>${ejml.version}</version>
         </dependency>
-		<dependency>
-			<groupId>org.nd4j</groupId>
-			<artifactId>nd4j-native</artifactId>
-			<version>${nd4j.version}</version>
-		</dependency>
+        <dependency>
+            <groupId>org.nd4j</groupId>
+            <artifactId>nd4j-native</artifactId>
+            <version>${nd4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.la4j</groupId>
             <artifactId>la4j</artifactId>
@@ -70,81 +79,91 @@
             <artifactId>colt</artifactId>
             <version>${colt.version}</version>
         </dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-			<version>${spring-boot-starter.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>net.openhft</groupId>
-			<artifactId>chronicle-map</artifactId>
-			<version>${chronicle.map.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.sun.java</groupId>
-					<artifactId>tools</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<!-- Dependencies for response decoder with okhttp -->
-		<dependency>
-			<groupId>com.squareup.okhttp3</groupId>
-			<artifactId>okhttp</artifactId>
-			<version>3.14.2</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.9.9</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.8.5</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.squareup.okhttp3</groupId>
-			<artifactId>mockwebserver</artifactId>
-			<version>3.14.2</version>
-			<scope>test</scope>
-		</dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <version>${spring-boot-starter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.openhft</groupId>
+            <artifactId>chronicle-map</artifactId>
+            <version>${chronicle.map.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.sun.java</groupId>
+                    <artifactId>tools</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Dependencies for response decoder with okhttp -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>${okhttp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <version>${mockwebserver.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>edu.uci.ics</groupId>
             <artifactId>crawler4j</artifactId>
             <version>${crawler4j.version}</version>
-		</dependency>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jknack</groupId>
+            <artifactId>handlebars</artifactId>
+            <version>${handlebars.version}</version>
+        </dependency>
+        <!-- Benchmarking -->
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${jmh.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${jmh.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.mesos</groupId>
+            <artifactId>mesos</artifactId>
+            <version>${mesos.library.version}</version>
+        </dependency>
+    </dependencies>
 
-		<!-- Benchmarking -->
-		<dependency>
-			<groupId>org.openjdk.jmh</groupId>
-			<artifactId>jmh-core</artifactId>
-			<version>${jmh.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.openjdk.jmh</groupId>
-			<artifactId>jmh-generator-annprocess</artifactId>
-			<version>${jmh.version}</version>
-		</dependency>
-          
-	</dependencies>
-
-	<properties>
-		<assertj.version>3.6.2</assertj.version>
-		<classgraph.version>4.8.28</classgraph.version>
-		<jbpm.version>6.0.0.Final</jbpm.version>
-		<picocli.version>3.9.6</picocli.version>
-		<chronicle.map.version>3.17.2</chronicle.map.version>
+    <properties>
+	    <mapdb.version>3.0.7</mapdb.version>
+        <assertj.version>3.6.2</assertj.version>
+        <classgraph.version>4.8.28</classgraph.version>
+        <jbpm.version>6.0.0.Final</jbpm.version>
+        <picocli.version>3.9.6</picocli.version>
+        <chronicle.map.version>3.17.2</chronicle.map.version>
         <crawler4j.version>4.4.0</crawler4j.version>
-		<spring-boot-starter.version>2.1.4.RELEASE</spring-boot-starter.version>
-		<ejml.version>0.38</ejml.version>
-		<nd4j.version>1.0.0-beta4</nd4j.version>
-		<colt.version>1.2.0</colt.version>
-		<la4j.version>0.6.0</la4j.version>
-		<jmh.version>1.19</jmh.version>
-	</properties>
+        <spring-boot-starter.version>2.1.4.RELEASE</spring-boot-starter.version>
+        <ejml.version>0.38</ejml.version>
+        <nd4j.version>1.0.0-beta4</nd4j.version>
+        <colt.version>1.2.0</colt.version>
+        <la4j.version>0.6.0</la4j.version>
+        <jmh.version>1.19</jmh.version>
+        <mesos.library.version>0.28.3</mesos.library.version>
+        <parallel-collectors.version>1.1.0</parallel-collectors.version>
+        <okhttp.version>3.14.2</okhttp.version>
+        <gson.version>2.8.5</gson.version>
+        <mockwebserver.version>3.14.2</mockwebserver.version>
+        <handlebars.version>4.1.2</handlebars.version>
+    </properties>
 </project>
diff --git a/libraries-2/src/main/java/com/baeldung/mesos/HelloWorldMain.java b/libraries-2/src/main/java/com/baeldung/mesos/HelloWorldMain.java
new file mode 100644
index 0000000000..e4bf593e7e
--- /dev/null
+++ b/libraries-2/src/main/java/com/baeldung/mesos/HelloWorldMain.java
@@ -0,0 +1,42 @@
+package com.baeldung.mesos;
+
+import com.baeldung.mesos.schedulers.HelloWorldScheduler;
+import org.apache.mesos.MesosSchedulerDriver;
+import org.apache.mesos.Protos;
+import org.apache.mesos.Protos.CommandInfo;
+import org.apache.mesos.Protos.ExecutorInfo;
+import org.apache.mesos.Protos.FrameworkInfo;
+
+public class HelloWorldMain {
+
+    public static void main(String[] args) {
+
+        String path = System.getProperty("user.dir")
+                + "/target/libraries2-1.0.0-SNAPSHOT.jar";
+
+        CommandInfo.URI uri = CommandInfo.URI.newBuilder().setValue(path).setExtract(false).build();
+
+        String helloWorldCommand = "java -cp libraries2-1.0.0-SNAPSHOT.jar com.baeldung.mesos.executors.HelloWorldExecutor";
+        CommandInfo commandInfoHelloWorld = CommandInfo.newBuilder().setValue(helloWorldCommand).addUris(uri)
+                .build();
+
+        ExecutorInfo executorHelloWorld = ExecutorInfo.newBuilder()
+                .setExecutorId(Protos.ExecutorID.newBuilder().setValue("HelloWorldExecutor"))
+                .setCommand(commandInfoHelloWorld).setName("Hello World (Java)").setSource("java").build();
+
+        FrameworkInfo.Builder frameworkBuilder = FrameworkInfo.newBuilder().setFailoverTimeout(120000)
+                .setUser("")
+                .setName("Hello World Framework (Java)");
+
+        frameworkBuilder.setPrincipal("test-framework-java");
+
+        MesosSchedulerDriver driver = new MesosSchedulerDriver(new HelloWorldScheduler(executorHelloWorld), frameworkBuilder.build(), args[0]);
+
+        int status = driver.run() == Protos.Status.DRIVER_STOPPED ? 0 : 1;
+
+        // Ensure that the driver process terminates.
+        driver.stop();
+
+        System.exit(status);
+    }
+}
diff --git a/libraries-2/src/main/java/com/baeldung/mesos/executors/HelloWorldExecutor.java b/libraries-2/src/main/java/com/baeldung/mesos/executors/HelloWorldExecutor.java
new file mode 100644
index 0000000000..a8620bbce3
--- /dev/null
+++ b/libraries-2/src/main/java/com/baeldung/mesos/executors/HelloWorldExecutor.java
@@ -0,0 +1,59 @@
+package com.baeldung.mesos.executors;
+
+import org.apache.mesos.Executor;
+import org.apache.mesos.ExecutorDriver;
+import org.apache.mesos.MesosExecutorDriver;
+import org.apache.mesos.Protos;
+import org.apache.mesos.Protos.TaskInfo;
+
+public class HelloWorldExecutor implements Executor {
+    @Override
+    public void registered(ExecutorDriver driver, Protos.ExecutorInfo executorInfo, Protos.FrameworkInfo frameworkInfo, Protos.SlaveInfo slaveInfo) {
+    }
+
+    @Override
+    public void reregistered(ExecutorDriver driver, Protos.SlaveInfo slaveInfo) {
+    }
+
+    @Override
+    public void disconnected(ExecutorDriver driver) {
+    }
+
+    @Override
+    public void launchTask(ExecutorDriver driver, TaskInfo task) {
+
+        Protos.TaskStatus status = Protos.TaskStatus.newBuilder().setTaskId(task.getTaskId())
+                .setState(Protos.TaskState.TASK_RUNNING).build();
+        driver.sendStatusUpdate(status);
+
+        String myStatus = "Hello Framework";
+        driver.sendFrameworkMessage(myStatus.getBytes());
+
+        System.out.println("Hello World!!!");
+
+        status = Protos.TaskStatus.newBuilder().setTaskId(task.getTaskId())
+                .setState(Protos.TaskState.TASK_FINISHED).build();
+        driver.sendStatusUpdate(status);
+    }
+
+    @Override
+    public void killTask(ExecutorDriver driver, Protos.TaskID taskId) {
+    }
+
+    @Override
+    public void frameworkMessage(ExecutorDriver driver, byte[] data) {
+    }
+
+    @Override
+    public void shutdown(ExecutorDriver driver) {
+    }
+
+    @Override
+    public void error(ExecutorDriver driver, String message) {
+    }
+
+    public static void main(String[] args) {
+        MesosExecutorDriver driver = new MesosExecutorDriver(new HelloWorldExecutor());
+        System.exit(driver.run() == Protos.Status.DRIVER_STOPPED ? 0 : 1);
+    }
+}
diff --git a/libraries-2/src/main/java/com/baeldung/mesos/schedulers/HelloWorldScheduler.java b/libraries-2/src/main/java/com/baeldung/mesos/schedulers/HelloWorldScheduler.java
new file mode 100644
index 0000000000..68808b4dd0
--- /dev/null
+++ b/libraries-2/src/main/java/com/baeldung/mesos/schedulers/HelloWorldScheduler.java
@@ -0,0 +1,100 @@
+package com.baeldung.mesos.schedulers;
+
+import com.google.protobuf.ByteString;
+import org.apache.mesos.Protos;
+import org.apache.mesos.Protos.ExecutorInfo;
+import org.apache.mesos.Protos.Offer;
+import org.apache.mesos.Protos.OfferID;
+import org.apache.mesos.Protos.TaskInfo;
+import org.apache.mesos.Scheduler;
+import org.apache.mesos.SchedulerDriver;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class HelloWorldScheduler implements Scheduler {
+
+    private int launchedTasks = 0;
+    private final ExecutorInfo helloWorldExecutor;
+
+    public HelloWorldScheduler(ExecutorInfo helloWorldExecutor) {
+        this.helloWorldExecutor = helloWorldExecutor;
+    }
+
+    @Override
+    public void registered(SchedulerDriver schedulerDriver, Protos.FrameworkID frameworkID, Protos.MasterInfo masterInfo) {
+
+    }
+
+    @Override
+    public void reregistered(SchedulerDriver schedulerDriver, Protos.MasterInfo masterInfo) {
+
+    }
+
+    @Override
+    public void resourceOffers(SchedulerDriver schedulerDriver, List<Offer> list) {
+
+        for (Offer offer : list) {
+            List<TaskInfo> tasks = new ArrayList<TaskInfo>();
+            Protos.TaskID taskId = Protos.TaskID.newBuilder().setValue(Integer.toString(launchedTasks++)).build();
+
+            System.out.println("Launching printHelloWorld " + taskId.getValue() + " Hello World Java");
+            TaskInfo printHelloWorld = TaskInfo
+                    .newBuilder()
+                    .setName("printHelloWorld " + taskId.getValue())
+                    .setTaskId(taskId)
+                    .setSlaveId(offer.getSlaveId())
+                    .addResources(
+                            Protos.Resource.newBuilder().setName("cpus").setType(Protos.Value.Type.SCALAR)
+                                    .setScalar(Protos.Value.Scalar.newBuilder().setValue(1)))
+                    .addResources(
+                            Protos.Resource.newBuilder().setName("mem").setType(Protos.Value.Type.SCALAR)
+                                    .setScalar(Protos.Value.Scalar.newBuilder().setValue(128)))
+                    .setExecutor(ExecutorInfo.newBuilder(helloWorldExecutor)).build();
+
+            List<OfferID> offerIDS = new ArrayList<>();
+            offerIDS.add(offer.getId());
+
+            tasks.add(printHelloWorld);
+
+            schedulerDriver.declineOffer(offer.getId());
+            schedulerDriver.launchTasks(offerIDS, tasks);
+        }
+
+    }
+
+    @Override
+    public void offerRescinded(SchedulerDriver schedulerDriver, OfferID offerID) {
+
+    }
+
+    @Override
+    public void statusUpdate(SchedulerDriver schedulerDriver, Protos.TaskStatus taskStatus) {
+
+    }
+
+    @Override
+    public void frameworkMessage(SchedulerDriver schedulerDriver, Protos.ExecutorID executorID, Protos.SlaveID slaveID, byte[] bytes) {
+
+    }
+
+    @Override
+    public void disconnected(SchedulerDriver schedulerDriver) {
+
+    }
+
+    @Override
+    public void slaveLost(SchedulerDriver schedulerDriver, Protos.SlaveID slaveID) {
+
+    }
+
+    @Override
+    public void executorLost(SchedulerDriver schedulerDriver, Protos.ExecutorID executorID, Protos.SlaveID slaveID, int i) {
+
+    }
+
+    @Override
+    public void error(SchedulerDriver schedulerDriver, String s) {
+
+    }
+}
diff --git a/libraries-2/src/test/java/com/baeldung/handlebars/BasicUsageUnitTest.java b/libraries-2/src/test/java/com/baeldung/handlebars/BasicUsageUnitTest.java
new file mode 100644
index 0000000000..3eb325dbb6
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/handlebars/BasicUsageUnitTest.java
@@ -0,0 +1,109 @@
+package com.baeldung.handlebars;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.github.jknack.handlebars.Handlebars;
+import com.github.jknack.handlebars.Template;
+import com.github.jknack.handlebars.io.ClassPathTemplateLoader;
+import com.github.jknack.handlebars.io.TemplateLoader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+
+/**
+ * Showcases the tag usage and different template loading mechanisms.
+ *
+ * @author isaolmez
+ */
+public class BasicUsageUnitTest {
+
+    @Test
+    public void whenThereIsNoTemplateFile_ThenCompilesInline() throws IOException {
+        Handlebars handlebars = new Handlebars();
+        Template template = handlebars.compileInline("Hi {{this}}!");
+
+        String templateString = template.apply("Baeldung");
+
+        assertThat(templateString).isEqualTo("Hi Baeldung!");
+    }
+
+    @Test
+    public void whenParameterMapIsSupplied_thenDisplays() throws IOException {
+        Handlebars handlebars = new Handlebars();
+        Template template = handlebars.compileInline("Hi {{name}}!");
+        Map<String, String> parameterMap = new HashMap<>();
+        parameterMap.put("name", "Baeldung");
+
+        String templateString = template.apply(parameterMap);
+
+        assertThat(templateString).isEqualTo("Hi Baeldung!");
+    }
+
+    @Test
+    public void whenParameterObjectIsSupplied_ThenDisplays() throws IOException {
+        Handlebars handlebars = new Handlebars();
+        Template template = handlebars.compileInline("Hi {{name}}!");
+        Person person = new Person();
+        person.setName("Baeldung");
+
+        String templateString = template.apply(person);
+
+        assertThat(templateString).isEqualTo("Hi Baeldung!");
+    }
+
+    @Test
+    public void whenMultipleParametersAreSupplied_ThenDisplays() throws IOException {
+        Handlebars handlebars = new Handlebars();
+        Template template = handlebars.compileInline("Hi {{name}}! This is {{topic}}.");
+        Map<String, String> parameterMap = new HashMap<>();
+        parameterMap.put("name", "Baeldung");
+        parameterMap.put("topic", "Handlebars");
+
+        String templateString = template.apply(parameterMap);
+
+        assertThat(templateString).isEqualTo("Hi Baeldung! This is Handlebars.");
+    }
+
+    @Test
+    public void whenNoLoaderIsGiven_ThenSearchesClasspath() throws IOException {
+        Handlebars handlebars = new Handlebars();
+        Template template = handlebars.compile("greeting");
+        Person person = getPerson("Baeldung");
+
+        String templateString = template.apply(person);
+
+        assertThat(templateString).isEqualTo("Hi Baeldung!");
+    }
+
+    @Test
+    public void whenClasspathTemplateLoaderIsGiven_ThenSearchesClasspathWithPrefixSuffix() throws IOException {
+        TemplateLoader loader = new ClassPathTemplateLoader("/handlebars", ".html");
+        Handlebars handlebars = new Handlebars(loader);
+        Template template = handlebars.compile("greeting");
+        Person person = getPerson("Baeldung");
+
+        String templateString = template.apply(person);
+
+        assertThat(templateString).isEqualTo("Hi Baeldung!");
+    }
+
+    @Test
+    public void whenMultipleLoadersAreGiven_ThenSearchesSequentially() throws IOException {
+        TemplateLoader firstLoader = new ClassPathTemplateLoader("/handlebars", ".html");
+        TemplateLoader secondLoader = new ClassPathTemplateLoader("/templates", ".html");
+        Handlebars handlebars = new Handlebars().with(firstLoader, secondLoader);
+        Template template = handlebars.compile("greeting");
+        Person person = getPerson("Baeldung");
+
+        String templateString = template.apply(person);
+
+        assertThat(templateString).isEqualTo("Hi Baeldung!");
+    }
+
+    private Person getPerson(String name) {
+        Person person = new Person();
+        person.setName(name);
+        return person;
+    }
+}
diff --git a/libraries-2/src/test/java/com/baeldung/handlebars/BuiltinHelperUnitTest.java b/libraries-2/src/test/java/com/baeldung/handlebars/BuiltinHelperUnitTest.java
new file mode 100644
index 0000000000..6749f7fe0a
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/handlebars/BuiltinHelperUnitTest.java
@@ -0,0 +1,106 @@
+package com.baeldung.handlebars;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.github.jknack.handlebars.Handlebars;
+import com.github.jknack.handlebars.Template;
+import com.github.jknack.handlebars.io.ClassPathTemplateLoader;
+import com.github.jknack.handlebars.io.TemplateLoader;
+import java.io.IOException;
+import org.junit.Test;
+
+/**
+ * Showcases the built-in template helpers.
+ *
+ * @author isaolmez
+ */
+public class BuiltinHelperUnitTest {
+
+    private TemplateLoader templateLoader = new ClassPathTemplateLoader("/handlebars", ".html");
+
+    @Test
+    public void whenUsedWith_ThenContextChanges() throws IOException {
+        Handlebars handlebars = new Handlebars(templateLoader);
+        Template template = handlebars.compile("with");
+        Person person = getPerson("Baeldung");
+        person.getAddress().setStreet("World");
+
+        String templateString = template.apply(person);
+
+        assertThat(templateString).isEqualTo("\n<h4>I live in World</h4>\n");
+    }
+
+    @Test
+    public void whenUsedWithMustacheStyle_ThenContextChanges() throws IOException {
+        Handlebars handlebars = new Handlebars(templateLoader);
+        Template template = handlebars.compile("with_mustache");
+        Person person = getPerson("Baeldung");
+        person.getAddress().setStreet("World");
+
+        String templateString = template.apply(person);
+
+        assertThat(templateString).isEqualTo("\n<h4>I live in World</h4>\n");
+    }
+
+    @Test
+    public void whenUsedEach_ThenIterates() throws IOException {
+        Handlebars handlebars = new Handlebars(templateLoader);
+        Template template = handlebars.compile("each");
+        Person person = getPerson("Baeldung");
+        Person friend1 = getPerson("Java");
+        Person friend2 = getPerson("Spring");
+        person.getFriends().add(friend1);
+        person.getFriends().add(friend2);
+
+        String templateString = template.apply(person);
+
+        assertThat(templateString).isEqualTo("\n<span>Java is my friend.</span>\n"
+                                               + "\n<span>Spring is my friend.</span>\n");
+    }
+
+    @Test
+    public void whenUsedEachMustacheStyle_ThenIterates() throws IOException {
+        Handlebars handlebars = new Handlebars(templateLoader);
+        Template template = handlebars.compile("each_mustache");
+        Person person = getPerson("Baeldung");
+        Person friend1 = getPerson("Java");
+        Person friend2 = getPerson("Spring");
+        person.getFriends().add(friend1);
+        person.getFriends().add(friend2);
+
+        String templateString = template.apply(person);
+
+        assertThat(templateString).isEqualTo("\n<span>Java is my friend.</span>\n"
+                                               + "\n<span>Spring is my friend.</span>\n");
+    }
+
+    @Test
+    public void whenUsedIf_ThenPutsCondition() throws IOException {
+        Handlebars handlebars = new Handlebars(templateLoader);
+        Template template = handlebars.compile("if");
+        Person person = getPerson("Baeldung");
+        person.setBusy(true);
+
+        String templateString = template.apply(person);
+
+        assertThat(templateString).isEqualTo("\n<h4>Baeldung is busy.</h4>\n");
+    }
+
+    @Test
+    public void whenUsedIfMustacheStyle_ThenPutsCondition() throws IOException {
+        Handlebars handlebars = new Handlebars(templateLoader);
+        Template template = handlebars.compile("if_mustache");
+        Person person = getPerson("Baeldung");
+        person.setBusy(true);
+
+        String templateString = template.apply(person);
+
+        assertThat(templateString).isEqualTo("\n<h4>Baeldung is busy.</h4>\n");
+    }
+
+    private Person getPerson(String name) {
+        Person person = new Person();
+        person.setName(name);
+        return person;
+    }
+}
diff --git a/libraries-2/src/test/java/com/baeldung/handlebars/CustomHelperUnitTest.java b/libraries-2/src/test/java/com/baeldung/handlebars/CustomHelperUnitTest.java
new file mode 100644
index 0000000000..a3c6667654
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/handlebars/CustomHelperUnitTest.java
@@ -0,0 +1,59 @@
+package com.baeldung.handlebars;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.github.jknack.handlebars.Handlebars;
+import com.github.jknack.handlebars.Helper;
+import com.github.jknack.handlebars.Options;
+import com.github.jknack.handlebars.Template;
+import com.github.jknack.handlebars.io.ClassPathTemplateLoader;
+import com.github.jknack.handlebars.io.TemplateLoader;
+import java.io.IOException;
+import org.junit.Test;
+
+/**
+ * Showcases implementing a custom template helper.
+ *
+ * @author isaolmez
+ */
+public class CustomHelperUnitTest {
+
+    private TemplateLoader templateLoader = new ClassPathTemplateLoader("/handlebars", ".html");
+
+    @Test
+    public void whenHelperIsCreated_ThenCanRegister() throws IOException {
+        Handlebars handlebars = new Handlebars(templateLoader);
+        handlebars.registerHelper("isBusy", new Helper<Person>() {
+            @Override
+            public Object apply(Person context, Options options) throws IOException {
+                String busyString = context.isBusy() ? "busy" : "available";
+                return context.getName() + " - " + busyString;
+            }
+        });
+        Template template = handlebars.compile("person");
+        Person person = getPerson("Baeldung");
+
+        String templateString = template.apply(person);
+
+        assertThat(templateString).isEqualTo("Baeldung - busy");
+    }
+
+    @Test
+    public void whenHelperSourceIsCreated_ThenCanRegister() throws IOException {
+        Handlebars handlebars = new Handlebars(templateLoader);
+        handlebars.registerHelpers(new HelperSource());
+        Template template = handlebars.compile("person");
+        Person person = getPerson("Baeldung");
+
+        String templateString = template.apply(person);
+
+        assertThat(templateString).isEqualTo("Baeldung - busy");
+    }
+
+    private Person getPerson(String name) {
+        Person person = new Person();
+        person.setName(name);
+        person.setBusy(true);
+        return person;
+    }
+}
diff --git a/libraries-2/src/test/java/com/baeldung/handlebars/HelperSource.java b/libraries-2/src/test/java/com/baeldung/handlebars/HelperSource.java
new file mode 100644
index 0000000000..b98786c029
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/handlebars/HelperSource.java
@@ -0,0 +1,9 @@
+package com.baeldung.handlebars;
+
+public class HelperSource {
+
+    public String isBusy(Person context) {
+        String busyString = context.isBusy() ? "busy" : "available";
+        return context.getName() + " - " + busyString;
+    }
+}
diff --git a/libraries-2/src/test/java/com/baeldung/handlebars/Person.java b/libraries-2/src/test/java/com/baeldung/handlebars/Person.java
new file mode 100644
index 0000000000..9ddc0fdffb
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/handlebars/Person.java
@@ -0,0 +1,58 @@
+package com.baeldung.handlebars;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Person {
+
+    private String name;
+    private boolean busy;
+    private Address address = new Address();
+    private List<Person> friends = new ArrayList<>();
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean isBusy() {
+        return busy;
+    }
+
+    public void setBusy(boolean busy) {
+        this.busy = busy;
+    }
+
+    public Address getAddress() {
+        return address;
+    }
+
+    public void setAddress(Address address) {
+        this.address = address;
+    }
+
+    public List<Person> getFriends() {
+        return friends;
+    }
+
+    public void setFriends(List<Person> friends) {
+        this.friends = friends;
+    }
+
+    public static class Address {
+
+        private String street;
+
+        public String getStreet() {
+            return street;
+        }
+
+        public void setStreet(String street) {
+            this.street = street;
+        }
+    }
+
+}
diff --git a/libraries-2/src/test/java/com/baeldung/handlebars/ReusingTemplatesUnitTest.java b/libraries-2/src/test/java/com/baeldung/handlebars/ReusingTemplatesUnitTest.java
new file mode 100644
index 0000000000..36f78f486e
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/handlebars/ReusingTemplatesUnitTest.java
@@ -0,0 +1,49 @@
+package com.baeldung.handlebars;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.github.jknack.handlebars.Handlebars;
+import com.github.jknack.handlebars.Template;
+import com.github.jknack.handlebars.io.ClassPathTemplateLoader;
+import com.github.jknack.handlebars.io.TemplateLoader;
+import java.io.IOException;
+import org.junit.Test;
+
+/**
+ * Showcases reusing the existing templates.
+ *
+ * @author isaolmez
+ */
+public class ReusingTemplatesUnitTest {
+
+    private TemplateLoader templateLoader = new ClassPathTemplateLoader("/handlebars", ".html");
+
+    @Test
+    public void whenOtherTemplateIsReferenced_ThenCanReuse() throws IOException {
+        Handlebars handlebars = new Handlebars(templateLoader);
+        Template template = handlebars.compile("page");
+        Person person = new Person();
+        person.setName("Baeldung");
+
+        String templateString = template.apply(person);
+
+        assertThat(templateString).isEqualTo("<h4>Hi Baeldung!</h4>\n<p>This is the page Baeldung</p>");
+    }
+
+    @Test
+    public void whenBlockIsDefined_ThenCanOverrideWithPartial() throws IOException {
+        Handlebars handlebars = new Handlebars(templateLoader);
+        Template template = handlebars.compile("simplemessage");
+        Person person = new Person();
+        person.setName("Baeldung");
+
+        String templateString = template.apply(person);
+
+        assertThat(templateString).isEqualTo("\n<html>\n"
+                                               + "<body>\n"
+                                               + "\n  This is the intro\n\n"
+                                               + "\n  Hi there!\n\n"
+                                               + "</body>\n"
+                                               + "</html>");
+    }
+}
diff --git a/libraries-2/src/test/java/com/baeldung/mapdb/CollectionsUnitTest.java b/libraries-2/src/test/java/com/baeldung/mapdb/CollectionsUnitTest.java
new file mode 100644
index 0000000000..6f5141b054
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/mapdb/CollectionsUnitTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.mapdb;
+
+import org.junit.Test;
+import org.mapdb.DB;
+import org.mapdb.DBMaker;
+import org.mapdb.Serializer;
+
+import java.util.NavigableSet;
+
+import static junit.framework.Assert.assertEquals;
+
+public class CollectionsUnitTest {
+
+    @Test
+    public void givenSetCreatedInDB_whenMultipleElementsAdded_checkOnlyOneExists() {
+
+        DB db = DBMaker.memoryDB().make();
+
+        NavigableSet<String> set = db.
+          treeSet("mySet")
+          .serializer(Serializer.STRING)
+          .createOrOpen();
+
+        String myString = "Baeldung!";
+
+        set.add(myString);
+        set.add(myString);
+
+        assertEquals(1, set.size());
+
+        db.close();
+    }
+}
diff --git a/libraries-2/src/test/java/com/baeldung/mapdb/HTreeMapUnitTest.java b/libraries-2/src/test/java/com/baeldung/mapdb/HTreeMapUnitTest.java
new file mode 100644
index 0000000000..3b7cac04fb
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/mapdb/HTreeMapUnitTest.java
@@ -0,0 +1,38 @@
+package com.baeldung.mapdb;
+
+import org.jetbrains.annotations.NotNull;
+import org.junit.Test;
+import org.mapdb.*;
+
+import java.io.IOException;
+
+import static junit.framework.Assert.assertEquals;
+
+public class HTreeMapUnitTest {
+
+    @Test
+    public void givenValidDB_whenHTreeMapAddedToAndRetrieved_CheckedRetrievalCorrect() {
+
+        DB db = DBMaker.memoryDB().make();
+
+        HTreeMap<String, String> hTreeMap = db
+          .hashMap("myTreMap")
+          .keySerializer(Serializer.STRING)
+          .valueSerializer(Serializer.STRING)
+          .create();
+
+        hTreeMap.put("key1", "value1");
+        hTreeMap.put("key2", "value2");
+
+        assertEquals(2, hTreeMap.size());
+
+        //add another value with the same key
+
+        hTreeMap.put("key1", "value3");
+
+        assertEquals(2, hTreeMap.size());
+        assertEquals("value3", hTreeMap.get("key1"));
+
+    }
+
+}
diff --git a/libraries-2/src/test/java/com/baeldung/mapdb/HelloBaeldungUnitTest.java b/libraries-2/src/test/java/com/baeldung/mapdb/HelloBaeldungUnitTest.java
new file mode 100644
index 0000000000..952efd0639
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/mapdb/HelloBaeldungUnitTest.java
@@ -0,0 +1,49 @@
+package com.baeldung.mapdb;
+
+import org.junit.Test;
+import org.mapdb.DB;
+import org.mapdb.DBMaker;
+import org.mapdb.HTreeMap;
+
+import java.util.concurrent.ConcurrentMap;
+
+import static junit.framework.Assert.assertEquals;
+
+public class HelloBaeldungUnitTest {
+
+    @Test
+    public void givenInMemoryDBInstantiateCorrectly_whenDataSavedAndRetrieved_checkRetrievalCorrect() {
+
+        DB db = DBMaker.memoryDB().make();
+
+        String welcomeMessageKey = "Welcome Message";
+        String welcomeMessageString = "Hello Baeldung!";
+
+        HTreeMap myMap = db.hashMap("myMap").createOrOpen();
+        myMap.put(welcomeMessageKey, welcomeMessageString);
+
+        String welcomeMessageFromDB = (String) myMap.get(welcomeMessageKey);
+
+        db.close();
+
+        assertEquals(welcomeMessageString, welcomeMessageFromDB);
+    }
+
+    @Test
+    public void givenInFileDBInstantiateCorrectly_whenDataSavedAndRetrieved_checkRetrievalCorrect() {
+
+        DB db = DBMaker.fileDB("file.db").make();
+
+        String welcomeMessageKey = "Welcome Message";
+        String welcomeMessageString = "Hello Baeldung!";
+
+        HTreeMap myMap = db.hashMap("myMap").createOrOpen();
+        myMap.put(welcomeMessageKey, welcomeMessageString);
+
+        String welcomeMessageFromDB = (String) myMap.get(welcomeMessageKey);
+
+        db.close();
+
+        assertEquals(welcomeMessageString, welcomeMessageFromDB);
+    }
+}
diff --git a/libraries-2/src/test/java/com/baeldung/mapdb/InMemoryModesUnitTest.java b/libraries-2/src/test/java/com/baeldung/mapdb/InMemoryModesUnitTest.java
new file mode 100644
index 0000000000..9c53f9c792
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/mapdb/InMemoryModesUnitTest.java
@@ -0,0 +1,62 @@
+package com.baeldung.mapdb;
+
+import org.junit.Test;
+import org.mapdb.DB;
+import org.mapdb.DBMaker;
+import org.mapdb.HTreeMap;
+import org.mapdb.Serializer;
+
+import static junit.framework.Assert.assertEquals;
+
+public class InMemoryModesUnitTest {
+
+    @Test
+    public void givenDBCreatedOnHeap_whenUsed_checkUsageCorrect() {
+
+        DB heapDB = DBMaker.heapDB().make();
+
+        HTreeMap<Integer, String> map = heapDB
+          .hashMap("myMap")
+          .keySerializer(Serializer.INTEGER)
+          .valueSerializer(Serializer.STRING)
+          .createOrOpen();
+
+        map.put(1, "ONE");
+
+        assertEquals("ONE", map.get(1));
+
+    }
+
+    @Test
+    public void givenDBCreatedBaseOnByteArray_whenUsed_checkUsageCorrect() {
+
+        DB heapDB = DBMaker.memoryDB().make();
+
+        HTreeMap<Integer, String> map = heapDB
+          .hashMap("myMap")
+          .keySerializer(Serializer.INTEGER)
+          .valueSerializer(Serializer.STRING)
+          .createOrOpen();
+
+        map.put(1, "ONE");
+
+        assertEquals("ONE", map.get(1));
+    }
+
+    @Test
+    public void givenDBCreatedBaseOnDirectByteBuffer_whenUsed_checkUsageCorrect() {
+
+        DB heapDB = DBMaker.memoryDirectDB().make();
+
+        HTreeMap<Integer, String> map = heapDB
+          .hashMap("myMap")
+          .keySerializer(Serializer.INTEGER)
+          .valueSerializer(Serializer.STRING)
+          .createOrOpen();
+
+        map.put(1, "ONE");
+
+        assertEquals("ONE", map.get(1));
+    }
+
+}
diff --git a/libraries-2/src/test/java/com/baeldung/mapdb/SortedTableMapUnitTest.java b/libraries-2/src/test/java/com/baeldung/mapdb/SortedTableMapUnitTest.java
new file mode 100644
index 0000000000..83ba917393
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/mapdb/SortedTableMapUnitTest.java
@@ -0,0 +1,47 @@
+package com.baeldung.mapdb;
+
+import org.junit.Test;
+import org.mapdb.Serializer;
+import org.mapdb.SortedTableMap;
+import org.mapdb.volume.MappedFileVol;
+import org.mapdb.volume.Volume;
+
+import static junit.framework.Assert.assertEquals;
+
+public class SortedTableMapUnitTest {
+
+    private static final String VOLUME_LOCATION = "sortedTableMapVol.db";
+
+    @Test
+    public void givenValidSortedTableMapSetup_whenQueried_checkValuesCorrect() {
+
+        //create memory mapped volume, readonly false
+        Volume vol = MappedFileVol.FACTORY.makeVolume(VOLUME_LOCATION, false);
+
+        //create sink to feed the map with data
+        SortedTableMap.Sink<Integer, String> sink =
+          SortedTableMap.create(
+            vol,
+            Serializer.INTEGER,
+            Serializer.STRING
+          ).createFromSink();
+
+        //add content
+        for(int i = 0; i < 100; i++){
+          sink.put(i, "Value " + Integer.toString(i));
+        }
+
+        sink.create();
+
+        //now open in read-only mode
+        Volume openVol = MappedFileVol.FACTORY.makeVolume(VOLUME_LOCATION, true);
+
+        SortedTableMap<Integer, String> sortedTableMap = SortedTableMap.open(
+          openVol,
+          Serializer.INTEGER,
+          Serializer.STRING
+        );
+
+        assertEquals(100, sortedTableMap.size());
+    }
+}
diff --git a/libraries-2/src/test/java/com/baeldung/mapdb/TransactionsUnitTest.java b/libraries-2/src/test/java/com/baeldung/mapdb/TransactionsUnitTest.java
new file mode 100644
index 0000000000..4de9db10e8
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/mapdb/TransactionsUnitTest.java
@@ -0,0 +1,41 @@
+package com.baeldung.mapdb;
+
+import org.junit.Test;
+import org.mapdb.DB;
+import org.mapdb.DBMaker;
+import org.mapdb.Serializer;
+
+import java.util.NavigableSet;
+
+import static junit.framework.Assert.assertEquals;
+
+public class TransactionsUnitTest {
+
+    @Test
+    public void givenValidDBSetup_whenTransactionCommittedAndRolledBack_checkPreviousStateAchieved() {
+
+        DB db = DBMaker.memoryDB().transactionEnable().make();
+
+        NavigableSet<String> set = db
+          .treeSet("mySet")
+          .serializer(Serializer.STRING)
+          .createOrOpen();
+
+        set.add("One");
+        set.add("Two");
+
+        db.commit();
+
+        assertEquals(2, set.size());
+
+        set.add("Three");
+
+        assertEquals(3, set.size());
+
+        db.rollback();
+
+        assertEquals(2, set.size());
+
+        db.close();
+    }
+}
diff --git a/libraries-2/src/test/java/com/baeldung/parallel_collectors/ParallelCollectorsUnitTest.java b/libraries-2/src/test/java/com/baeldung/parallel_collectors/ParallelCollectorsUnitTest.java
new file mode 100644
index 0000000000..adc753a8ad
--- /dev/null
+++ b/libraries-2/src/test/java/com/baeldung/parallel_collectors/ParallelCollectorsUnitTest.java
@@ -0,0 +1,168 @@
+package com.baeldung.parallel_collectors;
+
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.stream.Collectors;
+
+import static com.pivovarit.collectors.ParallelCollectors.parallel;
+import static com.pivovarit.collectors.ParallelCollectors.parallelOrdered;
+import static com.pivovarit.collectors.ParallelCollectors.parallelToCollection;
+import static com.pivovarit.collectors.ParallelCollectors.parallelToList;
+import static com.pivovarit.collectors.ParallelCollectors.parallelToMap;
+import static com.pivovarit.collectors.ParallelCollectors.parallelToStream;
+
+public class ParallelCollectorsUnitTest {
+
+    @Test
+    public void shouldProcessInParallelWithStreams() {
+        List<Integer> ids = Arrays.asList(1, 2, 3);
+
+        List<String> results = ids.parallelStream()
+          .map(i -> fetchById(i))
+          .collect(Collectors.toList());
+
+        System.out.println(results);
+    }
+
+    @Test
+    public void shouldProcessInParallelWithParallelCollectors() {
+        ExecutorService executor = Executors.newFixedThreadPool(10);
+
+        List<Integer> ids = Arrays.asList(1, 2, 3);
+
+        CompletableFuture<List<String>> results = ids.stream()
+          .collect(parallelToList(i -> fetchById(i), executor, 4));
+
+        System.out.println(results.join());
+    }
+
+    @Test
+    public void shouldCollectToList() {
+        ExecutorService executor = Executors.newFixedThreadPool(10);
+
+        List<Integer> ids = Arrays.asList(1, 2, 3);
+
+        List<String> results = ids.stream()
+          .collect(parallelToList(i -> fetchById(i), executor, 4))
+          .join();
+
+        System.out.println(results); // [user-1, user-2, user-3]
+    }
+
+    @Test
+    public void shouldCollectToCollection() {
+        ExecutorService executor = Executors.newFixedThreadPool(10);
+
+        List<Integer> ids = Arrays.asList(1, 2, 3);
+
+        List<String> results = ids.stream()
+          .collect(parallelToCollection(i -> fetchById(i), LinkedList::new, executor, 4))
+          .join();
+
+        System.out.println(results); // [user-1, user-2, user-3]
+    }
+
+    @Test
+    public void shouldCollectToStream() {
+        ExecutorService executor = Executors.newFixedThreadPool(10);
+
+        List<Integer> ids = Arrays.asList(1, 2, 3);
+
+        Map<Integer, List<String>> results = ids.stream()
+          .collect(parallelToStream(i -> fetchById(i), executor, 4))
+          .thenApply(stream -> stream.collect(Collectors.groupingBy(i -> i.length())))
+          .join();
+
+        System.out.println(results); // [user-1, user-2, user-3]
+    }
+
+    @Test
+    public void shouldStreamInCompletionOrder() {
+        ExecutorService executor = Executors.newFixedThreadPool(10);
+
+        List<Integer> ids = Arrays.asList(1, 2, 3);
+
+        ids.stream()
+          .collect(parallel(i -> fetchByIdWithRandomDelay(i), executor, 4))
+          .forEach(System.out::println);
+    }
+
+    @Test
+    public void shouldStreamInOriginalOrder() {
+        ExecutorService executor = Executors.newFixedThreadPool(10);
+
+        List<Integer> ids = Arrays.asList(1, 2, 3);
+
+        ids.stream()
+          .collect(parallelOrdered(i -> fetchByIdWithRandomDelay(i), executor, 4))
+          .forEach(System.out::println);
+    }
+
+    @Test
+    public void shouldCollectToMap() {
+        ExecutorService executor = Executors.newFixedThreadPool(10);
+
+        List<Integer> ids = Arrays.asList(1, 2, 3);
+
+        Map<Integer, String> results = ids.stream()
+          .collect(parallelToMap(i -> i, i -> fetchById(i), executor, 4))
+          .join();
+
+        System.out.println(results); // {1=user-1, 2=user-2, 3=user-3}
+    }
+
+    @Test
+    public void shouldCollectToTreeMap() {
+        ExecutorService executor = Executors.newFixedThreadPool(10);
+
+        List<Integer> ids = Arrays.asList(1, 2, 3);
+
+        Map<Integer, String> results = ids.stream()
+          .collect(parallelToMap(i -> i, i -> fetchById(i), TreeMap::new,  executor, 4))
+          .join();
+
+        System.out.println(results); // {1=user-1, 2=user-2, 3=user-3}
+    }
+
+    @Test
+    public void shouldCollectToTreeMapAndResolveClashes() {
+        ExecutorService executor = Executors.newFixedThreadPool(10);
+
+        List<Integer> ids = Arrays.asList(1, 2, 3);
+
+        Map<Integer, String> results = ids.stream()
+          .collect(parallelToMap(i -> i, i -> fetchById(i), TreeMap::new, (s1, s2) -> s1,   executor, 4))
+          .join();
+
+        System.out.println(results); // {1=user-1, 2=user-2, 3=user-3}
+    }
+
+    private static String fetchById(int id) {
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException e) {
+            // ignore shamelessly
+        }
+
+        return "user-" + id;
+    }
+
+    private static String fetchByIdWithRandomDelay(int id) {
+        try {
+            Thread.sleep(ThreadLocalRandom.current().nextInt(1000));
+        } catch (InterruptedException e) {
+            // ignore shamelessly
+        }
+
+        return "user-" + id;
+    }
+}
diff --git a/libraries-2/src/test/resources/greeting.hbs b/libraries-2/src/test/resources/greeting.hbs
new file mode 100644
index 0000000000..71a8266bce
--- /dev/null
+++ b/libraries-2/src/test/resources/greeting.hbs
@@ -0,0 +1 @@
+Hi {{name}}!
\ No newline at end of file
diff --git a/libraries-2/src/test/resources/handlebars/each.html b/libraries-2/src/test/resources/handlebars/each.html
new file mode 100644
index 0000000000..1570311bfc
--- /dev/null
+++ b/libraries-2/src/test/resources/handlebars/each.html
@@ -0,0 +1,3 @@
+{{#each friends}}
+<span>{{name}} is my friend.</span>
+{{/each}}
\ No newline at end of file
diff --git a/libraries-2/src/test/resources/handlebars/each_mustache.html b/libraries-2/src/test/resources/handlebars/each_mustache.html
new file mode 100644
index 0000000000..1570311bfc
--- /dev/null
+++ b/libraries-2/src/test/resources/handlebars/each_mustache.html
@@ -0,0 +1,3 @@
+{{#each friends}}
+<span>{{name}} is my friend.</span>
+{{/each}}
\ No newline at end of file
diff --git a/libraries-2/src/test/resources/handlebars/greeting.html b/libraries-2/src/test/resources/handlebars/greeting.html
new file mode 100644
index 0000000000..71a8266bce
--- /dev/null
+++ b/libraries-2/src/test/resources/handlebars/greeting.html
@@ -0,0 +1 @@
+Hi {{name}}!
\ No newline at end of file
diff --git a/libraries-2/src/test/resources/handlebars/header.html b/libraries-2/src/test/resources/handlebars/header.html
new file mode 100644
index 0000000000..80cca699e4
--- /dev/null
+++ b/libraries-2/src/test/resources/handlebars/header.html
@@ -0,0 +1 @@
+<h4>Hi {{name}}!</h4>
\ No newline at end of file
diff --git a/libraries-2/src/test/resources/handlebars/if.html b/libraries-2/src/test/resources/handlebars/if.html
new file mode 100644
index 0000000000..ebdc724f66
--- /dev/null
+++ b/libraries-2/src/test/resources/handlebars/if.html
@@ -0,0 +1,5 @@
+{{#if busy}}
+<h4>{{name}} is busy.</h4>
+{{else}}
+<h4>{{name}} is not busy.</h4>
+{{/if}}
\ No newline at end of file
diff --git a/libraries-2/src/test/resources/handlebars/if_mustache.html b/libraries-2/src/test/resources/handlebars/if_mustache.html
new file mode 100644
index 0000000000..d75f5fa8f9
--- /dev/null
+++ b/libraries-2/src/test/resources/handlebars/if_mustache.html
@@ -0,0 +1,5 @@
+{{#if busy}}
+<h4>{{name}} is busy.</h4>
+{{^}}
+<h4>{{name}} is not busy.</h4>
+{{/if}}
\ No newline at end of file
diff --git a/libraries-2/src/test/resources/handlebars/messagebase.html b/libraries-2/src/test/resources/handlebars/messagebase.html
new file mode 100644
index 0000000000..7ee3257e06
--- /dev/null
+++ b/libraries-2/src/test/resources/handlebars/messagebase.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+{{#block "intro"}}
+  This is the intro
+{{/block}}
+{{#block "message"}}
+{{/block}}
+</body>
+</html>
\ No newline at end of file
diff --git a/libraries-2/src/test/resources/handlebars/page.html b/libraries-2/src/test/resources/handlebars/page.html
new file mode 100644
index 0000000000..27b20737f3
--- /dev/null
+++ b/libraries-2/src/test/resources/handlebars/page.html
@@ -0,0 +1,2 @@
+{{>header}}
+<p>This is the page {{name}}</p>
\ No newline at end of file
diff --git a/libraries-2/src/test/resources/handlebars/person.html b/libraries-2/src/test/resources/handlebars/person.html
new file mode 100644
index 0000000000..9df7850f60
--- /dev/null
+++ b/libraries-2/src/test/resources/handlebars/person.html
@@ -0,0 +1 @@
+{{#isBusy this}}{{/isBusy}}
\ No newline at end of file
diff --git a/libraries-2/src/test/resources/handlebars/simplemessage.html b/libraries-2/src/test/resources/handlebars/simplemessage.html
new file mode 100644
index 0000000000..3b3a01980a
--- /dev/null
+++ b/libraries-2/src/test/resources/handlebars/simplemessage.html
@@ -0,0 +1,4 @@
+{{#partial "message" }}
+  Hi there!
+{{/partial}}
+{{> messagebase}}
\ No newline at end of file
diff --git a/libraries-2/src/test/resources/handlebars/with.html b/libraries-2/src/test/resources/handlebars/with.html
new file mode 100644
index 0000000000..90077b4835
--- /dev/null
+++ b/libraries-2/src/test/resources/handlebars/with.html
@@ -0,0 +1,3 @@
+{{#with address}}
+<h4>I live in {{street}}</h4>
+{{/with}}
\ No newline at end of file
diff --git a/libraries-2/src/test/resources/handlebars/with_mustache.html b/libraries-2/src/test/resources/handlebars/with_mustache.html
new file mode 100644
index 0000000000..3adf6a7556
--- /dev/null
+++ b/libraries-2/src/test/resources/handlebars/with_mustache.html
@@ -0,0 +1,3 @@
+{{#address}}
+<h4>I live in {{street}}</h4>
+{{/address}}
\ No newline at end of file
diff --git a/libraries-apache-commons/pom.xml b/libraries-apache-commons/pom.xml
index cb5990df22..05d11d83fe 100644
--- a/libraries-apache-commons/pom.xml
+++ b/libraries-apache-commons/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang.version}</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>${commons.io.version}</version>
+            <version>${commons-io.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-chain</groupId>
@@ -87,13 +87,12 @@
     </dependencies>
 
     <properties>
-        <commons-lang.version>3.6</commons-lang.version>
+        <commons-lang3.version>3.6</commons-lang3.version>
         <commons-text.version>1.1</commons-text.version>
         <commons-beanutils.version>1.9.3</commons-beanutils.version>
         <commons-chain.version>1.2</commons-chain.version>
         <commons-csv.version>1.4</commons-csv.version>
         <assertj.version>3.6.2</assertj.version>
-        <commons.io.version>2.5</commons.io.version>
         <commons.dbutils.version>1.6</commons.dbutils.version>
         <commons.collections.version>4.1</commons.collections.version>
         <org.hamcrest.java-hamcrest.version>2.0.0.0</org.hamcrest.java-hamcrest.version>
diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index 31aaaea951..88dcceafaa 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -449,7 +449,6 @@
         <gson.version>2.8.2</gson.version>
         <cache.version>1.1.0</cache.version>
         <flink.version>1.5.0</flink.version>
-        <jackson.version>2.9.7</jackson.version>
         <awaitility.version>3.0.0</awaitility.version>
         <assertj.version>3.6.2</assertj.version>
         <hazelcast.version>3.8.4</hazelcast.version>
diff --git a/libraries-http/README.md b/libraries-http/README.md
new file mode 100644
index 0000000000..dd8c6a5f67
--- /dev/null
+++ b/libraries-http/README.md
@@ -0,0 +1,7 @@
+
+### Relevant Articles: 
+
+- [A Guide to OkHttp](http://www.baeldung.com/guide-to-okhttp)
+- [A Guide to Google-Http-Client](http://www.baeldung.com/google-http-client)
+- [Asynchronous HTTP with async-http-client in Java](http://www.baeldung.com/async-http-client)
+- [WebSockets with AsyncHttpClient](http://www.baeldung.com/async-http-client-websockets)
diff --git a/libraries-http/pom.xml b/libraries-http/pom.xml
new file mode 100644
index 0000000000..6006a93aef
--- /dev/null
+++ b/libraries-http/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>libraries-http</artifactId>
+	<name>libraries-http</name>
+
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>parent-modules</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${assertj.version}</version>
+		</dependency>
+
+		<!-- Dependencies for response decoder with okhttp -->
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+            <version>${com.squareup.okhttp3.version}</version>
+		</dependency>
+
+        <!-- Dependencies for google http client -->
+        <dependency>
+            <groupId>com.google.http-client</groupId>
+            <artifactId>google-http-client</artifactId>
+            <version>${googleclient.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.http-client</groupId>
+            <artifactId>google-http-client-jackson2</artifactId>
+            <version>${googleclient.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.http-client</groupId>
+            <artifactId>google-http-client-gson</artifactId>
+            <version>${googleclient.version}</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.asynchttpclient/async-http-client -->
+        <dependency>
+            <groupId>org.asynchttpclient</groupId>
+            <artifactId>async-http-client</artifactId>
+            <version>${async.http.client.version}</version>
+        </dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.8.5</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>mockwebserver</artifactId>
+            <version>${com.squareup.okhttp3.version}</version>
+			<scope>test</scope>
+		</dependency>
+          
+	</dependencies>
+
+	<properties>
+		<assertj.version>3.6.2</assertj.version>
+        <com.squareup.okhttp3.version>3.14.2</com.squareup.okhttp3.version>
+        <googleclient.version>1.23.0</googleclient.version>
+        <async.http.client.version>2.2.0</async.http.client.version>
+	</properties>
+</project>
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/GitHubExample.java b/libraries-http/src/main/java/com/baeldung/googlehttpclientguide/GitHubExample.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/googlehttpclientguide/GitHubExample.java
rename to libraries-http/src/main/java/com/baeldung/googlehttpclientguide/GitHubExample.java
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/GitHubUrl.java b/libraries-http/src/main/java/com/baeldung/googlehttpclientguide/GitHubUrl.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/googlehttpclientguide/GitHubUrl.java
rename to libraries-http/src/main/java/com/baeldung/googlehttpclientguide/GitHubUrl.java
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/User.java b/libraries-http/src/main/java/com/baeldung/googlehttpclientguide/User.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/googlehttpclientguide/User.java
rename to libraries-http/src/main/java/com/baeldung/googlehttpclientguide/User.java
diff --git a/libraries/src/main/java/com/baeldung/googlehttpclientguide/logging.properties b/libraries-http/src/main/java/com/baeldung/googlehttpclientguide/logging.properties
similarity index 100%
rename from libraries/src/main/java/com/baeldung/googlehttpclientguide/logging.properties
rename to libraries-http/src/main/java/com/baeldung/googlehttpclientguide/logging.properties
diff --git a/rest-with-spark-java/src/main/resources/logback.xml b/libraries-http/src/main/resources/logback.xml
similarity index 100%
rename from rest-with-spark-java/src/main/resources/logback.xml
rename to libraries-http/src/main/resources/logback.xml
diff --git a/libraries/src/test/java/com/baeldung/asynchttpclient/AsyncHttpClientLiveTest.java b/libraries-http/src/test/java/com/baeldung/asynchttpclient/AsyncHttpClientLiveTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/asynchttpclient/AsyncHttpClientLiveTest.java
rename to libraries-http/src/test/java/com/baeldung/asynchttpclient/AsyncHttpClientLiveTest.java
diff --git a/spring-rest/src/test/java/com/baeldung/client/Consts.java b/libraries-http/src/test/java/com/baeldung/client/Consts.java
similarity index 100%
rename from spring-rest/src/test/java/com/baeldung/client/Consts.java
rename to libraries-http/src/test/java/com/baeldung/client/Consts.java
diff --git a/spring-rest/src/test/java/com/baeldung/okhttp/DefaultContentTypeInterceptor.java b/libraries-http/src/test/java/com/baeldung/okhttp/DefaultContentTypeInterceptor.java
similarity index 100%
rename from spring-rest/src/test/java/com/baeldung/okhttp/DefaultContentTypeInterceptor.java
rename to libraries-http/src/test/java/com/baeldung/okhttp/DefaultContentTypeInterceptor.java
diff --git a/spring-rest/src/test/java/com/baeldung/okhttp/OkHttpFileUploadingLiveTest.java b/libraries-http/src/test/java/com/baeldung/okhttp/OkHttpFileUploadingLiveTest.java
similarity index 93%
rename from spring-rest/src/test/java/com/baeldung/okhttp/OkHttpFileUploadingLiveTest.java
rename to libraries-http/src/test/java/com/baeldung/okhttp/OkHttpFileUploadingLiveTest.java
index 75980a5360..7b28c17607 100644
--- a/spring-rest/src/test/java/com/baeldung/okhttp/OkHttpFileUploadingLiveTest.java
+++ b/libraries-http/src/test/java/com/baeldung/okhttp/OkHttpFileUploadingLiveTest.java
@@ -19,6 +19,9 @@ import okhttp3.Response;
 import org.junit.Before;
 import org.junit.Test;
 
+/**
+ * Execute <code>spring-rest</code> module before running this live test
+ */
 public class OkHttpFileUploadingLiveTest {
 
     private static final String BASE_URL = "http://localhost:" + APPLICATION_PORT + "/spring-rest";
diff --git a/spring-rest/src/test/java/com/baeldung/okhttp/OkHttpGetLiveTest.java b/libraries-http/src/test/java/com/baeldung/okhttp/OkHttpGetLiveTest.java
similarity index 93%
rename from spring-rest/src/test/java/com/baeldung/okhttp/OkHttpGetLiveTest.java
rename to libraries-http/src/test/java/com/baeldung/okhttp/OkHttpGetLiveTest.java
index 3edd2eab06..5efc4aa998 100644
--- a/spring-rest/src/test/java/com/baeldung/okhttp/OkHttpGetLiveTest.java
+++ b/libraries-http/src/test/java/com/baeldung/okhttp/OkHttpGetLiveTest.java
@@ -17,6 +17,9 @@ import okhttp3.Response;
 import org.junit.Before;
 import org.junit.Test;
 
+/**
+ * Execute <code>spring-rest</code> module before running this live test
+ */
 public class OkHttpGetLiveTest {
 
     private static final String BASE_URL = "http://localhost:" + APPLICATION_PORT + "/spring-rest";
diff --git a/spring-rest/src/test/java/com/baeldung/okhttp/OkHttpHeaderLiveTest.java b/libraries-http/src/test/java/com/baeldung/okhttp/OkHttpHeaderLiveTest.java
similarity index 100%
rename from spring-rest/src/test/java/com/baeldung/okhttp/OkHttpHeaderLiveTest.java
rename to libraries-http/src/test/java/com/baeldung/okhttp/OkHttpHeaderLiveTest.java
diff --git a/spring-rest/src/test/java/com/baeldung/okhttp/OkHttpMiscLiveTest.java b/libraries-http/src/test/java/com/baeldung/okhttp/OkHttpMiscLiveTest.java
similarity index 95%
rename from spring-rest/src/test/java/com/baeldung/okhttp/OkHttpMiscLiveTest.java
rename to libraries-http/src/test/java/com/baeldung/okhttp/OkHttpMiscLiveTest.java
index 207ad14e71..24617794d1 100644
--- a/spring-rest/src/test/java/com/baeldung/okhttp/OkHttpMiscLiveTest.java
+++ b/libraries-http/src/test/java/com/baeldung/okhttp/OkHttpMiscLiveTest.java
@@ -20,6 +20,9 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * Execute <code>spring-rest</code> module before running this live test
+ */
 public class OkHttpMiscLiveTest {
 
     private static final String BASE_URL = "http://localhost:" + APPLICATION_PORT + "/spring-rest";
diff --git a/spring-rest/src/test/java/com/baeldung/okhttp/OkHttpPostingLiveTest.java b/libraries-http/src/test/java/com/baeldung/okhttp/OkHttpPostingLiveTest.java
similarity index 94%
rename from spring-rest/src/test/java/com/baeldung/okhttp/OkHttpPostingLiveTest.java
rename to libraries-http/src/test/java/com/baeldung/okhttp/OkHttpPostingLiveTest.java
index 66fee0b626..19e689c093 100644
--- a/spring-rest/src/test/java/com/baeldung/okhttp/OkHttpPostingLiveTest.java
+++ b/libraries-http/src/test/java/com/baeldung/okhttp/OkHttpPostingLiveTest.java
@@ -20,6 +20,9 @@ import okhttp3.Response;
 import org.junit.Before;
 import org.junit.Test;
 
+/**
+ * Execute <code>spring-rest</code> module before running this live test
+ */
 public class OkHttpPostingLiveTest {
 
     private static final String BASE_URL = "http://localhost:" + APPLICATION_PORT + "/spring-rest";
diff --git a/spring-rest/src/test/java/com/baeldung/okhttp/OkHttpRedirectLiveTest.java b/libraries-http/src/test/java/com/baeldung/okhttp/OkHttpRedirectLiveTest.java
similarity index 100%
rename from spring-rest/src/test/java/com/baeldung/okhttp/OkHttpRedirectLiveTest.java
rename to libraries-http/src/test/java/com/baeldung/okhttp/OkHttpRedirectLiveTest.java
diff --git a/spring-rest/src/test/java/com/baeldung/okhttp/ProgressRequestWrapper.java b/libraries-http/src/test/java/com/baeldung/okhttp/ProgressRequestWrapper.java
similarity index 100%
rename from spring-rest/src/test/java/com/baeldung/okhttp/ProgressRequestWrapper.java
rename to libraries-http/src/test/java/com/baeldung/okhttp/ProgressRequestWrapper.java
diff --git a/libraries-io/README.md b/libraries-io/README.md
new file mode 100644
index 0000000000..90095a2f23
--- /dev/null
+++ b/libraries-io/README.md
@@ -0,0 +1,5 @@
+
+### Relevant Articles: 
+
+- [Transferring a File Through SFTP in Java](https://www.baeldung.com/java-file-sftp)
+
diff --git a/libraries-io/pom.xml b/libraries-io/pom.xml
new file mode 100644
index 0000000000..5b78ae9442
--- /dev/null
+++ b/libraries-io/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>libraries-io</artifactId>
+    <name>libraries-io</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <!-- sftp file transfer -->
+        <dependency>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jsch</artifactId>
+            <version>${jsch.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.hierynomus</groupId>
+            <artifactId>sshj</artifactId>
+            <version>${sshj.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-vfs2</artifactId>
+            <version>${vfs.version}</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <!-- sftp -->
+        <jsch.version>0.1.55</jsch.version>
+        <sshj.version>0.27.0</sshj.version>
+        <vfs.version>2.4</vfs.version>
+    </properties>
+</project>
diff --git a/libraries-io/src/main/resources/input.txt b/libraries-io/src/main/resources/input.txt
new file mode 100644
index 0000000000..a10db923e5
--- /dev/null
+++ b/libraries-io/src/main/resources/input.txt
@@ -0,0 +1 @@
+This is a sample text content
\ No newline at end of file
diff --git a/libraries-io/src/test/java/org/baeldung/java/io/remote/SftpFileTransferLiveTest.java b/libraries-io/src/test/java/org/baeldung/java/io/remote/SftpFileTransferLiveTest.java
new file mode 100644
index 0000000000..192153bc90
--- /dev/null
+++ b/libraries-io/src/test/java/org/baeldung/java/io/remote/SftpFileTransferLiveTest.java
@@ -0,0 +1,106 @@
+package org.baeldung.java.io.remote;
+
+import java.io.IOException;
+
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileSystemManager;
+import org.apache.commons.vfs2.Selectors;
+import org.apache.commons.vfs2.VFS;
+import org.junit.Test;
+
+import com.jcraft.jsch.ChannelSftp;
+import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.Session;
+import com.jcraft.jsch.SftpException;
+
+import net.schmizz.sshj.SSHClient;
+import net.schmizz.sshj.sftp.SFTPClient;
+import net.schmizz.sshj.transport.verification.PromiscuousVerifier;
+
+public class SftpFileTransferLiveTest {
+
+    private String remoteHost = "HOST_NAME_HERE";
+    private String username = "USERNAME_HERE";
+    private String password = "PASSWORD_HERE";
+    private String localFile = "src/main/resources/input.txt";
+    private String remoteFile = "welcome.txt";
+    private String localDir = "src/main/resources/";
+    private String remoteDir = "remote_sftp_test/";
+    private String knownHostsFileLoc = "/Users/USERNAME/known_hosts_sample";
+
+    @Test
+    public void whenUploadFileUsingJsch_thenSuccess() throws JSchException, SftpException {
+        ChannelSftp channelSftp = setupJsch();
+        channelSftp.connect();
+        channelSftp.put(localFile, remoteDir + "jschFile.txt");
+        channelSftp.exit();
+    }
+
+    @Test
+    public void whenDownloadFileUsingJsch_thenSuccess() throws JSchException, SftpException {
+        ChannelSftp channelSftp = setupJsch();
+        channelSftp.connect();
+        channelSftp.get(remoteFile, localDir + "jschFile.txt");
+        channelSftp.exit();
+    }
+
+    @Test
+    public void whenUploadFileUsingSshj_thenSuccess() throws IOException {
+        SSHClient sshClient = setupSshj();
+        SFTPClient sftpClient = sshClient.newSFTPClient();
+        sftpClient.put(localFile, remoteDir + "sshjFile.txt");
+        sftpClient.close();
+        sshClient.disconnect();
+    }
+
+    @Test
+    public void whenDownloadFileUsingSshj_thenSuccess() throws IOException {
+        SSHClient sshClient = setupSshj();
+        SFTPClient sftpClient = sshClient.newSFTPClient();
+        sftpClient.get(remoteFile, localDir + "sshjFile.txt");
+        sftpClient.close();
+        sshClient.disconnect();
+    }
+
+    @Test
+    public void whenUploadFileUsingApacheVfs_thenSuccess() throws IOException {
+        FileSystemManager manager = VFS.getManager();
+        FileObject local = manager.resolveFile(System.getProperty("user.dir") + "/" + localFile);
+        FileObject remote = manager.resolveFile("sftp://" + username + ":" + password + "@" + remoteHost + "/" + remoteDir + "vfsFile.txt");
+        remote.copyFrom(local, Selectors.SELECT_SELF);
+        local.close();
+        remote.close();
+    }
+
+    @Test
+    public void whenDownloadFileUsingApacheVfs_thenSuccess() throws IOException {
+        FileSystemManager manager = VFS.getManager();
+        FileObject local = manager.resolveFile(System.getProperty("user.dir") + "/" + localDir + "vfsFile.txt");
+        FileObject remote = manager.resolveFile("sftp://" + username + ":" + password + "@" + remoteHost + "/" + remoteFile);
+        local.copyFrom(remote, Selectors.SELECT_SELF);
+        local.close();
+        remote.close();
+    }
+
+    // ====== ssh-keyscan -H -t rsa remoteHost >> known_hosts_sample
+
+    private ChannelSftp setupJsch() throws JSchException {
+        JSch jsch = new JSch();
+        jsch.setKnownHosts(knownHostsFileLoc);
+        Session jschSession = jsch.getSession(username, remoteHost);
+        jschSession.setPassword(password);
+        //jschSession.setConfig("StrictHostKeyChecking", "no");
+        jschSession.connect();
+        return (ChannelSftp) jschSession.openChannel("sftp");
+    }
+
+    private SSHClient setupSshj() throws IOException {
+        SSHClient client = new SSHClient();
+        client.addHostKeyVerifier(new PromiscuousVerifier());
+        client.connect(remoteHost);
+        client.authPassword(username, password);
+        return client;
+    }
+
+}
diff --git a/libraries-server/pom.xml b/libraries-server/pom.xml
index 873cca9b9b..9bed5e211b 100644
--- a/libraries-server/pom.xml
+++ b/libraries-server/pom.xml
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>${commons.io.version}</version>
+            <version>${commons-io.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
@@ -65,7 +65,7 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
-		
+
         <!-- tomcat -->
         <dependency>
             <groupId>org.apache.tomcat</groupId>
@@ -114,14 +114,13 @@
     <properties>
         <assertj.version>3.6.2</assertj.version>
         <httpclient.version>4.5.3</httpclient.version>
-        <commons.io.version>2.5</commons.io.version>
         <jetty.version>9.4.8.v20171121</jetty.version>
         <netty.version>4.1.20.Final</netty.version>
         <commons.collections.version>4.1</commons.collections.version>
         <tomcat.version>8.5.24</tomcat.version>
         <smack.version>4.3.1</smack.version>
-		<eclipse.paho.client.mqttv3.version>1.2.0</eclipse.paho.client.mqttv3.version>
-		<nanohttpd.version>2.3.1</nanohttpd.version>
+        <eclipse.paho.client.mqttv3.version>1.2.0</eclipse.paho.client.mqttv3.version>
+        <nanohttpd.version>2.3.1</nanohttpd.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/libraries/README.md b/libraries/README.md
index f6a39daef1..c7b40e3c94 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -36,16 +36,12 @@
 - [Introduction To Docx4J](http://www.baeldung.com/docx4j)
 - [Introduction to StreamEx](http://www.baeldung.com/streamex)
 - [Introduction to BouncyCastle with Java](http://www.baeldung.com/java-bouncy-castle)
-- [A Guide to Google-Http-Client](http://www.baeldung.com/google-http-client)
 - [Interact with Google Sheets from Java](http://www.baeldung.com/google-sheets-java-client)
 - [A Docker Guide for Java](http://www.baeldung.com/docker-java-api)
 - [Introduction To OpenCSV](http://www.baeldung.com/opencsv)
 - [Introduction to Akka Actors in Java](http://www.baeldung.com/akka-actors-java)
-- [Asynchronous HTTP with async-http-client in Java](http://www.baeldung.com/async-http-client)
 - [Introduction to Smooks](http://www.baeldung.com/smooks)
-- [WebSockets with AsyncHttpClient](http://www.baeldung.com/async-http-client-websockets)
 - [A Guide to Infinispan in Java](http://www.baeldung.com/infinispan)
-- [Introduction to OpenCSV](http://www.baeldung.com/opencsv)
 - [A Guide to Unirest](http://www.baeldung.com/unirest)
 - [Introduction to Akka Actors in Java](http://www.baeldung.com/akka-actors-java)
 - [A Guide to Byte Buddy](http://www.baeldung.com/byte-buddy)
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 7823732224..e8ffde5f99 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -18,20 +18,12 @@
             <artifactId>akka-actor_2.12</artifactId>
             <version>${typesafe-akka.version}</version>
         </dependency>
-
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-testkit_2.12</artifactId>
             <version>${typesafe-akka.version}</version>
             <scope>test</scope>
         </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.asynchttpclient/async-http-client -->
-        <dependency>
-            <groupId>org.asynchttpclient</groupId>
-            <artifactId>async-http-client</artifactId>
-            <version>${async.http.client.version}</version>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/org.beykery/neuroph/2.92 -->
         <dependency>
             <groupId>org.beykery</groupId>
@@ -53,7 +45,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang.version}</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-net</groupId>
@@ -826,7 +818,6 @@
         <crdt.version>0.1.0</crdt.version>
         <multiverse.version>0.7.0</multiverse.version>
         <cglib.version>3.2.7</cglib.version>
-        <commons-lang.version>3.6</commons-lang.version>
         <jasypt.version>1.9.2</jasypt.version>
         <javatuples.version>1.2</javatuples.version>
         <javaassist.version>3.21.0-GA</javaassist.version>
@@ -834,11 +825,10 @@
         <jsonassert.version>1.5.0</jsonassert.version>
         <javers.version>3.1.0</javers.version>
         <httpclient.version>4.5.3</httpclient.version>
-        <h2.version>1.4.196</h2.version>
         <jnats.version>1.0</jnats.version>
 
+
         <httpclient.version>4.5.3</httpclient.version>
-        <jackson.version>2.9.7</jackson.version>
         <neuroph.version>2.92</neuroph.version>
         <serenity.version>1.9.26</serenity.version>
         <serenity.jbehave.version>1.41.0</serenity.jbehave.version>
@@ -871,7 +861,6 @@
         <kafka.version>2.0.0</kafka.version>
         <smooks.version>1.7.0</smooks.version>
         <docker.version>3.0.14</docker.version>
-        <async.http.client.version>2.2.0</async.http.client.version>
         <infinispan.version>9.1.5.Final</infinispan.version>
         <opencsv.version>4.1</opencsv.version>
         <unirest.version>1.4.9</unirest.version>
diff --git a/logging-modules/log-mdc/pom.xml b/logging-modules/log-mdc/pom.xml
index ae658e034e..ce58f43e4e 100644
--- a/logging-modules/log-mdc/pom.xml
+++ b/logging-modules/log-mdc/pom.xml
@@ -101,7 +101,6 @@
         <log4j2.version>2.7</log4j2.version>
         <disruptor.version>3.3.6</disruptor.version>
         <jbosslogging.version>3.3.0.Final</jbosslogging.version>
-        <maven-war-plugin.version>2.4</maven-war-plugin.version>
     </properties>
 
 </project>
diff --git a/lombok/src/main/java/com/baeldung/lombok/getter/GetterLazy.java b/lombok/src/main/java/com/baeldung/lombok/getter/GetterLazy.java
index 5ac82a74d8..604c45be3b 100644
--- a/lombok/src/main/java/com/baeldung/lombok/getter/GetterLazy.java
+++ b/lombok/src/main/java/com/baeldung/lombok/getter/GetterLazy.java
@@ -13,9 +13,9 @@ public class GetterLazy {
     private static final String DELIMETER = ",";
 
     @Getter(lazy = true)
-    private final Map<String, Long> transactions = readTxnsFromFile();
+    private final Map<String, Long> transactions = getTransactions();
 
-    private Map<String, Long> readTxnsFromFile() {
+    private Map<String, Long> getTransactions() {
 
         final Map<String, Long> cache = new HashMap<>();
         List<String> txnRows = readTxnListFromFile();
diff --git a/lombok/src/main/java/com/baeldung/lombok/intro/Utility.java b/lombok/src/main/java/com/baeldung/lombok/intro/Utility.java
new file mode 100644
index 0000000000..07198d2ffc
--- /dev/null
+++ b/lombok/src/main/java/com/baeldung/lombok/intro/Utility.java
@@ -0,0 +1,26 @@
+package com.baeldung.lombok.intro;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.stream.Collectors;
+
+import lombok.SneakyThrows;
+import lombok.Synchronized;
+
+public class Utility {
+
+    @SneakyThrows
+    public String resourceAsString() throws IOException {
+        try (InputStream is = this.getClass().getResourceAsStream("sure_in_my_jar.txt")) {
+            BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+            return br.lines().collect(Collectors.joining("\n"));
+        } 
+    }
+
+    @Synchronized
+    public void putValueInCache(String key, String value) {
+        System.out.println("Thread safe here with key : [" + key + "] and value[" + value + "]");
+    }
+}
diff --git a/lombok/src/main/resources/sure_in_my_jar.txt b/lombok/src/main/resources/sure_in_my_jar.txt
new file mode 100644
index 0000000000..5ab2f8a432
--- /dev/null
+++ b/lombok/src/main/resources/sure_in_my_jar.txt
@@ -0,0 +1 @@
+Hello
\ No newline at end of file
diff --git a/maven-java-11/multimodule-maven-project/daomodule/pom.xml b/maven-java-11/multimodule-maven-project/daomodule/pom.xml
index de9be656d4..5520c5a90a 100644
--- a/maven-java-11/multimodule-maven-project/daomodule/pom.xml
+++ b/maven-java-11/multimodule-maven-project/daomodule/pom.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.baeldung.multimodule-maven-project</groupId>
-        <artifactId>multimodule-maven-project</artifactId>
-        <version>1.0</version>
-    </parent>
     <groupId>com.baeldung.daomodule</groupId>
     <artifactId>daomodule</artifactId>
     <packaging>jar</packaging>
     <version>1.0</version>
     <name>daomodule</name>
+	
+    <parent>
+        <groupId>com.baeldung.multimodule-maven-project</groupId>
+        <artifactId>multimodule-maven-project</artifactId>
+        <version>1.0</version>
+    </parent>
 </project>
diff --git a/maven-java-11/multimodule-maven-project/entitiymodule/pom.xml b/maven-java-11/multimodule-maven-project/entitiymodule/pom.xml
index 8e700e62b5..747722e912 100644
--- a/maven-java-11/multimodule-maven-project/entitiymodule/pom.xml
+++ b/maven-java-11/multimodule-maven-project/entitiymodule/pom.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.baeldung.multimodule-maven-project</groupId>
-        <artifactId>multimodule-maven-project</artifactId>
-        <version>1.0</version>
-    </parent>
     <groupId>com.baeldung.entitymodule</groupId>
     <artifactId>entitymodule</artifactId>
     <packaging>jar</packaging>
     <version>1.0</version>
     <name>entitymodule</name>
+
+    <parent>
+        <groupId>com.baeldung.multimodule-maven-project</groupId>
+        <artifactId>multimodule-maven-project</artifactId>
+        <version>1.0</version>
+    </parent>
+
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/maven-java-11/multimodule-maven-project/mainppmodule/pom.xml b/maven-java-11/multimodule-maven-project/mainppmodule/pom.xml
index d2c94527f1..3e5ec122ff 100644
--- a/maven-java-11/multimodule-maven-project/mainppmodule/pom.xml
+++ b/maven-java-11/multimodule-maven-project/mainppmodule/pom.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.baeldung.multimodule-maven-project</groupId>
-        <artifactId>multimodule-maven-project</artifactId>
-        <version>1.0</version>
-    </parent>
     <groupId>com.baeldung.mainappmodule</groupId>
     <artifactId>mainappmodule</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
     <name>mainappmodule</name>
+
+    <parent>
+        <groupId>com.baeldung.multimodule-maven-project</groupId>
+        <artifactId>multimodule-maven-project</artifactId>
+        <version>1.0</version>
+    </parent>
     
     <dependencies>
         <dependency>
diff --git a/maven-java-11/multimodule-maven-project/pom.xml b/maven-java-11/multimodule-maven-project/pom.xml
index f22541738c..7e2eb0dd7b 100644
--- a/maven-java-11/multimodule-maven-project/pom.xml
+++ b/maven-java-11/multimodule-maven-project/pom.xml
@@ -6,12 +6,20 @@
     <version>1.0</version>
     <packaging>pom</packaging>
     <name>multimodule-maven-project</name>
+
     <parent>
         <groupId>com.baeldung.maven-java-11</groupId>
         <artifactId>maven-java-11</artifactId>
         <version>1.0</version>
     </parent>
     
+    <modules>
+        <module>entitymodule</module>
+        <module>daomodule</module>
+        <module>userdaomodule</module>
+        <module>mainappmodule</module>
+    </modules>
+    
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -45,13 +53,6 @@
         </pluginManagement>
     </build>
     
-    <modules>
-        <module>entitymodule</module>
-        <module>daomodule</module>
-        <module>userdaomodule</module>
-        <module>mainappmodule</module>
-    </modules>
-    
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/maven-java-11/multimodule-maven-project/userdaomodule/pom.xml b/maven-java-11/multimodule-maven-project/userdaomodule/pom.xml
index b4fe7f0398..68e7ae9b82 100644
--- a/maven-java-11/multimodule-maven-project/userdaomodule/pom.xml
+++ b/maven-java-11/multimodule-maven-project/userdaomodule/pom.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.baeldung.multimodule-maven-project</groupId>
-        <artifactId>multimodule-maven-project</artifactId>
-        <version>1.0</version>
-    </parent>
     <groupId>com.baeldung.userdaomodule</groupId>
     <artifactId>userdaomodule</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
     <name>userdaomodule</name>
+	
+    <parent>
+        <groupId>com.baeldung.multimodule-maven-project</groupId>
+        <artifactId>multimodule-maven-project</artifactId>
+        <version>1.0</version>
+    </parent>
+	
     <dependencies>
         <dependency>
             <groupId>com.baeldung.entitymodule</groupId>
diff --git a/maven-java-11/pom.xml b/maven-java-11/pom.xml
index ff95840523..5ae4c00892 100644
--- a/maven-java-11/pom.xml
+++ b/maven-java-11/pom.xml
@@ -6,14 +6,17 @@
     <version>1.0</version>
     <packaging>pom</packaging>
     <name>maven-java-11</name>
+
     <parent>
-	<artifactId>parent-modules</artifactId>
-	<groupId>com.baeldung</groupId>
-	<version>1.0.0-SNAPSHOT</version>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
+
     <modules>
         <module>multimodule-maven-project</module>
     </modules>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
diff --git a/maven-polyglot/maven-polyglot-json-app/pom.json b/maven-polyglot/maven-polyglot-json-app/pom.json
index abd58f3127..3e809b7b83 100644
--- a/maven-polyglot/maven-polyglot-json-app/pom.json
+++ b/maven-polyglot/maven-polyglot-json-app/pom.json
@@ -5,10 +5,10 @@
   "version": "1.0-SNAPSHOT",
   "name": "Json Maven Polyglot",
   "parent": {
-    "groupId": "org.springframework.boot",
-    "artifactId": "spring-boot-starter-parent",
-    "version": "2.0.5.RELEASE",
-    "relativePath": null
+    "groupId": "com.baeldung",
+    "artifactId": "parent-boot-2",
+    "version": "0.0.1-SNAPSHOT",
+    "relativePath": "../../parent-boot-2"
   },
   "properties": {
     "project.build.sourceEncoding": "UTF-8",
diff --git a/maven-polyglot/maven-polyglot-json-extension/pom.xml b/maven-polyglot/maven-polyglot-json-extension/pom.xml
index 5b18529ec5..1170fe7aa6 100644
--- a/maven-polyglot/maven-polyglot-json-extension/pom.xml
+++ b/maven-polyglot/maven-polyglot-json-extension/pom.xml
@@ -8,17 +8,24 @@
     <version>1.0-SNAPSHOT</version>
 	<name>maven-polyglot-json-extension</name>
 
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.5.4</version>
+            <version>${maven-core.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.6</version>
+            <version>${jackson.version}</version>
         </dependency>
     </dependencies>
 
@@ -42,6 +49,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <maven-core.version>3.5.4</maven-core.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/maven-polyglot/maven-polyglot-yml-app/pom.yml b/maven-polyglot/maven-polyglot-yml-app/pom.yml
index 445e2eec3b..393f7e9e15 100644
--- a/maven-polyglot/maven-polyglot-yml-app/pom.yml
+++ b/maven-polyglot/maven-polyglot-yml-app/pom.yml
@@ -4,4 +4,10 @@ artifactId: maven-polyglot-yml-app
 version: 1.0-SNAPSHOT
 name: 'YAML Demo'
 
+parent: 
+  groupId: "com.baeldung"
+  artifactId: "parent-modules"
+  version: "1.0.0-SNAPSHOT"
+  relativePath: "../.."
+
 properties: {maven.compiler.source: 1.8, maven.compiler.target: 1.8}
\ No newline at end of file
diff --git a/maven/pom.xml b/maven/pom.xml
index 942bf683e2..ef6e7b7d93 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -4,12 +4,19 @@
     <groupId>com.baeldung</groupId>
     <artifactId>maven</artifactId>
     <version>0.0.1-SNAPSHOT</version>
+    <name>maven</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
     <modules>
         <module>custom-rule</module>
         <module>maven-enforcer</module>
     </modules>
-    <name>maven</name>
-    <packaging>pom</packaging>
 
     <dependencies>
         <dependency>
@@ -292,7 +299,6 @@
     </profiles>
 
     <properties>
-        <java.version>1.8</java.version>
         <maven.resources.version>3.0.2</maven.resources.version>
         <maven.compiler.version>3.8.0</maven.compiler.version>
         <maven.surefire.version>2.22.0</maven.surefire.version>
@@ -303,6 +309,5 @@
         <resources.name>Baeldung</resources.name>
         <jetty.version>9.4.11.v20180605</jetty.version>
         <jersey.version>2.27</jersey.version>
-        <junit.version>4.12</junit.version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/maven/versions-maven-plugin/original/pom.xml b/maven/versions-maven-plugin/original/pom.xml
index 7608e4d168..df8ee9a20e 100644
--- a/maven/versions-maven-plugin/original/pom.xml
+++ b/maven/versions-maven-plugin/original/pom.xml
@@ -11,19 +11,19 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.3</version>
+            <version>${commons-io.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
-            <version>4.0</version>
+            <version>${commons-collections4.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.0</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
 
         <dependency>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
-            <version>1.9.1-SNAPSHOT</version>
+            <version>${commons-beanutils.version}</version>
         </dependency>
 
     </dependencies>
@@ -71,6 +71,10 @@
 
     <properties>        
         <commons-compress-version>1.15</commons-compress-version>
+        <commons-io.version>2.3</commons-io.version>
+        <commons-collections4.version>4.0</commons-collections4.version>
+        <commons-lang3.version>3.0</commons-lang3.version>
+        <commons-beanutils.version>1.9.1</commons-beanutils.version>
     </properties>
     	
 </project>
\ No newline at end of file
diff --git a/maven/versions-maven-plugin/pom.xml b/maven/versions-maven-plugin/pom.xml
index dc0cba75f9..e0714bf0e0 100644
--- a/maven/versions-maven-plugin/pom.xml
+++ b/maven/versions-maven-plugin/pom.xml
@@ -6,10 +6,6 @@
     <artifactId>versions-maven-plugin</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 	<name>versions-maven-plugin</name>
-	
-    <properties>        
-        <commons-compress-version>1.15</commons-compress-version>
-    </properties>
 
     <dependencies>
 
@@ -73,5 +69,9 @@
             </snapshots>
         </repository>
     </repositories>
+	
+    <properties>        
+        <commons-compress-version>1.15</commons-compress-version>
+    </properties>
 
 </project>
\ No newline at end of file
diff --git a/msf4j/pom.xml b/msf4j/pom.xml
index 4a6f63159d..2a862ac289 100644
--- a/msf4j/pom.xml
+++ b/msf4j/pom.xml
@@ -23,6 +23,7 @@
 			</dependency>
 		</dependencies>		
 	</dependencyManagement>
+	
 	<dependencies>
 		<dependency>
 			<groupId>org.wso2.msf4j</groupId>
diff --git a/oauth2-framework-impl/oauth2-authorization-server/pom.xml b/oauth2-framework-impl/oauth2-authorization-server/pom.xml
new file mode 100644
index 0000000000..8db2150558
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>oauth2-authorization-server</artifactId>
+    <packaging>war</packaging>
+
+    <parent>
+        <groupId>com.baeldung.oauth2</groupId>
+        <artifactId>oauth2-framework-impl</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <properties>
+        <h2.version>1.4.199</h2.version>
+        <httpPort>9080</httpPort>
+        <httpsPort>9443</httpsPort>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.nimbusds</groupId>
+            <artifactId>nimbus-jose-jwt</artifactId>
+            <version>7.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.62</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+            <version>1.62</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>net.wasdev.wlp.maven.plugins</groupId>
+                <artifactId>liberty-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-h2-dependency</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <artifactItems>
+                        <artifactItem>
+                            <groupId>com.h2database</groupId>
+                            <artifactId>h2</artifactId>
+                            <version>${h2.version}</version>
+                            <type>jar</type>
+                            <outputDirectory>${project.build.directory}/liberty/wlp/usr/shared/resources/
+                            </outputDirectory>
+                        </artifactItem>
+                    </artifactItems>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/OAuth2ServerApplication.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/OAuth2ServerApplication.java
new file mode 100644
index 0000000000..62d6b04464
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/OAuth2ServerApplication.java
@@ -0,0 +1,8 @@
+package com.baeldung.oauth2.authorization.server;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/")
+public class OAuth2ServerApplication extends Application {
+}
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/PEMKeyUtils.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/PEMKeyUtils.java
new file mode 100644
index 0000000000..dab57b91a7
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/PEMKeyUtils.java
@@ -0,0 +1,17 @@
+package com.baeldung.oauth2.authorization.server;
+
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static java.lang.Thread.currentThread;
+
+
+public class PEMKeyUtils {
+
+    public static String readKeyAsString(String keyLocation) throws Exception {
+        URI uri = currentThread().getContextClassLoader().getResource(keyLocation).toURI();
+        byte[] byteArray = Files.readAllBytes(Paths.get(uri));
+        return new String(byteArray);
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/api/AuthorizationEndpoint.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/api/AuthorizationEndpoint.java
new file mode 100644
index 0000000000..ba5e1ec359
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/api/AuthorizationEndpoint.java
@@ -0,0 +1,185 @@
+package com.baeldung.oauth2.authorization.server.api;
+
+import com.baeldung.oauth2.authorization.server.handler.AuthorizationGrantTypeHandler;
+import com.baeldung.oauth2.authorization.server.model.AppDataRepository;
+import com.baeldung.oauth2.authorization.server.model.AuthorizationCode;
+import com.baeldung.oauth2.authorization.server.model.Client;
+import com.baeldung.oauth2.authorization.server.model.User;
+
+import javax.annotation.security.RolesAllowed;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.literal.NamedLiteral;
+import javax.inject.Inject;
+import javax.json.JsonObject;
+import javax.security.enterprise.SecurityContext;
+import javax.security.enterprise.authentication.mechanism.http.FormAuthenticationMechanismDefinition;
+import javax.security.enterprise.authentication.mechanism.http.LoginToContinue;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.*;
+import java.io.IOException;
+import java.net.URI;
+import java.security.Principal;
+import java.time.LocalDateTime;
+import java.util.*;
+
+@FormAuthenticationMechanismDefinition(
+        loginToContinue = @LoginToContinue(loginPage = "/login.jsp", errorPage = "/login.jsp")
+)
+@RolesAllowed("USER")
+@RequestScoped
+@Path("authorize")
+public class AuthorizationEndpoint {
+
+    @Inject
+    private SecurityContext securityContext;
+
+    @Inject
+    private AppDataRepository appDataRepository;
+
+    @Inject
+    Instance<AuthorizationGrantTypeHandler> authorizationGrantTypeHandlers;
+
+    @GET
+    @Produces(MediaType.TEXT_HTML)
+    public Response doGet(@Context HttpServletRequest request,
+                          @Context HttpServletResponse response,
+                          @Context UriInfo uriInfo) throws ServletException, IOException {
+        MultivaluedMap<String, String> params = uriInfo.getQueryParameters();
+        Principal principal = securityContext.getCallerPrincipal();
+
+        //error about redirect_uri && client_id ==> forward user, thus to error.jsp.
+        //otherwise ==> sendRedirect redirect_uri?error=error&error_description=error_description
+        //1. client_id
+        String clientId = params.getFirst("client_id");
+        if (clientId == null || clientId.isEmpty()) {
+            return informUserAboutError(request, response, "Invalid client_id :" + clientId);
+        }
+        Client client = appDataRepository.getClient(clientId);
+        if (client == null) {
+            return informUserAboutError(request, response, "Invalid client_id :" + clientId);
+        }
+        //2. Client Authorized Grant Type
+        String clientError = "";
+        if (client.getAuthorizedGrantTypes() != null && !client.getAuthorizedGrantTypes().contains("authorization_code")) {
+            return informUserAboutError(request, response, "Authorization Grant type, authorization_code, is not allowed for this client :" + clientId);
+        }
+
+        //3. redirectUri
+        String redirectUri = params.getFirst("redirect_uri");
+        if (client.getRedirectUri() != null && !client.getRedirectUri().isEmpty()) {
+            if (redirectUri != null && !redirectUri.isEmpty() && !client.getRedirectUri().equals(redirectUri)) {
+                //sould be in the client.redirectUri
+                return informUserAboutError(request, response, "redirect_uri is pre-registred and should match");
+            }
+            redirectUri = client.getRedirectUri();
+            params.putSingle("resolved_redirect_uri", redirectUri);
+        } else {
+            if (redirectUri == null || redirectUri.isEmpty()) {
+                return informUserAboutError(request, response, "redirect_uri is not pre-registred and should be provided");
+            }
+            params.putSingle("resolved_redirect_uri", redirectUri);
+        }
+        request.setAttribute("client", client);
+
+        //4. response_type
+        String responseType = params.getFirst("response_type");
+        if (!"code".equals(responseType) && !"token".equals(responseType)) {
+            //error = "invalid_grant :" + responseType + ", response_type params should be code or token:";
+            //return informUserAboutError(error);
+        }
+
+        //Save params in session
+        request.getSession().setAttribute("ORIGINAL_PARAMS", params);
+
+        //4.scope: Optional
+        String requestedScope = request.getParameter("scope");
+        if (requestedScope == null || requestedScope.isEmpty()) {
+            requestedScope = client.getScope();
+        }
+        User user = appDataRepository.getUser(principal.getName());
+        String allowedScopes = checkUserScopes(user.getScopes(), requestedScope);
+        request.setAttribute("scopes", allowedScopes);
+
+        request.getRequestDispatcher("/authorize.jsp").forward(request, response);
+        return null;
+    }
+
+    @POST
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    @Produces(MediaType.TEXT_HTML)
+    public Response doPost(@Context HttpServletRequest request,
+                           @Context HttpServletResponse response,
+                           MultivaluedMap<String, String> params) throws Exception {
+        MultivaluedMap<String, String> originalParams = (MultivaluedMap<String, String>) request.getSession().getAttribute("ORIGINAL_PARAMS");
+        if (originalParams == null) {
+            return informUserAboutError(request, response, "No pending authorization request.");
+        }
+        String redirectUri = originalParams.getFirst("resolved_redirect_uri");
+        StringBuilder sb = new StringBuilder(redirectUri);
+
+        String approvalStatus = params.getFirst("approval_status");
+        if ("NO".equals(approvalStatus)) {
+            URI location = UriBuilder.fromUri(sb.toString())
+                    .queryParam("error", "User doesn't approved the request.")
+                    .queryParam("error_description", "User doesn't approved the request.")
+                    .build();
+            return Response.seeOther(location).build();
+        }
+        //==> YES
+        List<String> approvedScopes = params.get("scope");
+        if (approvedScopes == null || approvedScopes.isEmpty()) {
+            URI location = UriBuilder.fromUri(sb.toString())
+                    .queryParam("error", "User doesn't approved the request.")
+                    .queryParam("error_description", "User doesn't approved the request.")
+                    .build();
+            return Response.seeOther(location).build();
+        }
+
+        String responseType = originalParams.getFirst("response_type");
+        String clientId = originalParams.getFirst("client_id");
+        if ("code".equals(responseType)) {
+            String userId = securityContext.getCallerPrincipal().getName();
+            AuthorizationCode authorizationCode = new AuthorizationCode();
+            authorizationCode.setClientId(clientId);
+            authorizationCode.setUserId(userId);
+            authorizationCode.setApprovedScopes(String.join(" ", approvedScopes));
+            authorizationCode.setExpirationDate(LocalDateTime.now().plusMinutes(10));
+            authorizationCode.setRedirectUri(redirectUri);
+            appDataRepository.save(authorizationCode);
+            String code = authorizationCode.getCode();
+            sb.append("?code=").append(code);
+        } else {
+            //Implicit: responseType=token
+            AuthorizationGrantTypeHandler authorizationGrantTypeHandler = authorizationGrantTypeHandlers.select(NamedLiteral.of("implicit")).get();
+            JsonObject tokenResponse = authorizationGrantTypeHandler.createAccessToken(clientId, params);
+            sb.append("#access_token=").append(tokenResponse.getString("access_token"))
+                    .append("&token_type=").append(tokenResponse.getString("token_type"))
+                    .append("&scope=").append(tokenResponse.getString("scope"));
+        }
+        String state = originalParams.getFirst("state");
+        if (state != null) {
+            sb.append("&state=").append(state);
+        }
+        return Response.seeOther(UriBuilder.fromUri(sb.toString()).build()).build();
+    }
+
+    private String checkUserScopes(String userScopes, String requestedScope) {
+        Set<String> allowedScopes = new LinkedHashSet<>();
+        Set<String> rScopes = new HashSet(Arrays.asList(requestedScope.split(" ")));
+        Set<String> uScopes = new HashSet(Arrays.asList(userScopes.split(" ")));
+        for (String scope : uScopes) {
+            if (rScopes.contains(scope)) allowedScopes.add(scope);
+        }
+        return String.join(" ", allowedScopes);
+    }
+
+    private Response informUserAboutError(HttpServletRequest request, HttpServletResponse response, String error) throws ServletException, IOException {
+        request.setAttribute("error", error);
+        request.getRequestDispatcher("/error.jsp").forward(request, response);
+        return null;
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/api/JWKEndpoint.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/api/JWKEndpoint.java
new file mode 100644
index 0000000000..9d38c823b9
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/api/JWKEndpoint.java
@@ -0,0 +1,38 @@
+package com.baeldung.oauth2.authorization.server.api;
+
+import com.baeldung.oauth2.authorization.server.PEMKeyUtils;
+import com.nimbusds.jose.jwk.JWK;
+import org.eclipse.microprofile.config.Config;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.Arrays;
+
+@Path("jwk")
+@ApplicationScoped
+public class JWKEndpoint {
+
+    @Inject
+    private Config config;
+
+    @GET
+    public Response getKey(@QueryParam("format") String format) throws Exception {
+        if (format != null && !Arrays.asList("jwk", "pem").contains(format)) {
+            return Response.status(Response.Status.BAD_REQUEST).entity("Public Key Format should be : jwk or pem").build();
+        }
+        String verificationkey = config.getValue("verificationkey", String.class);
+        String pemEncodedRSAPublicKey = PEMKeyUtils.readKeyAsString(verificationkey);
+        if (format == null || format.equals("jwk")) {
+            JWK jwk = JWK.parseFromPEMEncodedObjects(pemEncodedRSAPublicKey);
+            return Response.ok(jwk.toJSONString()).type(MediaType.APPLICATION_JSON).build();
+        } else if (format.equals("pem")) {
+            return Response.ok(pemEncodedRSAPublicKey).build();
+        }
+        return null;
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/api/TokenEndpoint.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/api/TokenEndpoint.java
new file mode 100644
index 0000000000..0ea12da16e
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/api/TokenEndpoint.java
@@ -0,0 +1,94 @@
+package com.baeldung.oauth2.authorization.server.api;
+
+import com.baeldung.oauth2.authorization.server.handler.AuthorizationGrantTypeHandler;
+import com.baeldung.oauth2.authorization.server.model.AppDataRepository;
+import com.baeldung.oauth2.authorization.server.model.Client;
+import com.nimbusds.jose.JOSEException;
+
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.literal.NamedLiteral;
+import javax.inject.Inject;
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.ws.rs.*;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.List;
+
+@Path("token")
+public class TokenEndpoint {
+
+    List<String> supportedGrantTypes = Arrays.asList("authorization_code", "refresh_token");
+
+    @Inject
+    private AppDataRepository appDataRepository;
+
+    @Inject
+    Instance<AuthorizationGrantTypeHandler> authorizationGrantTypeHandlers;
+
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    public Response token(MultivaluedMap<String, String> params,
+                          @HeaderParam(HttpHeaders.AUTHORIZATION) String authHeader) throws JOSEException {
+
+        //Check grant_type params
+        String grantType = params.getFirst("grant_type");
+        if (grantType == null || grantType.isEmpty())
+            return responseError("Invalid_request", "grant_type is required", Response.Status.BAD_REQUEST);
+
+        if (!supportedGrantTypes.contains(grantType)) {
+            return responseError("unsupported_grant_type", "grant_type should be one of :" + supportedGrantTypes, Response.Status.BAD_REQUEST);
+        }
+
+        //Client Authentication
+        String[] clientCredentials = extract(authHeader);
+        if (clientCredentials.length != 2) {
+            return responseError("Invalid_request", "Bad Credentials client_id/client_secret", Response.Status.BAD_REQUEST);
+        }
+        String clientId = clientCredentials[0];
+        Client client = appDataRepository.getClient(clientId);
+        if (client == null) {
+            return responseError("Invalid_request", "Invalid client_id", Response.Status.BAD_REQUEST);
+        }
+        String clientSecret = clientCredentials[1];
+        if (!clientSecret.equals(client.getClientSecret())) {
+            return responseError("Invalid_request", "Invalid client_secret", Response.Status.UNAUTHORIZED);
+        }
+
+        AuthorizationGrantTypeHandler authorizationGrantTypeHandler = authorizationGrantTypeHandlers.select(NamedLiteral.of(grantType)).get();
+        JsonObject tokenResponse = null;
+        try {
+            tokenResponse = authorizationGrantTypeHandler.createAccessToken(clientId, params);
+        } catch (WebApplicationException e) {
+            return e.getResponse();
+        } catch (Exception e) {
+            return responseError("Invalid_request", "Can't get token", Response.Status.INTERNAL_SERVER_ERROR);
+        }
+
+        return Response.ok(tokenResponse)
+                .header("Cache-Control", "no-store")
+                .header("Pragma", "no-cache")
+                .build();
+    }
+
+    private String[] extract(String authHeader) {
+        if (authHeader != null && authHeader.startsWith("Basic ")) {
+            return new String(Base64.getDecoder().decode(authHeader.substring(6))).split(":");
+        }
+        return new String[]{};
+    }
+
+    private Response responseError(String error, String errorDescription, Response.Status status) {
+        JsonObject errorResponse = Json.createObjectBuilder()
+                .add("error", error)
+                .add("error_description", errorDescription)
+                .build();
+        return Response.status(status)
+                .entity(errorResponse).build();
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/handler/AbstractGrantTypeHandler.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/handler/AbstractGrantTypeHandler.java
new file mode 100644
index 0000000000..324bacb33f
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/handler/AbstractGrantTypeHandler.java
@@ -0,0 +1,87 @@
+package com.baeldung.oauth2.authorization.server.handler;
+
+import com.baeldung.oauth2.authorization.server.PEMKeyUtils;
+import com.nimbusds.jose.*;
+import com.nimbusds.jose.crypto.RSASSASigner;
+import com.nimbusds.jose.crypto.RSASSAVerifier;
+import com.nimbusds.jose.jwk.JWK;
+import com.nimbusds.jose.jwk.RSAKey;
+import com.nimbusds.jwt.JWTClaimsSet;
+import com.nimbusds.jwt.SignedJWT;
+import org.eclipse.microprofile.config.Config;
+
+import javax.inject.Inject;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.UUID;
+
+public abstract class AbstractGrantTypeHandler implements AuthorizationGrantTypeHandler {
+
+    //Always RSA 256, but could be parametrized
+    protected JWSHeader jwsHeader = new JWSHeader.Builder(JWSAlgorithm.RS256).type(JOSEObjectType.JWT).build();
+
+    @Inject
+    protected Config config;
+
+    //30 min
+    protected Long expiresInMin = 30L;
+
+    protected JWSVerifier getJWSVerifier() throws Exception {
+        String verificationkey = config.getValue("verificationkey", String.class);
+        String pemEncodedRSAPublicKey = PEMKeyUtils.readKeyAsString(verificationkey);
+        RSAKey rsaPublicKey = (RSAKey) JWK.parseFromPEMEncodedObjects(pemEncodedRSAPublicKey);
+        return new RSASSAVerifier(rsaPublicKey);
+    }
+
+    protected JWSSigner getJwsSigner() throws Exception {
+        String signingkey = config.getValue("signingkey", String.class);
+        String pemEncodedRSAPrivateKey = PEMKeyUtils.readKeyAsString(signingkey);
+        RSAKey rsaKey = (RSAKey) JWK.parseFromPEMEncodedObjects(pemEncodedRSAPrivateKey);
+        return new RSASSASigner(rsaKey.toRSAPrivateKey());
+    }
+
+    protected String getAccessToken(String clientId, String subject, String approvedScope) throws Exception {
+        //4. Signing
+        JWSSigner jwsSigner = getJwsSigner();
+
+        Instant now = Instant.now();
+        //Long expiresInMin = 30L;
+        Date expirationTime = Date.from(now.plus(expiresInMin, ChronoUnit.MINUTES));
+
+        //3. JWT Payload or claims
+        JWTClaimsSet jwtClaims = new JWTClaimsSet.Builder()
+                .issuer("http://localhost:9080")
+                .subject(subject)
+                .claim("upn", subject)
+                .claim("client_id", clientId)
+                .audience("http://localhost:9280")
+                .claim("scope", approvedScope)
+                .claim("groups", Arrays.asList(approvedScope.split(" ")))
+                .expirationTime(expirationTime) // expires in 30 minutes
+                .notBeforeTime(Date.from(now))
+                .issueTime(Date.from(now))
+                .jwtID(UUID.randomUUID().toString())
+                .build();
+        SignedJWT signedJWT = new SignedJWT(jwsHeader, jwtClaims);
+        signedJWT.sign(jwsSigner);
+        return signedJWT.serialize();
+    }
+
+    protected String getRefreshToken(String clientId, String subject, String approvedScope) throws Exception {
+        JWSSigner jwsSigner = getJwsSigner();
+        Instant now = Instant.now();
+        //6.Build refresh token
+        JWTClaimsSet refreshTokenClaims = new JWTClaimsSet.Builder()
+                .subject(subject)
+                .claim("client_id", clientId)
+                .claim("scope", approvedScope)
+                //refresh token for 1 day.
+                .expirationTime(Date.from(now.plus(1, ChronoUnit.DAYS)))
+                .build();
+        SignedJWT signedRefreshToken = new SignedJWT(jwsHeader, refreshTokenClaims);
+        signedRefreshToken.sign(jwsSigner);
+        return signedRefreshToken.serialize();
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/handler/AuthorizationCodeGrantTypeHandler.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/handler/AuthorizationCodeGrantTypeHandler.java
new file mode 100644
index 0000000000..78128aead6
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/handler/AuthorizationCodeGrantTypeHandler.java
@@ -0,0 +1,54 @@
+package com.baeldung.oauth2.authorization.server.handler;
+
+import com.baeldung.oauth2.authorization.server.model.AuthorizationCode;
+
+import javax.inject.Named;
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MultivaluedMap;
+import java.time.LocalDateTime;
+
+@Named("authorization_code")
+public class AuthorizationCodeGrantTypeHandler extends AbstractGrantTypeHandler {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Override
+    public JsonObject createAccessToken(String clientId, MultivaluedMap<String, String> params) throws Exception {
+        //1. code is required
+        String code = params.getFirst("code");
+        if (code == null || "".equals(code)) {
+            throw new WebApplicationException("invalid_grant");
+        }
+        AuthorizationCode authorizationCode = entityManager.find(AuthorizationCode.class, code);
+        if (!authorizationCode.getExpirationDate().isAfter(LocalDateTime.now())) {
+            throw new WebApplicationException("code Expired !");
+        }
+        String redirectUri = params.getFirst("redirect_uri");
+        //redirecturi match
+        if (authorizationCode.getRedirectUri() != null && !authorizationCode.getRedirectUri().equals(redirectUri)) {
+            //redirectUri params should be the same as the requested redirectUri.
+            throw new WebApplicationException("invalid_grant");
+        }
+        //client match
+        if (!clientId.equals(authorizationCode.getClientId())) {
+            throw new WebApplicationException("invalid_grant");
+        }
+
+        //3. JWT Payload or claims
+        String accessToken = getAccessToken(clientId, authorizationCode.getUserId(), authorizationCode.getApprovedScopes());
+        String refreshToken = getRefreshToken(clientId, authorizationCode.getUserId(), authorizationCode.getApprovedScopes());
+
+        return Json.createObjectBuilder()
+                .add("token_type", "Bearer")
+                .add("access_token", accessToken)
+                .add("expires_in", expiresInMin * 60)
+                .add("scope", authorizationCode.getApprovedScopes())
+                .add("refresh_token", refreshToken)
+                .build();
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/handler/AuthorizationGrantTypeHandler.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/handler/AuthorizationGrantTypeHandler.java
new file mode 100644
index 0000000000..a5afe293ef
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/handler/AuthorizationGrantTypeHandler.java
@@ -0,0 +1,8 @@
+package com.baeldung.oauth2.authorization.server.handler;
+
+import javax.json.JsonObject;
+import javax.ws.rs.core.MultivaluedMap;
+
+public interface AuthorizationGrantTypeHandler {
+    JsonObject createAccessToken(String clientId, MultivaluedMap<String, String> params) throws Exception;
+}
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/handler/RefreshTokenGrantTypeHandler.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/handler/RefreshTokenGrantTypeHandler.java
new file mode 100644
index 0000000000..63e3552353
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/handler/RefreshTokenGrantTypeHandler.java
@@ -0,0 +1,72 @@
+package com.baeldung.oauth2.authorization.server.handler;
+
+import com.nimbusds.jose.JWSVerifier;
+import com.nimbusds.jwt.SignedJWT;
+
+import javax.inject.Named;
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+@Named("refresh_token")
+public class RefreshTokenGrantTypeHandler extends AbstractGrantTypeHandler {
+
+    @Override
+    public JsonObject createAccessToken(String clientId, MultivaluedMap<String, String> params) throws Exception {
+        String refreshToken = params.getFirst("refresh_token");
+        if (refreshToken == null || "".equals(refreshToken)) {
+            throw new WebApplicationException("invalid_grant");
+        }
+
+        //Decode refresh token
+        SignedJWT signedRefreshToken = SignedJWT.parse(refreshToken);
+        JWSVerifier verifier = getJWSVerifier();
+
+        if (!signedRefreshToken.verify(verifier)) {
+            throw new WebApplicationException("Invalid refresh token.");
+        }
+        if (!(new Date().before(signedRefreshToken.getJWTClaimsSet().getExpirationTime()))) {
+            throw new WebApplicationException("Refresh token expired.");
+        }
+        String refreshTokenClientId = signedRefreshToken.getJWTClaimsSet().getStringClaim("client_id");
+        if (!clientId.equals(refreshTokenClientId)) {
+            throw new WebApplicationException("Invalid client_id.");
+        }
+
+        //At this point, the refresh token is valid and not yet expired
+        //So create a new access token from it.
+        String subject = signedRefreshToken.getJWTClaimsSet().getSubject();
+        String approvedScopes = signedRefreshToken.getJWTClaimsSet().getStringClaim("scope");
+
+        String requestedScopes = params.getFirst("scope");
+        if (requestedScopes != null && !requestedScopes.isEmpty()) {
+            Set<String> rScopes = new HashSet(Arrays.asList(requestedScopes.split(" ")));
+            Set<String> aScopes = new HashSet(Arrays.asList(approvedScopes.split(" ")));
+            if (!aScopes.containsAll(rScopes)) {
+                JsonObject error = Json.createObjectBuilder()
+                        .add("error", "Invalid_request")
+                        .add("error_description", "Requested scopes should be a subset of the original scopes.")
+                        .build();
+                Response response = Response.status(Response.Status.BAD_REQUEST).entity(error).build();
+                throw new WebApplicationException(response);
+            }
+        } else {
+            requestedScopes = approvedScopes;
+        }
+
+        String accessToken = getAccessToken(clientId, subject, requestedScopes);
+        return Json.createObjectBuilder()
+                .add("token_type", "Bearer")
+                .add("access_token", accessToken)
+                .add("expires_in", expiresInMin * 60)
+                .add("scope", requestedScopes)
+                .add("refresh_token", refreshToken)
+                .build();
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/model/AppDataRepository.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/model/AppDataRepository.java
new file mode 100644
index 0000000000..6b827d6a3d
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/model/AppDataRepository.java
@@ -0,0 +1,27 @@
+package com.baeldung.oauth2.authorization.server.model;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.transaction.Transactional;
+
+@ApplicationScoped
+public class AppDataRepository {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    public Client getClient(String clientId) {
+        return entityManager.find(Client.class, clientId);
+    }
+
+    public User getUser(String userId) {
+        return entityManager.find(User.class, userId);
+    }
+
+    @Transactional
+    public AuthorizationCode save(AuthorizationCode authorizationCode) {
+        entityManager.persist(authorizationCode);
+        return authorizationCode;
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/model/AuthorizationCode.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/model/AuthorizationCode.java
new file mode 100644
index 0000000000..a2ec088eb9
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/model/AuthorizationCode.java
@@ -0,0 +1,73 @@
+package com.baeldung.oauth2.authorization.server.model;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "authorization_code")
+public class AuthorizationCode {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "code")
+    private String code;
+    @Column(name = "client_id")
+    private String clientId;
+    @Column(name = "user_id")
+    private String userId;
+    @Column(name = "approved_scopes")
+    private String approvedScopes;
+
+    @Column(name = "redirect_uri")
+    private String redirectUri;
+
+    @Column(name = "expiration_date")
+    private LocalDateTime expirationDate;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String username) {
+        this.userId = username;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getApprovedScopes() {
+        return approvedScopes;
+    }
+
+    public void setApprovedScopes(String approvedScopes) {
+        this.approvedScopes = approvedScopes;
+    }
+
+    public String getRedirectUri() {
+        return redirectUri;
+    }
+
+    public void setRedirectUri(String redirectUri) {
+        this.redirectUri = redirectUri;
+    }
+
+    public LocalDateTime getExpirationDate() {
+        return expirationDate;
+    }
+
+    public void setExpirationDate(LocalDateTime expirationDate) {
+        this.expirationDate = expirationDate;
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/model/Client.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/model/Client.java
new file mode 100644
index 0000000000..9b5ad2f904
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/model/Client.java
@@ -0,0 +1,62 @@
+package com.baeldung.oauth2.authorization.server.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "clients")
+public class Client {
+    @Id
+    @Column(name = "client_id")
+    private String clientId;
+    @Column(name = "client_secret")
+    private String clientSecret;
+    @Column(name = "redirect_uri")
+    private String redirectUri;
+    @Column(name = "scope")
+    private String scope;
+    @Column(name = "authorized_grant_types")
+    private String authorizedGrantTypes;
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public String getClientSecret() {
+        return clientSecret;
+    }
+
+    public void setClientSecret(String clientSecret) {
+        this.clientSecret = clientSecret;
+    }
+
+    public String getRedirectUri() {
+        return redirectUri;
+    }
+
+    public void setRedirectUri(String redirectUri) {
+        this.redirectUri = redirectUri;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
+
+    public String getAuthorizedGrantTypes() {
+        return authorizedGrantTypes;
+    }
+
+    public void setAuthorizedGrantTypes(String authorizedGrantTypes) {
+        this.authorizedGrantTypes = authorizedGrantTypes;
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/model/User.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/model/User.java
new file mode 100644
index 0000000000..b3821715f4
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/model/User.java
@@ -0,0 +1,58 @@
+package com.baeldung.oauth2.authorization.server.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.security.Principal;
+
+@Entity
+@Table(name = "users")
+public class User implements Principal {
+    @Id
+    @Column(name = "user_id")
+    private String userId;
+    @Column(name = "password")
+    private String password;
+    @Column(name = "roles")
+    private String roles;
+    @Column(name = "scopes")
+    private String scopes;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String username) {
+        this.userId = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getRoles() {
+        return roles;
+    }
+
+    public void setRoles(String roles) {
+        this.roles = roles;
+    }
+
+    public String getScopes() {
+        return scopes;
+    }
+
+    public void setScopes(String scopes) {
+        this.scopes = scopes;
+    }
+
+    @Override
+    public String getName() {
+        return getUserId();
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/security/UserIdentityStore.java b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/security/UserIdentityStore.java
new file mode 100644
index 0000000000..a32ab32cd4
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/java/com/baeldung/oauth2/authorization/server/security/UserIdentityStore.java
@@ -0,0 +1,37 @@
+package com.baeldung.oauth2.authorization.server.security;
+
+import com.baeldung.oauth2.authorization.server.model.AppDataRepository;
+import com.baeldung.oauth2.authorization.server.model.User;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.security.enterprise.credential.Credential;
+import javax.security.enterprise.credential.UsernamePasswordCredential;
+import javax.security.enterprise.identitystore.CredentialValidationResult;
+import javax.security.enterprise.identitystore.IdentityStore;
+import javax.transaction.Transactional;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Objects;
+
+import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT;
+
+@ApplicationScoped
+@Transactional
+public class UserIdentityStore implements IdentityStore {
+
+    @Inject
+    private AppDataRepository appDataRepository;
+
+    @Override
+    public CredentialValidationResult validate(Credential credential) {
+        UsernamePasswordCredential usernamePasswordCredential = (UsernamePasswordCredential) credential;
+        String userId = usernamePasswordCredential.getCaller();
+        User user = appDataRepository.getUser(userId);
+        Objects.requireNonNull(user, "User should be not null");
+        if (usernamePasswordCredential.getPasswordAsString().equals(user.getPassword())) {
+            return new CredentialValidationResult(userId, new HashSet<>(Arrays.asList(user.getRoles().split(","))));
+        }
+        return INVALID_RESULT;
+    }
+}
\ No newline at end of file
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/liberty/config/server.xml b/oauth2-framework-impl/oauth2-authorization-server/src/main/liberty/config/server.xml
new file mode 100644
index 0000000000..97d9ec4a28
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/liberty/config/server.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server description="${project.artifactId}">
+
+    <featureManager>
+        <feature>localConnector-1.0</feature>
+        <feature>cdi-2.0</feature>
+        <feature>jaxrs-2.1</feature>
+        <feature>jpa-2.2</feature>
+        <feature>appSecurity-3.0</feature>
+        <feature>jsp-2.3</feature>
+        <feature>mpConfig-1.3</feature>
+    </featureManager>
+
+    <httpEndpoint id="defaultHttpEndpoint" httpPort="${httpPort}" httpsPort="${httpsPort}"/>
+
+    <library id="H2_JDBC_Lib">
+        <fileset dir="${shared.resource.dir}" includes="h2*.jar"/>
+    </library>
+    <dataSource id="oauth2datasource" jndiName="jdbc/OAuth2_DS">
+        <jdbcDriver
+                javax.sql.XADataSource="org.h2.jdbcx.JdbcDataSource"
+                javax.sql.ConnectionPoolDataSource="org.h2.jdbcx.JdbcDataSource"
+                javax.sql.DataSource="org.h2.jdbcx.JdbcDataSource"
+                libraryRef="H2_JDBC_Lib"/>
+        <properties url="jdbc:h2:mem:OAuth2_DB" user="sa" password=""/>
+    </dataSource>
+
+    <applicationManager autoExpand="true"/>
+    <applicationMonitor updateTrigger="mbean"/>
+    <application type="war" location="${project.build.finalName}.war" context-root="/"/>
+
+</server>
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/resources/META-INF/microprofile-config.properties b/oauth2-framework-impl/oauth2-authorization-server/src/main/resources/META-INF/microprofile-config.properties
new file mode 100644
index 0000000000..d9c68bc111
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/resources/META-INF/microprofile-config.properties
@@ -0,0 +1,2 @@
+signingkey=/META-INF/private-key.pem
+verificationkey=/META-INF/public-key.pem
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/resources/META-INF/persistence.xml b/oauth2-framework-impl/oauth2-authorization-server/src/main/resources/META-INF/persistence.xml
new file mode 100644
index 0000000000..a10ad3c886
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.2"
+             xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
+                        http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
+    <persistence-unit name="jpa-oauth2-pu" transaction-type="JTA">
+        <jta-data-source>jdbc/OAuth2_DS</jta-data-source>
+        <properties>
+            <property name="javax.persistence.schema-generation.database.action" value="create"/>
+            <property name="javax.persistence.sql-load-script-source" value="data.sql"/>
+        </properties>
+    </persistence-unit>
+</persistence>
\ No newline at end of file
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/resources/META-INF/private-key.pem b/oauth2-framework-impl/oauth2-authorization-server/src/main/resources/META-INF/private-key.pem
new file mode 100644
index 0000000000..6e36cb4d78
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/resources/META-INF/private-key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDYizUyvwY6qMd0
+ZkYPzP9mLTJOSczW8WtAbjhrgxk5LORIjcdv/aB1BAzDEOCX4UC+Rbs9YwaekIvW
+7dL/t6xPzsA7+9tMt27TqUxXigWEFQG73w/WbEVzCG09IHqG7Ztjb6aGL+8pfcu+
+SLvOtXWrctHNbr35BYC5yBQaos9bH+nLYbh2Ff+emrpg7Kwoeis6MY6RgZIL/lxt
+3beZt1NQhLEvB9t6XoSkyLQKSjT/OC8XOa4OYI4OfOSFqEUEp+8dKe3svZbQUNJf
+KKehx78xx0rfwH+iBsFKkHdvt1ZHtINvYedAfGrc5rWnesunzOW7OKMAiIXAJSRA
+rn9Iv5/fAgMBAAECggEAYHKwgSfAGIRwQhIDhqoh31qmG2SXjez9fjcZfhloNKUg
+EIjFmcX3n+br4D42Kq+zbIwWd6MRobJz9oj6/9bJMsq9qHnnFWZmQHQZgqwBBPFu
+UkVqAnE7BZ9tOFqs+EgAe+uQ2hejiHF1PA2dSNZd0L1VYRDAIJgo25aYDb0Sal0c
+qaFmK1XzPnSIhgnopKP/TmUfALjeshtGvh6WkiXHTY2VKJlyLEiGd3/1tBZnzwSQ
+QiS/2zfXL7lO0SYRA10m1BmtqGi3wSKIXUA6tNulmpXEMnYk4RtsqBClOanzQIm7
+f4Ie59AtUUlDdHzRmhxBaDprgAI/FdCxXkseLzk5sQKBgQDyptOhJ/VQ5tkgffJW
+X2QwGIaNdvNCEL4GlgXKAWNkCzT4h+Q/2wFoKhaN2JH2YZwKCRwG/UZh4Hq22fdx
+fa/DP8PK3zlX0c9dWQOtmBOe0/nG28kq9iqziP3ILLNuelfaMhxtRkUmR652VCzx
+qazZmjoo2MxtA6BMiK3Vx5aikwKBgQDkdLalVveHKTVkrplQYNapQAtAwjlsNnMt
+VJh6nLo3eOg1xBNA7JrYqx7sXRQInUGAyNKvgQL/lCQdMkTzyetLjJGsiFSEgeot
+RMsDXBrJFYZiErbpQungpaevwAymaGi++nbCzhw1/n3AvVUhRKNknX8Ms0UKlLRZ
+TCktCTChBQKBgGA7ZzzHgxPFqaCoMl6s0Cf+4gXigdDWoPYtszgM2uUHSMez5QKq
+EWHFJ1Kz7BdBWMfmGvZupeYVR7WStf6NcRJHDJg9dRlt/QYxUjMbV9Sqjqmd6qce
+H4s6LiOgDr0mygafzwRLVQs8bGVDNtvUhdd6wcwHRvOI957CqeZZlFT/AoGBAN2P
+j79EW6U6wuyVJF0+vZDBauhwNQ6MtCEnZQWs0DCSUuop8d5KWVZ+huwGzTIZiPhk
+S2goP4cs3eVu5k5k6oyHlJP2V7l24WzrxdPJVLTl6kFdEwWgfn//SGR7ZglRQxzM
+fbcp+1QmL0FonZI5JhmjYR8pEXFUjJ/57AkgW4gdAoGASV3TlaNd+reb2l0kETqp
+HrzzMIYkM2faZ8LmpcEO0wz606SK468bnl6SqVBYT2J0bkqCpEmPBtWs/OFCWd6x
+93NndSfJk57/7AqNxfVyZWp2sjRzt5vZ4KPlRVvMHIGeJNbIV7RqUr6XGu+u3ZrS
+B7SqwKZqdHVSULG9nMK7Iz8=
+-----END PRIVATE KEY-----
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/resources/META-INF/public-key.pem b/oauth2-framework-impl/oauth2-authorization-server/src/main/resources/META-INF/public-key.pem
new file mode 100644
index 0000000000..f53ceca446
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/resources/META-INF/public-key.pem
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Is1Mr8GOqjHdGZGD8z/
+Zi0yTknM1vFrQG44a4MZOSzkSI3Hb/2gdQQMwxDgl+FAvkW7PWMGnpCL1u3S/7es
+T87AO/vbTLdu06lMV4oFhBUBu98P1mxFcwhtPSB6hu2bY2+mhi/vKX3Lvki7zrV1
+q3LRzW69+QWAucgUGqLPWx/py2G4dhX/npq6YOysKHorOjGOkYGSC/5cbd23mbdT
+UISxLwfbel6EpMi0Cko0/zgvFzmuDmCODnzkhahFBKfvHSnt7L2W0FDSXyinoce/
+McdK38B/ogbBSpB3b7dWR7SDb2HnQHxq3Oa1p3rLp8zluzijAIiFwCUkQK5/SL+f
+3wIDAQAB
+-----END PUBLIC KEY-----
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/resources/data.sql b/oauth2-framework-impl/oauth2-authorization-server/src/main/resources/data.sql
new file mode 100644
index 0000000000..ecda0fa2ad
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/resources/data.sql
@@ -0,0 +1,3 @@
+INSERT INTO `users` (`user_id`, `password`, `roles`, `scopes`) VALUES ('appuser', 'appusersecret', 'USER', 'resource.read resource.write');
+
+INSERT INTO `clients` (`client_id`, `client_secret`, `redirect_uri`,`scope`,`authorized_grant_types`) VALUES ('webappclient', 'webappclientsecret', 'http://localhost:9180/callback', 'resource.read resource.write', 'authorization_code refresh_token');
\ No newline at end of file
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/webapp/WEB-INF/beans.xml b/oauth2-framework-impl/oauth2-authorization-server/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 0000000000..29595ff490
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+       bean-discovery-mode="all">
+</beans>
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/webapp/authorize.jsp b/oauth2-framework-impl/oauth2-authorization-server/src/main/webapp/authorize.jsp
new file mode 100644
index 0000000000..41b0582c03
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/webapp/authorize.jsp
@@ -0,0 +1,54 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<html>
+<head>
+    <title>Authorization</title>
+    <style>
+        input[type=submit]{
+            width: 25%;
+            padding: 4px 0px;
+            display: inline-block;
+            border: 1px solid #ccc;
+            box-sizing: border-box;
+        }
+
+        .container {
+            width: 75%;
+            padding: 25px;
+            border: 1px solid #ccc;
+            background: beige;
+        }
+
+    </style>
+</head>
+<body>
+
+<div class="container">
+    <p><h3>Want to Authorize scopes for client : ${client.clientId} ?</h3></p>
+    <hr>
+
+    <form method="post" action="authorize">
+        <table>
+            <tr>
+                <td valign="top">Scopes :</td>
+                <td>
+                    <c:forTokens items="${scopes}" delims=" " var="scope">
+                        <input type="checkbox" name="scope" value="${scope}">${scope}</input><br/>
+                    </c:forTokens>
+                </td>
+            </tr>
+
+            <tr>
+                <td colspan="2">
+                    <input type="submit" name="approval_status" value="YES"/>
+                    <input type="submit" name="approval_status" value="NO"/>
+                </td>
+            </tr>
+        </table>
+    </form>
+
+</div>
+
+</body>
+</html>
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/webapp/error.jsp b/oauth2-framework-impl/oauth2-authorization-server/src/main/webapp/error.jsp
new file mode 100644
index 0000000000..edb0bf28b7
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/webapp/error.jsp
@@ -0,0 +1,25 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %>
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+    <title>Error</title>
+</head>
+
+<style>
+    .container {
+        padding: 16px;
+        border: 1px solid #ccc;
+        background: #f57007;
+    }
+</style>
+
+<body>
+
+<div class="container">
+    <p>${error}</p>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-apache-camel/src/test/destination-folder/2016-12-18 22-00-11File1.txt b/oauth2-framework-impl/oauth2-authorization-server/src/main/webapp/login-error.jsp
similarity index 100%
rename from spring-apache-camel/src/test/destination-folder/2016-12-18 22-00-11File1.txt
rename to oauth2-framework-impl/oauth2-authorization-server/src/main/webapp/login-error.jsp
diff --git a/oauth2-framework-impl/oauth2-authorization-server/src/main/webapp/login.jsp b/oauth2-framework-impl/oauth2-authorization-server/src/main/webapp/login.jsp
new file mode 100644
index 0000000000..1d2dd93fd0
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-authorization-server/src/main/webapp/login.jsp
@@ -0,0 +1,49 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+    <title>Login Form</title>
+</head>
+<style>
+    input[type=text], input[type=password] {
+        width: 75%;
+        padding: 4px 0px;
+        display: inline-block;
+        border: 1px solid #ccc;
+        box-sizing: border-box;
+    }
+    .container {
+        width: 50%;
+        padding: 16px;
+        border: 1px solid #ccc;
+        background: beige;
+    }
+
+</style>
+<body>
+
+<div class="container">
+    <p>Login Form</p>
+    <hr>
+    <form id="loginform" action="j_security_check" method="post">
+        <table style="with: 50%">
+            <tr>
+                <td width="20%">Username</td>
+                <td><input type="text" name="j_username"/></td>
+            </tr>
+            <tr>
+                <td width="20%">Password</td>
+                <td><input type="password" name="j_password"/></td>
+            </tr>
+            <tr>
+                <td width="20%"></td>
+                <td><input type="submit" value="Login"/></td>
+            </tr>
+        </table>
+    </form>
+
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/oauth2-framework-impl/oauth2-client/pom.xml b/oauth2-framework-impl/oauth2-client/pom.xml
new file mode 100644
index 0000000000..e46a44268e
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-client/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>oauth2-client</artifactId>
+    <packaging>war</packaging>
+
+    <parent>
+        <groupId>com.baeldung.oauth2</groupId>
+        <artifactId>oauth2-framework-impl</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <properties>
+        <httpPort>9180</httpPort>
+        <httpsPort>9543</httpsPort>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>net.wasdev.wlp.maven.plugins</groupId>
+                <artifactId>liberty-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/oauth2-framework-impl/oauth2-client/src/main/java/com/baeldung/oauth2/client/AbstractServlet.java b/oauth2-framework-impl/oauth2-client/src/main/java/com/baeldung/oauth2/client/AbstractServlet.java
new file mode 100644
index 0000000000..7059c4f7e1
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-client/src/main/java/com/baeldung/oauth2/client/AbstractServlet.java
@@ -0,0 +1,23 @@
+package com.baeldung.oauth2.client;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Base64;
+
+public abstract class AbstractServlet extends HttpServlet {
+
+    protected void dispatch(String location, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        RequestDispatcher requestDispatcher = request.getRequestDispatcher(location);
+        requestDispatcher.forward(request, response);
+    }
+
+    protected String getAuthorizationHeaderValue(String clientId, String clientSecret) {
+        String token = clientId + ":" + clientSecret;
+        String encodedString = Base64.getEncoder().encodeToString(token.getBytes());
+        return "Basic " + encodedString;
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-client/src/main/java/com/baeldung/oauth2/client/AuthorizationCodeServlet.java b/oauth2-framework-impl/oauth2-client/src/main/java/com/baeldung/oauth2/client/AuthorizationCodeServlet.java
new file mode 100644
index 0000000000..a5fdaf07f2
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-client/src/main/java/com/baeldung/oauth2/client/AuthorizationCodeServlet.java
@@ -0,0 +1,39 @@
+package com.baeldung.oauth2.client;
+
+import org.eclipse.microprofile.config.Config;
+
+import javax.inject.Inject;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.UUID;
+
+@WebServlet(urlPatterns = "/authorize")
+public class AuthorizationCodeServlet extends HttpServlet {
+
+    @Inject
+    private Config config;
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        //...
+        request.getSession().removeAttribute("tokenResponse");
+        String state = UUID.randomUUID().toString();
+        request.getSession().setAttribute("CLIENT_LOCAL_STATE", state);
+
+        String authorizationUri = config.getValue("provider.authorizationUri", String.class);
+        String clientId = config.getValue("client.clientId", String.class);
+        String redirectUri = config.getValue("client.redirectUri", String.class);
+        String scope = config.getValue("client.scope", String.class);
+
+        String authorizationLocation = authorizationUri + "?response_type=code"
+                + "&client_id=" + clientId
+                + "&redirect_uri=" + redirectUri
+                + "&scope=" + scope
+                + "&state=" + state;
+        response.sendRedirect(authorizationLocation);
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-client/src/main/java/com/baeldung/oauth2/client/CallbackServlet.java b/oauth2-framework-impl/oauth2-client/src/main/java/com/baeldung/oauth2/client/CallbackServlet.java
new file mode 100644
index 0000000000..e72877076c
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-client/src/main/java/com/baeldung/oauth2/client/CallbackServlet.java
@@ -0,0 +1,67 @@
+package com.baeldung.oauth2.client;
+
+import org.eclipse.microprofile.config.Config;
+
+import javax.inject.Inject;
+import javax.json.JsonObject;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Form;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+
+@WebServlet(urlPatterns = "/callback")
+public class CallbackServlet extends AbstractServlet {
+
+    @Inject
+    private Config config;
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+        String clientId = config.getValue("client.clientId", String.class);
+        String clientSecret = config.getValue("client.clientSecret", String.class);
+
+        //Error:
+        String error = request.getParameter("error");
+        if (error != null) {
+            request.setAttribute("error", error);
+            dispatch("/", request, response);
+            return;
+        }
+        String localState = (String) request.getSession().getAttribute("CLIENT_LOCAL_STATE");
+        if (!localState.equals(request.getParameter("state"))) {
+            request.setAttribute("error", "The state attribute doesn't match !!");
+            dispatch("/", request, response);
+            return;
+        }
+
+        String code = request.getParameter("code");
+
+        Client client = ClientBuilder.newClient();
+        WebTarget target = client.target(config.getValue("provider.tokenUri", String.class));
+
+        Form form = new Form();
+        form.param("grant_type", "authorization_code");
+        form.param("code", code);
+        form.param("redirect_uri", config.getValue("client.redirectUri", String.class));
+
+        try {
+            JsonObject tokenResponse = target.request(MediaType.APPLICATION_JSON_TYPE)
+                    .header(HttpHeaders.AUTHORIZATION, getAuthorizationHeaderValue(clientId, clientSecret))
+                    .post(Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE), JsonObject.class);
+            request.getSession().setAttribute("tokenResponse", tokenResponse);
+        } catch (Exception ex) {
+            System.out.println(ex.getMessage());
+            request.setAttribute("error", ex.getMessage());
+        }
+        dispatch("/", request, response);
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-client/src/main/java/com/baeldung/oauth2/client/DownstreamCallServlet.java b/oauth2-framework-impl/oauth2-client/src/main/java/com/baeldung/oauth2/client/DownstreamCallServlet.java
new file mode 100644
index 0000000000..bbe850917b
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-client/src/main/java/com/baeldung/oauth2/client/DownstreamCallServlet.java
@@ -0,0 +1,49 @@
+package com.baeldung.oauth2.client;
+
+import org.eclipse.microprofile.config.Config;
+
+import javax.inject.Inject;
+import javax.json.JsonObject;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.client.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+@WebServlet(urlPatterns = "/downstream")
+public class DownstreamCallServlet extends HttpServlet {
+
+    @Inject
+    private Config config;
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse resp) throws ServletException, IOException {
+        resp.setContentType("text/html;charset=UTF-8");
+        String action = request.getParameter("action");
+        Client client = ClientBuilder.newClient();
+        WebTarget webTarget = client.target(config.getValue("resourceServerUri", String.class));
+        WebTarget resourceWebTarget;
+        String response = null;
+        JsonObject tokenResponse = (JsonObject) request.getSession().getAttribute("tokenResponse");
+        if ("read".equals(action)) {
+            resourceWebTarget = webTarget.path("resource/read");
+            Invocation.Builder invocationBuilder = resourceWebTarget.request();
+            response = invocationBuilder
+                    .header("authorization", tokenResponse.getString("access_token"))
+                    .get(String.class);
+        } else if ("write".equals(action)) {
+            resourceWebTarget = webTarget.path("resource/write");
+            Invocation.Builder invocationBuilder = resourceWebTarget.request();
+            response = invocationBuilder
+                    .header("authorization", tokenResponse.getString("access_token"))
+                    .post(Entity.text("body string"), String.class);
+        }
+        PrintWriter out = resp.getWriter();
+        out.println(response);
+        out.flush();
+        out.close();
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-client/src/main/java/com/baeldung/oauth2/client/RefreshTokenServlet.java b/oauth2-framework-impl/oauth2-client/src/main/java/com/baeldung/oauth2/client/RefreshTokenServlet.java
new file mode 100644
index 0000000000..a519a53070
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-client/src/main/java/com/baeldung/oauth2/client/RefreshTokenServlet.java
@@ -0,0 +1,57 @@
+package com.baeldung.oauth2.client;
+
+import org.eclipse.microprofile.config.Config;
+
+import javax.inject.Inject;
+import javax.json.JsonObject;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Form;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.IOException;
+
+@WebServlet(urlPatterns = "/refreshtoken")
+public class RefreshTokenServlet extends AbstractServlet {
+
+    @Inject
+    private Config config;
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+        String clientId = config.getValue("client.clientId", String.class);
+        String clientSecret = config.getValue("client.clientSecret", String.class);
+
+        JsonObject actualTokenResponse = (JsonObject) request.getSession().getAttribute("tokenResponse");
+        Client client = ClientBuilder.newClient();
+        WebTarget target = client.target(config.getValue("provider.tokenUri", String.class));
+
+        Form form = new Form();
+        form.param("grant_type", "refresh_token");
+        form.param("refresh_token", actualTokenResponse.getString("refresh_token"));
+
+        String scope = request.getParameter("scope");
+        if (scope != null && !scope.isEmpty()) {
+            form.param("scope", scope);
+        }
+
+        Response jaxrsResponse = target.request(MediaType.APPLICATION_JSON_TYPE)
+                .header(HttpHeaders.AUTHORIZATION, getAuthorizationHeaderValue(clientId, clientSecret))
+                .post(Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE), Response.class);
+        JsonObject tokenResponse = jaxrsResponse.readEntity(JsonObject.class);
+        if (jaxrsResponse.getStatus() == 200) {
+            request.getSession().setAttribute("tokenResponse", tokenResponse);
+        } else {
+            request.setAttribute("error", tokenResponse.getString("error_description", "error!"));
+        }
+        dispatch("/", request, response);
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-client/src/main/liberty/config/server.xml b/oauth2-framework-impl/oauth2-client/src/main/liberty/config/server.xml
new file mode 100644
index 0000000000..26dc730361
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-client/src/main/liberty/config/server.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server description="${project.artifactId}">
+
+    <featureManager>
+        <feature>localConnector-1.0</feature>
+        <feature>cdi-2.0</feature>
+        <feature>jsp-2.3</feature>
+        <feature>mpConfig-1.3</feature>
+        <feature>jaxrsClient-2.1</feature>
+        <feature>jsonp-1.1</feature>
+    </featureManager>
+
+    <httpEndpoint id="defaultHttpEndpoint" httpPort="${httpPort}" httpsPort="${httpsPort}"/>
+
+    <applicationManager autoExpand="true"/>
+    <applicationMonitor updateTrigger="mbean"/>
+    <application type="war" location="${project.build.finalName}.war" context-root="/"/>
+
+</server>
diff --git a/oauth2-framework-impl/oauth2-client/src/main/resources/META-INF/microprofile-config.properties b/oauth2-framework-impl/oauth2-client/src/main/resources/META-INF/microprofile-config.properties
new file mode 100644
index 0000000000..d66f4f6a74
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-client/src/main/resources/META-INF/microprofile-config.properties
@@ -0,0 +1,12 @@
+#Client registration
+client.clientId=webappclient
+client.clientSecret=webappclientsecret
+client.redirectUri=http://localhost:9180/callback
+client.scope=resource.read resource.write
+
+#Provider
+provider.authorizationUri=http://127.0.0.1:9080/authorize
+provider.tokenUri=http://127.0.0.1:9080/token
+
+#Resource Server
+resourceServerUri=http://localhost:9280/api
\ No newline at end of file
diff --git a/oauth2-framework-impl/oauth2-client/src/main/webapp/WEB-INF/beans.xml b/oauth2-framework-impl/oauth2-client/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 0000000000..29595ff490
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-client/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+       bean-discovery-mode="all">
+</beans>
diff --git a/oauth2-framework-impl/oauth2-client/src/main/webapp/WEB-INF/web.xml b/oauth2-framework-impl/oauth2-client/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..0203894c1b
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-client/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,5 @@
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="3.0">
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
+</web-app>
\ No newline at end of file
diff --git a/oauth2-framework-impl/oauth2-client/src/main/webapp/index.jsp b/oauth2-framework-impl/oauth2-client/src/main/webapp/index.jsp
new file mode 100644
index 0000000000..ccb74df228
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-client/src/main/webapp/index.jsp
@@ -0,0 +1,111 @@
+<%@ page import="org.eclipse.microprofile.config.Config" %>
+<%@ page import="org.eclipse.microprofile.config.ConfigProvider" %>
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <title>OAuth2 Client</title>
+    <style>
+        body {
+            margin: 0px;
+        }
+
+        input[type=text], input[type=password] {
+            width: 75%;
+            padding: 4px 0px;
+            display: inline-block;
+            border: 1px solid #502bcc;
+            box-sizing: border-box;
+        }
+
+        .container-error {
+            padding: 16px;
+            border: 1px solid #cc102a;
+            background: #f50307;
+            width: 75%;
+            margin-left: 25px;
+            margin-bottom: 25px;
+        }
+
+        .container {
+            padding: 16px;
+            border: 1px solid #130ecc;
+            background: #eaecf5;
+            width: 75%;
+            margin-left: 25px;
+            margin-bottom: 25px;
+        }
+    </style>
+</head>
+
+<body>
+
+<%
+    Config config1 = ConfigProvider.getConfig();
+%>
+
+<div class="container-error" style="visibility: <%=request.getAttribute("error")!=null?"visible":"hidden"%>">
+    <span>Error : ${error}</span>
+</div>
+
+<div class="container">
+    <span><h4>OAuth2 Authorization Server</h4></span>
+    <hr>
+    <p>Client Registration :</p>
+    <ul>
+        <li>client_id: <%=config1.getValue("client.clientId", String.class)%>
+        </li>
+        <li>client_secret: <%=config1.getValue("client.clientSecret", String.class)%>
+        </li>
+        <li>redirect_uri: <%=config1.getValue("client.redirectUri", String.class)%>
+        </li>
+        <li>scope: <%=config1.getValue("client.scope", String.class)%>
+        </li>
+    </ul>
+    <p>Authorization Server :</p>
+    <ul>
+        <li>authorization_uri: <%=config1.getValue("provider.authorizationUri", String.class)%>
+        </li>
+        <li>token_uri: <%=config1.getValue("provider.tokenUri", String.class)%>
+        </li>
+    </ul>
+</div>
+<div class="container">
+    <span><h4>OAuth2 Client</h4></span>
+    <hr>
+    <p>Token Request :</p>
+    <ul>
+        <li><a class="btn btn-primary" href="/authorize">Get Access Token</a></li>
+    </ul>
+
+    <p>Token Response:</p>
+    <ul>
+        <li>access_token: ${tokenResponse.getString("access_token")}</li>
+        <li>scope: ${tokenResponse.getString("scope")}</li>
+        <li>Expires in (s): ${tokenResponse.getInt("expires_in")}</li>
+        <li>refresh_token: ${tokenResponse.getString("refresh_token")}</li>
+    </ul>
+</div>
+
+<div class="container">
+    <span><h4>Refresh Token</h4></span>
+    <hr>
+    <ul>
+        <li><a href="refreshtoken">Refresh token (original scope)</a></li>
+        <li><a href="refreshtoken?scope=resource.read">Refresh token (scope: resource.read)</a></li>
+        <li><a href="refreshtoken?scope=resource.write">Refresh token (scope: resource.write)</a></li>
+    </ul>
+</div>
+
+<div class="container">
+    <span><h4>OAuth2 Resource Server Call</h4></span>
+    <hr>
+    <ul>
+        <li><a href="downstream?action=read">Read Protected Resource</a></li>
+        <li><a href="downstream?action=write">Write Protected Resource</a></li>
+    </ul>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/oauth2-framework-impl/oauth2-resource-server/pom.xml b/oauth2-framework-impl/oauth2-resource-server/pom.xml
new file mode 100644
index 0000000000..9b58c33472
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-resource-server/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>oauth2-resource-server</artifactId>
+    <packaging>war</packaging>
+
+    <parent>
+        <groupId>com.baeldung.oauth2</groupId>
+        <artifactId>oauth2-framework-impl</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <properties>
+        <httpPort>9280</httpPort>
+        <httpsPort>8643</httpsPort>
+        <jwt.issuer>http://localhost:9080</jwt.issuer>
+        <jwt.resourceId>http://localhost:9280</jwt.resourceId>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.microprofile.jwt</groupId>
+            <artifactId>microprofile-jwt-auth-api</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>net.wasdev.wlp.maven.plugins</groupId>
+                <artifactId>liberty-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/oauth2-framework-impl/oauth2-resource-server/src/main/java/com/baeldung/oauth2/resource/server/OAuth2ResourceServerApplication.java b/oauth2-framework-impl/oauth2-resource-server/src/main/java/com/baeldung/oauth2/resource/server/OAuth2ResourceServerApplication.java
new file mode 100644
index 0000000000..835e80a416
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-resource-server/src/main/java/com/baeldung/oauth2/resource/server/OAuth2ResourceServerApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.oauth2.resource.server;
+
+import org.eclipse.microprofile.auth.LoginConfig;
+
+import javax.annotation.security.DeclareRoles;
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/api")
+@DeclareRoles({"resource.read", "resource.write"})
+@LoginConfig(authMethod = "MP-JWT")
+public class OAuth2ResourceServerApplication extends Application {
+}
diff --git a/oauth2-framework-impl/oauth2-resource-server/src/main/java/com/baeldung/oauth2/resource/server/secure/ProtectedResource.java b/oauth2-framework-impl/oauth2-resource-server/src/main/java/com/baeldung/oauth2/resource/server/secure/ProtectedResource.java
new file mode 100644
index 0000000000..300de83c6d
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-resource-server/src/main/java/com/baeldung/oauth2/resource/server/secure/ProtectedResource.java
@@ -0,0 +1,38 @@
+package com.baeldung.oauth2.resource.server.secure;
+
+import org.eclipse.microprofile.jwt.JsonWebToken;
+
+import javax.annotation.security.RolesAllowed;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+import java.util.UUID;
+
+@Path("/resource")
+@RequestScoped
+public class ProtectedResource {
+
+    @Inject
+    private JsonWebToken principal;
+
+    @GET
+    @RolesAllowed("resource.read")
+    @Path("/read")
+    public Response read() {
+        //DoStaff
+        return Response.ok("Hello, " + principal.getName()).build();
+    }
+
+    @POST
+    @RolesAllowed("resource.write")
+    @Path("/write")
+    public Response write() {
+        //DoStaff
+        return Response.ok("Hello, " + principal.getName())
+                .header("location", UUID.randomUUID().toString())
+                .build();
+    }
+}
diff --git a/oauth2-framework-impl/oauth2-resource-server/src/main/liberty/config/server.xml b/oauth2-framework-impl/oauth2-resource-server/src/main/liberty/config/server.xml
new file mode 100644
index 0000000000..c54d698359
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-resource-server/src/main/liberty/config/server.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server description="${project.artifactId}">
+
+    <featureManager>
+        <feature>localConnector-1.0</feature>
+        <feature>cdi-2.0</feature>
+        <feature>jaxrs-2.1</feature>
+        <feature>jsonp-1.1</feature>
+        <feature>mpConfig-1.3</feature>
+        <feature>mpJwt-1.1</feature>
+    </featureManager>
+
+    <httpEndpoint id="defaultHttpEndpoint" httpPort="${httpPort}" httpsPort="${httpsPort}"/>
+    <mpJwt id="mpJwt123" audiences="${jwt.resourceId}"/>
+
+    <applicationManager autoExpand="true"/>
+    <applicationMonitor updateTrigger="mbean"/>
+    <application type="war" location="${project.build.finalName}.war" context-root="/"/>
+
+</server>
diff --git a/oauth2-framework-impl/oauth2-resource-server/src/main/resources/META-INF/microprofile-config.properties b/oauth2-framework-impl/oauth2-resource-server/src/main/resources/META-INF/microprofile-config.properties
new file mode 100644
index 0000000000..be6919ec50
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-resource-server/src/main/resources/META-INF/microprofile-config.properties
@@ -0,0 +1,2 @@
+mp.jwt.verify.publickey.location=/META-INF/public-key.pem
+mp.jwt.verify.issuer=http://localhost:9080
\ No newline at end of file
diff --git a/oauth2-framework-impl/oauth2-resource-server/src/main/resources/META-INF/public-key.pem b/oauth2-framework-impl/oauth2-resource-server/src/main/resources/META-INF/public-key.pem
new file mode 100644
index 0000000000..f53ceca446
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-resource-server/src/main/resources/META-INF/public-key.pem
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Is1Mr8GOqjHdGZGD8z/
+Zi0yTknM1vFrQG44a4MZOSzkSI3Hb/2gdQQMwxDgl+FAvkW7PWMGnpCL1u3S/7es
+T87AO/vbTLdu06lMV4oFhBUBu98P1mxFcwhtPSB6hu2bY2+mhi/vKX3Lvki7zrV1
+q3LRzW69+QWAucgUGqLPWx/py2G4dhX/npq6YOysKHorOjGOkYGSC/5cbd23mbdT
+UISxLwfbel6EpMi0Cko0/zgvFzmuDmCODnzkhahFBKfvHSnt7L2W0FDSXyinoce/
+McdK38B/ogbBSpB3b7dWR7SDb2HnQHxq3Oa1p3rLp8zluzijAIiFwCUkQK5/SL+f
+3wIDAQAB
+-----END PUBLIC KEY-----
diff --git a/oauth2-framework-impl/oauth2-resource-server/src/main/webapp/WEB-INF/beans.xml b/oauth2-framework-impl/oauth2-resource-server/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 0000000000..2777559c20
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-resource-server/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+       bean-discovery-mode="all">
+</beans>
diff --git a/oauth2-framework-impl/oauth2-resource-server/src/main/webapp/index.html b/oauth2-framework-impl/oauth2-resource-server/src/main/webapp/index.html
new file mode 100644
index 0000000000..7ea29c1097
--- /dev/null
+++ b/oauth2-framework-impl/oauth2-resource-server/src/main/webapp/index.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Eclipse MicroProfile demo</title>
+</head>
+<body>
+
+<h2>MicroProfile</h2>
+
+<a href="data/hello" target="_blank" >Hello JAX-RS endpoint</a> <br/>
+
+
+<h3>Config</h3>
+<a href="data/config/injected" target="_blank" >Injected config values</a> <br/>
+<a href="data/config/lookup" target="_blank" >Config values by lookup</a> <br/>
+
+
+
+
+
+
+
+
+
+<h3>JWT Auth</h3>
+Look at readme.md on how to test protected endpoint.
+
+
+
+
+
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/oauth2-framework-impl/pom.xml b/oauth2-framework-impl/pom.xml
new file mode 100644
index 0000000000..281103660b
--- /dev/null
+++ b/oauth2-framework-impl/pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.oauth2</groupId>
+    <artifactId>oauth2-framework-impl</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <failOnMissingWebXml>false</failOnMissingWebXml>
+        <openliberty.version>RELEASE</openliberty.version>
+        <openliberty.maven.version>2.6.4</openliberty.maven.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-web-api</artifactId>
+            <version>8.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.microprofile.config</groupId>
+            <artifactId>microprofile-config-api</artifactId>
+            <version>1.3</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/main/resources</directory>
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+            <resource>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/liberty</directory>
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+        </resources>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>net.wasdev.wlp.maven.plugins</groupId>
+                    <artifactId>liberty-maven-plugin</artifactId>
+                    <version>${openliberty.maven.version}</version>
+                    <executions>
+                        <execution>
+                            <id>package-server</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>create-server</goal>
+                                <goal>install-apps</goal>
+                            </goals>
+                            <configuration>
+                                <outputDirectory>target/wlp-package</outputDirectory>
+                            </configuration>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <assemblyArtifact>
+                            <groupId>io.openliberty</groupId>
+                            <artifactId>openliberty-webProfile8</artifactId>
+                            <version>${openliberty.version}</version>
+                            <type>zip</type>
+                        </assemblyArtifact>
+                        <configFile>target/classes/config/server.xml</configFile>
+                        <appArchive>${project.build.directory}/${project.build.finalName}.war</appArchive>
+                        <installAppPackages>project</installAppPackages>
+                        <configDirectory>${project.basedir}/src/main/liberty/server</configDirectory>
+                        <appsDirectory>apps</appsDirectory>
+                        <looseApplication>true</looseApplication>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    <modules>
+        <module>oauth2-authorization-server</module>
+        <module>oauth2-resource-server</module>
+        <module>oauth2-client</module>
+    </modules>
+</project>
diff --git a/optaplanner/pom.xml b/optaplanner/pom.xml
index fbce0ea072..93b1e68264 100644
--- a/optaplanner/pom.xml
+++ b/optaplanner/pom.xml
@@ -18,11 +18,6 @@
             <artifactId>optaplanner-core</artifactId>
             <version>7.9.0.Final</version>
         </dependency>
-
-        <!--<dependency>-->
-            <!--<groupId></groupId>-->
-            <!--<artifactId></artifactId>-->
-        <!--</dependency>-->
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml
index 4b81e27333..f0e921bf37 100644
--- a/parent-boot-2/pom.xml
+++ b/parent-boot-2/pom.xml
@@ -1,9 +1,9 @@
 <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/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>parent-boot-2</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-	<name>parent-boot-2</name>
+    <name>parent-boot-2</name>
     <packaging>pom</packaging>
     <description>Parent for all Spring Boot 2 modules</description>
 
@@ -13,7 +13,7 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-	<dependencyManagement>
+    <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            </dependency>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -36,22 +36,22 @@
         </dependency>
     </dependencies>
 
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-maven-plugin</artifactId>
-					<version>${spring-boot.version}</version>
-					<configuration>
-						<mainClass>${start-class}</mainClass>
-						<!-- this is necessary as we're not using the Boot parent -->
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-	
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <version>${spring-boot.version}</version>
+                    <configuration>
+                        <mainClass>${start-class}</mainClass>
+                        <!-- this is necessary as we're not using the Boot parent -->
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
     <profiles>
         <profile>
             <id>thin-jar</id>
@@ -75,9 +75,9 @@
     </profiles>
 
     <properties>
-        <rest-assured.version>3.1.0</rest-assured.version>
+        <rest-assured.version>3.3.0</rest-assured.version>
         <!-- plugins -->
-        <thin.version>1.0.21.RELEASE</thin.version>
-        <spring-boot.version>2.1.3.RELEASE</spring-boot.version>
+        <thin.version>1.0.22.RELEASE</thin.version>
+        <spring-boot.version>2.1.6.RELEASE</spring-boot.version>
     </properties>
 </project>
diff --git a/parent-boot-performance/README.md b/parent-boot-performance/README.md
deleted file mode 100644
index fce9e101da..0000000000
--- a/parent-boot-performance/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This is a parent module for projects that want to take advantage of the latest Spring Boot improvements/features.
\ No newline at end of file
diff --git a/parent-boot-performance/pom.xml b/parent-boot-performance/pom.xml
deleted file mode 100644
index b1c6854eae..0000000000
--- a/parent-boot-performance/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>parent-boot-performance</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>parent-boot-performance</name>
-    <packaging>pom</packaging>
-    <description>Parent for all modules that want to take advantage of the latest Spring Boot improvements/features. Current version: 2.2</description>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <rest-assured.version>3.1.0</rest-assured.version>
-        <!-- plugins -->
-        <thin.version>1.0.21.RELEASE</thin.version>
-        <spring-boot.version>2.2.0.M3</spring-boot.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <dependencies>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-maven-plugin</artifactId>
-                    <version>${spring-boot.version}</version>
-                    <configuration>
-                        <mainClass>${start-class}</mainClass>
-                        <!-- this is necessary as we're not using the Boot parent -->
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-    
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-    
-    <profiles>
-        <profile>
-            <id>thin-jar</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.springframework.boot</groupId>
-                        <artifactId>spring-boot-maven-plugin</artifactId>
-                        <dependencies>
-                            <!-- The following enables the "thin jar" deployment option. -->
-                            <dependency>
-                                <groupId>org.springframework.boot.experimental</groupId>
-                                <artifactId>spring-boot-thin-layout</artifactId>
-                                <version>${thin.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
diff --git a/parent-java/README.md b/parent-java/README.md
index ff12555376..729105e3fd 100644
--- a/parent-java/README.md
+++ b/parent-java/README.md
@@ -1 +1 @@
-## Relevant articles:
+## Relevant Articles:
diff --git a/parent-kotlin/pom.xml b/parent-kotlin/pom.xml
index 6f7fe6c102..d993fad3c6 100644
--- a/parent-kotlin/pom.xml
+++ b/parent-kotlin/pom.xml
@@ -26,6 +26,11 @@
             <id>kotlin-eap</id>
             <url>http://dl.bintray.com/kotlin/kotlin-eap</url>
         </repository>
+        <repository>
+            <id>spring-milestone</id>
+            <name>Spring Milestone Repository</name> 
+            <url>http://repo.spring.io/milestone</url> 
+        </repository>
     </repositories>
     
     <pluginRepositories>
@@ -40,7 +45,7 @@
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
-				<version>2.0.1.RELEASE</version>
+				<version>2.2.0.M4</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -80,6 +85,10 @@
 			<artifactId>ktor-gson</artifactId>
 			<version>${ktor.io.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-kotlin</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
diff --git a/parent-spring-4/README.md b/parent-spring-4/README.md
index ff12555376..729105e3fd 100644
--- a/parent-spring-4/README.md
+++ b/parent-spring-4/README.md
@@ -1 +1 @@
-## Relevant articles:
+## Relevant Articles:
diff --git a/parent-spring-4/pom.xml b/parent-spring-4/pom.xml
index d7eea44989..ab66cf19bf 100644
--- a/parent-spring-4/pom.xml
+++ b/parent-spring-4/pom.xml
@@ -23,14 +23,36 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit.jupiter.version}</version>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <version>${cargo-maven2-plugin.version}</version>
+                <configuration>
+                    <wait>true</wait>
+                    <container>
+                        <containerId>jetty8x</containerId>
+                        <type>embedded</type>
+                    </container>
+                    <configuration>
+                        <properties>
+                            <cargo.servlet.port>8082</cargo.servlet.port>
+                        </properties>
+                    </configuration>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <spring.version>4.3.22.RELEASE</spring.version>
-        <junit.jupiter.version>5.0.2</junit.jupiter.version>
+        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/parent-spring-5/README.md b/parent-spring-5/README.md
index ff12555376..729105e3fd 100644
--- a/parent-spring-5/README.md
+++ b/parent-spring-5/README.md
@@ -1 +1 @@
-## Relevant articles:
+## Relevant Articles:
diff --git a/parent-spring-5/pom.xml b/parent-spring-5/pom.xml
index 84df8cf30a..f85924b801 100644
--- a/parent-spring-5/pom.xml
+++ b/parent-spring-5/pom.xml
@@ -23,14 +23,13 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit.jupiter.version}</version>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <properties>
         <spring.version>5.1.4.RELEASE</spring.version>
-        <junit.jupiter.version>5.0.2</junit.jupiter.version>
 		<spring-security.version>5.1.4.RELEASE</spring-security.version>
     </properties>
 
diff --git a/patterns/backoff-jitter/README.md b/patterns/backoff-jitter/README.md
new file mode 100644
index 0000000000..6459e4c8e0
--- /dev/null
+++ b/patterns/backoff-jitter/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Better Retries with Exponential Backoff and Jitter](https://baeldung.com/retries-with-exponential-backoff-and-jitter)
diff --git a/patterns/backoff-jitter/pom.xml b/patterns/backoff-jitter/pom.xml
new file mode 100644
index 0000000000..6b0d016609
--- /dev/null
+++ b/patterns/backoff-jitter/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>backoff-jitter</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.resilience4j</groupId>
+            <artifactId>resilience4j-retry</artifactId>
+            <version>${resilience4j.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <junit.version>4.12</junit.version>
+        <mockito-core.version>2.27.0</mockito-core.version>
+        <slf4j.version>1.7.26</slf4j.version>
+        <resilience4j.version>0.16.0</resilience4j.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/patterns/backoff-jitter/src/test/java/com/baeldung/backoff/jitter/BackoffWithJitterTest.java b/patterns/backoff-jitter/src/test/java/com/baeldung/backoff/jitter/BackoffWithJitterTest.java
new file mode 100644
index 0000000000..f6b3ebbe45
--- /dev/null
+++ b/patterns/backoff-jitter/src/test/java/com/baeldung/backoff/jitter/BackoffWithJitterTest.java
@@ -0,0 +1,103 @@
+package com.baeldung.backoff.jitter;
+
+import io.github.resilience4j.retry.IntervalFunction;
+import io.github.resilience4j.retry.Retry;
+import io.github.resilience4j.retry.RetryConfig;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Function;
+
+import static com.baeldung.backoff.jitter.BackoffWithJitterTest.RetryProperties.*;
+import static io.github.resilience4j.retry.IntervalFunction.ofExponentialBackoff;
+import static io.github.resilience4j.retry.IntervalFunction.ofExponentialRandomBackoff;
+import static java.util.Collections.nCopies;
+import static java.util.concurrent.Executors.newFixedThreadPool;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.*;
+
+public class BackoffWithJitterTest {
+
+    static Logger log = LoggerFactory.getLogger(BackoffWithJitterTest.class);
+
+    interface PingPongService {
+
+        String call(String ping) throws PingPongServiceException;
+    }
+
+    class PingPongServiceException extends RuntimeException {
+
+        public PingPongServiceException(String reason) {
+            super(reason);
+        }
+    }
+
+    private PingPongService service;
+    private static final int NUM_CONCURRENT_CLIENTS = 8;
+
+    @Before
+    public void setUp() {
+        service = mock(PingPongService.class);
+    }
+
+    @Test
+    public void whenRetryExponentialBackoff_thenRetriedConfiguredNoOfTimes() {
+        IntervalFunction intervalFn = ofExponentialBackoff(INITIAL_INTERVAL, MULTIPLIER);
+        Function<String, String> pingPongFn = getRetryablePingPongFn(intervalFn);
+
+        when(service.call(anyString())).thenThrow(PingPongServiceException.class);
+        try {
+            pingPongFn.apply("Hello");
+        } catch (PingPongServiceException e) {
+            verify(service, times(MAX_RETRIES)).call(anyString());
+        }
+    }
+
+    @Test
+    public void whenRetryExponentialBackoffWithoutJitter_thenThunderingHerdProblemOccurs() throws InterruptedException {
+        IntervalFunction intervalFn = ofExponentialBackoff(INITIAL_INTERVAL, MULTIPLIER);
+        test(intervalFn);
+    }
+
+    @Test
+    public void whenRetryExponentialBackoffWithJitter_thenRetriesAreSpread() throws InterruptedException {
+        IntervalFunction intervalFn = ofExponentialRandomBackoff(INITIAL_INTERVAL, MULTIPLIER, RANDOMIZATION_FACTOR);
+        test(intervalFn);
+    }
+
+    private void test(IntervalFunction intervalFn) throws InterruptedException {
+        Function<String, String> pingPongFn = getRetryablePingPongFn(intervalFn);
+        ExecutorService executors = newFixedThreadPool(NUM_CONCURRENT_CLIENTS);
+        List<Callable<String>> tasks = nCopies(NUM_CONCURRENT_CLIENTS, () -> pingPongFn.apply("Hello"));
+
+        when(service.call(anyString())).thenThrow(PingPongServiceException.class);
+
+        executors.invokeAll(tasks);
+    }
+
+    private Function<String, String> getRetryablePingPongFn(IntervalFunction intervalFn) {
+        RetryConfig retryConfig = RetryConfig.custom()
+                .maxAttempts(MAX_RETRIES)
+                .intervalFunction(intervalFn)
+                .retryExceptions(PingPongServiceException.class)
+                .build();
+        Retry retry = Retry.of("pingpong", retryConfig);
+        return Retry.decorateFunction(retry, ping -> {
+            log.info("Invoked at {}", LocalDateTime.now());
+            return service.call(ping);
+        });
+    }
+
+    static class RetryProperties {
+        static final Long INITIAL_INTERVAL = 1000L;
+        static final Double MULTIPLIER = 2.0D;
+        static final Double RANDOMIZATION_FACTOR = 0.6D;
+        static final Integer MAX_RETRIES = 4;
+    }
+}
diff --git a/patterns/design-patterns-2/pom.xml b/patterns/design-patterns-2/pom.xml
index 5c3e70b046..392035ab84 100644
--- a/patterns/design-patterns-2/pom.xml
+++ b/patterns/design-patterns-2/pom.xml
@@ -38,6 +38,5 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <intellij.annotations.version>16.0.2</intellij.annotations.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
     </properties>
 </project>
diff --git a/patterns/design-patterns/README.md b/patterns/design-patterns/README.md
index 605fdc0d6e..1c611f05d2 100644
--- a/patterns/design-patterns/README.md
+++ b/patterns/design-patterns/README.md
@@ -20,3 +20,4 @@
 - [Java Constructors vs Static Factory Methods](https://www.baeldung.com/java-constructors-vs-static-factory-methods)
 - [The Adapter Pattern in Java](https://www.baeldung.com/java-adapter-pattern)
 - [Currying in Java](https://www.baeldung.com/java-currying)
+- [The Proxy Pattern in Java](https://www.baeldung.com/java-proxy-pattern)
diff --git a/patterns/design-patterns/pom.xml b/patterns/design-patterns/pom.xml
index ac201ad653..e6bff64f9e 100644
--- a/patterns/design-patterns/pom.xml
+++ b/patterns/design-patterns/pom.xml
@@ -48,6 +48,7 @@
             <version>${grep4j.version}</version>
         </dependency>
     </dependencies>
+	
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProcessor.java b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProcessor.java
index 374de31ba9..986c1d9660 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProcessor.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProcessor.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.chainofresponsibility;
+package com.baeldung.chainofresponsibility;
 
 public abstract class AuthenticationProcessor {
 
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProvider.java b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProvider.java
index 7b8771ca41..4d5e3bde24 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProvider.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProvider.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.chainofresponsibility;
+package com.baeldung.chainofresponsibility;
 
 public interface AuthenticationProvider {
 
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/OAuthAuthenticationProcessor.java b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/OAuthAuthenticationProcessor.java
index 3bf20cfc85..5f994bad89 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/OAuthAuthenticationProcessor.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/OAuthAuthenticationProcessor.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.chainofresponsibility;
+package com.baeldung.chainofresponsibility;
 
 public class OAuthAuthenticationProcessor extends AuthenticationProcessor {
 
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/OAuthTokenProvider.java b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/OAuthTokenProvider.java
index 92d5f94245..37f419b6e2 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/OAuthTokenProvider.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/OAuthTokenProvider.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.chainofresponsibility;
+package com.baeldung.chainofresponsibility;
 
 public class OAuthTokenProvider implements AuthenticationProvider {
 
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/SamlAuthenticationProvider.java b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/SamlAuthenticationProvider.java
index cd927932ad..3a0c35a9b9 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/SamlAuthenticationProvider.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/SamlAuthenticationProvider.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.chainofresponsibility;
+package com.baeldung.chainofresponsibility;
 
 public class SamlAuthenticationProvider implements AuthenticationProvider {
 
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordAuthenticationProcessor.java b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordAuthenticationProcessor.java
index 3885b2b79b..39038b1374 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordAuthenticationProcessor.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordAuthenticationProcessor.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.chainofresponsibility;
+package com.baeldung.chainofresponsibility;
 
 public class UsernamePasswordAuthenticationProcessor extends AuthenticationProcessor {
 
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordProvider.java b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordProvider.java
index 9877039446..14dc93b8fc 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordProvider.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordProvider.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.chainofresponsibility;
+package com.baeldung.chainofresponsibility;
 
 public class UsernamePasswordProvider implements AuthenticationProvider {
 
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/command/client/TextFileApplication.java b/patterns/design-patterns/src/main/java/com/baeldung/command/client/TextFileApplication.java
index 30dcf08e89..878b67e0cf 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/command/client/TextFileApplication.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/command/client/TextFileApplication.java
@@ -1,10 +1,10 @@
-package com.baeldung.pattern.command.client;
+package com.baeldung.command.client;
 
-import com.baeldung.pattern.command.command.OpenTextFileOperation;
-import com.baeldung.pattern.command.command.SaveTextFileOperation;
-import com.baeldung.pattern.command.command.TextFileOperation;
-import com.baeldung.pattern.command.invoker.TextFileOperationExecutor;
-import com.baeldung.pattern.command.receiver.TextFile;
+import com.baeldung.command.command.OpenTextFileOperation;
+import com.baeldung.command.command.SaveTextFileOperation;
+import com.baeldung.command.command.TextFileOperation;
+import com.baeldung.command.invoker.TextFileOperationExecutor;
+import com.baeldung.command.receiver.TextFile;
 
 public class TextFileApplication {
     
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/command/command/OpenTextFileOperation.java b/patterns/design-patterns/src/main/java/com/baeldung/command/command/OpenTextFileOperation.java
index c90a162b88..74adce0116 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/command/command/OpenTextFileOperation.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/command/command/OpenTextFileOperation.java
@@ -1,6 +1,6 @@
-package com.baeldung.pattern.command.command;
+package com.baeldung.command.command;
 
-import com.baeldung.pattern.command.receiver.TextFile;
+import com.baeldung.command.receiver.TextFile;
 
 public class OpenTextFileOperation implements TextFileOperation {
 
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/command/command/SaveTextFileOperation.java b/patterns/design-patterns/src/main/java/com/baeldung/command/command/SaveTextFileOperation.java
index b908e2c44c..f0462622e3 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/command/command/SaveTextFileOperation.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/command/command/SaveTextFileOperation.java
@@ -1,6 +1,6 @@
-package com.baeldung.pattern.command.command;
+package com.baeldung.command.command;
 
-import com.baeldung.pattern.command.receiver.TextFile;
+import com.baeldung.command.receiver.TextFile;
 
 public class SaveTextFileOperation implements TextFileOperation {
     
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/command/command/TextFileOperation.java b/patterns/design-patterns/src/main/java/com/baeldung/command/command/TextFileOperation.java
index 506bb23d99..2d0267d315 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/command/command/TextFileOperation.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/command/command/TextFileOperation.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.command.command;
+package com.baeldung.command.command;
 
 @FunctionalInterface
 public interface TextFileOperation {
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/command/invoker/TextFileOperationExecutor.java b/patterns/design-patterns/src/main/java/com/baeldung/command/invoker/TextFileOperationExecutor.java
index bd2213706e..67c6dedd89 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/command/invoker/TextFileOperationExecutor.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/command/invoker/TextFileOperationExecutor.java
@@ -1,6 +1,6 @@
-package com.baeldung.pattern.command.invoker;
+package com.baeldung.command.invoker;
 
-import com.baeldung.pattern.command.command.TextFileOperation;
+import com.baeldung.command.command.TextFileOperation;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/command/receiver/TextFile.java b/patterns/design-patterns/src/main/java/com/baeldung/command/receiver/TextFile.java
index c0b2d3c41e..0163102256 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/command/receiver/TextFile.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/command/receiver/TextFile.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.command.receiver;
+package com.baeldung.command.receiver;
 
 public class TextFile {
     
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/application/Application.java b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/application/Application.java
index 9ab34c3cd8..353a369837 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/application/Application.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/application/Application.java
@@ -1,11 +1,9 @@
-package com.baeldung.pattern.templatemethod.application;
+package com.baeldung.templatemethod.application;
 
-import com.baeldung.pattern.templatemethod.model.Computer;
-import com.baeldung.pattern.templatemethod.model.StandardComputer;
-import com.baeldung.pattern.templatemethod.model.HighEndComputer;
-import com.baeldung.pattern.templatemethod.model.ComputerBuilder;
-import com.baeldung.pattern.templatemethod.model.HighEndComputerBuilder;
-import com.baeldung.pattern.templatemethod.model.StandardComputerBuilder;
+import com.baeldung.templatemethod.model.Computer;
+import com.baeldung.templatemethod.model.ComputerBuilder;
+import com.baeldung.templatemethod.model.HighEndComputerBuilder;
+import com.baeldung.templatemethod.model.StandardComputerBuilder;
 
 public class Application {
     
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/Computer.java b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/Computer.java
index 1419398f62..129a8d4c65 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/Computer.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/Computer.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.templatemethod.model;
+package com.baeldung.templatemethod.model;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/ComputerBuilder.java b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/ComputerBuilder.java
index 515a6940f5..b5c7ee3987 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/ComputerBuilder.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/ComputerBuilder.java
@@ -1,6 +1,5 @@
-package com.baeldung.pattern.templatemethod.model;
+package com.baeldung.templatemethod.model;
 
-import com.baeldung.pattern.templatemethod.model.Computer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/HighEndComputer.java b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/HighEndComputer.java
index 0684b1b233..55394d1df6 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/HighEndComputer.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/HighEndComputer.java
@@ -1,6 +1,5 @@
-package com.baeldung.pattern.templatemethod.model;
+package com.baeldung.templatemethod.model;
 
-import com.baeldung.pattern.templatemethod.model.Computer;
 import java.util.Map;
 
 public class HighEndComputer extends Computer {
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java
index c992aa2bff..2ee6f93f9b 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.templatemethod.model;
+package com.baeldung.templatemethod.model;
 
 public class HighEndComputerBuilder extends ComputerBuilder {
 
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/StandardComputer.java b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/StandardComputer.java
index 4e1d857016..3abe240316 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/StandardComputer.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/StandardComputer.java
@@ -1,6 +1,5 @@
-package com.baeldung.pattern.templatemethod.model;
+package com.baeldung.templatemethod.model;
 
-import com.baeldung.pattern.templatemethod.model.Computer;
 import java.util.Map;
 
 public class StandardComputer extends Computer {
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java
index cc81dddc1b..da2c2e9b2d 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java
@@ -1,4 +1,4 @@
-package com.baeldung.pattern.templatemethod.model;
+package com.baeldung.templatemethod.model;
  
 public class StandardComputerBuilder extends ComputerBuilder {
 
diff --git a/patterns/design-patterns/src/test/java/com/baeldung/chainofresponsibility/ChainOfResponsibilityIntegrationTest.java b/patterns/design-patterns/src/test/java/com/baeldung/chainofresponsibility/ChainOfResponsibilityIntegrationTest.java
index 824b104f81..4556232815 100644
--- a/patterns/design-patterns/src/test/java/com/baeldung/chainofresponsibility/ChainOfResponsibilityIntegrationTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/chainofresponsibility/ChainOfResponsibilityIntegrationTest.java
@@ -1,14 +1,9 @@
 package com.baeldung.chainofresponsibility;
 
-import org.junit.Test;
-import com.baeldung.pattern.chainofresponsibility.AuthenticationProcessor;
-import com.baeldung.pattern.chainofresponsibility.OAuthAuthenticationProcessor;
-import com.baeldung.pattern.chainofresponsibility.OAuthTokenProvider;
-import com.baeldung.pattern.chainofresponsibility.UsernamePasswordProvider;
-import com.baeldung.pattern.chainofresponsibility.SamlAuthenticationProvider;
-import com.baeldung.pattern.chainofresponsibility.UsernamePasswordAuthenticationProcessor;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Test;
+
 public class ChainOfResponsibilityIntegrationTest {
 
     private static AuthenticationProcessor getChainOfAuthProcessor() {
diff --git a/patterns/design-patterns/src/test/java/com/baeldung/command/test/OpenTextFileOperationUnitTest.java b/patterns/design-patterns/src/test/java/com/baeldung/command/test/OpenTextFileOperationUnitTest.java
index 1c72bfdd2f..eac62313f7 100644
--- a/patterns/design-patterns/src/test/java/com/baeldung/command/test/OpenTextFileOperationUnitTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/command/test/OpenTextFileOperationUnitTest.java
@@ -1,10 +1,12 @@
-package com.baeldung.pattern.command.test;
+package com.baeldung.command.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
-import com.baeldung.pattern.command.command.OpenTextFileOperation;
-import com.baeldung.pattern.command.command.TextFileOperation;
-import com.baeldung.pattern.command.receiver.TextFile;
 import org.junit.Test;
-import static org.assertj.core.api.Assertions.*;
+
+import com.baeldung.command.command.OpenTextFileOperation;
+import com.baeldung.command.command.TextFileOperation;
+import com.baeldung.command.receiver.TextFile;
 
 public class OpenTextFileOperationUnitTest {
     
diff --git a/patterns/design-patterns/src/test/java/com/baeldung/command/test/SaveTextFileOperationUnitTest.java b/patterns/design-patterns/src/test/java/com/baeldung/command/test/SaveTextFileOperationUnitTest.java
index a7bc1f3025..3e47f10366 100644
--- a/patterns/design-patterns/src/test/java/com/baeldung/command/test/SaveTextFileOperationUnitTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/command/test/SaveTextFileOperationUnitTest.java
@@ -1,10 +1,12 @@
-package com.baeldung.pattern.command.test;
+package com.baeldung.command.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
-import com.baeldung.pattern.command.command.SaveTextFileOperation;
-import com.baeldung.pattern.command.command.TextFileOperation;
-import com.baeldung.pattern.command.receiver.TextFile;
 import org.junit.Test;
-import static org.assertj.core.api.Assertions.*;
+
+import com.baeldung.command.command.SaveTextFileOperation;
+import com.baeldung.command.command.TextFileOperation;
+import com.baeldung.command.receiver.TextFile;
 
 public class SaveTextFileOperationUnitTest {
     
diff --git a/patterns/design-patterns/src/test/java/com/baeldung/command/test/TextFileOperationExecutorUnitTest.java b/patterns/design-patterns/src/test/java/com/baeldung/command/test/TextFileOperationExecutorUnitTest.java
index efafa0d8a2..3861b1109e 100644
--- a/patterns/design-patterns/src/test/java/com/baeldung/command/test/TextFileOperationExecutorUnitTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/command/test/TextFileOperationExecutorUnitTest.java
@@ -1,14 +1,17 @@
-package com.baeldung.pattern.command.test;
+package com.baeldung.command.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
-import com.baeldung.pattern.command.command.OpenTextFileOperation;
-import com.baeldung.pattern.command.command.SaveTextFileOperation;
-import com.baeldung.pattern.command.command.TextFileOperation;
-import com.baeldung.pattern.command.invoker.TextFileOperationExecutor;
-import com.baeldung.pattern.command.receiver.TextFile;
 import java.util.function.Function;
-import org.junit.Test;
-import static org.assertj.core.api.Assertions.*;
+
 import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.baeldung.command.command.OpenTextFileOperation;
+import com.baeldung.command.command.SaveTextFileOperation;
+import com.baeldung.command.command.TextFileOperation;
+import com.baeldung.command.invoker.TextFileOperationExecutor;
+import com.baeldung.command.receiver.TextFile;
 
 public class TextFileOperationExecutorUnitTest {
     
@@ -65,4 +68,11 @@ public class TextFileOperationExecutorUnitTest {
         Function<SaveTextFileOperation, String> executeMethodReference = SaveTextFileOperation::execute;
         assertThat(executeMethodReference.apply(new SaveTextFileOperation(new TextFile("file1.txt")))).isEqualTo("Saving file file1.txt"); 
     }
+    
+    @Test
+    public void givenOpenAndSaveTextFileOperationExecutorInstance_whenCalledExecuteOperationWithLambdaExpression_thenBothAssertion() {
+        TextFileOperationExecutor textFileOperationExecutor = new TextFileOperationExecutor();
+        assertThat(textFileOperationExecutor.executeOperation(() -> "Opening file file1.txt")).isEqualTo("Opening file file1.txt");
+        assertThat(textFileOperationExecutor.executeOperation(() -> "Saving file file1.txt")).isEqualTo("Saving file file1.txt");
+    }
 }
diff --git a/patterns/design-patterns/src/test/java/com/baeldung/command/test/TextFileUnitTest.java b/patterns/design-patterns/src/test/java/com/baeldung/command/test/TextFileUnitTest.java
index 32b83897c9..e35c785f3e 100644
--- a/patterns/design-patterns/src/test/java/com/baeldung/command/test/TextFileUnitTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/command/test/TextFileUnitTest.java
@@ -1,9 +1,11 @@
-package com.baeldung.pattern.command.test;
+package com.baeldung.command.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
-import com.baeldung.pattern.command.receiver.TextFile;
-import org.junit.Test;
-import static org.assertj.core.api.Assertions.*;
 import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.baeldung.command.receiver.TextFile;
 
 public class TextFileUnitTest {
     
diff --git a/patterns/design-patterns/src/test/java/com/baeldung/templatemethod/test/TemplateMethodPatternIntegrationTest.java b/patterns/design-patterns/src/test/java/com/baeldung/templatemethod/test/TemplateMethodPatternIntegrationTest.java
index 4ad4debb27..2c721be5da 100644
--- a/patterns/design-patterns/src/test/java/com/baeldung/templatemethod/test/TemplateMethodPatternIntegrationTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/templatemethod/test/TemplateMethodPatternIntegrationTest.java
@@ -1,14 +1,16 @@
 package com.baeldung.templatemethod.test;
 
-import com.baeldung.pattern.templatemethod.model.Computer;
-import com.baeldung.pattern.templatemethod.model.HighEndComputerBuilder;
-import com.baeldung.pattern.templatemethod.model.StandardComputerBuilder;
-import org.junit.Assert;
+import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertThat;
+
+import com.baeldung.templatemethod.model.Computer;
+import com.baeldung.templatemethod.model.HighEndComputerBuilder;
+import com.baeldung.templatemethod.model.StandardComputerBuilder;
 
 public class TemplateMethodPatternIntegrationTest {
 
diff --git a/patterns/dip/pom.xml b/patterns/dip/pom.xml
index dac3f824f2..bc793c0090 100644
--- a/patterns/dip/pom.xml
+++ b/patterns/dip/pom.xml
@@ -19,13 +19,13 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.12.1</version>
+            <version>${assertj-core.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -34,6 +34,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
+        <assertj-core.version>3.12.1</assertj-core.version>
     </properties>
 
 </project>
diff --git a/patterns/pom.xml b/patterns/pom.xml
index 875af67d55..7f7368ca07 100644
--- a/patterns/pom.xml
+++ b/patterns/pom.xml
@@ -19,7 +19,8 @@
         <module>design-patterns</module>
         <module>design-patterns-2</module>
         <module>solid</module>
-        <module>dip</module>     
+        <module>dip</module>
+        <module>backoff-jitter</module>
     </modules>
 
     <dependencyManagement>
@@ -51,7 +52,6 @@
     </build>
 
     <properties>
-        <maven-war-plugin.version>3.0.0</maven-war-plugin.version>
         <jetty-maven-plugin.version>9.4.0.v20161208</jetty-maven-plugin.version>
     </properties>
 
diff --git a/persistence-modules/deltaspike/pom.xml b/persistence-modules/deltaspike/pom.xml
index 4dcef07695..46e774edff 100644
--- a/persistence-modules/deltaspike/pom.xml
+++ b/persistence-modules/deltaspike/pom.xml
@@ -317,7 +317,6 @@
         <war.plugin.version>2.6</war.plugin.version>
         <apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
         <jandex.version>1.2.5.Final-redhat-1</jandex.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/elasticsearch/README.md b/persistence-modules/elasticsearch/README.md
new file mode 100644
index 0000000000..691e855314
--- /dev/null
+++ b/persistence-modules/elasticsearch/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles
+
+- [Jest – Elasticsearch Java Client](https://www.baeldung.com/elasticsearch-jest)
diff --git a/persistence-modules/elasticsearch/pom.xml b/persistence-modules/elasticsearch/pom.xml
index ceed88aa24..f7bfdb44de 100644
--- a/persistence-modules/elasticsearch/pom.xml
+++ b/persistence-modules/elasticsearch/pom.xml
@@ -20,12 +20,16 @@
         <dependency>
             <groupId>io.searchbox</groupId>
             <artifactId>jest</artifactId>
-            <version>6.3.1</version>
+            <version>${jest.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.6</version>
+            <version>${jackson.version}</version>
         </dependency>
     </dependencies>
+
+    <properties>
+        <jest.version>6.3.1</jest.version>
+    </properties>
 </project>
diff --git a/persistence-modules/hibernate-mapping/README.md b/persistence-modules/hibernate-mapping/README.md
index 203cb2f8e4..99374f9135 100644
--- a/persistence-modules/hibernate-mapping/README.md
+++ b/persistence-modules/hibernate-mapping/README.md
@@ -3,3 +3,5 @@
 
 - [Persisting Maps with Hibernate](https://www.baeldung.com/hibernate-persisting-maps)
 - [Difference Between @Size, @Length, and @Column(length=value)](https://www.baeldung.com/jpa-size-length-column-differences)
+- [Hibernate Validator Specific Constraints](https://www.baeldung.com/hibernate-validator-constraints)
+- [Hibernate One to Many Annotation Tutorial](http://www.baeldung.com/hibernate-one-to-many)
\ No newline at end of file
diff --git a/persistence-modules/hibernate-mapping/pom.xml b/persistence-modules/hibernate-mapping/pom.xml
index bb8ebdab65..e90d7463bd 100644
--- a/persistence-modules/hibernate-mapping/pom.xml
+++ b/persistence-modules/hibernate-mapping/pom.xml
@@ -2,6 +2,9 @@
 <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/xsd/maven-4.0.0.xsd">
+    <artifactId>hibernate-mapping</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -10,10 +13,6 @@
         <relativePath>..</relativePath>
     </parent>
 
-    <artifactId>hibernate-mapping</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <modelVersion>4.0.0</modelVersion>
-
     <dependencies>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -45,12 +44,12 @@
         <dependency>
             <groupId>javax.money</groupId>
             <artifactId>money-api</artifactId>
-            <version>1.0.3</version>
+            <version>${money-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.javamoney</groupId>
             <artifactId>moneta</artifactId>
-            <version>1.3</version>
+            <version>${moneta.version}</version>
             <type>pom</type>
         </dependency>
     </dependencies>
@@ -59,7 +58,7 @@
         <finalName>hibernate-mapping</finalName>
         <resources>
             <resource>
-                <directory>src/test/resources</directory>
+                <directory>src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>
@@ -70,6 +69,8 @@
         <assertj-core.version>3.8.0</assertj-core.version>
         <hibernate-validator.version>6.0.16.Final</hibernate-validator.version>
         <org.glassfish.javax.el.version>3.0.1-b11</org.glassfish.javax.el.version>
+        <money-api.version>1.0.3</money-api.version>
+        <moneta.version>1.3</moneta.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/config/HibernateAnnotationUtil.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/config/HibernateAnnotationUtil.java
similarity index 65%
rename from persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/config/HibernateAnnotationUtil.java
rename to persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/config/HibernateAnnotationUtil.java
index e522dab48d..46e6824f42 100644
--- a/persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/config/HibernateAnnotationUtil.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/config/HibernateAnnotationUtil.java
@@ -1,8 +1,9 @@
 package com.baeldung.hibernate.oneToMany.config;
 
 import org.hibernate.SessionFactory;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.cfg.Configuration;
 import org.hibernate.service.ServiceRegistry;
 
 public class HibernateAnnotationUtil {
@@ -12,16 +13,12 @@ public class HibernateAnnotationUtil {
     private static SessionFactory buildSessionFactory() {
         try {
             // Create the SessionFactory from hibernate-annotation.cfg.xml
-            Configuration configuration = new Configuration();
-            configuration.configure("hibernate-annotation.cfg.xml");
-            System.out.println("Hibernate Annotation Configuration loaded");
-
-            ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties()).build();
-            System.out.println("Hibernate Annotation serviceRegistry created");
-
-            SessionFactory sessionFactory = configuration.buildSessionFactory(serviceRegistry);
+            ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().configure("hibernate-annotation.cfg.xml").build();
+            Metadata metadata = new MetadataSources(serviceRegistry).getMetadataBuilder().build();
+            SessionFactory sessionFactory = metadata.getSessionFactoryBuilder().build();
 
             return sessionFactory;
+
         } catch (Throwable ex) {
             System.err.println("Initial SessionFactory creation failed." + ex);
             ex.printStackTrace();
diff --git a/persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateManyisOwningSide.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateManyisOwningSide.java
similarity index 100%
rename from persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateManyisOwningSide.java
rename to persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateManyisOwningSide.java
diff --git a/persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMain.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMain.java
similarity index 100%
rename from persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMain.java
rename to persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMain.java
diff --git a/persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateOneisOwningSide.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateOneisOwningSide.java
similarity index 100%
rename from persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateOneisOwningSide.java
rename to persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateOneisOwningSide.java
diff --git a/persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/model/Cart.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/model/Cart.java
similarity index 100%
rename from persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/model/Cart.java
rename to persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/model/Cart.java
diff --git a/persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/model/CartOIO.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/model/CartOIO.java
similarity index 100%
rename from persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/model/CartOIO.java
rename to persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/model/CartOIO.java
diff --git a/persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/model/Items.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/model/Items.java
similarity index 100%
rename from persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/model/Items.java
rename to persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/model/Items.java
diff --git a/persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/model/ItemsOIO.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/model/ItemsOIO.java
similarity index 100%
rename from persistence-modules/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/model/ItemsOIO.java
rename to persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/oneToMany/model/ItemsOIO.java
diff --git a/persistence-modules/spring-hibernate4/src/main/resources/hibernate-annotation.cfg.xml b/persistence-modules/hibernate-mapping/src/main/resources/hibernate-annotation.cfg.xml
similarity index 67%
rename from persistence-modules/spring-hibernate4/src/main/resources/hibernate-annotation.cfg.xml
rename to persistence-modules/hibernate-mapping/src/main/resources/hibernate-annotation.cfg.xml
index 14d853d3fd..9b97c03935 100644
--- a/persistence-modules/spring-hibernate4/src/main/resources/hibernate-annotation.cfg.xml
+++ b/persistence-modules/hibernate-mapping/src/main/resources/hibernate-annotation.cfg.xml
@@ -4,11 +4,11 @@
 		"http://hibernate.org/dtd/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
     <session-factory>
-        <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
-        <property name="hibernate.connection.password">mypassword</property>
-        <property name="hibernate.connection.url">jdbc:mysql://localhost:3306/spring_hibernate_one_to_many?createDatabaseIfNotExist=true</property>
-        <property name="hibernate.connection.username">myuser</property>
-        <property name="hibernate.dialect">org.hibernate.dialect.MySQLDialect</property>
+        <property name="hibernate.connection.driver_class">org.h2.Driver</property>
+        <property name="hibernate.connection.password"></property>
+        <property name="hibernate.connection.url">jdbc:h2:mem:spring_hibernate_one_to_many</property>
+        <property name="hibernate.connection.username">sa</property>
+        <property name="hibernate.dialect">org.hibernate.dialect.H2Dialect</property>
         <property name="hbm2ddl.auto">create</property>
         <property name="hibernate.current_session_context_class">thread</property>
         <property name="hibernate.show_sql">true</property>
diff --git a/persistence-modules/hibernate-mapping/src/test/resources/hibernate.properties b/persistence-modules/hibernate-mapping/src/main/resources/hibernate.properties
similarity index 100%
rename from persistence-modules/hibernate-mapping/src/test/resources/hibernate.properties
rename to persistence-modules/hibernate-mapping/src/main/resources/hibernate.properties
diff --git a/persistence-modules/spring-hibernate4/src/main/resources/one_to_many.sql b/persistence-modules/hibernate-mapping/src/main/resources/one_to_many.sql
similarity index 100%
rename from persistence-modules/spring-hibernate4/src/main/resources/one_to_many.sql
rename to persistence-modules/hibernate-mapping/src/main/resources/one_to_many.sql
diff --git a/persistence-modules/spring-hibernate4/src/test/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMainIntegrationTest.java b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMainIntegrationTest.java
similarity index 90%
rename from persistence-modules/spring-hibernate4/src/test/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMainIntegrationTest.java
rename to persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMainIntegrationTest.java
index b3a091ebf1..3bc5a6e12a 100644
--- a/persistence-modules/spring-hibernate4/src/test/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMainIntegrationTest.java
+++ b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMainIntegrationTest.java
@@ -10,7 +10,7 @@ import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.dialect.HSQLDialect;
+import org.hibernate.dialect.H2Dialect;
 import org.hibernate.service.ServiceRegistry;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -18,6 +18,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import com.baeldung.hibernate.oneToMany.model.Cart;
 import com.baeldung.hibernate.oneToMany.model.Items;
 
@@ -33,9 +34,9 @@ public class HibernateOneToManyAnnotationMainIntegrationTest {
 	@BeforeClass
 	public static void beforeTests() {
 		Configuration configuration = new Configuration().addAnnotatedClass(Cart.class).addAnnotatedClass(Items.class)
-				.setProperty("hibernate.dialect", HSQLDialect.class.getName())
-				.setProperty("hibernate.connection.driver_class", org.hsqldb.jdbcDriver.class.getName())
-				.setProperty("hibernate.connection.url", "jdbc:hsqldb:mem:test")
+				.setProperty("hibernate.dialect", H2Dialect.class.getName())
+				.setProperty("hibernate.connection.driver_class", org.h2.Driver.class.getName())
+				.setProperty("hibernate.connection.url", "jdbc:h2:mem:test")
 				.setProperty("hibernate.connection.username", "sa").setProperty("hibernate.connection.password", "")
 				.setProperty("hibernate.hbm2ddl.auto", "update");
 		ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
diff --git a/persistence-modules/hibernate-ogm/pom.xml b/persistence-modules/hibernate-ogm/pom.xml
index 2ccac03bd3..7ac29b1720 100644
--- a/persistence-modules/hibernate-ogm/pom.xml
+++ b/persistence-modules/hibernate-ogm/pom.xml
@@ -19,31 +19,31 @@
 		<dependency>
 			<groupId>org.hibernate.ogm</groupId>
 			<artifactId>hibernate-ogm-mongodb</artifactId>
-			<version>5.4.0.Final</version>
+			<version>${hibernate.version}</version>
 		</dependency>
 		<!-- Neo4j -->
 		<dependency>
 			<groupId>org.hibernate.ogm</groupId>
 			<artifactId>hibernate-ogm-neo4j</artifactId>
-			<version>5.4.0.Final</version>
+			<version>${hibernate.version}</version>
 		</dependency>
 		<!-- Narayana JTA -->  
 		<dependency>
 			<groupId>org.jboss.narayana.jta</groupId>
 			<artifactId>narayana-jta</artifactId>
-			<version>5.5.23.Final</version>
+			<version>${narayana-jta.version}</version>
 		</dependency>
 		<!-- Testing -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.easytesting</groupId>
 			<artifactId>fest-assert</artifactId>
-			<version>1.4</version>
+			<version>${fest-assert.version}</version>
 			<scope>test</scope>
 		</dependency>
     </dependencies>
@@ -57,4 +57,10 @@
             </resource>
         </resources>
     </build>
+
+    <properties>
+        <hibernate.version>5.4.0.Final</hibernate.version>
+        <fest-assert.version>1.4</fest-assert.version>
+        <narayana-jta.version>5.5.23.Final</narayana-jta.version>
+    </properties>
 </project>
\ No newline at end of file
diff --git a/persistence-modules/hibernate5/README.md b/persistence-modules/hibernate5/README.md
index 68008bc8fe..65322f0cea 100644
--- a/persistence-modules/hibernate5/README.md
+++ b/persistence-modules/hibernate5/README.md
@@ -33,3 +33,4 @@
 - [Hibernate Aggregate Functions](https://www.baeldung.com/hibernate-aggregate-functions)
 - [Hibernate Query Plan Cache](https://www.baeldung.com/hibernate-query-plan-cache)
 - [TransactionRequiredException Error](https://www.baeldung.com/jpa-transaction-required-exception)
+- [Enabling Transaction Locks in Spring Data JPA](https://www.baeldung.com/java-jpa-transaction-locks)
diff --git a/persistence-modules/hibernate5/pom.xml b/persistence-modules/hibernate5/pom.xml
index 7a9fdc0d34..bf4b2d27ec 100644
--- a/persistence-modules/hibernate5/pom.xml
+++ b/persistence-modules/hibernate5/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-testing</artifactId>
-            <version>5.2.2.Final</version>
+            <version>${hibernate.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
-            <version>1.9.5</version>
+            <version>${byte-buddy.version}</version>
         </dependency>
 
         <dependency>
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.3.0</version>
+            <version>${jaxb-api.version}</version>
         </dependency>
     </dependencies>
 
@@ -120,6 +120,8 @@
         <assertj-core.version>3.8.0</assertj-core.version>
         <openjdk-jmh.version>1.21</openjdk-jmh.version>
         <geodb.version>0.9</geodb.version>
+        <byte-buddy.version>1.9.5</byte-buddy.version>
+        <jaxb-api.version>2.3.0</jaxb-api.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/java-jpa-2/README.md b/persistence-modules/java-jpa-2/README.md
new file mode 100644
index 0000000000..e65ce65a95
--- /dev/null
+++ b/persistence-modules/java-jpa-2/README.md
@@ -0,0 +1 @@
+# Relevant Articles
diff --git a/persistence-modules/java-jpa-2/pom.xml b/persistence-modules/java-jpa-2/pom.xml
new file mode 100644
index 0000000000..12586db1b7
--- /dev/null
+++ b/persistence-modules/java-jpa-2/pom.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>java-jpa-2</artifactId>
+    <name>java-jpa-2</name>
+
+    <parent>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-jpamodelgen</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+
+        <!--Compile time JPA API-->
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>${javax.persistence-api.version}</version>
+        </dependency>
+
+        <!--Runtime JPA implementation-->
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>eclipselink</artifactId>
+            <version>${eclipselink.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${postgres.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <compilerArgument>-proc:none</compilerArgument>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.bsc.maven</groupId>
+                <artifactId>maven-processor-plugin</artifactId>
+                <version>3.3.3</version>
+                <executions>
+                    <execution>
+                        <id>process</id>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <outputDirectory>target/metamodel</outputDirectory>
+                            <processors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </processors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/metamodel</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <hibernate.version>5.4.0.Final</hibernate.version>
+        <eclipselink.version>2.7.4-RC1</eclipselink.version>
+        <postgres.version>42.2.5</postgres.version>
+        <javax.persistence-api.version>2.2</javax.persistence-api.version>
+    </properties>
+
+</project>
diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/entity/Article.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/entity/Article.java
new file mode 100644
index 0000000000..02082c3d92
--- /dev/null
+++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/entity/Article.java
@@ -0,0 +1,12 @@
+package com.baeldung.jpa.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Entity(name = "MyArticle")
+@Table(name = Article.TABLE_NAME)
+public class Article {
+
+    public static final String TABLE_NAME = "ARTICLES";
+
+}
diff --git a/persistence-modules/java-jpa/README.md b/persistence-modules/java-jpa/README.md
index 7edcd168e9..5a99217f45 100644
--- a/persistence-modules/java-jpa/README.md
+++ b/persistence-modules/java-jpa/README.md
@@ -13,3 +13,4 @@
 - [Defining JPA Entities](https://www.baeldung.com/jpa-entities)
 - [JPA @Basic Annotation](https://www.baeldung.com/jpa-basic-annotation)
 - [Default Column Values in JPA](https://www.baeldung.com/jpa-default-column-values)
+- [Persisting Enums in JPA](https://www.baeldung.com/jpa-persisting-enums-in-jpa)
diff --git a/persistence-modules/java-jpa/pom.xml b/persistence-modules/java-jpa/pom.xml
index 51cc401332..ced049d281 100644
--- a/persistence-modules/java-jpa/pom.xml
+++ b/persistence-modules/java-jpa/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>javax.persistence</groupId>
             <artifactId>javax.persistence-api</artifactId>
-            <version>2.2</version>
+            <version>${javax.persistence-api.version}</version>
         </dependency>
 
         <!--Runtime JPA implementation-->
@@ -104,10 +104,12 @@
 			</plugin>
 		</plugins>
 	</build>
+
     <properties>
         <hibernate.version>5.4.0.Final</hibernate.version>
         <eclipselink.version>2.7.4-RC1</eclipselink.version>
         <postgres.version>42.2.5</postgres.version>
+        <javax.persistence-api.version>2.2</javax.persistence-api.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/java-mongodb/pom.xml b/persistence-modules/java-mongodb/pom.xml
index 0f5efedb96..35e59e60c6 100644
--- a/persistence-modules/java-mongodb/pom.xml
+++ b/persistence-modules/java-mongodb/pom.xml
@@ -1,42 +1,49 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>java-mongodb</artifactId>
-    <version>1.0-SNAPSHOT</version>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.baeldung</groupId>
+	<artifactId>java-mongodb</artifactId>
+	<version>1.0-SNAPSHOT</version>
 	<name>java-mongodb</name>
 
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
-    </parent>
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>parent-modules</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../</relativePath>
+	</parent>
 
-    <dependencies>
+	<dependencies>
 
-        <dependency>
-            <groupId>de.flapdoodle.embedmongo</groupId>
-            <artifactId>de.flapdoodle.embedmongo</artifactId>
-            <version>${flapdoodle.version}</version>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>de.flapdoodle.embedmongo</groupId>
+			<artifactId>de.flapdoodle.embedmongo</artifactId>
+			<version>${flapdoodle.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongo-java-driver</artifactId>
+			<version>${mongo.version}</version>
+		</dependency>
 
+		<dependency>
+			<groupId>dev.morphia.morphia</groupId>
+			<artifactId>core</artifactId>
+			<version>${morphia.version}</version>
+		</dependency>
 
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongo-java-driver</artifactId>
-            <version>${mongo.version}</version>
-        </dependency>
+	</dependencies>
 
-    </dependencies>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <mongo.version>3.10.1</mongo.version>
-        <flapdoodle.version>1.11</flapdoodle.version>
-    </properties>
+	<properties>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<mongo.version>3.10.1</mongo.version>
+		<flapdoodle.version>1.11</flapdoodle.version>
+		<morphia.version>1.5.3</morphia.version>
+	</properties>
 
 </project>
diff --git a/persistence-modules/java-mongodb/src/main/java/com/baeldung/morphia/domain/Author.java b/persistence-modules/java-mongodb/src/main/java/com/baeldung/morphia/domain/Author.java
new file mode 100644
index 0000000000..b45aee6068
--- /dev/null
+++ b/persistence-modules/java-mongodb/src/main/java/com/baeldung/morphia/domain/Author.java
@@ -0,0 +1,31 @@
+package com.baeldung.morphia.domain;
+
+import java.util.List;
+
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Id;
+
+@Entity
+public class Author {
+
+    @Id
+    private String name;
+    private List<String> books;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<String> getBooks() {
+        return books;
+    }
+
+    public void setBooks(List<String> books) {
+        this.books = books;
+    }
+
+}
diff --git a/persistence-modules/java-mongodb/src/main/java/com/baeldung/morphia/domain/Book.java b/persistence-modules/java-mongodb/src/main/java/com/baeldung/morphia/domain/Book.java
new file mode 100644
index 0000000000..172c916ad9
--- /dev/null
+++ b/persistence-modules/java-mongodb/src/main/java/com/baeldung/morphia/domain/Book.java
@@ -0,0 +1,116 @@
+package com.baeldung.morphia.domain;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import dev.morphia.annotations.Embedded;
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Field;
+import dev.morphia.annotations.Id;
+import dev.morphia.annotations.Index;
+import dev.morphia.annotations.IndexOptions;
+import dev.morphia.annotations.Indexes;
+import dev.morphia.annotations.Property;
+import dev.morphia.annotations.Reference;
+import dev.morphia.annotations.Validation;
+
+@Entity("Books")
+@Indexes({ @Index(fields = @Field("title"), options = @IndexOptions(name = "book_title")) })
+@Validation("{ price : { $gt : 0 } }")
+public class Book {
+    @Id
+    private String isbn;
+    @Property
+    private String title;
+    private String author;
+    @Embedded
+    private Publisher publisher;
+    @Property("price")
+    private double cost;
+    @Reference
+    private Set<Book> companionBooks;
+
+    public Book() {
+
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public double getCost() {
+        return cost;
+    }
+
+    public void addCompanionBooks(Book book) {
+        if (companionBooks != null)
+            this.companionBooks.add(book);
+    }
+
+    public Book(String isbn, String title, String author, double cost, Publisher publisher) {
+        this.isbn = isbn;
+        this.title = title;
+        this.author = author;
+        this.cost = cost;
+        this.publisher = publisher;
+        this.companionBooks = new HashSet<>();
+    }
+
+    @Override
+    public String toString() {
+        return "Book [isbn=" + isbn + ", title=" + title + ", author=" + author + ", publisher=" + publisher + ", cost=" + cost + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((author == null) ? 0 : author.hashCode());
+        long temp;
+        temp = Double.doubleToLongBits(cost);
+        result = prime * result + (int) (temp ^ (temp >>> 32));
+        result = prime * result + ((isbn == null) ? 0 : isbn.hashCode());
+        result = prime * result + ((publisher == null) ? 0 : publisher.hashCode());
+        result = prime * result + ((title == null) ? 0 : title.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Book other = (Book) obj;
+        if (author == null) {
+            if (other.author != null)
+                return false;
+        } else if (!author.equals(other.author))
+            return false;
+        if (Double.doubleToLongBits(cost) != Double.doubleToLongBits(other.cost))
+            return false;
+        if (isbn == null) {
+            if (other.isbn != null)
+                return false;
+        } else if (!isbn.equals(other.isbn))
+            return false;
+        if (publisher == null) {
+            if (other.publisher != null)
+                return false;
+        } else if (!publisher.equals(other.publisher))
+            return false;
+        if (title == null) {
+            if (other.title != null)
+                return false;
+        } else if (!title.equals(other.title))
+            return false;
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/java-mongodb/src/main/java/com/baeldung/morphia/domain/Publisher.java b/persistence-modules/java-mongodb/src/main/java/com/baeldung/morphia/domain/Publisher.java
new file mode 100644
index 0000000000..b9e054e9ab
--- /dev/null
+++ b/persistence-modules/java-mongodb/src/main/java/com/baeldung/morphia/domain/Publisher.java
@@ -0,0 +1,70 @@
+package com.baeldung.morphia.domain;
+
+import org.bson.types.ObjectId;
+
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Id;
+
+@Entity
+public class Publisher {
+
+    @Id
+    private ObjectId id;
+    private String name;
+
+    public Publisher() {
+
+    }
+
+    public Publisher(ObjectId id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public ObjectId getId() {
+        return id;
+    }
+
+    public void setId(ObjectId id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Catalog [id=" + id + ", name=" + name + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Publisher other = (Publisher) obj;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        return true;
+    }
+
+}
diff --git a/persistence-modules/java-mongodb/src/test/java/com/baeldung/morphia/MorphiaIntegrationTest.java b/persistence-modules/java-mongodb/src/test/java/com/baeldung/morphia/MorphiaIntegrationTest.java
new file mode 100644
index 0000000000..f508c5f525
--- /dev/null
+++ b/persistence-modules/java-mongodb/src/test/java/com/baeldung/morphia/MorphiaIntegrationTest.java
@@ -0,0 +1,131 @@
+package com.baeldung.morphia;
+
+import static dev.morphia.aggregation.Group.grouping;
+import static dev.morphia.aggregation.Group.push;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.bson.types.ObjectId;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.baeldung.morphia.domain.Author;
+import com.baeldung.morphia.domain.Book;
+import com.baeldung.morphia.domain.Publisher;
+import com.mongodb.MongoClient;
+
+import dev.morphia.Datastore;
+import dev.morphia.Morphia;
+import dev.morphia.query.Query;
+import dev.morphia.query.UpdateOperations;
+
+@Ignore
+public class MorphiaIntegrationTest {
+
+    private static Datastore datastore;
+    private static ObjectId id = new ObjectId();
+
+    @BeforeClass
+    public static void setUp() {
+        Morphia morphia = new Morphia();
+        morphia.mapPackage("com.baeldung.morphia");
+        datastore = morphia.createDatastore(new MongoClient(), "library");
+        datastore.ensureIndexes();
+    }
+
+    @Test
+    public void givenDataSource_whenCreateEntity_thenEntityCreated() {
+        Publisher publisher = new Publisher(id, "Awsome Publisher");
+        Book book = new Book("9781565927186", "Learning Java", "Tom Kirkman", 3.95, publisher);
+        Book companionBook = new Book("9789332575103", "Java Performance Companion", "Tom Kirkman", 1.95, publisher);
+        book.addCompanionBooks(companionBook);
+        datastore.save(companionBook);
+        datastore.save(book);
+
+        List<Book> books = datastore.createQuery(Book.class)
+            .field("title")
+            .contains("Learning Java")
+            .find()
+            .toList();
+        assertEquals(1, books.size());
+        assertEquals(book, books.get(0));
+    }
+
+    @Test
+    public void givenDocument_whenUpdated_thenUpdateReflected() {
+        Publisher publisher = new Publisher(id, "Awsome Publisher");
+        Book book = new Book("9781565927186", "Learning Java", "Tom Kirkman", 3.95, publisher);
+        datastore.save(book);
+        Query<Book> query = datastore.createQuery(Book.class)
+            .field("title")
+            .contains("Learning Java");
+        UpdateOperations<Book> updates = datastore.createUpdateOperations(Book.class)
+            .inc("price", 1);
+        datastore.update(query, updates);
+        List<Book> books = datastore.createQuery(Book.class)
+            .field("title")
+            .contains("Learning Java")
+            .find()
+            .toList();
+        assertEquals(4.95, books.get(0)
+            .getCost());
+    }
+
+    @Test
+    public void givenDocument_whenDeleted_thenDeleteReflected() {
+        Publisher publisher = new Publisher(id, "Awsome Publisher");
+        Book book = new Book("9781565927186", "Learning Java", "Tom Kirkman", 3.95, publisher);
+        datastore.save(book);
+        Query<Book> query = datastore.createQuery(Book.class)
+            .field("title")
+            .contains("Learning Java");
+        datastore.delete(query);
+        List<Book> books = datastore.createQuery(Book.class)
+            .field("title")
+            .contains("Learning Java")
+            .find()
+            .toList();
+        assertEquals(0, books.size());
+    }
+
+    @Test
+    public void givenDocument_whenAggregated_thenResultsCollected() {
+        Publisher publisher = new Publisher(id, "Awsome Publisher");
+        datastore.save(new Book("9781565927186", "Learning Java", "Tom Kirkman", 3.95, publisher));
+        datastore.save(new Book("9781449313142", "Learning Perl", "Mark Pence", 2.95, publisher));
+        datastore.save(new Book("9787564100476", "Learning Python", "Mark Pence", 5.95, publisher));
+        datastore.save(new Book("9781449368814", "Learning Scala", "Mark Pence", 6.95, publisher));
+        datastore.save(new Book("9781784392338", "Learning Go", "Jonathan Sawyer", 8.95, publisher));
+
+        Iterator<Author> authors = datastore.createAggregation(Book.class)
+            .group("author", grouping("books", push("title")))
+            .out(Author.class);
+
+        assertTrue(authors.hasNext());
+
+    }
+
+    @Test
+    public void givenDocument_whenProjected_thenOnlyProjectionReceived() {
+        Publisher publisher = new Publisher(id, "Awsome Publisher");
+        Book book = new Book("9781565927186", "Learning Java", "Tom Kirkman", 3.95, publisher);
+        datastore.save(book);
+        List<Book> books = datastore.createQuery(Book.class)
+            .field("title")
+            .contains("Learning Java")
+            .project("title", true)
+            .find()
+            .toList();
+        assertEquals(books.size(), 1);
+        assertEquals("Learning Java", books.get(0)
+            .getTitle());
+        assertNull(books.get(0)
+            .getAuthor());
+    }
+
+}
diff --git a/persistence-modules/java-sql2o/README.md b/persistence-modules/java-sql2o/README.md
new file mode 100644
index 0000000000..a86e45f1c8
--- /dev/null
+++ b/persistence-modules/java-sql2o/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles:
+
+- [A Guide to Sql2o](http://www.baeldung.com/sql2o)
diff --git a/persistence-modules/java-sql2o/pom.xml b/persistence-modules/java-sql2o/pom.xml
new file mode 100644
index 0000000000..fe5a0e5dc8
--- /dev/null
+++ b/persistence-modules/java-sql2o/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>java-sql2o</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <name>java-sql2o</name>
+
+    <parent>
+        <artifactId>persistence-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.sql2o</groupId>
+            <artifactId>sql2o</artifactId>
+            <version>${sql2o.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>${hsqldb.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <hsqldb.version>2.4.0</hsqldb.version>
+        <junit.version>4.12</junit.version>
+        <sql2o.version>1.6.0</sql2o.version>
+    </properties>
+
+</project>
diff --git a/persistence-modules/java-sql2o/src/test/java/com/baeldung/persistence/sql2o/Sql2oIntegrationTest.java b/persistence-modules/java-sql2o/src/test/java/com/baeldung/persistence/sql2o/Sql2oIntegrationTest.java
new file mode 100644
index 0000000000..4429b1578c
--- /dev/null
+++ b/persistence-modules/java-sql2o/src/test/java/com/baeldung/persistence/sql2o/Sql2oIntegrationTest.java
@@ -0,0 +1,340 @@
+package com.baeldung.persistence.sql2o;
+
+import org.junit.Test;
+import org.sql2o.Connection;
+import org.sql2o.Query;
+import org.sql2o.ResultSetIterable;
+import org.sql2o.Sql2o;
+import org.sql2o.data.Row;
+import org.sql2o.data.Table;
+
+import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import static org.junit.Assert.*;
+
+public class Sql2oIntegrationTest {
+
+    @Test
+    public void whenSql2oCreated_thenSuccess() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.open()) {
+            java.sql.Connection jdbcConnection = connection.getJdbcConnection();
+            assertFalse(jdbcConnection.isClosed());
+        } catch (SQLException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test
+    public void whenTableCreated_thenInsertIsPossible() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.open()) {
+            connection.createQuery("create table PROJECT_1 (id integer identity, name varchar(50), url varchar(100))").executeUpdate();
+            assertEquals(0, connection.getResult());
+            connection.createQuery("INSERT INTO PROJECT_1 VALUES (1, 'tutorials', 'github.com/eugenp/tutorials')").executeUpdate();
+            assertEquals(1, connection.getResult());
+            connection.createQuery("drop table PROJECT_1").executeUpdate();
+        }
+    }
+
+    @Test
+    public void whenIdentityColumn_thenInsertReturnsNewId() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.open()) {
+            connection.createQuery("create table PROJECT_2 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))").executeUpdate();
+            Query query = connection.createQuery(
+                    "INSERT INTO PROJECT_2 (NAME, URL) VALUES ('tutorials', 'github.com/eugenp/tutorials')",
+                    true);
+            assertEquals(0, query.executeUpdate().getKey());
+            query = connection.createQuery("INSERT INTO PROJECT_2 (NAME, URL) VALUES ('REST with Spring', 'github.com/eugenp/REST-With-Spring')",
+                    true);
+            assertEquals(1, query.executeUpdate().getKeys()[0]);
+            connection.createQuery("drop table PROJECT_2").executeUpdate();
+        }
+    }
+
+    @Test
+    public void whenSelect_thenResultsAreObjects() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.open()) {
+            connection.createQuery("create table PROJECT_3 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_3 (NAME, URL) VALUES ('tutorials', 'github.com/eugenp/tutorials')").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_3 (NAME, URL) VALUES ('REST with Spring', 'github.com/eugenp/REST-With-Spring')").executeUpdate();
+            Query query = connection.createQuery("select * from PROJECT_3 order by id");
+            List<Project> list = query.executeAndFetch(Project.class);
+
+            assertEquals("tutorials", list.get(0).getName());
+            assertEquals("REST with Spring", list.get(1).getName());
+
+            connection.createQuery("drop table PROJECT_3").executeUpdate();
+        }
+    }
+
+    @Test
+    public void whenSelectAlias_thenResultsAreObjects() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.open()) {
+            connection.createQuery("create table PROJECT_4 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100), creation_date date)").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_4 (NAME, URL, creation_date) VALUES ('tutorials', 'github.com/eugenp/tutorials', '2019-01-01')").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_4 (NAME, URL, creation_date) VALUES ('REST with Spring', 'github.com/eugenp/REST-With-Spring', '2019-02-01')").executeUpdate();
+            Query query = connection.createQuery("select NAME, URL, creation_date as creationDate from PROJECT_4 order by id");
+            List<Project> list = query.executeAndFetch(Project.class);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            assertEquals("2019-01-01", sdf.format(list.get(0).getCreationDate()));
+            assertEquals("2019-02-01", sdf.format(list.get(1).getCreationDate()));
+
+            connection.createQuery("drop table PROJECT_4").executeUpdate();
+        }
+    }
+
+    @Test
+    public void whenSelectMapping_thenResultsAreObjects() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.open()) {
+            connection.createQuery("create table PROJECT_5 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100), creation_date date)").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_5 (NAME, URL, creation_date) VALUES ('tutorials', 'github.com/eugenp/tutorials', '2019-01-01')").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_5 (NAME, URL, creation_date) VALUES ('REST with Spring', 'github.com/eugenp/REST-With-Spring', '2019-02-01')").executeUpdate();
+            Query query = connection.createQuery("select * from PROJECT_5 order by id")
+                    .addColumnMapping("CrEaTiOn_date", "creationDate");
+            List<Project> list = query.executeAndFetch(Project.class);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            assertEquals("2019-01-01", sdf.format(list.get(0).getCreationDate()));
+            assertEquals("2019-02-01", sdf.format(list.get(1).getCreationDate()));
+
+            connection.createQuery("drop table PROJECT_5").executeUpdate();
+        }
+    }
+
+    @Test
+    public void whenSelectCount_thenResultIsScalar() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.open()) {
+            connection.createQuery("create table PROJECT_6 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100), creation_date date)").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_6 (NAME, URL, creation_date) VALUES ('tutorials', 'github.com/eugenp/tutorials', '2019-01-01')").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_6 (NAME, URL, creation_date) VALUES ('REST with Spring', 'github.com/eugenp/REST-With-Spring', '2019-02-01')").executeUpdate();
+            Query query = connection.createQuery("select count(*) from PROJECT_6");
+            assertEquals(2.0, query.executeScalar(Double.TYPE), 0.001);
+            connection.createQuery("drop table PROJECT_6").executeUpdate();
+        }
+    }
+
+    @Test
+    public void whenFetchTable_thenResultsAreMaps() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.open()) {
+            connection.createQuery("create table PROJECT_5 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100), creation_date date)").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_5 (NAME, URL, creation_date) VALUES ('tutorials', 'github.com/eugenp/tutorials', '2019-01-01')").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_5 (NAME, URL, creation_date) VALUES ('REST with Spring', 'github.com/eugenp/REST-With-Spring', '2019-02-01')").executeUpdate();
+            Query query = connection.createQuery("select * from PROJECT_5 order by id");
+            Table table = query.executeAndFetchTable();
+            List<Map<String, Object>> list = table.asList();
+
+            assertEquals("tutorials", list.get(0).get("name"));
+            assertEquals("REST with Spring", list.get(1).get("name"));
+
+            connection.createQuery("drop table PROJECT_5").executeUpdate();
+        }
+    }
+
+    @Test
+    public void whenFetchTable_thenResultsAreRows() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.open()) {
+            connection.createQuery("create table PROJECT_5 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100), creation_date date)").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_5 (NAME, URL, creation_date) VALUES ('tutorials', 'github.com/eugenp/tutorials', '2019-01-01')").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_5 (NAME, URL, creation_date) VALUES ('REST with Spring', 'github.com/eugenp/REST-With-Spring', '2019-02-01')").executeUpdate();
+            Query query = connection.createQuery("select * from PROJECT_5 order by id");
+            Table table = query.executeAndFetchTable();
+            List<Row> rows = table.rows();
+
+            assertEquals("tutorials", rows.get(0).getString("name"));
+            assertEquals("REST with Spring", rows.get(1).getString("name"));
+
+            connection.createQuery("drop table PROJECT_5").executeUpdate();
+        }
+    }
+
+    @Test
+    public void whenParameters_thenReplacement() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.open()) {
+            connection.createQuery("create table PROJECT_10 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))").executeUpdate();
+            Query query = connection.createQuery("INSERT INTO PROJECT_10 (NAME, URL) VALUES (:name, :url)")
+                    .addParameter("name", "REST with Spring")
+                    .addParameter("url", "github.com/eugenp/REST-With-Spring");
+            assertEquals(1, query.executeUpdate().getResult());
+
+            List<Project> list = connection.createQuery("SELECT * FROM PROJECT_10 WHERE NAME = 'REST with Spring'").executeAndFetch(Project.class);
+            assertEquals(1, list.size());
+
+            connection.createQuery("drop table PROJECT_10").executeUpdate();
+        }
+    }
+
+    @Test
+    public void whenPOJOParameters_thenReplacement() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.open()) {
+            connection.createQuery("create table PROJECT_11 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))").executeUpdate();
+
+            Project project = new Project();
+            project.setName("REST with Spring");
+            project.setUrl("github.com/eugenp/REST-With-Spring");
+            connection.createQuery("INSERT INTO PROJECT_11 (NAME, URL) VALUES (:name, :url)")
+                    .bind(project).executeUpdate();
+            assertEquals(1, connection.getResult());
+
+            List<Project> list = connection.createQuery("SELECT * FROM PROJECT_11 WHERE NAME = 'REST with Spring'").executeAndFetch(Project.class);
+            assertEquals(1, list.size());
+
+            connection.createQuery("drop table PROJECT_11").executeUpdate();
+        }
+    }
+
+    @Test
+    public void whenTransactionRollback_thenNoDataInserted() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.beginTransaction()) {
+            connection.createQuery("create table PROJECT_12 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_12 (NAME, URL) VALUES ('tutorials', 'https://github.com/eugenp/tutorials')").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_12 (NAME, URL) VALUES ('REST with Spring', 'https://github.com/eugenp/REST-With-Spring')").executeUpdate();
+            connection.rollback();
+            List<Map<String, Object>> list = connection.createQuery("SELECT * FROM PROJECT_12").executeAndFetchTable().asList();
+            assertEquals(0, list.size());
+        }
+    }
+
+    @Test
+    public void whenTransactionEnds_thenSubsequentStatementsNotRolledBack() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.beginTransaction()) {
+            connection.createQuery("create table PROJECT_13 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_13 (NAME, URL) VALUES ('tutorials', 'https://github.com/eugenp/tutorials')").executeUpdate();
+            List<Map<String, Object>> list = connection.createQuery("SELECT * FROM PROJECT_13").executeAndFetchTable().asList();
+            assertEquals(1, list.size());
+            connection.rollback();
+            list = connection.createQuery("SELECT * FROM PROJECT_13").executeAndFetchTable().asList();
+            assertEquals(0, list.size());
+            connection.createQuery("INSERT INTO PROJECT_13 (NAME, URL) VALUES ('REST with Spring', 'https://github.com/eugenp/REST-With-Spring')").executeUpdate();
+            list = connection.createQuery("SELECT * FROM PROJECT_13").executeAndFetchTable().asList();
+            assertEquals(1, list.size());
+            //No implicit rollback
+        }
+        try(Connection connection = sql2o.beginTransaction()) {
+            List<Map<String, Object>> list = connection.createQuery("SELECT * FROM PROJECT_13").executeAndFetchTable().asList();
+            assertEquals(1, list.size());
+        }
+    }
+
+    @Test
+    public void whenTransactionRollbackThenCommit_thenOnlyLastInserted() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.beginTransaction()) {
+            connection.createQuery("create table PROJECT_14 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_14 (NAME, URL) VALUES ('tutorials', 'https://github.com/eugenp/tutorials')").executeUpdate();
+            List<Map<String, Object>> list = connection.createQuery("SELECT * FROM PROJECT_14").executeAndFetchTable().asList();
+            assertEquals(1, list.size());
+            connection.rollback(false);
+            list = connection.createQuery("SELECT * FROM PROJECT_14").executeAndFetchTable().asList();
+            assertEquals(0, list.size());
+            connection.createQuery("INSERT INTO PROJECT_14 (NAME, URL) VALUES ('REST with Spring', 'https://github.com/eugenp/REST-With-Spring')").executeUpdate();
+            list = connection.createQuery("SELECT * FROM PROJECT_14").executeAndFetchTable().asList();
+            assertEquals(1, list.size());
+            //Implicit rollback
+        }
+        try(Connection connection = sql2o.beginTransaction()) {
+            List<Map<String, Object>> list = connection.createQuery("SELECT * FROM PROJECT_14").executeAndFetchTable().asList();
+            assertEquals(0, list.size());
+            connection.createQuery("INSERT INTO PROJECT_14 (NAME, URL) VALUES ('tutorials', 'https://github.com/eugenp/tutorials')").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_14 (NAME, URL) VALUES ('REST with Spring', 'https://github.com/eugenp/REST-With-Spring')").executeUpdate();
+            connection.commit();
+            list = connection.createQuery("SELECT * FROM PROJECT_14").executeAndFetchTable().asList();
+            assertEquals(2, list.size());
+        }
+        try(Connection connection = sql2o.beginTransaction()) {
+            List<Map<String, Object>> list = connection.createQuery("SELECT * FROM PROJECT_14").executeAndFetchTable().asList();
+            assertEquals(2, list.size());
+        }
+    }
+
+    @Test
+    public void whenBatch_thenMultipleInserts() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.beginTransaction()) {
+            connection.createQuery("create table PROJECT_15 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))").executeUpdate();
+            Query query = connection.createQuery("INSERT INTO PROJECT_15 (NAME, URL) VALUES (:name, :url)");
+            for(int i = 0; i < 1000; i++) {
+                query.addParameter("name", "tutorials" + i);
+                query.addParameter("url", "https://github.com/eugenp/tutorials" + i);
+                query.addToBatch();
+            }
+            query.executeBatch();
+            connection.commit();
+        }
+        try(Connection connection = sql2o.beginTransaction()) {
+            assertEquals(1000L, connection.createQuery("SELECT count(*) FROM PROJECT_15").executeScalar());
+        }
+    }
+
+    @Test
+    public void whenLazyFetch_thenResultsAreObjects() {
+        Sql2o sql2o = new Sql2o("jdbc:hsqldb:mem:testDB", "sa", "");
+        try(Connection connection = sql2o.open()) {
+            connection.createQuery("create table PROJECT_16 (ID IDENTITY, NAME VARCHAR (50), URL VARCHAR (100))").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_16 (NAME, URL) VALUES ('tutorials', 'github.com/eugenp/tutorials')").executeUpdate();
+            connection.createQuery("INSERT INTO PROJECT_16 (NAME, URL) VALUES ('REST with Spring', 'github.com/eugenp/REST-With-Spring')").executeUpdate();
+            Query query = connection.createQuery("select * from PROJECT_16 order by id");
+            try(ResultSetIterable<Project> projects = query.executeAndFetchLazy(Project.class)) {
+                for(Project p : projects) {
+                    assertNotNull(p.getName());
+                    assertNotNull(p.getUrl());
+                    assertNull(p.getCreationDate());
+                }
+            }
+            connection.createQuery("drop table PROJECT_16").executeUpdate();
+        }
+    }
+
+    static class Project {
+        private long id;
+        private String name;
+        private String url;
+        private Date creationDate;
+
+        public long getId() {
+            return id;
+        }
+
+        public void setId(long id) {
+            this.id = id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+
+        public Date getCreationDate() {
+            return creationDate;
+        }
+
+        public void setCreationDate(Date creationDate) {
+            this.creationDate = creationDate;
+        }
+    }
+
+
+}
diff --git a/persistence-modules/jpa-hibernate-cascade-type/README.md b/persistence-modules/jpa-hibernate-cascade-type/README.md
new file mode 100644
index 0000000000..d7f3d7dd7c
--- /dev/null
+++ b/persistence-modules/jpa-hibernate-cascade-type/README.md
@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Overview of JPA/Hibernate Cascade Types](https://www.baeldung.com/jpa-cascade-types)
diff --git a/persistence-modules/jpa-hibernate-cascade-type/pom.xml b/persistence-modules/jpa-hibernate-cascade-type/pom.xml
new file mode 100644
index 0000000000..8cfc2a5fa2
--- /dev/null
+++ b/persistence-modules/jpa-hibernate-cascade-type/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+
+    <artifactId>jpa-hibernate-cascade-type</artifactId>
+    <modelVersion>4.0.0</modelVersion>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+        <!-- validation -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate-validator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.el</groupId>
+            <artifactId>javax.el-api</artifactId>
+            <version>${javax.el-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.el</artifactId>
+            <version>${org.glassfish.javax.el.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>jpa-hibernate-cascade-type</finalName>
+        <resources>
+            <resource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <properties>
+        <hibernate.version>5.4.3.Final</hibernate.version>
+        <assertj-core.version>3.12.2</assertj-core.version>
+        <hibernate-validator.version>6.0.17.Final</hibernate-validator.version>
+        <javax.el-api.version>3.0.0</javax.el-api.version>
+        <org.glassfish.javax.el.version>3.0.1-b11</org.glassfish.javax.el.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/persistence-modules/jpa-hibernate-cascade-type/src/main/java/com/baeldung/cascading/HibernateUtil.java b/persistence-modules/jpa-hibernate-cascade-type/src/main/java/com/baeldung/cascading/HibernateUtil.java
new file mode 100644
index 0000000000..700c289e38
--- /dev/null
+++ b/persistence-modules/jpa-hibernate-cascade-type/src/main/java/com/baeldung/cascading/HibernateUtil.java
@@ -0,0 +1,45 @@
+package com.baeldung.cascading;
+
+import com.baeldung.cascading.domain.Address;
+import com.baeldung.cascading.domain.Person;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.service.ServiceRegistry;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+
+public class HibernateUtil {
+    private static SessionFactory sessionFactory;
+
+    public static SessionFactory getSessionFactory() {
+        try {
+            Properties properties = getProperties();
+            Configuration configuration = new Configuration();
+            configuration.setProperties(properties);
+            configuration.addAnnotatedClass(Person.class);
+            configuration.addAnnotatedClass(Address.class);
+            ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
+                    .applySettings(configuration.getProperties()).build();
+            sessionFactory = configuration.buildSessionFactory(serviceRegistry);
+            return sessionFactory;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return sessionFactory;
+    }
+
+    private static Properties getProperties() throws IOException {
+        Properties properties = new Properties();
+        URL propertiesURL = Thread.currentThread()
+                .getContextClassLoader()
+                .getResource("hibernate.properties");
+        try (FileInputStream inputStream = new FileInputStream(propertiesURL.getFile())) {
+            properties.load(inputStream);
+        }
+        return properties;
+    }
+}
diff --git a/persistence-modules/jpa-hibernate-cascade-type/src/main/java/com/baeldung/cascading/domain/Address.java b/persistence-modules/jpa-hibernate-cascade-type/src/main/java/com/baeldung/cascading/domain/Address.java
new file mode 100644
index 0000000000..a16b0f81b6
--- /dev/null
+++ b/persistence-modules/jpa-hibernate-cascade-type/src/main/java/com/baeldung/cascading/domain/Address.java
@@ -0,0 +1,64 @@
+package com.baeldung.cascading.domain;
+
+import javax.persistence.*;
+
+@Entity
+public class Address {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+    private String street;
+    private int houseNumber;
+    private String city;
+    private int zipCode;
+    @ManyToOne(fetch = FetchType.LAZY)
+    private Person person;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public Person getPerson() {
+        return person;
+    }
+
+    public void setPerson(Person person) {
+        this.person = person;
+    }
+
+    public String getStreet() {
+        return street;
+    }
+
+    public int getHouseNumber() {
+        return houseNumber;
+    }
+
+    public void setHouseNumber(int houseNumber) {
+        this.houseNumber = houseNumber;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public int getZipCode() {
+        return zipCode;
+    }
+
+    public void setZipCode(int zipCode) {
+        this.zipCode = zipCode;
+    }
+
+    public void setStreet(String street) {
+        this.street = street;
+    }
+}
diff --git a/persistence-modules/jpa-hibernate-cascade-type/src/main/java/com/baeldung/cascading/domain/Person.java b/persistence-modules/jpa-hibernate-cascade-type/src/main/java/com/baeldung/cascading/domain/Person.java
new file mode 100644
index 0000000000..9ca61323b3
--- /dev/null
+++ b/persistence-modules/jpa-hibernate-cascade-type/src/main/java/com/baeldung/cascading/domain/Person.java
@@ -0,0 +1,38 @@
+package com.baeldung.cascading.domain;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Entity
+public class Person {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+    private String name;
+    @OneToMany(mappedBy = "person", cascade = CascadeType.ALL)
+    private List<Address> addresses;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public List<Address> getAddresses() {
+        return addresses;
+    }
+
+    public void setAddresses(List<Address> addresses) {
+        this.addresses = addresses;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/persistence-modules/jpa-hibernate-cascade-type/src/test/java/com/baeldung/cascading/CasCadeTypeUnitTest.java b/persistence-modules/jpa-hibernate-cascade-type/src/test/java/com/baeldung/cascading/CasCadeTypeUnitTest.java
new file mode 100644
index 0000000000..a196bdac12
--- /dev/null
+++ b/persistence-modules/jpa-hibernate-cascade-type/src/test/java/com/baeldung/cascading/CasCadeTypeUnitTest.java
@@ -0,0 +1,169 @@
+package com.baeldung.cascading;
+
+import com.baeldung.cascading.domain.Address;
+import com.baeldung.cascading.domain.Person;
+import org.assertj.core.api.Assertions;
+import org.hibernate.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+public class CasCadeTypeUnitTest {
+    private static SessionFactory sessionFactory;
+    private Session session;
+    private Transaction transaction;
+
+    @BeforeClass
+    public static void beforeTests() {
+        sessionFactory = HibernateUtil.getSessionFactory();
+    }
+
+    @Before
+    public void setUp() {
+        session = sessionFactory.openSession();
+        transaction = session.beginTransaction();
+    }
+
+    @After
+    public void tearDown() {
+        transaction.rollback();
+        session.close();
+    }
+
+    @Test
+    public void testPersist() {
+        Person person = new Person();
+        Address address = new Address();
+        address.setPerson(person);
+        person.setAddresses(Arrays.asList(address));
+        session.persist(person);
+        session.flush();
+        session.clear();
+    }
+
+    @Test
+    public void testMerge() {
+        int addressId;
+        Person person = buildPerson("devender");
+        Address address = buildAddress(person);
+        person.setAddresses(Arrays.asList(address));
+        session.persist(person);
+        session.flush();
+        addressId = address.getId();
+        session.clear();
+
+        Address savedAddressEntity = session.find(Address.class, addressId);
+        Person savedPersonEntity = savedAddressEntity.getPerson();
+        savedPersonEntity.setName("devender kumar");
+        savedAddressEntity.setHouseNumber(24);
+        session.merge(savedPersonEntity);
+        session.flush();
+    }
+
+    @Test
+    public void testRemove() {
+        int personId;
+        Person person = buildPerson("devender");
+        Address address = buildAddress(person);
+        person.setAddresses(Arrays.asList(address));
+        session.persist(person);
+        session.flush();
+        personId = person.getId();
+        session.clear();
+
+        Person savedPersonEntity = session.find(Person.class, personId);
+        session.remove(savedPersonEntity);
+        session.flush();
+    }
+
+    @Test
+    public void testDetach() {
+        Person person = buildPerson("devender");
+        Address address = buildAddress(person);
+        person.setAddresses(Arrays.asList(address));
+        session.persist(person);
+        session.flush();
+        Assertions.assertThat(session.contains(person)).isTrue();
+        Assertions.assertThat(session.contains(address)).isTrue();
+
+        session.detach(person);
+        Assertions.assertThat(session.contains(person)).isFalse();
+        Assertions.assertThat(session.contains(address)).isFalse();
+    }
+
+    @Test
+    public void testLock() {
+        Person person = buildPerson("devender");
+        Address address = buildAddress(person);
+        person.setAddresses(Arrays.asList(address));
+        session.persist(person);
+        session.flush();
+        Assertions.assertThat(session.contains(person)).isTrue();
+        Assertions.assertThat(session.contains(address)).isTrue();
+
+        session.detach(person);
+        Assertions.assertThat(session.contains(person)).isFalse();
+        Assertions.assertThat(session.contains(address)).isFalse();
+        session.unwrap(Session.class)
+                .buildLockRequest(new LockOptions(LockMode.NONE))
+                .lock(person);
+
+        Assertions.assertThat(session.contains(person)).isTrue();
+        Assertions.assertThat(session.contains(address)).isTrue();
+    }
+
+    @Test
+    public void testRefresh() {
+        Person person = buildPerson("devender");
+        Address address = buildAddress(person);
+        person.setAddresses(Arrays.asList(address));
+        session.persist(person);
+        session.flush();
+        person.setName("Devender Kumar");
+        address.setHouseNumber(24);
+        session.refresh(person);
+        Assertions.assertThat(person.getName()).isEqualTo("devender");
+        Assertions.assertThat(address.getHouseNumber()).isEqualTo(23);
+    }
+
+    @Test
+    public void testReplicate() {
+        Person person = buildPerson("devender");
+        person.setId(2);
+        Address address = buildAddress(person);
+        address.setId(2);
+        person.setAddresses(Arrays.asList(address));
+        session.unwrap(Session.class).replicate(person, ReplicationMode.OVERWRITE);
+        session.flush();
+        Assertions.assertThat(person.getId()).isEqualTo(2);
+        Assertions.assertThat(address.getId()).isEqualTo(2);
+    }
+
+    @Test
+    public void testSaveOrUpdate() {
+        Person person = buildPerson("devender");
+        Address address = buildAddress(person);
+        person.setAddresses(Arrays.asList(address));
+        session.saveOrUpdate(person);
+        session.flush();
+    }
+
+    private Address buildAddress(Person person) {
+        Address address = new Address();
+        address.setCity("Berlin");
+        address.setHouseNumber(23);
+        address.setStreet("Zeughofstraße");
+        address.setZipCode(123001);
+        address.setPerson(person);
+        return address;
+    }
+
+    private Person buildPerson(String name) {
+        Person person = new Person();
+        person.setName(name);
+        return person;
+    }
+}
diff --git a/persistence-modules/jpa-hibernate-cascade-type/src/test/resources/hibernate.properties b/persistence-modules/jpa-hibernate-cascade-type/src/test/resources/hibernate.properties
new file mode 100644
index 0000000000..c22da2496b
--- /dev/null
+++ b/persistence-modules/jpa-hibernate-cascade-type/src/test/resources/hibernate.properties
@@ -0,0 +1,10 @@
+hibernate.connection.driver_class=org.h2.Driver
+hibernate.connection.url=jdbc:h2:mem:mydb1;DB_CLOSE_DELAY=-1
+hibernate.connection.username=sa
+hibernate.connection.autocommit=true
+jdbc.password=
+
+hibernate.dialect=org.hibernate.dialect.H2Dialect
+hibernate.show_sql=true
+hibernate.hbm2ddl.auto=create-drop
+
diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index e6d883334f..314b680ca5 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -29,7 +29,9 @@
         <module>java-cockroachdb</module>
         <module>java-jdbi</module>
         <module>java-jpa</module>
+        <module>java-jpa-2</module>
         <module>java-mongodb</module>
+        <module>java-sql2o</module>
         <module>jnosql</module>
         <module>liquibase</module>
         <module>orientdb</module>
@@ -57,5 +59,7 @@
         <module>spring-hibernate4</module>
         <module>spring-jpa</module>
         <module>spring-persistence-simple</module>
+        <module>jpa-hibernate-cascade-type</module>
+				<module>r2dbc</module>
     </modules>
 </project>
diff --git a/persistence-modules/r2dbc/.gitignore b/persistence-modules/r2dbc/.gitignore
new file mode 100644
index 0000000000..a2a3040aa8
--- /dev/null
+++ b/persistence-modules/r2dbc/.gitignore
@@ -0,0 +1,31 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**
+!**/src/test/**
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+
+### VS Code ###
+.vscode/
diff --git a/persistence-modules/r2dbc/.mvn/wrapper/MavenWrapperDownloader.java b/persistence-modules/r2dbc/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 0000000000..72308aa479
--- /dev/null
+++ b/persistence-modules/r2dbc/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,114 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL =
+            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: : " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}
diff --git a/persistence-modules/r2dbc/.mvn/wrapper/maven-wrapper.jar b/persistence-modules/r2dbc/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000000..01e6799737
Binary files /dev/null and b/persistence-modules/r2dbc/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/persistence-modules/r2dbc/.mvn/wrapper/maven-wrapper.properties b/persistence-modules/r2dbc/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000000..cd0d451ccd
--- /dev/null
+++ b/persistence-modules/r2dbc/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
diff --git a/persistence-modules/r2dbc/README.md b/persistence-modules/r2dbc/README.md
new file mode 100644
index 0000000000..02d3cbf5fc
--- /dev/null
+++ b/persistence-modules/r2dbc/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles:
+- [R2DBC – Reactive Relational Database Connectivity](https://www.baeldung.com/r2dbc)
+
diff --git a/persistence-modules/r2dbc/mvnw b/persistence-modules/r2dbc/mvnw
new file mode 100644
index 0000000000..8b9da3b8b6
--- /dev/null
+++ b/persistence-modules/r2dbc/mvnw
@@ -0,0 +1,286 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+  # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        wget "$jarUrl" -O "$wrapperJarPath"
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        curl -o "$wrapperJarPath" "$jarUrl"
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/persistence-modules/r2dbc/mvnw.cmd b/persistence-modules/r2dbc/mvnw.cmd
new file mode 100644
index 0000000000..fef5a8f7f9
--- /dev/null
+++ b/persistence-modules/r2dbc/mvnw.cmd
@@ -0,0 +1,161 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+	IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B 
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    echo Found %WRAPPER_JAR%
+) else (
+    echo Couldn't find %WRAPPER_JAR%, downloading it ...
+	echo Downloading from: %DOWNLOAD_URL%
+    powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
+    echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/persistence-modules/r2dbc/pom.xml b/persistence-modules/r2dbc/pom.xml
new file mode 100644
index 0000000000..388abafdaf
--- /dev/null
+++ b/persistence-modules/r2dbc/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.1.6.RELEASE</version>
+		<relativePath /> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>org.baeldung.examples.r2dbc</groupId>
+	<artifactId>r2dbc-example</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>r2dbc-example</name>
+	<description>Sample R2DBC Project</description>
+
+	<properties>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webflux</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+
+		<!-- R2DBC H2 Driver -->
+		<dependency>
+			<groupId>io.r2dbc</groupId>
+			<artifactId>r2dbc-h2</artifactId>
+			<version>0.8.0.M8</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<!-- Extra repositories for R2DBC-H2 -->
+	<repositories>
+
+		<repository>
+			<id>spring-snapshots</id>
+			<name>Spring Snapshots</name>
+			<url>https://repo.spring.io/snapshot</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+
+	</repositories>
+
+</project>
diff --git a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/Account.java b/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/Account.java
new file mode 100644
index 0000000000..65bf33168e
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/Account.java
@@ -0,0 +1,68 @@
+package org.baeldung.examples.r2dbc;
+
+import java.math.BigDecimal;
+
+public class Account {
+
+    private Long id;
+    private String iban;
+    private BigDecimal balance;
+    
+    
+    public Account() {}
+    
+    public Account(Long id, String iban, BigDecimal balance) {
+        this.id = id;
+        this.iban = iban;
+        this.balance = balance;
+    }
+
+    public Account(Long id, String iban, Double balance) {
+        this.id = id;
+        this.iban = iban;
+        this.balance = new BigDecimal(balance);
+    }
+    
+    /**
+     * @return the id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * @param id the id to set
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * @return the iban
+     */
+    public String getIban() {
+        return iban;
+    }
+
+    /**
+     * @param iban the iban to set
+     */
+    public void setIban(String iban) {
+        this.iban = iban;
+    }
+
+    /**
+     * @return the balance
+     */
+    public BigDecimal getBalance() {
+        return balance;
+    }
+
+    /**
+     * @param balance the balance to set
+     */
+    public void setBalance(BigDecimal balance) {
+        this.balance = balance;
+    }
+
+}
diff --git a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/AccountResource.java b/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/AccountResource.java
new file mode 100644
index 0000000000..90816a7522
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/AccountResource.java
@@ -0,0 +1,56 @@
+/**
+ * 
+ */
+package org.baeldung.examples.r2dbc;
+
+import java.math.BigDecimal;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.r2dbc.spi.Connection;
+import io.r2dbc.spi.ConnectionFactory;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * @author Philippe
+ *
+ */
+@RestController
+public class AccountResource {
+
+    private final ReactiveAccountDao accountDao;
+
+    public AccountResource(ReactiveAccountDao accountDao) {
+        this.accountDao = accountDao;
+    }
+
+    @GetMapping("/accounts/{id}")
+    public Mono<ResponseEntity<Account>> getAccount(@PathVariable("id") Long id) {
+
+        return accountDao.findById(id)
+          .map(acc -> new ResponseEntity<>(acc, HttpStatus.OK))
+          .switchIfEmpty(Mono.just(new ResponseEntity<>(null, HttpStatus.NOT_FOUND)));
+    }
+
+    @GetMapping("/accounts")
+    public Flux<Account> getAllAccounts() {
+        return accountDao.findAll();
+    }
+
+    @PostMapping("/accounts")
+    public Mono<ResponseEntity<Account>> postAccount(@RequestBody Account account) {
+        return accountDao.createAccount(account)
+          .map(acc -> new ResponseEntity<>(acc, HttpStatus.CREATED))
+          .log();
+    }
+
+}
diff --git a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/DatasourceConfig.java b/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/DatasourceConfig.java
new file mode 100644
index 0000000000..5b695f39f5
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/DatasourceConfig.java
@@ -0,0 +1,65 @@
+package org.baeldung.examples.r2dbc;
+
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.StringUtils;
+
+import io.netty.util.internal.StringUtil;
+import io.r2dbc.spi.ConnectionFactories;
+import io.r2dbc.spi.ConnectionFactory;
+import io.r2dbc.spi.ConnectionFactoryOptions;
+import io.r2dbc.spi.ConnectionFactoryOptions.Builder;
+import io.r2dbc.spi.Option;
+import reactor.core.publisher.Flux;
+
+import static io.r2dbc.spi.ConnectionFactoryOptions.*;
+
+
+@Configuration
+public class DatasourceConfig {
+    
+    @Bean
+    public ConnectionFactory connectionFactory(R2DBCConfigurationProperties properties) {
+        
+        ConnectionFactoryOptions baseOptions = ConnectionFactoryOptions.parse(properties.getUrl());
+        Builder ob = ConnectionFactoryOptions.builder().from(baseOptions);
+        if ( !StringUtil.isNullOrEmpty(properties.getUser())) {
+            ob = ob.option(USER, properties.getUser());
+        }
+
+        if ( !StringUtil.isNullOrEmpty(properties.getPassword())) {
+            ob = ob.option(PASSWORD, properties.getPassword());
+        }
+        
+        ConnectionFactory cf = ConnectionFactories.get(ob.build());
+        return cf;
+    }
+    
+
+    @Bean
+    public CommandLineRunner initDatabase(ConnectionFactory cf) {
+    
+        return (args) ->
+          Flux.from(cf.create())
+              .flatMap(c -> 
+                Flux.from(c.createBatch()
+                  .add("drop table if exists Account")
+                  .add("create table Account(" +
+                    "id IDENTITY(1,1)," +
+                    "iban varchar(80) not null," +
+                    "balance DECIMAL(18,2) not null)")
+                  .add("insert into Account(iban,balance)" +
+                    "values('BR430120980198201982',100.00)")
+                  .add("insert into Account(iban,balance)" +
+                    "values('BR430120998729871000',250.00)")
+                  .execute())
+                .doFinally((st) -> c.close())
+              )
+              .log()
+              .blockLast();
+    }
+
+
+}
+
diff --git a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/R2DBCConfigurationProperties.java b/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/R2DBCConfigurationProperties.java
new file mode 100644
index 0000000000..02733ebed9
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/R2DBCConfigurationProperties.java
@@ -0,0 +1,58 @@
+package org.baeldung.examples.r2dbc;
+
+import javax.validation.constraints.NotEmpty;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "r2dbc")
+public class R2DBCConfigurationProperties {
+
+    @NotEmpty
+    private String url;
+
+    private String user;
+    private String password;
+
+    /**
+     * @return the url
+     */
+    public String getUrl() {
+        return url;
+    }
+
+    /**
+     * @param url the url to set
+     */
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    /**
+     * @return the user
+     */
+    public String getUser() {
+        return user;
+    }
+
+    /**
+     * @param user the user to set
+     */
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    /**
+     * @return the password
+     */
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * @param password the password to set
+     */
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+}
diff --git a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/R2dbcExampleApplication.java b/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/R2dbcExampleApplication.java
new file mode 100644
index 0000000000..1147936e2d
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/R2dbcExampleApplication.java
@@ -0,0 +1,17 @@
+package org.baeldung.examples.r2dbc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+
+@SpringBootApplication
+@EnableConfigurationProperties(R2DBCConfigurationProperties.class)
+public class R2dbcExampleApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(R2dbcExampleApplication.class, args);
+    }
+    
+    
+
+}
diff --git a/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/ReactiveAccountDao.java b/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/ReactiveAccountDao.java
new file mode 100644
index 0000000000..f9717d4b9b
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/java/org/baeldung/examples/r2dbc/ReactiveAccountDao.java
@@ -0,0 +1,76 @@
+package org.baeldung.examples.r2dbc;
+
+import java.math.BigDecimal;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+import io.r2dbc.spi.Connection;
+import io.r2dbc.spi.ConnectionFactory;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@Component
+public class ReactiveAccountDao {
+
+    private ConnectionFactory connectionFactory;
+
+    public ReactiveAccountDao(ConnectionFactory connectionFactory) {
+        this.connectionFactory = connectionFactory;
+    }
+
+    public Mono<Account> findById(long id) {
+
+        return Mono.from(connectionFactory.create())
+          .flatMap(c -> Mono.from(c.createStatement("select id,iban,balance from Account where id = $1")
+            .bind("$1", id)
+            .execute())
+             .doFinally((st) -> close(c)))
+          .map(result -> result.map((row, meta) -> 
+            new Account(row.get("id", Long.class),
+              row.get("iban", String.class),
+              row.get("balance", BigDecimal.class))))
+          .flatMap( p -> Mono.from(p));
+    }
+
+    public Flux<Account> findAll() {
+
+        return Mono.from(connectionFactory.create())
+            .flatMap((c) -> Mono.from(c.createStatement("select id,iban,balance from Account")
+                .execute())
+                .doFinally((st) -> close(c)))
+            .flatMapMany(result -> Flux.from(result.map((row, meta) -> {
+                Account acc = new Account();
+                acc.setId(row.get("id", Long.class));
+                acc.setIban(row.get("iban", String.class));
+                acc.setBalance(row.get("balance", BigDecimal.class));
+                return acc;
+            })));
+    }
+    
+    public Mono<Account> createAccount(Account account) {
+        
+        return Mono.from(connectionFactory.create())
+          .flatMap(c -> Mono.from(c.beginTransaction())
+            .then(Mono.from(c.createStatement("insert into Account(iban,balance) values($1,$2)")
+              .bind("$1", account.getIban())
+              .bind("$2", account.getBalance())
+              .returnGeneratedValues("id")
+              .execute()))
+            .map(result -> result.map((row, meta) -> 
+                new Account(row.get("id", Long.class),
+                  account.getIban(),
+                  account.getBalance())))
+            .flatMap(pub -> Mono.from(pub))
+            .delayUntil(r -> c.commitTransaction())
+            .doFinally((st) -> c.close()));
+        
+    }
+
+    private <T> Mono<T> close(Connection connection) {
+        return Mono.from(connection.close())
+          .then(Mono.empty());
+    }
+
+}
diff --git a/persistence-modules/r2dbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/persistence-modules/r2dbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json
new file mode 100644
index 0000000000..55eb5659a7
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,5 @@
+{"properties": [{
+  "name": "r2dbc",
+  "type": "org.baeldung.examples.r2dbc.R2DBCConfigurationProperties",
+  "description": "R2DBC Connection properties"
+}]}
\ No newline at end of file
diff --git a/persistence-modules/r2dbc/src/main/resources/application.yml b/persistence-modules/r2dbc/src/main/resources/application.yml
new file mode 100644
index 0000000000..bb47c7261c
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/resources/application.yml
@@ -0,0 +1,13 @@
+spring:
+  application:
+    name: r2dbc-test
+    
+# R2DBC URL
+r2dbc:
+  url: r2dbc:h2:mem://./testdb
+  
+  
+  
+    
+    
+    
diff --git a/persistence-modules/r2dbc/src/test/java/org/baeldung/examples/r2dbc/R2dbcExampleApplicationTests.java b/persistence-modules/r2dbc/src/test/java/org/baeldung/examples/r2dbc/R2dbcExampleApplicationTests.java
new file mode 100644
index 0000000000..a1d433847b
--- /dev/null
+++ b/persistence-modules/r2dbc/src/test/java/org/baeldung/examples/r2dbc/R2dbcExampleApplicationTests.java
@@ -0,0 +1,102 @@
+package org.baeldung.examples.r2dbc;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import java.util.List;
+
+import org.hamcrest.core.IsNull;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+import io.r2dbc.spi.ConnectionFactory;
+import reactor.core.publisher.Flux;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class R2dbcExampleApplicationTests {
+    
+    
+    @Autowired
+    private WebTestClient webTestClient;
+    
+    @Autowired
+    ConnectionFactory cf;
+    
+    @Before
+    public void initDatabase() {
+        
+        Flux.from(cf.create())
+          .flatMap(c -> 
+            c.createBatch()
+              .add("drop table if exists Account")
+              .add("create table Account(id IDENTITY(1,1), iban varchar(80) not null, balance DECIMAL(18,2) not null)")
+              .add("insert into Account(iban,balance) values ( 'BR430120980198201982', 100.00 ) ")
+              .add("insert into Account(iban,balance) values ( 'BR430120998729871000', 250.00 ) ")
+              .execute()
+          )
+          .log()
+          .blockLast();
+    }
+
+    @Test
+    public void givenExistingAccountId_whenGetAccount_thenReturnExistingAccountInfo() {
+        
+        webTestClient
+          .get()
+          .uri("/accounts/1")
+          .accept(MediaType.APPLICATION_JSON)
+          .exchange()
+          .expectStatus()
+            .isOk()
+          .expectBody(Account.class)
+            .value((acc) -> {
+                assertThat(acc.getId(),is(1l));
+            });
+    }
+    
+    @Test
+    public void givenDatabaseHasSomeAccounts_whenGetAccount_thenReturnExistingAccounts() {
+        
+        webTestClient
+          .get()
+          .uri("/accounts")
+          .accept(MediaType.APPLICATION_JSON)
+          .exchange()
+          .expectStatus()
+            .isOk()
+          .expectBody(List.class)
+            .value((accounts) -> {
+                assertThat(accounts.size(),not(is(0)));
+            });
+    }
+    
+    
+    @Test
+    public void givenNewAccountData_whenPostAccount_thenReturnNewAccountInfo() {
+
+        webTestClient
+        .post()
+        .uri("/accounts")
+        .syncBody(new Account(null,"BR4303010298012098", 151.00 ))
+        .accept(MediaType.APPLICATION_JSON)
+        .exchange()
+        .expectStatus()
+          .is2xxSuccessful()
+        .expectBody(Account.class)
+          .value((acc) -> {
+              assertThat(acc.getId(),is(notNullValue()));
+          });
+        
+    }
+
+}
diff --git a/persistence-modules/r2dbc/src/test/resources/application.yml b/persistence-modules/r2dbc/src/test/resources/application.yml
new file mode 100644
index 0000000000..8925116e4a
--- /dev/null
+++ b/persistence-modules/r2dbc/src/test/resources/application.yml
@@ -0,0 +1,6 @@
+# R2DBC Test configuration
+r2dbc:
+  url: r2dbc:h2:mem://./testdb
+  
+  
+  
diff --git a/persistence-modules/spring-boot-mysql/.gitignore b/persistence-modules/spring-boot-mysql/.gitignore
new file mode 100644
index 0000000000..96136ab255
--- /dev/null
+++ b/persistence-modules/spring-boot-mysql/.gitignore
@@ -0,0 +1,5 @@
+/target/
+.settings/
+.classpath
+.project
+.mvn/
\ No newline at end of file
diff --git a/persistence-modules/spring-boot-mysql/pom.xml b/persistence-modules/spring-boot-mysql/pom.xml
new file mode 100644
index 0000000000..6be58332aa
--- /dev/null
+++ b/persistence-modules/spring-boot-mysql/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-boot-mysql</artifactId>
+    <version>0.1.0</version>
+    <name>spring-boot-mysql</name>
+
+    <parent>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>2.1.5.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>spring-boot-mysql-timezone</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+
+        </plugins>
+    </build>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <mysql-connector-java.version>8.0.12</mysql-connector-java.version>
+    </properties>
+
+</project>
diff --git a/persistence-modules/spring-boot-mysql/src/main/java/com/baeldung/boot/Application.java b/persistence-modules/spring-boot-mysql/src/main/java/com/baeldung/boot/Application.java
new file mode 100644
index 0000000000..d69f66fc7a
--- /dev/null
+++ b/persistence-modules/spring-boot-mysql/src/main/java/com/baeldung/boot/Application.java
@@ -0,0 +1,20 @@
+package com.baeldung.boot;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import javax.annotation.PostConstruct;
+import java.util.TimeZone;
+
+@SpringBootApplication
+public class Application {
+
+    @PostConstruct
+    void started() {
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    }
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/persistence-modules/spring-boot-mysql/src/main/java/com/baeldung/boot/Controller.java b/persistence-modules/spring-boot-mysql/src/main/java/com/baeldung/boot/Controller.java
new file mode 100644
index 0000000000..48864269fe
--- /dev/null
+++ b/persistence-modules/spring-boot-mysql/src/main/java/com/baeldung/boot/Controller.java
@@ -0,0 +1,27 @@
+package com.baeldung.boot;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+public class Controller {
+
+    @Autowired
+    UserRepository userRepository;
+
+    @GetMapping
+    public User get() {
+        User user = new User();
+        userRepository.save(user);
+        return user;
+    }
+
+    @GetMapping("/find")
+    public List<User> find() {
+        List<User> users = userRepository.findAll();
+        return users;
+    }
+}
diff --git a/persistence-modules/spring-boot-mysql/src/main/java/com/baeldung/boot/User.java b/persistence-modules/spring-boot-mysql/src/main/java/com/baeldung/boot/User.java
new file mode 100644
index 0000000000..55cb97dec2
--- /dev/null
+++ b/persistence-modules/spring-boot-mysql/src/main/java/com/baeldung/boot/User.java
@@ -0,0 +1,40 @@
+package com.baeldung.boot;
+
+
+import org.springframework.data.annotation.CreatedDate;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Entity
+public class User {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Integer id;
+
+    @Column
+    private String name;
+
+    @CreatedDate
+    private Date createdDate = new Date();
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/persistence-modules/spring-boot-mysql/src/main/java/com/baeldung/boot/UserRepository.java b/persistence-modules/spring-boot-mysql/src/main/java/com/baeldung/boot/UserRepository.java
new file mode 100644
index 0000000000..3c50c30cce
--- /dev/null
+++ b/persistence-modules/spring-boot-mysql/src/main/java/com/baeldung/boot/UserRepository.java
@@ -0,0 +1,10 @@
+package com.baeldung.boot;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.io.Serializable;
+
+@Repository
+public interface UserRepository extends JpaRepository<User, Serializable> {
+}
diff --git a/persistence-modules/spring-boot-mysql/src/main/resources/application.yml b/persistence-modules/spring-boot-mysql/src/main/resources/application.yml
new file mode 100644
index 0000000000..5404555d49
--- /dev/null
+++ b/persistence-modules/spring-boot-mysql/src/main/resources/application.yml
@@ -0,0 +1,14 @@
+spring:
+  datasource:
+    url: jdbc:mysql://localhost:3306/test?useLegacyDatetimeCode=false
+    username: root
+    password:
+
+  jpa:
+    hibernate:
+      ddl-auto: update
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MySQL5Dialect
+        jdbc:
+          time_zone: UTC
\ No newline at end of file
diff --git a/persistence-modules/spring-boot-persistence-h2/src/test/java/com/baeldung/SpringContextTest.java b/persistence-modules/spring-boot-persistence-h2/src/test/java/com/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..90787681cf
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-h2/src/test/java/com/baeldung/SpringContextTest.java
@@ -0,0 +1,19 @@
+package com.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(loader = AnnotationConfigContextLoader.class)
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/persistence-modules/spring-boot-persistence-mongodb/README.md b/persistence-modules/spring-boot-persistence-mongodb/README.md
index 40f9f40749..f277ef66ca 100644
--- a/persistence-modules/spring-boot-persistence-mongodb/README.md
+++ b/persistence-modules/spring-boot-persistence-mongodb/README.md
@@ -2,3 +2,4 @@
 
 - [Auto-Generated Field for MongoDB using Spring Boot](https://www.baeldung.com/spring-boot-mongodb-auto-generated-field)
 - [Spring Boot Integration Testing with Embedded MongoDB](http://www.baeldung.com/spring-boot-embedded-mongodb)
+- [Upload and Retrieve Files Using MongoDB and Spring Boot](https://www.baeldung.com/spring-boot-mongodb-upload-file)
diff --git a/persistence-modules/spring-boot-persistence-mongodb/pom.xml b/persistence-modules/spring-boot-persistence-mongodb/pom.xml
index 585e54bf57..dae5efa6d0 100644
--- a/persistence-modules/spring-boot-persistence-mongodb/pom.xml
+++ b/persistence-modules/spring-boot-persistence-mongodb/pom.xml
@@ -20,6 +20,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>        
         <!-- MongoDB -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/daos/PhotoRepository.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/daos/PhotoRepository.java
new file mode 100644
index 0000000000..dc18df7b0a
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/daos/PhotoRepository.java
@@ -0,0 +1,9 @@
+package com.baeldung.mongodb.file.daos;
+
+import org.springframework.data.mongodb.repository.MongoRepository;
+
+import com.baeldung.mongodb.file.models.Photo;
+
+public interface PhotoRepository extends MongoRepository<Photo, String> {
+
+}
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/models/Photo.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/models/Photo.java
new file mode 100644
index 0000000000..afb79b4dbb
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/models/Photo.java
@@ -0,0 +1,51 @@
+package com.baeldung.mongodb.file.models;
+
+import org.bson.types.Binary;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+@Document(collection = "photos")
+public class Photo {
+    
+    @Id
+    private String id;
+    
+    private String title;
+        
+    private Binary image;
+
+    public Photo(String title) {
+        super();
+        this.title = title;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Binary getImage() {
+        return image;
+    }
+
+    public void setImage(Binary image) {
+        this.image = image;
+    }
+
+    @Override
+    public String toString() {
+        return "Photo [id=" + id + ", title=" + title + ", image=" + image + "]";
+    }
+    
+}
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/models/Video.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/models/Video.java
new file mode 100644
index 0000000000..9e60fd1746
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/models/Video.java
@@ -0,0 +1,39 @@
+package com.baeldung.mongodb.file.models;
+
+import java.io.InputStream;
+
+public class Video {
+    private String title;
+    private InputStream stream;
+    
+    public Video() {
+        super();
+    }
+
+    public Video(String title) {
+        super();
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public InputStream getStream() {
+        return stream;
+    }
+
+    public void setStream(InputStream stream) {
+        this.stream = stream;
+    }
+
+    @Override
+    public String toString() {
+        return "Video [title=" + title + "]";
+    }
+
+}
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/services/PhotoService.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/services/PhotoService.java
new file mode 100644
index 0000000000..8d0313b280
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/services/PhotoService.java
@@ -0,0 +1,30 @@
+package com.baeldung.mongodb.file.services;
+
+import java.io.IOException;
+
+import org.bson.BsonBinarySubType;
+import org.bson.types.Binary;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baeldung.mongodb.file.daos.PhotoRepository;
+import com.baeldung.mongodb.file.models.Photo;
+
+@Service
+public class PhotoService {
+
+    @Autowired
+    private PhotoRepository photoRepo;
+
+    public Photo getPhoto(String id) {
+        return photoRepo.findById(id).get();
+    }
+
+    public String addPhoto(String title, MultipartFile file) throws IOException {
+        Photo photo = new Photo(title);
+        photo.setImage(new Binary(BsonBinarySubType.BINARY, file.getBytes()));
+        photo = photoRepo.insert(photo);
+        return photo.getId();
+    }
+}
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/services/VideoService.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/services/VideoService.java
new file mode 100644
index 0000000000..e4d3237bb1
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/services/VideoService.java
@@ -0,0 +1,44 @@
+package com.baeldung.mongodb.file.services;
+
+import java.io.IOException;
+
+import org.bson.types.ObjectId;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.gridfs.GridFsOperations;
+import org.springframework.data.mongodb.gridfs.GridFsTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baeldung.mongodb.file.models.Video;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+import com.mongodb.client.gridfs.model.GridFSFile;
+
+@Service
+public class VideoService {
+
+    @Autowired
+    private GridFsTemplate gridFsTemplate;
+
+    @Autowired
+    private GridFsOperations operations;
+
+    public Video getVideo(String id) throws IllegalStateException, IOException {
+        GridFSFile file = gridFsTemplate.findOne(new Query(Criteria.where("_id").is(id)));
+        Video video = new Video();
+        video.setTitle(file.getMetadata().get("title").toString());
+        video.setStream(operations.getResource(file).getInputStream());
+        return video;
+    }
+
+    public String addVideo(String title, MultipartFile file) throws IOException {
+        DBObject metaData = new BasicDBObject();
+        metaData.put("type", "video");
+        metaData.put("title", title);
+        ObjectId id = gridFsTemplate.store(file.getInputStream(), file.getName(), file.getContentType(), metaData);
+        return id.toString();
+    }
+
+}
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/web/PhotoController.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/web/PhotoController.java
new file mode 100644
index 0000000000..55de8ffd1d
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/web/PhotoController.java
@@ -0,0 +1,43 @@
+package com.baeldung.mongodb.file.web;
+
+import java.io.IOException;
+import java.util.Base64;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baeldung.mongodb.file.models.Photo;
+import com.baeldung.mongodb.file.services.PhotoService;
+
+@Controller
+public class PhotoController {
+
+    @Autowired
+    private PhotoService photoService;
+
+    @GetMapping("/photos/{id}")
+    public String getPhoto(@PathVariable String id, Model model) {
+        Photo photo = photoService.getPhoto(id);
+        model.addAttribute("title", photo.getTitle());
+        model.addAttribute("image", Base64.getEncoder().encodeToString(photo.getImage().getData()));
+        return "photos";
+    }
+
+    @GetMapping("/photos/upload")
+    public String uploadPhoto(Model model) {
+        model.addAttribute("message", "hello");
+        return "uploadPhoto";
+    }
+
+    @PostMapping("/photos/add")
+    public String addPhoto(@RequestParam("title") String title, @RequestParam("image") MultipartFile image, Model model) throws IOException {
+        String id = photoService.addPhoto(title, image);
+        return "redirect:/photos/" + id;
+    }
+}
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/web/VideoController.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/web/VideoController.java
new file mode 100644
index 0000000000..cbe8c5d7da
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/mongodb/file/web/VideoController.java
@@ -0,0 +1,51 @@
+package com.baeldung.mongodb.file.web;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.FileCopyUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baeldung.mongodb.file.models.Video;
+import com.baeldung.mongodb.file.services.VideoService;
+
+@Controller
+public class VideoController {
+
+    @Autowired
+    private VideoService videoService;
+
+    @GetMapping("/videos/{id}")
+    public String getVideo(@PathVariable String id, Model model) throws IllegalStateException, IOException {
+        Video video = videoService.getVideo(id);
+        model.addAttribute("title", video.getTitle());
+        model.addAttribute("url", "/videos/stream/" + id);
+        return "videos";
+    }
+
+    @GetMapping("/videos/stream/{id}")
+    public void streamVideo(@PathVariable String id, HttpServletResponse response) throws IllegalStateException, IOException {
+        Video video = videoService.getVideo(id);
+        FileCopyUtils.copy(video.getStream(), response.getOutputStream());
+    }
+
+    @GetMapping("/videos/upload")
+    public String uploadVideo(Model model) {
+        model.addAttribute("message", "hello");
+        return "uploadVideo";
+    }
+
+    @PostMapping("/videos/add")
+    public String addVideo(@RequestParam("title") String title, @RequestParam("file") MultipartFile file, Model model) throws IOException {
+        String id = videoService.addVideo(title, file);
+        return "redirect:/videos/" + id;
+    }
+}
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/application.properties b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/application.properties
index 5b1b8000d0..6548f2b28a 100644
--- a/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/application.properties
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/application.properties
@@ -1,8 +1,13 @@
 spring.application.name=spring-boot-persistence
-server.port=${PORT:0}
+server.port=8082
 
 #spring boot mongodb
 spring.data.mongodb.host=localhost
 spring.data.mongodb.port=27017
 spring.data.mongodb.database=springboot-mongo
 
+spring.thymeleaf.cache=false
+
+spring.servlet.multipart.max-file-size=256MB
+spring.servlet.multipart.max-request-size=256MB
+spring.servlet.multipart.enabled=true
\ No newline at end of file
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/templates/index.html b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/templates/index.html
new file mode 100644
index 0000000000..f99e9caa8b
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/templates/index.html
@@ -0,0 +1,14 @@
+<html xmlns:th="https://www.thymeleaf.org">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>Upload Files MongoDB</title>
+</head>
+<body>
+	<h1>Home Page</h1>
+	<div th:if="${message != null}" th:text="${message}">Message</div>
+	<br/>
+	<a href="/photos/upload">Upload new Photo</a>
+	<br/><br/>
+	<a href="/videos/upload">Upload new Video</a>	
+</body>
+</html>
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/templates/photos.html b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/templates/photos.html
new file mode 100644
index 0000000000..b5d56d020a
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/templates/photos.html
@@ -0,0 +1,10 @@
+<html xmlns:th="https://www.thymeleaf.org">
+<body>
+	<h1>View Photo</h1>
+	Title: <span th:text="${title}">name</span>
+	<br/>
+	<img alt="sample" th:src="*{'data:image/png;base64,'+image}" width="200"/>
+	<br/> <br/>
+	<a href="/">Back to home page</a>	
+</body>
+</html>
\ No newline at end of file
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/templates/uploadPhoto.html b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/templates/uploadPhoto.html
new file mode 100644
index 0000000000..6d51c06d8f
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/templates/uploadPhoto.html
@@ -0,0 +1,15 @@
+<html xmlns:th="https://www.thymeleaf.org">
+<body>
+
+<h1>Upload new Photo</h1>
+<form method="POST" action="/photos/add" enctype="multipart/form-data">
+	Title:<input type="text" name="title" />
+	<br/>
+	Image:<input type="file" name="image" accept="image/*" />
+	<br/>
+	<br/>
+    <input type="submit" value="Upload" />
+</form>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/templates/uploadVideo.html b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/templates/uploadVideo.html
new file mode 100644
index 0000000000..ebc29d98e2
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/templates/uploadVideo.html
@@ -0,0 +1,15 @@
+<html xmlns:th="https://www.thymeleaf.org">
+<body>
+
+<h1>Upload new Video</h1>
+<form method="POST" action="/videos/add" enctype="multipart/form-data">
+	Title:<input type="text" name="title" />
+	<br/>
+	Video:<input type="file" name="file" accept="video/*" />
+	<br/>
+	<br/>
+    <input type="submit" value="Upload" />
+</form>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/templates/videos.html b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/templates/videos.html
new file mode 100644
index 0000000000..b0ee0fc577
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/templates/videos.html
@@ -0,0 +1,15 @@
+<html xmlns:th="https://www.thymeleaf.org">
+<body>
+	<h1>View Video</h1>
+	Title: <span th:text="${title}">title</span>
+	<br/>
+	<br/>
+	
+	<video width="400" controls>
+    	<source th:src="${url}" />
+  	</video>
+  	
+  	<br/> <br/>
+	<a href="/">Back to home page</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/SpringContextTest.java b/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..89e729da86
--- /dev/null
+++ b/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,67 @@
+package org.baeldung;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.thrift.transport.TTransportException;
+import org.baeldung.spring.data.cassandra.config.CassandraConfig;
+import org.baeldung.spring.data.cassandra.model.Book;
+import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cassandra.core.cql.CqlIdentifier;
+import org.springframework.data.cassandra.core.CassandraAdminOperations;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.Session;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = CassandraConfig.class)
+public class SpringContextTest {
+
+    public static final String KEYSPACE_CREATION_QUERY = "CREATE KEYSPACE IF NOT EXISTS testKeySpace " + "WITH replication = { 'class': 'SimpleStrategy', 'replication_factor': '3' };";
+
+    public static final String KEYSPACE_ACTIVATE_QUERY = "USE testKeySpace;";
+
+    public static final String DATA_TABLE_NAME = "book";
+	
+	@Autowired
+    private CassandraAdminOperations adminTemplate;
+    
+    @BeforeClass
+    public static void startCassandraEmbedded() throws InterruptedException, TTransportException, ConfigurationException, IOException {
+        EmbeddedCassandraServerHelper.startEmbeddedCassandra();
+        final Cluster cluster = Cluster.builder().addContactPoints("127.0.0.1").withPort(9142).build();
+        final Session session = cluster.connect();
+        session.execute(KEYSPACE_CREATION_QUERY);
+        session.execute(KEYSPACE_ACTIVATE_QUERY);
+        Thread.sleep(5000);
+    }
+
+    @Before
+    public void createTable() throws InterruptedException, TTransportException, ConfigurationException, IOException {
+        adminTemplate.createTable(true, CqlIdentifier.cqlId(DATA_TABLE_NAME), Book.class, new HashMap<String, Object>());
+    }
+    
+	@Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+	
+	@After
+    public void dropTable() {
+        adminTemplate.dropTable(CqlIdentifier.cqlId(DATA_TABLE_NAME));
+    }
+
+    @AfterClass
+    public static void stopCassandraEmbedded() {
+        EmbeddedCassandraServerHelper.cleanEmbeddedCassandra();
+    }
+}
diff --git a/persistence-modules/spring-data-dynamodb/src/test/java/org/baeldung/SpringContextTest.java b/persistence-modules/spring-data-dynamodb/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..5e68a8e64f
--- /dev/null
+++ b/persistence-modules/spring-data-dynamodb/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/persistence-modules/spring-data-eclipselink/src/test/java/org/baeldung/SpringContextTest.java b/persistence-modules/spring-data-eclipselink/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..4c69245f65
--- /dev/null
+++ b/persistence-modules/spring-data-eclipselink/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.eclipselink.springdata.EclipselinkSpringDataApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = EclipselinkSpringDataApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/persistence-modules/spring-data-gemfire/src/test/java/org/baeldung/SpringContextTest.java b/persistence-modules/spring-data-gemfire/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..3772e22137
--- /dev/null
+++ b/persistence-modules/spring-data-gemfire/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.spring.data.gemfire.function.GemfireConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes=GemfireConfiguration.class, loader=AnnotationConfigContextLoader.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-2/README.md b/persistence-modules/spring-data-jpa-2/README.md
index 3bd62cbd45..1f7de81c02 100644
--- a/persistence-modules/spring-data-jpa-2/README.md
+++ b/persistence-modules/spring-data-jpa-2/README.md
@@ -12,3 +12,4 @@
 - [Batch Insert/Update with Hibernate/JPA](https://www.baeldung.com/jpa-hibernate-batch-insert-update)
 - [Difference Between save() and saveAndFlush() in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-save-saveandflush)
 - [Derived Query Methods in Spring Data JPA Repositories](https://www.baeldung.com/spring-data-derived-queries)
+- [LIKE Queries in Spring JPA Repositories](https://www.baeldung.com/spring-jpa-like-queries)
diff --git a/persistence-modules/spring-data-jpa-2/pom.xml b/persistence-modules/spring-data-jpa-2/pom.xml
index fbc19810ef..08be64670b 100644
--- a/persistence-modules/spring-data-jpa-2/pom.xml
+++ b/persistence-modules/spring-data-jpa-2/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>net.ttddyy</groupId>
             <artifactId>datasource-proxy</artifactId>
-            <version>1.4.1</version>
+            <version>${datasource-proxy.version}</version>
         </dependency>
 
         <dependency>
@@ -42,4 +42,8 @@
             <artifactId>spring-oxm</artifactId>
         </dependency>
     </dependencies>
+	
+    <properties>
+        <datasource-proxy.version>1.4.1</datasource-proxy.version>
+    </properties>
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa/README.md b/persistence-modules/spring-data-jpa/README.md
index e85d8a8487..4b4a590e10 100644
--- a/persistence-modules/spring-data-jpa/README.md
+++ b/persistence-modules/spring-data-jpa/README.md
@@ -10,7 +10,6 @@
 - [Spring Data Java 8 Support](http://www.baeldung.com/spring-data-java-8)
 - [A Simple Tagging Implementation with JPA](http://www.baeldung.com/jpa-tagging)
 - [Spring Data Composable Repositories](https://www.baeldung.com/spring-data-composable-repositories)
-- [Auditing with JPA, Hibernate, and Spring Data JPA](https://www.baeldung.com/database-auditing-jpa)
 - [Query Entities by Dates and Times with Spring Data JPA](https://www.baeldung.com/spring-data-jpa-query-by-date)
 - [DDD Aggregates and @DomainEvents](https://www.baeldung.com/spring-data-ddd)
 - [Spring Data – CrudRepository save() Method](https://www.baeldung.com/spring-data-crud-repository-save)
diff --git a/persistence-modules/spring-data-jpa/pom.xml b/persistence-modules/spring-data-jpa/pom.xml
index a7788065c9..af92f331d1 100644
--- a/persistence-modules/spring-data-jpa/pom.xml
+++ b/persistence-modules/spring-data-jpa/pom.xml
@@ -37,14 +37,14 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>postgresql</artifactId>
-            <version>1.10.6</version>
+            <version>${testcontainers.postgresql.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.5</version>
+            <version>${postgresql.version}</version>
         </dependency>
         <!-- Test containers only dependencies -->
 
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>21.0</version>
+            <version>${guava.version}</version>
         </dependency>
         
         <!-- JUnit Jupiter dependencies -->
@@ -92,6 +92,9 @@
     
     <properties>
     	<start-class>com.baeldung.boot.Application</start-class>
+    	<testcontainers.postgresql.version>1.10.6</testcontainers.postgresql.version>
+    	<postgresql.version>42.2.5</postgresql.version>
+    	<guava.version>21.0</guava.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringContextTest.java b/persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..db7b156415
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.boot.Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/persistence-modules/spring-data-keyvalue/src/test/java/org/baeldung/SpringContextTest.java b/persistence-modules/spring-data-keyvalue/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..e6cc5c15af
--- /dev/null
+++ b/persistence-modules/spring-data-keyvalue/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.data.keyvalue.SpringDataKeyValueApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringDataKeyValueApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/persistence-modules/spring-data-mongodb/pom.xml b/persistence-modules/spring-data-mongodb/pom.xml
index 7156cdf071..33ad3a5267 100644
--- a/persistence-modules/spring-data-mongodb/pom.xml
+++ b/persistence-modules/spring-data-mongodb/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-releasetrain</artifactId>
-            <version>Lovelace-SR3</version>
+            <version>Lovelace-SR9</version>
             <type>pom</type>
         </dependency>
 
@@ -95,7 +95,7 @@
     </build>
 
     <properties>
-        <org.springframework.data.version>2.1.2.RELEASE</org.springframework.data.version>
+        <org.springframework.data.version>2.1.9.RELEASE</org.springframework.data.version>
         <querydsl.version>4.1.4</querydsl.version>
         <mysema.maven.version>1.1.3</mysema.maven.version>
         <mongodb-reactivestreams.version>1.9.2</mongodb-reactivestreams.version>
diff --git a/persistence-modules/spring-data-neo4j/src/test/java/org/baeldung/SpringContextTest.java b/persistence-modules/spring-data-neo4j/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..5bf54fc0bd
--- /dev/null
+++ b/persistence-modules/spring-data-neo4j/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,19 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.spring.data.neo4j.config.MovieDatabaseNeo4jTestConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = MovieDatabaseNeo4jTestConfiguration.class)
+@ActiveProfiles(profiles = "test")
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/persistence-modules/spring-data-redis/src/test/java/org/baeldung/SpringContextTest.java b/persistence-modules/spring-data-redis/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..6652345595
--- /dev/null
+++ b/persistence-modules/spring-data-redis/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.spring.data.redis.config.RedisConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = RedisConfig.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/persistence-modules/spring-data-solr/src/test/java/org/baeldung/SpringContextTest.java b/persistence-modules/spring-data-solr/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..09bf0255a0
--- /dev/null
+++ b/persistence-modules/spring-data-solr/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.spring.data.solr.config.SolrConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = SolrConfig.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/persistence-modules/spring-hibernate-3/pom.xml b/persistence-modules/spring-hibernate-3/pom.xml
index ec35f35bb3..4349492370 100644
--- a/persistence-modules/spring-hibernate-3/pom.xml
+++ b/persistence-modules/spring-hibernate-3/pom.xml
@@ -93,7 +93,6 @@
         <tomcat-dbcp.version>8.5.8</tomcat-dbcp.version>
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/spring-hibernate-3/src/test/java/org/baeldung/SpringContextTest.java b/persistence-modules/spring-hibernate-3/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..956d5279a3
--- /dev/null
+++ b/persistence-modules/spring-hibernate-3/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.baeldung.spring.PersistenceConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/persistence-modules/spring-hibernate-5/pom.xml b/persistence-modules/spring-hibernate-5/pom.xml
index 16e55cb0c0..e27775c76f 100644
--- a/persistence-modules/spring-hibernate-5/pom.xml
+++ b/persistence-modules/spring-hibernate-5/pom.xml
@@ -146,7 +146,6 @@
 
         <!-- util -->
         <guava.version>21.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
 
     </properties>
 
diff --git a/persistence-modules/spring-hibernate-5/src/test/java/org/baeldung/SpringContextTest.java b/persistence-modules/spring-hibernate-5/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..6815ebf304
--- /dev/null
+++ b/persistence-modules/spring-hibernate-5/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.spring.PersistenceConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/persistence-modules/spring-hibernate4/README.md b/persistence-modules/spring-hibernate4/README.md
index 6f8d83aa9d..020e867c82 100644
--- a/persistence-modules/spring-hibernate4/README.md
+++ b/persistence-modules/spring-hibernate4/README.md
@@ -9,8 +9,8 @@
 - [Stored Procedures with Hibernate](http://www.baeldung.com/stored-procedures-with-hibernate-tutorial)
 - [Hibernate: save, persist, update, merge, saveOrUpdate](http://www.baeldung.com/hibernate-save-persist-update-merge-saveorupdate)
 - [Eager/Lazy Loading In Hibernate](http://www.baeldung.com/hibernate-lazy-eager-loading)
-- [Hibernate One to Many Annotation Tutorial](http://www.baeldung.com/hibernate-one-to-many)
 - [The DAO with Spring and Hibernate](http://www.baeldung.com/persistence-layer-with-spring-and-hibernate)
+- [Auditing with JPA, Hibernate, and Spring Data JPA](https://www.baeldung.com/database-auditing-jpa)
 
 ### Quick Start
 
diff --git a/persistence-modules/spring-hibernate4/pom.xml b/persistence-modules/spring-hibernate4/pom.xml
index 4289c9c3d5..c22342a34a 100644
--- a/persistence-modules/spring-hibernate4/pom.xml
+++ b/persistence-modules/spring-hibernate4/pom.xml
@@ -7,10 +7,10 @@
     <name>spring-hibernate4</name>
 
     <parent>
+        <artifactId>parent-spring-4</artifactId>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-spring-4</relativePath>
     </parent>
 
     <dependencies>
@@ -167,7 +167,6 @@
 
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
 
         <httpcore.version>4.4.1</httpcore.version>
         <httpclient.version>4.5</httpclient.version>
@@ -176,7 +175,6 @@
 
         <!-- maven plugins -->
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
         <!-- <hibernate4-maven-plugin.version>1.1.0</hibernate4-maven-plugin.version> -->
     </properties>
 
diff --git a/persistence-modules/spring-hibernate4/src/main/java/com/baeldung/spring/PersistenceConfig.java b/persistence-modules/spring-hibernate4/src/main/java/com/baeldung/spring/PersistenceConfig.java
index 35e80b81a5..b7cf0fadf2 100644
--- a/persistence-modules/spring-hibernate4/src/main/java/com/baeldung/spring/PersistenceConfig.java
+++ b/persistence-modules/spring-hibernate4/src/main/java/com/baeldung/spring/PersistenceConfig.java
@@ -47,7 +47,7 @@ import com.google.common.base.Preconditions;
 @EnableTransactionManagement
 @EnableJpaRepositories(basePackages = { "com.baeldung.persistence" }, transactionManagerRef = "jpaTransactionManager")
 @EnableJpaAuditing
-@PropertySource({ "classpath:persistence-mysql.properties" })
+@PropertySource({ "classpath:persistence-h2.properties" })
 @ComponentScan({ "com.baeldung.persistence" })
 public class PersistenceConfig {
 
diff --git a/persistence-modules/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java b/persistence-modules/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java
index 2f23a9a532..444324dafc 100644
--- a/persistence-modules/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java
+++ b/persistence-modules/spring-hibernate4/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java
@@ -2,6 +2,7 @@ package com.baeldung.persistence.audit;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
@@ -17,6 +18,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
@@ -29,6 +31,7 @@ import com.baeldung.spring.config.PersistenceTestConfig;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { PersistenceTestConfig.class }, loader = AnnotationConfigContextLoader.class)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 public class EnversFooBarAuditIntegrationTest {
 
     private static Logger logger = LoggerFactory.getLogger(EnversFooBarAuditIntegrationTest.class);
diff --git a/persistence-modules/spring-hibernate4/src/test/java/org/baeldung/SpringContextTest.java b/persistence-modules/spring-hibernate4/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..6815ebf304
--- /dev/null
+++ b/persistence-modules/spring-hibernate4/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.spring.PersistenceConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/persistence-modules/spring-jpa/pom.xml b/persistence-modules/spring-jpa/pom.xml
index 0fdffad8db..0961cabaff 100644
--- a/persistence-modules/spring-jpa/pom.xml
+++ b/persistence-modules/spring-jpa/pom.xml
@@ -174,11 +174,7 @@
 
         <!-- util -->
         <guava.version>21.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <assertj.version>3.8.0</assertj.version>
-
-        <!-- maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-jpa/src/test/java/com/baeldung/SpringContextTest.java b/persistence-modules/spring-jpa/src/test/java/com/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..291e49d0c4
--- /dev/null
+++ b/persistence-modules/spring-jpa/src/test/java/com/baeldung/SpringContextTest.java
@@ -0,0 +1,21 @@
+package com.baeldung;
+
+import org.baeldung.config.PersistenceJPAConfigL2Cache;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceJPAConfigL2Cache.class }, loader = AnnotationConfigContextLoader.class)
+@WebAppConfiguration
+@DirtiesContext
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/persistence-modules/spring-persistence-simple/pom.xml b/persistence-modules/spring-persistence-simple/pom.xml
index 1afacab164..d0b3f5fe29 100644
--- a/persistence-modules/spring-persistence-simple/pom.xml
+++ b/persistence-modules/spring-persistence-simple/pom.xml
@@ -147,7 +147,6 @@
 
         <!-- util -->
         <guava.version>21.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <assertj.version>3.8.0</assertj.version>
     </properties>
 
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/config/PersistenceJPAConfig.java b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/config/PersistenceJPAConfig.java
index 9fae34d99e..e202e45b32 100644
--- a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/config/PersistenceJPAConfig.java
+++ b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/config/PersistenceJPAConfig.java
@@ -39,7 +39,7 @@ public class PersistenceJPAConfig {
     // beans
 
     @Bean
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
+    public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
         em.setPackagesToScan(new String[] { "com.baeldung.persistence.model" });
diff --git a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jdbc/EmployeeDAO.java b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jdbc/EmployeeDAO.java
index 9ba4ebdb6d..eef085f386 100644
--- a/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jdbc/EmployeeDAO.java
+++ b/persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jdbc/EmployeeDAO.java
@@ -16,6 +16,7 @@ import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.jdbc.core.namedparam.SqlParameterSourceUtils;
+import org.springframework.jdbc.core.simple.SimpleJdbcCall;
 import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
 import org.springframework.stereotype.Repository;
 
@@ -27,6 +28,8 @@ public class EmployeeDAO {
     private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
 
     private SimpleJdbcInsert simpleJdbcInsert;
+    
+    private SimpleJdbcCall simpleJdbcCall;
 
     @Autowired
     public void setDataSource(final DataSource dataSource) {
@@ -36,7 +39,9 @@ public class EmployeeDAO {
 
         namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
         simpleJdbcInsert = new SimpleJdbcInsert(dataSource).withTableName("EMPLOYEE");
-
+        
+        // Commented as the database is H2, change the database and create procedure READ_EMPLOYEE before calling getEmployeeUsingSimpleJdbcCall 
+        //simpleJdbcCall = new SimpleJdbcCall(dataSource).withProcedureName("READ_EMPLOYEE");
     }
 
     public int getCountOfEmployees() {
@@ -110,4 +115,15 @@ public class EmployeeDAO {
         final int[] updateCounts = namedParameterJdbcTemplate.batchUpdate("INSERT INTO EMPLOYEE VALUES (:id, :firstName, :lastName, :address)", batch);
         return updateCounts;
     }
+    
+    public Employee getEmployeeUsingSimpleJdbcCall(int id) {
+        SqlParameterSource in = new MapSqlParameterSource().addValue("in_id", id);
+        Map<String, Object> out = simpleJdbcCall.execute(in);
+
+        Employee emp = new Employee();
+        emp.setFirstName((String) out.get("FIRST_NAME"));
+        emp.setLastName((String) out.get("LAST_NAME"));
+
+        return emp;
+    }
 }
diff --git a/pom.xml b/pom.xml
index 982c52c54e..352da33fee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.baeldung</groupId>
 	<artifactId>parent-modules</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
-    <name>parent-modules</name>
+	<name>parent-modules</name>
 	<packaging>pom</packaging>
 
-    <modules>
-        <module>quarkus</module>
-    </modules>
-
 	<dependencies>
 		<!-- logging -->
 		<dependency>
@@ -57,11 +53,11 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
 			<version>${junit-jupiter.version}</version>
 			<scope>test</scope>
-        </dependency>
+		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-core</artifactId>
@@ -123,22 +119,22 @@
 					</excludes>
 				</configuration>
 				<dependencies>
-                                    <dependency>
-	                                <groupId>org.junit.platform</groupId>
-	                                <artifactId>junit-platform-surefire-provider</artifactId>
-	                                <version>${junit-platform.version}</version>
-	                            </dependency>
-	                            <dependency>
-	                                <groupId>org.junit.jupiter</groupId>
-	                                <artifactId>junit-jupiter-engine</artifactId>
-	                                <version>${junit-jupiter.version}</version>
-	                            </dependency>
-                                    <dependency>
-                                        <groupId>org.junit.vintage</groupId>
-                                        <artifactId>junit-vintage-engine</artifactId>
-  	                                <version>${junit-jupiter.version}</version>
-                                    </dependency>
-                                </dependencies>
+					<dependency>
+						<groupId>org.junit.platform</groupId>
+						<artifactId>junit-platform-surefire-provider</artifactId>
+						<version>${junit-platform.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.junit.jupiter</groupId>
+						<artifactId>junit-jupiter-engine</artifactId>
+						<version>${junit-jupiter.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.junit.vintage</groupId>
+						<artifactId>junit-vintage-engine</artifactId>
+						<version>${junit-jupiter.version}</version>
+					</dependency>
+				</dependencies>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -312,6 +308,10 @@
 						<configuration>
 							<forkCount>3</forkCount>
 							<reuseForks>true</reuseForks>
+							<includes>
+								<include>SpringContextTest</include>
+								<include>**/*UnitTest</include>
+							</includes>
 							<excludes>
 								<exclude>**/*IntegrationTest.java</exclude>
 								<exclude>**/*IntTest.java</exclude>
@@ -328,66 +328,67 @@
 
 			<modules>
 				<module>parent-boot-1</module>
-                <module>parent-boot-2</module>
-                <module>parent-spring-4</module>
-                <module>parent-spring-5</module>
-                <module>parent-java</module>
-                <module>parent-kotlin</module>
-                <!-- <module>akka-http</module> --> <!-- Unit test is failing -->
-                <module>akka-streams</module>
-                <module>algorithms-genetic</module>
-                <module>algorithms-miscellaneous-1</module>
-                <module>algorithms-miscellaneous-2</module>
-                <module>algorithms-miscellaneous-3</module>
-                <module>algorithms-sorting</module>
-                <module>animal-sniffer-mvn-plugin</module>
-                <module>annotations</module>
-                <module>antlr</module>
-                <module>apache-avro</module>
-                <module>apache-bval</module>
-                <module>apache-curator</module>
-                <module>apache-cxf</module>
-                <module>apache-fop</module>
-                <module>apache-geode</module>
-                <module>apache-meecrowave</module>
-                <module>apache-opennlp</module>
-                <module>apache-poi</module>
-                <module>apache-pulsar</module>
-                <module>apache-shiro</module>
-                <module>apache-solrj</module>
-                <module>apache-spark</module>
-                <module>apache-thrift</module>
-                <module>apache-tika</module>
-                <module>apache-velocity</module>
-                <module>apache-zookeeper</module>
-                <module>asciidoctor</module>
-                <module>asm</module>
-                <module>atomix</module>
-                <module>autovalue</module>
-                <module>aws</module>
-                <module>aws-lambda</module>
-                <module>axon</module>
-                <module>azure</module>
+				<module>parent-boot-2</module>
+				<module>parent-spring-4</module>
+				<module>parent-spring-5</module>
+				<module>parent-java</module>
+				<module>parent-kotlin</module>
+				<!-- <module>akka-http</module> --> <!-- Unit test is failing -->
+				<module>akka-streams</module>
+				<module>algorithms-genetic</module>
+				<module>algorithms-miscellaneous-1</module>
+				<module>algorithms-miscellaneous-2</module>
+				<module>algorithms-miscellaneous-3</module>
+				<module>algorithms-sorting</module>
+				<module>animal-sniffer-mvn-plugin</module>
+				<module>annotations</module>
+				<module>antlr</module>
+				<module>apache-avro</module>
+				<module>apache-bval</module>
+				<module>apache-curator</module>
+				<module>apache-cxf</module>
+				<module>apache-fop</module>
+				<module>apache-geode</module>
+				<module>apache-meecrowave</module>
+				<module>apache-opennlp</module>
+				<module>apache-poi</module>
+				<module>apache-pulsar</module>
+				<module>apache-shiro</module>
+				<module>apache-solrj</module>
+				<module>apache-spark</module>
+				<module>apache-thrift</module>
+				<module>apache-tika</module>
+				<module>apache-velocity</module>
+				<module>apache-zookeeper</module>
+				<module>asciidoctor</module>
+				<module>asm</module>
+				<module>atomix</module>
+				<module>autovalue</module>
+				<module>aws</module>
+				<module>aws-lambda</module>
+				<module>axon</module>
+				<module>azure</module>
 
-                <module>blade</module>
+				<module>blade</module>
 
-                <module>bootique</module>
+				<module>bootique</module>
 
-                <module>cas</module>
-                <module>cdi</module>
-                <module>checker-plugin</module>
-                <module>core-groovy</module>
-                <module>core-groovy-2</module>
-		<module>core-groovy-collections</module>
-                <!-- <module>core-java-modules/core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
-                <!-- <module>core-java-modules/core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
-                <!-- <module>core-java-modules/core-java-12</module> --> <!-- We haven't upgraded to java 12. Fixing in BAEL-10841 -->
-                <module>core-java-modules/core-java-8</module>
-                <module>core-java-modules/core-java-8-2</module>
+				<module>cas</module>
+				<module>cdi</module>
+				<module>checker-plugin</module>
+				<module>core-groovy</module>
+				<module>core-groovy-2</module>
+				<module>core-groovy-collections</module>
+				<!-- <module>core-java-modules/core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
+				<!-- <module>core-java-modules/core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
+				<!-- <module>core-java-modules/core-java-12</module> --> <!-- We haven't upgraded to java 12. Fixing in BAEL-10841 -->
+				<module>core-java-modules/core-java-8</module>
+				<module>core-java-modules/core-java-8-2</module>
 				<module>core-java-modules/core-java-lambdas</module>
                 <!--<module>core-java-modules/core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
                 <!--<module>core-java-modules/core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
                 <module>core-java-modules/core-java-arrays</module>
+                <module>core-java-modules/core-java-arrays-2</module>
                 <module>core-java-modules/core-java-collections</module>
                 <module>core-java-modules/core-java-collections-list</module>
                 <module>core-java-modules/core-java-collections-list-2</module>
@@ -461,12 +462,14 @@
                 <!-- <module>java-ee-8-security-api</module> --> <!-- long running -->
                 <module>java-lite</module>
                 <module>java-numbers</module>
+                <module>java-numbers-2</module>
                 <module>java-rmi</module>
                 <module>java-spi</module>
                 <module>java-streams</module>
                 <!-- <module>java-streams-2</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
                 <module>java-strings</module>
                 <module>java-strings-2</module>
+                <module>java-strings-ops</module>
                 <module>java-vavr-stream</module>
                 <module>java-websocket</module>
                 <module>javafx</module>
@@ -475,83 +478,319 @@
                 <module>jaxb</module>
                 <!-- JIRA-10842
                 <module>jee-7</module> -->
-                <module>jee-7-security</module>
-                <module>jersey</module>
-                <module>JGit</module>
-                <module>jgroups</module>
-                <module>jhipster</module>
-                <module>jhipster-5</module>
-                <module>jib</module>
-                <module>jjwt</module>
-                <module>jmeter</module>
-                <module>jmh</module>
-                <module>jni</module>
-                <module>jooby</module>
-                <module>jsf</module>
-                <module>json</module>
-                <module>json-path</module>
-                <module>jsoup</module>
-                <module>jta</module>
+				<module>jee-7-security</module>
+				<module>jersey</module>
+				<module>jgit</module>
+				<module>jgroups</module>
+				<module>jhipster-5</module>
+				<module>jib</module>
+				<module>jjwt</module>
+				<module>jmeter</module>
+				<module>jmh</module>
+				<module>jni</module>
+				<module>jooby</module>
+				<module>jsf</module>
+				<module>json</module>
+				<module>json-path</module>
+				<module>jsoup</module>
+				<module>jta</module>
 
-                <!-- <module>kotlin-js</module> --> <!-- Not a maven project -->
-                <module>kotlin-libraries</module>
-                <module>kotlin-libraries-2</module>
+				<!-- <module>kotlin-js</module> --> <!-- Not a maven project -->
+				<module>kotlin-libraries</module>
+				<module>kotlin-libraries-2</module>
 
-                <!-- <module>lagom</module> --> <!-- Not a maven project -->
-                <module>libraries</module>
-                <module>libraries-2</module>
-                <module>libraries-data</module>
-                <module>libraries-apache-commons</module>
-                <module>libraries-primitive</module>
-                <module>libraries-security</module>
-                <module>libraries-server</module>
-                <module>linkrest</module>
-                <module>logging-modules</module>
-                <module>lombok</module>
-                <module>lucene</module>
+				<!-- <module>lagom</module> --> <!-- Not a maven project -->
+				<module>libraries</module>
+				<module>libraries-2</module>
+				<module>libraries-data</module>
+				<module>libraries-apache-commons</module>
+				<module>libraries-primitive</module>
+				<module>libraries-security</module>
+				<module>libraries-server</module>
+				<module>libraries-http</module>
+				<module>libraries-io</module>
+				<module>linkrest</module>
+				<module>logging-modules</module>
+				<module>lombok</module>
+				<module>lucene</module>
 
-                <module>mapstruct</module>
-                <module>maven</module>
-                <module>maven-archetype</module>
-                <!-- <module>maven-polyglot/maven-polyglot-json-app</module> --> <!-- Not a maven project -->
-                <module>maven-polyglot/maven-polyglot-json-extension</module>
-                <!-- <module>maven-polyglot/maven-polyglot-yml-app</module> --> <!-- Not a maven project -->
-                <module>mesos-marathon</module>
-                <module>metrics</module>
-                <!-- <module>micronaut</module> --> <!-- Fixing in BAEL-10877 -->
-                <module>microprofile</module>
-                <module>msf4j</module>
-                <!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
-                <module>mustache</module>
-                <module>mybatis</module>
+				<module>mapstruct</module>
+				<module>maven</module>
+				<module>maven-archetype</module>
+				<!-- <module>maven-polyglot/maven-polyglot-json-app</module> --> <!-- Not a maven project -->
+				<module>maven-polyglot/maven-polyglot-json-extension</module>
+				<!-- <module>maven-polyglot/maven-polyglot-yml-app</module> --> <!-- Not a maven project -->
+				<module>mesos-marathon</module>
+				<module>metrics</module>
+				<!-- <module>micronaut</module> --> <!-- Fixing in BAEL-10877 -->
+				<module>microprofile</module>
+				<module>msf4j</module>
+				<!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
+				<module>mustache</module>
+				<module>mybatis</module>
 
 
-                <module>optaplanner</module>
-                <module>orika</module>
-                <module>osgi</module>
+				<module>optaplanner</module>
+				<module>orika</module>
+				<module>osgi</module>
 
-                <module>patterns</module>
-                <module>pdf</module>
-                <module>performance-tests</module>
-                <!-- <module>play-framework</module> --> <!-- Not a maven project -->
-                <module>protobuffer</module>
+				<module>patterns</module>
+				<module>pdf</module>
+				<module>performance-tests</module>
+				<!-- <module>play-framework</module> --> <!-- Not a maven project -->
+				<module>protobuffer</module>
 
-                <module>persistence-modules</module>
-		<module>quarkus</module>
+				<module>persistence-modules</module>
+				<module>quarkus</module>
 
-                <module>rabbitmq</module>
-                <!-- <module>raml</module> --> <!-- Not a maven project -->
-                <module>ratpack</module>
-                <module>reactor-core</module>
-                <module>rest-with-spark-java</module>
-                <module>resteasy</module>
-                <module>restx</module>
-                <!-- <module>rmi</module> --> <!-- Not a maven project -->
-                <module>rule-engines</module>
+				<module>rabbitmq</module>
+				<!-- <module>raml</module> --> <!-- Not a maven project -->
+				<module>ratpack</module>
+				<module>reactor-core</module>
+				<module>resteasy</module>
+				<module>restx</module>
+				<!-- <module>rmi</module> --> <!-- Not a maven project -->
+				<module>rule-engines</module>
 				<module>rsocket</module>
-                <module>rxjava</module>
-                <module>rxjava-2</module>
-			    <module>software-security/sql-injection-samples</module>
+				<module>rxjava</module>
+				<module>rxjava-2</module>
+				<module>software-security/sql-injection-samples</module>
+
+				<module>tensorflow-java</module>
+				<module>spring-boot-flowable</module>
+				<module>spring-security-kerberos</module>
+				<module>oauth2-framework-impl</module>
+			</modules>
+
+		</profile>
+
+		<profile>
+			<id>default-second</id>
+			<build>
+				<plugins>
+
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<version>${maven-surefire-plugin.version}</version>
+						<configuration>
+							<forkCount>3</forkCount>
+							<reuseForks>true</reuseForks>
+							<includes>
+								<include>SpringContextTest</include>
+								<include>**/*UnitTest</include>
+							</includes>
+							<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>
+			</build>
+
+			<modules>
+				<module>parent-boot-1</module>
+				<module>parent-boot-2</module>
+				<module>parent-spring-4</module>
+				<module>parent-spring-5</module>
+				<module>parent-java</module>
+				<module>parent-kotlin</module>
+
+				<module>saas</module>
+				<module>spark-java</module>
+
+				<module>spring-4</module>
+
+				<module>spring-5</module>
+				<module>spring-5-webflux</module>
+				<module>spring-5-data-reactive</module>
+				<module>spring-5-mvc</module>
+				<module>spring-5-reactive</module>
+				<module>spring-5-reactive-2</module>
+				<module>spring-5-reactive-client</module>
+				<module>spring-5-reactive-oauth</module>
+				<module>spring-5-reactive-security</module>
+				<module>spring-5-security</module>
+				<module>spring-5-security-oauth</module>
+				<module>spring-5-security-cognito</module>
+
+				<module>spring-activiti</module>
+				<module>spring-akka</module>
+				<module>spring-all</module>
+				<module>spring-amqp</module>
+				<module>spring-amqp-simple</module>
+				<module>spring-aop</module>
+				<module>spring-apache-camel</module>
+				<module>spring-batch</module>
+				<module>spring-bom</module>
+
+				<module>spring-boot</module>
+				<module>spring-boot-admin</module>
+				<module>spring-boot-angular</module>
+				<module>spring-boot-angular-ecommerce</module>
+				<module>spring-boot-autoconfiguration</module>
+				<module>spring-boot-bootstrap</module>
+				<module>spring-boot-camel</module>
+				<!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
+				<module>spring-boot-client</module>
+
+				<module>spring-boot-crud</module>
+				<module>spring-boot-ctx-fluent</module>
+				<module>spring-boot-custom-starter</module>
+				<module>spring-boot-disable-console-logging</module>
+				<!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
+				<module>spring-boot-jasypt</module>
+				<module>spring-boot-keycloak</module>
+				<module>spring-boot-kotlin</module>
+				<module>spring-boot-logging-log4j2</module>
+				<module>spring-boot-mvc</module>
+				<module>spring-boot-mvc-birt</module>
+				<module>spring-boot-ops</module>
+				<module>spring-boot-ops-2</module>
+				<module>spring-boot-rest</module>
+				<module>spring-boot-data</module>
+				<module>spring-boot-parent</module>
+				<module>spring-boot-property-exp</module>
+				<module>spring-boot-security</module>
+				<module>spring-boot-testing</module>
+				<module>spring-boot-vue</module>
+				<module>spring-boot-libraries</module>
+
+				
+                                <!-- <module>spring-cloud</module> --> <!-- BAEL-14304 -->
+				<!-- <module>spring-cloud-bus</module> --> <!-- BAEL-14304 -->
+				<!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
+                                <!-- <module>spring-cloud-data-flow</module> --> <!-- BAEL-14304 -->
+
+				<module>spring-core</module>
+				<module>spring-core-2</module>
+				<module>spring-cucumber</module>
+
+				<module>spring-data-rest</module>
+				<!-- <module>spring-data-rest-querydsl</module> --> <!-- BAEL-14304 -->
+				<module>spring-dispatcher-servlet</module>
+				<module>spring-drools</module>
+
+				<module>spring-ehcache</module>
+				<!-- <module>spring-ejb</module> BAEL-14304 -->
+				<module>spring-exceptions</module>
+
+				<module>spring-freemarker</module>
+
+				<module>spring-groovy</module>
+
+				<module>spring-integration</module>
+
+				<module>spring-jenkins-pipeline</module>
+				<module>spring-jersey</module>
+				<module>spring-jinq</module>
+				<module>spring-jms</module>
+				<module>spring-jooq</module>
+
+				<module>spring-kafka</module>
+				<module>spring-katharsis</module>
+
+				<module>spring-ldap</module>
+
+				<module>spring-mobile</module>
+				<module>spring-mockito</module>
+				<module>spring-mvc-forms-jsp</module>
+				<module>spring-mvc-forms-thymeleaf</module>
+				<module>spring-mvc-java</module>
+				<module>spring-mvc-kotlin</module>
+				<module>spring-mvc-simple</module>
+				<module>spring-mvc-simple-2</module>
+				<module>spring-mvc-velocity</module>
+				<module>spring-mvc-webflow</module>
+				<module>spring-mvc-xml</module>
+
+				<module>spring-protobuf</module>
+				<!-- <module>spring-security-cors</module> -->  <!-- PMD violation -->
+
+				<module>spring-quartz</module>
+
+				<module>spring-reactive-kotlin</module>
+				<module>spring-reactor</module>
+				<module>spring-remoting</module>
+				<module>spring-rest</module>
+				<module>spring-rest-angular</module>
+				<module>spring-rest-full</module>
+				<module>spring-rest-hal-browser</module>
+				<module>spring-rest-query-language</module>
+				<module>spring-rest-shell</module>
+				<module>spring-rest-simple</module>
+				<module>spring-resttemplate</module>
+				<module>spring-roo</module>
+				<module>spring-security-acl</module>
+				<module>spring-security-angular/server</module>
+				<module>spring-security-cache-control</module>
+
+				<module>spring-security-client</module>
+
+				<module>spring-security-core</module>
+				<module>spring-security-mvc-boot</module>
+				<module>spring-security-mvc-custom</module>
+				<module>spring-security-mvc-digest-auth</module>
+				<module>spring-security-mvc-jsonview</module>
+				<module>spring-security-mvc-ldap</module>
+				<module>spring-security-mvc-login</module>
+				<module>spring-security-mvc-persisted-remember-me</module>
+				<module>spring-security-mvc</module>
+				<module>spring-security-mvc-socket</module>
+				<module>spring-security-openid</module>
+				<!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
+				<module>spring-security-rest</module>
+				<module>spring-security-rest-basic-auth</module>
+				<module>spring-security-rest-custom</module>
+				<module>spring-security-sso</module>
+				<module>spring-security-stormpath</module>
+				<module>spring-security-thymeleaf</module>
+				<module>spring-security-x509</module>
+				<!-- <module>spring-session</module> BAEL-14304 -->
+				<module>spring-sleuth</module>
+				<module>spring-soap</module>
+				<module>spring-social-login</module>
+				<module>spring-spel</module>
+				<module>spring-state-machine</module>
+				<module>spring-static-resources</module>
+				<module>spring-swagger-codegen</module>
+
+				<module>spring-thymeleaf</module>
+
+				<!-- <module>spring-vault</module> BAEL-14304 -->
+				<module>spring-vertx</module>
+
+				<!-- <module>spring-webflux-amqp</module> BAEL-14304 --> <!-- long --> 
+
+				<module>spring-zuul</module>
+
+				<module>static-analysis</module>
+				<module>stripe</module>
+				<module>structurizr</module>
+				<module>struts-2</module>
+
+				<module>testing-modules</module>
+
+				<module>twilio</module>
+				<module>twitter4j</module>
+
+				<module>undertow</module>
+
+				<module>vertx</module>
+				<module>vertx-and-rxjava</module>
+				<module>video-tutorials</module>
+				<module>vraptor</module>
+
+				<module>wicket</module>
+
+				<module>xml</module>
+				<module>xstream</module>
 
 				<module>tensorflow-java</module>
 				<module>spring-boot-flowable</module>
@@ -561,238 +800,6 @@
 
 		</profile>
 
-        <profile>
-            <id>default-second</id>
-            <build>
-                <plugins>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven-surefire-plugin.version}</version>
-                        <configuration>
-                            <forkCount>3</forkCount>
-                            <reuseForks>true</reuseForks>
-                            <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>
-            </build>
-
-            <modules>
-                <module>parent-boot-1</module>
-                <module>parent-boot-2</module>
-                <module>parent-spring-4</module>
-                <module>parent-spring-5</module>
-                <module>parent-java</module>
-                <module>parent-kotlin</module>
-
-                <module>saas</module>
-                <module>spark-java</module>
-
-                <module>spring-4</module>
-
-                <module>spring-5</module>
-                <module>spring-5-webflux</module>
-                <module>spring-5-data-reactive</module>
-                <module>spring-5-mvc</module>
-                <module>spring-5-reactive</module>
-                <module>spring-5-reactive-client</module>
-                <module>spring-5-reactive-oauth</module>
-                <module>spring-5-reactive-security</module>
-                <module>spring-5-security</module>
-                <module>spring-5-security-oauth</module>
-                <module>spring-5-security-cognito</module>
-
-                <module>spring-activiti</module>
-                <module>spring-akka</module>
-                <module>spring-all</module>
-                <module>spring-amqp</module>
-                <module>spring-amqp-simple</module>
-                <module>spring-aop</module>
-                <module>spring-apache-camel</module>
-                <module>spring-batch</module>
-                <module>spring-bom</module>
-
-                <module>spring-boot</module>
-                <module>spring-boot-admin</module>
-                <module>spring-boot-angular</module>
-                <module>spring-boot-angular-ecommerce</module>
-                <module>spring-boot-autoconfiguration</module>
-                <module>spring-boot-bootstrap</module>
-                <module>spring-boot-camel</module>
-                <!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
-                <module>spring-boot-client</module>
-
-                <module>spring-boot-crud</module>
-                <module>spring-boot-ctx-fluent</module>
-                <module>spring-boot-custom-starter</module>
-                <module>spring-boot-disable-console-logging</module>
-                <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
-                <module>spring-boot-jasypt</module>
-                <module>spring-boot-keycloak</module>
-                <module>spring-boot-logging-log4j2</module>
-                <module>spring-boot-mvc</module>
-                <module>spring-boot-mvc-birt</module>
-                <module>spring-boot-ops</module>
-                <module>spring-boot-ops-2</module>
-                <module>spring-boot-rest</module>
-                <module>spring-boot-data</module>
-                <module>spring-boot-parent</module>
-                <module>spring-boot-property-exp</module>
-                <module>spring-boot-security</module>
-                <module>spring-boot-testing</module>
-                <module>spring-boot-vue</module>
-                <module>spring-boot-libraries</module>
-
-                <module>spring-cloud</module>
-                <module>spring-cloud-bus</module>
-                <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
-                <module>spring-cloud-data-flow</module>
-
-                <module>spring-core</module>
-                <module>spring-cucumber</module>
-
-                <module>spring-data-rest</module>
-                <module>spring-data-rest-querydsl</module>
-                <module>spring-dispatcher-servlet</module>
-                <module>spring-drools</module>
-
-                <module>spring-ehcache</module>
-                <module>spring-ejb</module>
-                <module>spring-exceptions</module>
-
-                <module>spring-freemarker</module>
-
-                <module>spring-groovy</module>
-
-                <module>spring-integration</module>
-
-                <module>spring-jenkins-pipeline</module>
-                <module>spring-jersey</module>
-                <module>spring-jinq</module>
-                <module>spring-jms</module>
-                <module>spring-jooq</module>
-
-                <module>spring-kafka</module>
-                <module>spring-katharsis</module>
-
-                <module>spring-ldap</module>
-
-                <module>spring-mobile</module>
-                <module>spring-mockito</module>
-                <module>spring-mvc-forms-jsp</module>
-                <module>spring-mvc-forms-thymeleaf</module>
-                <module>spring-mvc-java</module>
-                <module>spring-mvc-kotlin</module>
-                <module>spring-mvc-simple</module>
-                <module>spring-mvc-simple-2</module>
-                <module>spring-mvc-velocity</module>
-                <module>spring-mvc-webflow</module>
-                <module>spring-mvc-xml</module>
-
-                <module>spring-protobuf</module>
-                <!-- <module>spring-security-cors</module> -->  <!-- PMD violation -->
-
-                <module>spring-quartz</module>
-
-                <module>spring-reactive-kotlin</module>
-                <module>spring-reactor</module>
-                <module>spring-remoting</module>
-                <module>spring-rest</module>
-                <module>spring-rest-angular</module>
-                <module>spring-rest-full</module>
-                <module>spring-rest-hal-browser</module>
-                <module>spring-rest-query-language</module>
-                <module>spring-rest-shell</module>
-                <module>spring-rest-simple</module>
-                <module>spring-resttemplate</module>
-                <module>spring-roo</module>
-                <module>spring-security-acl</module>
-                <module>spring-security-angular/server</module>
-                <module>spring-security-cache-control</module>
-
-                <module>spring-security-client</module>
-
-                <module>spring-security-core</module>
-                <module>spring-security-mvc-boot</module>
-                <module>spring-security-mvc-custom</module>
-                <module>spring-security-mvc-digest-auth</module>
-				<module>spring-security-mvc-jsonview</module>
-                <module>spring-security-mvc-ldap</module>
-                <module>spring-security-mvc-login</module>
-                <module>spring-security-mvc-persisted-remember-me</module>
-                <module>spring-security-mvc-session</module>
-                <module>spring-security-mvc-socket</module>
-                <module>spring-security-openid</module>
-                <!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
-                <module>spring-security-rest</module>
-                <module>spring-security-rest-basic-auth</module>
-                <module>spring-security-rest-custom</module>
-                <module>spring-security-sso</module>
-                <module>spring-security-stormpath</module>
-                <module>spring-security-thymeleaf</module>
-                <module>spring-security-x509</module>
-                <module>spring-session</module>
-                <module>spring-sleuth</module>
-                <module>spring-soap</module>
-                <module>spring-social-login</module>
-                <module>spring-spel</module>
-                <module>spring-state-machine</module>
-                <module>spring-static-resources</module>
-                <module>spring-swagger-codegen</module>
-
-                <module>spring-thymeleaf</module>
-
-                <module>spring-userservice</module>
-
-                <module>spring-vault</module>
-                <module>spring-vertx</module>
-
-                <module>spring-webflux-amqp</module> <!-- long -->
-
-                <module>spring-zuul</module>
-
-                <module>static-analysis</module>
-                <module>stripe</module>
-                <module>structurizr</module>
-                <module>struts-2</module>
-
-                <module>testing-modules</module>
-
-                <module>twilio</module>
-                <module>Twitter4J</module>
-
-                <module>undertow</module>
-
-                <module>vavr</module>
-                <module>vertx</module>
-                <module>vertx-and-rxjava</module>
-                <module>video-tutorials</module>
-                <module>vraptor</module>
-
-                <module>wicket</module>
-
-                <module>xml</module>
-                <module>xmlunit-2</module>
-                <module>xstream</module>
-
-				<module>tensorflow-java</module>
-				<module>spring-boot-flowable</module>
-				<module>spring-security-kerberos</module>
-
-            </modules>
-
-        </profile>
-
 		<profile>
 			<id>spring-context</id>
 			<build>
@@ -818,6 +825,7 @@
 				<module>spring-5</module>
 				<module>spring-5-data-reactive</module>
 				<module>spring-5-reactive</module>
+				<module>spring-5-reactive-2</module>
 				<module>spring-5-reactive-client</module>
 				<module>spring-5-reactive-security</module>
 				<module>spring-5-security</module>
@@ -836,6 +844,7 @@
 				<module>spring-boot-camel</module>
 				<module>spring-boot-client</module>
 				<module>spring-boot-custom-starter</module>
+				<module>spring-boot-di</module>
 		 		<module>greeter-spring-boot-autoconfigure</module>
 				<module>greeter-spring-boot-sample-app</module>
 				<module>persistence-modules/spring-boot-h2/spring-boot-h2-database</module>
@@ -908,7 +917,7 @@
 				<module>spring-security-mvc-digest-auth</module>
 				<module>spring-security-mvc-ldap</module>
 				<module>spring-security-mvc-persisted-remember-me</module>
-				<module>spring-security-mvc-session</module>
+				<module>spring-security-mvc</module>
 				<module>spring-security-mvc-socket</module>
 				<module>spring-security-rest</module>
 				<module>spring-security-sso</module>
@@ -923,7 +932,6 @@
 				<module>spring-state-machine</module>
 				<module>spring-swagger-codegen/spring-swagger-codegen-app</module>
 				<module>spring-thymeleaf</module>
-				<module>spring-userservice</module>
 				<module>spring-vault</module>
 				<module>spring-vertx</module>
 				<module>spring-zuul/spring-zuul-foos-resource</module>
@@ -939,569 +947,578 @@
 
 		</profile>
 
-        <profile>
-            <id>default-heavy</id>
-            <build>
-                <plugins>
+		<profile>
+			<id>default-heavy</id>
+			<build>
+				<plugins>
 
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven-surefire-plugin.version}</version>
-                        <configuration>
-                            <forkCount>3</forkCount>
-                            <reuseForks>true</reuseForks>
-                            <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>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<version>${maven-surefire-plugin.version}</version>
+						<configuration>
+							<forkCount>3</forkCount>
+							<reuseForks>true</reuseForks>
+							<includes>
+								<include>SpringContextTest</include>
+								<include>**/*UnitTest</include>
+							</includes>
+							<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>
-            </build>
+				</plugins>
+			</build>
 
-            <modules>
-                <module>parent-boot-1</module>
-                <module>parent-boot-2</module>
-                <module>parent-spring-4</module>
-                <module>parent-spring-5</module>
-                <module>parent-java</module>
-                <module>parent-kotlin</module>
+			<modules>
+				<module>parent-boot-1</module>
+				<module>parent-boot-2</module>
+				<module>parent-spring-4</module>
+				<module>parent-spring-5</module>
+				<module>parent-java</module>
+				<module>parent-kotlin</module>
 
-                <module>core-java-modules/core-java-concurrency-advanced</module> <!-- very long running? -->
-                <module>core-kotlin</module> <!-- long running? -->
-                <module>core-kotlin-2</module>
-                <module>core-kotlin-io</module>
+				<module>core-java-modules/core-java-concurrency-advanced</module> <!-- very long running? -->
+				<module>core-kotlin</module> <!-- long running? -->
+				<module>core-kotlin-2</module>
+				<module>core-kotlin-io</module>
 
-                <module>jenkins/hello-world</module>
-                <module>jws</module>
+				<module>jenkins/hello-world</module>
+				<module>jhipster</module>
+				<module>jws</module>
 
-                <module>libraries</module> <!-- very long running -->
+				<module>libraries</module> <!-- very long running -->
+				<module>persistence-modules/hibernate5</module>
+				<module>persistence-modules/hibernate-mapping</module>
+				<module>persistence-modules/java-jpa</module>
+				<module>persistence-modules/java-jpa-2</module>
+				<module>persistence-modules/java-mongodb</module>
+				<module>persistence-modules/jnosql</module>
 
-                <module>persistence-modules/hibernate5</module>
-		<module>persistence-modules/hibernate-mapping</module>
-                <module>persistence-modules/java-jpa</module>
-                <module>persistence-modules/java-mongodb</module>
-                <module>persistence-modules/jnosql</module>
+				<module>vaadin</module>
+				<module>vavr</module>
+			</modules>
+		</profile>
 
-                <module>vaadin</module>
-            </modules>
-        </profile>
+		<profile>
+			<id>integration-lite-first</id>
 
-        <profile>
-            <id>integration-lite-first</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<configuration>
+							<excludes>
+								<exclude>**/*ManualTest.java</exclude>
+								<exclude>**/*LiveTest.java</exclude>
+							</excludes>
+							<includes>
+								<include>**/*IntegrationTest.java</include>
+								<include>**/*IntTest.java</include>
+							</includes>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
 
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/*ManualTest.java</exclude>
-                                <exclude>**/*LiveTest.java</exclude>
-                            </excludes>
-                            <includes>
-                                <include>**/*IntegrationTest.java</include>
-                                <include>**/*IntTest.java</include>
-                            </includes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
+			<modules>
+				<module>parent-boot-1</module>
+				<module>parent-boot-2</module>
+				<module>parent-spring-4</module>
+				<module>parent-spring-5</module>
+				<module>parent-java</module>
+				<module>parent-kotlin</module>
+				<!-- <module>akka-http</module> --> <!-- Unit test is failing -->
+				<module>akka-streams</module>
+				<module>algorithms-genetic</module>
+				<module>algorithms-miscellaneous-1</module>
+				<module>algorithms-miscellaneous-2</module>
+				<module>algorithms-miscellaneous-3</module>
+				<module>algorithms-sorting</module>
+				<module>animal-sniffer-mvn-plugin</module>
+				<module>annotations</module>
+				<module>antlr</module>
+				<module>apache-avro</module>
+				<module>apache-bval</module>
+				<module>apache-curator</module>
+				<module>apache-cxf</module>
+				<module>apache-fop</module>
+				<module>apache-geode</module>
+				<module>apache-meecrowave</module>
+				<module>apache-opennlp</module>
+				<module>apache-poi</module>
+				<module>apache-pulsar</module>
+				<module>apache-shiro</module>
+				<module>apache-solrj</module>
+				<module>apache-spark</module>
+				<module>apache-thrift</module>
+				<module>apache-tika</module>
+				<module>apache-velocity</module>
+				<module>apache-zookeeper</module>
+				<module>asciidoctor</module>
+				<module>asm</module>
+				<module>atomix</module>
+				<module>autovalue</module>
+				<module>aws</module>
+				<module>aws-lambda</module>
+				<module>axon</module>
+				<module>azure</module>
 
-            <modules>
-                <module>parent-boot-1</module>
-                <module>parent-boot-2</module>
-                <module>parent-spring-4</module>
-                <module>parent-spring-5</module>
-                <module>parent-java</module>
-                <module>parent-kotlin</module>
-                <!-- <module>akka-http</module> --> <!-- Unit test is failing -->
-                <module>akka-streams</module>
-                <module>algorithms-genetic</module>
-                <module>algorithms-miscellaneous-1</module>
-                <module>algorithms-miscellaneous-2</module>
-                <module>algorithms-miscellaneous-3</module>
-                <module>algorithms-sorting</module>
-                <module>animal-sniffer-mvn-plugin</module>
-                <module>annotations</module>
-                <module>antlr</module>
-                <module>apache-avro</module>
-                <module>apache-bval</module>
-                <module>apache-curator</module>
-                <module>apache-cxf</module>
-                <module>apache-fop</module>
-                <module>apache-geode</module>
-                <module>apache-meecrowave</module>
-                <module>apache-opennlp</module>
-                <module>apache-poi</module>
-                <module>apache-pulsar</module>
-                <module>apache-shiro</module>
-                <module>apache-solrj</module>
-                <module>apache-spark</module>
-                <module>apache-thrift</module>
-                <module>apache-tika</module>
-                <module>apache-velocity</module>
-                <module>apache-zookeeper</module>
-                <module>asciidoctor</module>
-                <module>asm</module>
-                <module>atomix</module>
-                <module>autovalue</module>
-                <module>aws</module>
-                <module>aws-lambda</module>
-                <module>axon</module>
-                <module>azure</module>
+				<module>bootique</module>
 
-                <module>bootique</module>
+				<module>cas</module>
+				<module>cdi</module>
+				<module>checker-plugin</module>
+				<module>core-groovy</module>
+				<module>core-groovy-2</module>
+				<module>core-groovy-collections</module>
+				<!-- <module>core-java-modules/core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
+				<!-- <module>core-java-modules/core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
+				<module>core-java-modules/core-java-8</module>
+				<module>core-java-modules/core-java-8-2</module>
+				<!--<module>core-java-modules/core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
+				<!--<module>core-java-modules/core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
+				<module>core-java-modules/core-java-arrays</module>
+				<module>core-java-modules/core-java-arrays-2</module>
+				<module>core-java-modules/core-java-collections</module>
+				<module>core-java-modules/core-java-collections-list</module>
+				<module>core-java-modules/core-java-collections-list-2</module>
+				<module>core-java-modules/core-java-collections-array-list</module>
+				<module>core-java-modules/core-java-collections-set</module>
+				<module>core-java-modules/core-java-concurrency-basic</module>
+				<module>core-java-modules/core-java-concurrency-collections</module>
+				<module>core-java-modules/core-java-io</module>
+				<module>core-java-modules/core-java-nio</module>
+				<module>core-java-modules/core-java-security</module>
+				<module>core-java-modules/core-java-lang-syntax</module>
+				<module>core-java-modules/core-java-lang</module>
+				<module>core-java-modules/core-java-lang-oop</module>
+				<module>core-java-modules/core-java-lang-oop-2</module>
+				<module>core-java-modules</module>
+				<module>core-java-modules/core-java-networking</module>
+				<module>core-java-modules/core-java-perf</module>
+				<module>core-java-modules/core-java-sun</module>
+				<module>core-scala</module>
+				<module>couchbase</module>
+				<module>custom-pmd</module>
 
-                <module>cas</module>
-                <module>cdi</module>
-                <module>checker-plugin</module>
-                <module>core-groovy</module>
-                <module>core-groovy-2</module>
-                <module>core-groovy-collections</module>
-                <!-- <module>core-java-modules/core-java-10</module> --> <!-- We haven't upgraded to java 10. Fixing in BAEL-10841 -->
-                <!-- <module>core-java-modules/core-java-11</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
-                <module>core-java-modules/core-java-8</module>
-                <module>core-java-modules/core-java-8-2</module>
-                <!--<module>core-java-modules/core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
-                <!--<module>core-java-modules/core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
-                <module>core-java-modules/core-java-arrays</module>
-                <module>core-java-modules/core-java-collections</module>
-                <module>core-java-modules/core-java-collections-list</module>
-                <module>core-java-modules/core-java-collections-list-2</module>
-                <module>core-java-modules/core-java-collections-array-list</module>
-                <module>core-java-modules/core-java-collections-set</module>
-                <module>core-java-modules/core-java-concurrency-basic</module>
-                <module>core-java-modules/core-java-concurrency-collections</module>
-                <module>core-java-modules/core-java-io</module>
-                <module>core-java-modules/core-java-nio</module>
-                <module>core-java-modules/core-java-security</module>
-                <module>core-java-modules/core-java-lang-syntax</module>
-                <module>core-java-modules/core-java-lang</module>
-                <module>core-java-modules/core-java-lang-oop</module>
-                <module>core-java-modules/core-java-lang-oop-2</module>
-                <module>core-java-modules</module>
-                <module>core-java-modules/core-java-networking</module>
-                <module>core-java-modules/core-java-perf</module>
-                <module>core-java-modules/core-java-sun</module>
-                <module>core-scala</module>
-                <module>couchbase</module>
-                <module>custom-pmd</module>
+				<module>dagger</module>
+				<module>data-structures</module>
+				<module>ddd</module>
+				<module>deeplearning4j</module>
+				<module>disruptor</module>
+				<module>dozer</module>
+				<module>drools</module>
+				<module>dubbo</module>
 
-                <module>dagger</module>
-                <module>data-structures</module>
-                <module>ddd</module>
-                <module>deeplearning4j</module>
-                <module>disruptor</module>
-                <module>dozer</module>
-                <module>drools</module>
-                <module>dubbo</module>
+				<module>ethereum</module>
 
-                <module>ethereum</module>
+				<module>feign</module>
+				<module>flyway-cdi-extension</module>
 
-                <module>feign</module>
-                <module>flyway-cdi-extension</module>
+				<module>geotools</module>
+				<module>google-cloud</module>
+				<module>google-web-toolkit</module>
+				<!-- <module>gradle</module> --> <!-- Not a maven project -->
+				<!-- <module>grails</module> --> <!-- Not a maven project -->
+				<module>graphql/graphql-java</module>
+				<module>grpc</module>
+				<module>gson</module>
+				<module>guava</module>
+				<module>guava-collections</module>
+				<module>guava-modules</module>
+				<!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
+				<module>guice</module>
 
-                <module>geotools</module>
-                <module>google-cloud</module>
-                <module>google-web-toolkit</module>
-                <!-- <module>gradle</module> --> <!-- Not a maven project -->
-                <!-- <module>grails</module> --> <!-- Not a maven project -->
-                <module>graphql/graphql-java</module>
-                <module>grpc</module>
-                <module>gson</module>
-                <module>guava</module>
-                <module>guava-collections</module>
-                <module>guava-modules</module>
-                <!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
-                <module>guice</module>
+				<module>hazelcast</module>
+				<module>helidon</module>
+				<module>httpclient</module>
+				<module>httpclient-simple</module>
+				<module>hystrix</module>
 
-                <module>hazelcast</module>
-                <module>helidon</module>
-                <module>httpclient</module>
-                <module>httpclient-simple</module>
-                <module>hystrix</module>
+				<module>image-processing</module>
+				<module>immutables</module>
 
-                <module>image-processing</module>
-                <module>immutables</module>
-
-                <module>jackson</module>
-                <module>jackson-2</module>
-                <module>jackson-simple</module>
-                <module>java-collections-conversions</module>
-                <module>java-collections-maps</module>
-                <module>java-collections-maps-2</module>
-                <!-- <module>java-dates</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
-                <module>java-ee-8-security-api</module>
-                <module>java-lite</module>
-                <module>java-numbers</module>
-                <module>java-rmi</module>
-                <module>java-spi</module>
-                <module>java-streams</module>
-                <module>java-streams-2</module>
-                <module>java-strings</module>
-                <module>java-strings-2</module>
-                <module>java-vavr-stream</module>
-                <module>java-websocket</module>
-                <module>javafx</module>
-                <module>javax-servlets</module>
-                <module>javaxval</module>
-                <module>jaxb</module>
-                <!-- JIRA-10842
+				<module>jackson</module>
+				<module>jackson-2</module>
+				<module>jackson-simple</module>
+				<module>java-collections-conversions</module>
+				<module>java-collections-maps</module>
+				<module>java-collections-maps-2</module>
+				<!-- <module>java-dates</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
+				<module>java-ee-8-security-api</module>
+				<module>java-lite</module>
+				<module>java-numbers</module>
+				<module>java-numbers-2</module>
+				<module>java-rmi</module>
+				<module>java-spi</module>
+				<module>java-streams</module>
+				<!-- <module>java-streams-2</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
+				<module>java-strings</module>
+				<module>java-strings-2</module>
+				<module>java-strings-ops</module>
+				<module>java-vavr-stream</module>
+				<module>java-websocket</module>
+				<module>javafx</module>
+				<module>javax-servlets</module>
+				<module>javaxval</module>
+				<module>jaxb</module>
+				<!-- JIRA-10842
                 <module>jee-7</module> -->
-                <module>jee-7-security</module>
-                <module>jersey</module>
-                <module>JGit</module>
-                <module>jgroups</module>
-                <module>jhipster</module>
-                <module>jhipster-5</module>
-                <module>jib</module>
-                <module>jjwt</module>
-                <module>jmeter</module>
-                <module>jmh</module>
-                <module>jni</module>
-                <module>jooby</module>
-                <module>jsf</module>
-                <module>json</module>
-                <module>json-path</module>
-                <module>jsoup</module>
-                <module>jta</module>
+				<module>jee-7-security</module>
+				<module>jersey</module>
+				<module>jgit</module>
+				<module>jgroups</module>
+				<module>jhipster-5</module>
+				<module>jib</module>
+				<module>jjwt</module>
+				<module>jmeter</module>
+				<module>jmh</module>
+				<module>jni</module>
+				<module>jooby</module>
+				<module>jsf</module>
+				<module>json</module>
+				<module>json-path</module>
+				<module>jsoup</module>
+				<module>jta</module>
 
-                <!-- <module>kotlin-js</module> --> <!-- Not a maven project -->
-                <module>kotlin-libraries</module>
+				<!-- <module>kotlin-js</module> --> <!-- Not a maven project -->
+				<module>kotlin-libraries</module>
 
-                <!-- <module>lagom</module> --> <!-- Not a maven project -->
-                <module>libraries</module>
-                <module>libraries-data</module>
-                <module>libraries-apache-commons</module>
-                <module>libraries-security</module>
-                <module>libraries-server</module>
-                <module>linkrest</module>
-                <module>logging-modules</module>
-                <module>lombok</module>
-                <module>lucene</module>
+				<!-- <module>lagom</module> --> <!-- Not a maven project -->
+				<module>libraries</module>
+				<module>libraries-data</module>
+				<module>libraries-apache-commons</module>
+				<module>libraries-security</module>
+				<module>libraries-server</module>
+				<module>libraries-http</module>
+				<module>linkrest</module>
+				<module>logging-modules</module>
+				<module>lombok</module>
+				<module>lucene</module>
 
-                <module>mapstruct</module>
-                <module>maven</module>
-                <!-- <module>maven-java-11</module> --> <!-- we haven't upgraded to Java 11 -->
-                <module>maven-archetype</module>
-                <!-- <module>maven-polyglot/maven-polyglot-json-app</module> --> <!-- Not a maven project -->
-                <module>maven-polyglot/maven-polyglot-json-extension</module>
-                <!-- <module>maven-polyglot/maven-polyglot-yml-app</module> --> <!-- Not a maven project -->
-                <module>mesos-marathon</module>
-                <module>metrics</module>
-                <!-- <module>micronaut</module> --> <!-- Fixing in BAEL-10877 -->
-                <module>microprofile</module>
-                <module>msf4j</module>
-                <!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
-                <module>mustache</module>
-                <module>mybatis</module>
+				<module>mapstruct</module>
+				<module>maven</module>
+				<!-- <module>maven-java-11</module> --> <!-- we haven't upgraded to Java 11 -->
+				<module>maven-archetype</module>
+				<!-- <module>maven-polyglot/maven-polyglot-json-app</module> --> <!-- Not a maven project -->
+				<module>maven-polyglot/maven-polyglot-json-extension</module>
+				<!-- <module>maven-polyglot/maven-polyglot-yml-app</module> --> <!-- Not a maven project -->
+				<module>mesos-marathon</module>
+				<module>metrics</module>
+				<!-- <module>micronaut</module> --> <!-- Fixing in BAEL-10877 -->
+				<module>microprofile</module>
+				<module>msf4j</module>
+				<!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
+				<module>mustache</module>
+				<module>mybatis</module>
 
 
-                <module>optaplanner</module>
-                <module>orika</module>
-                <module>osgi</module>
+				<module>optaplanner</module>
+				<module>orika</module>
+				<module>osgi</module>
 
-                <module>patterns</module>
-                <module>pdf</module>
-                <module>performance-tests</module>
-                <!-- <module>play-framework</module> --> <!-- Not a maven project -->
-                <module>protobuffer</module>
+				<module>patterns</module>
+				<module>pdf</module>
+				<module>performance-tests</module>
+				<!-- <module>play-framework</module> --> <!-- Not a maven project -->
+				<module>protobuffer</module>
 
-                <module>persistence-modules</module>
+				<module>persistence-modules</module>
 
-                <module>rabbitmq</module>
-                <!-- <module>raml</module> --> <!-- Not a maven project -->
-                <module>ratpack</module>
-                <module>reactor-core</module>
-                <module>rest-with-spark-java</module>
-                <module>resteasy</module>
-                <module>restx</module>
-                <!-- <module>rmi</module> --> <!-- Not a maven project -->
-                <module>rule-engines</module>
-                <module>rsocket</module>
-                <module>rxjava</module>
-                <module>rxjava-2</module>
+				<module>rabbitmq</module>
+				<!-- <module>raml</module> --> <!-- Not a maven project -->
+				<module>ratpack</module>
+				<module>reactor-core</module>
+				<module>resteasy</module>
+				<module>restx</module>
+				<!-- <module>rmi</module> --> <!-- Not a maven project -->
+				<module>rule-engines</module>
+				<module>rsocket</module>
+				<module>rxjava</module>
+				<module>rxjava-2</module>
+				<module>oauth2-framework-impl</module>
 
-             </modules>
+			</modules>
 
-        </profile>
+		</profile>
 
-        <profile>
-            <id>integration-lite-second</id>
+		<profile>
+			<id>integration-lite-second</id>
 
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/*ManualTest.java</exclude>
-                                <exclude>**/*LiveTest.java</exclude>
-                            </excludes>
-                            <includes>
-                                <include>**/*IntegrationTest.java</include>
-                                <include>**/*IntTest.java</include>
-                            </includes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<configuration>
+							<excludes>
+								<exclude>**/*ManualTest.java</exclude>
+								<exclude>**/*LiveTest.java</exclude>
+							</excludes>
+							<includes>
+								<include>**/*IntegrationTest.java</include>
+								<include>**/*IntTest.java</include>
+							</includes>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
 
-            <modules>
-                <module>parent-boot-1</module>
-                <module>parent-boot-2</module>
-                <module>parent-spring-4</module>
-                <module>parent-spring-5</module>
-                <module>parent-java</module>
-                <module>parent-kotlin</module>
+			<modules>
+				<module>parent-boot-1</module>
+				<module>parent-boot-2</module>
+				<module>parent-spring-4</module>
+				<module>parent-spring-5</module>
+				<module>parent-java</module>
+				<module>parent-kotlin</module>
 
-                <module>saas</module>
-                <module>spark-java</module>
+				<module>saas</module>
+				<module>spark-java</module>
 
-                <module>spring-4</module>
+				<module>spring-4</module>
 
-                <module>spring-5</module>
-                <module>spring-5-data-reactive</module>
-                <module>spring-5-mvc</module>
-                <module>spring-5-reactive</module>
-                <module>spring-5-reactive-client</module>
-                <module>spring-5-reactive-oauth</module>
-                <module>spring-5-reactive-security</module>
-                <module>spring-5-security</module>
-                <module>spring-5-security-oauth</module>
-                <module>spring-5-security-cognito</module>
-                <module>spring-activiti</module>
-                <module>spring-akka</module>
-                <module>spring-all</module>
-                <module>spring-amqp</module>
-                <module>spring-amqp-simple</module>
-                <module>spring-aop</module>
-                <module>spring-apache-camel</module>
-                <module>spring-batch</module>
-                <module>spring-bom</module>
+				<module>spring-5</module>
+				<module>spring-5-data-reactive</module>
+				<module>spring-5-mvc</module>
+				<module>spring-5-reactive</module>
+				<module>spring-5-reactive-2</module>
+				<module>spring-5-reactive-client</module>
+				<module>spring-5-reactive-oauth</module>
+				<module>spring-5-reactive-security</module>
+				<module>spring-5-security</module>
+				<module>spring-5-security-oauth</module>
+				<module>spring-5-security-cognito</module>
+				<module>spring-activiti</module>
+				<module>spring-akka</module>
+				<module>spring-all</module>
+				<module>spring-amqp</module>
+				<module>spring-amqp-simple</module>
+				<module>spring-aop</module>
+				<module>spring-apache-camel</module>
+				<module>spring-batch</module>
+				<module>spring-bom</module>
 
-                <module>spring-boot</module>
-                <module>spring-boot-admin</module>
-                <module>spring-boot-angular</module>
-                <module>spring-boot-angular-ecommerce</module>
-                <module>spring-boot-autoconfiguration</module>
-                <module>spring-boot-bootstrap</module>
-                <module>spring-boot-camel</module>
-                <!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
-                <module>spring-boot-client</module>
-                <module>spring-boot-crud</module>
-                <module>spring-boot-ctx-fluent</module>
-                <module>spring-boot-custom-starter</module>
-                <module>spring-boot-disable-console-logging</module>
-                <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
-                <module>spring-boot-jasypt</module>
-                <module>spring-boot-keycloak</module>
-                <module>spring-boot-logging-log4j2</module>
-                <module>spring-boot-mvc</module>
-                <module>spring-boot-mvc-birt</module>
-                <module>spring-boot-ops</module>
-                <module>spring-boot-ops-2</module>
-                <module>spring-boot-rest</module>
-                <module>spring-boot-data</module>
-                <module>spring-boot-parent</module>
-                <module>spring-boot-property-exp</module>
-                <module>spring-boot-security</module>
-                <module>spring-boot-vue</module>
+				<module>spring-boot</module>
+				<module>spring-boot-admin</module>
+				<module>spring-boot-angular</module>
+				<module>spring-boot-angular-ecommerce</module>
+				<module>spring-boot-autoconfiguration</module>
+				<module>spring-boot-bootstrap</module>
+				<module>spring-boot-camel</module>
+				<!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
+				<module>spring-boot-client</module>
+				<module>spring-boot-crud</module>
+				<module>spring-boot-ctx-fluent</module>
+				<module>spring-boot-custom-starter</module>
+				<module>spring-boot-disable-console-logging</module>
+				<!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
+				<module>spring-boot-jasypt</module>
+				<module>spring-boot-keycloak</module>
+				<module>spring-boot-logging-log4j2</module>
+				<module>spring-boot-mvc</module>
+				<module>spring-boot-mvc-birt</module>
+				<module>spring-boot-ops</module>
+				<module>spring-boot-ops-2</module>
+				<module>spring-boot-rest</module>
+				<module>spring-boot-data</module>
+				<module>spring-boot-parent</module>
+				<module>spring-boot-property-exp</module>
+				<module>spring-boot-security</module>
+				<module>spring-boot-vue</module>
 
-                <module>spring-cloud</module>
-                <module>spring-cloud-bus</module>
-                <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
-                <module>spring-cloud-data-flow</module>
+				<module>spring-cloud</module>
+				<module>spring-cloud-bus</module>
+				<!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
+				<module>spring-cloud-data-flow</module>
 
-                <module>spring-core</module>
-                <module>spring-cucumber</module>
+				<module>spring-core</module>
+				<module>spring-core-2</module>
+				<module>spring-cucumber</module>
 
-                <module>spring-data-rest</module>
-                <module>spring-data-rest-querydsl</module>
-                <module>spring-dispatcher-servlet</module>
-                <module>spring-drools</module>
+				<module>spring-data-rest</module>
+				<module>spring-data-rest-querydsl</module>
+				<module>spring-dispatcher-servlet</module>
+				<module>spring-drools</module>
 
 				<module>spring-ehcache</module>
-                <module>spring-ejb</module>
-                <module>spring-exceptions</module>
+				<module>spring-ejb</module>
+				<module>spring-exceptions</module>
 
-                <module>spring-freemarker</module>
+				<module>spring-freemarker</module>
 
-                <module>spring-groovy</module>
+				<module>spring-groovy</module>
 
-                <module>spring-integration</module>
+				<module>spring-integration</module>
 
-                <module>spring-jenkins-pipeline</module>
-                <module>spring-jersey</module>
-                <module>spring-jinq</module>
-                <module>spring-jms</module>
-                <module>spring-jooq</module>
+				<module>spring-jenkins-pipeline</module>
+				<module>spring-jersey</module>
+				<module>spring-jinq</module>
+				<module>spring-jms</module>
+				<module>spring-jooq</module>
 
-                <module>spring-kafka</module>
-                <module>spring-katharsis</module>
+				<module>spring-kafka</module>
+				<module>spring-katharsis</module>
 
-                <module>spring-ldap</module>
+				<module>spring-ldap</module>
 
-                <module>spring-mobile</module>
-                <module>spring-mockito</module>
-                <module>spring-mvc-forms-jsp</module>
-                <module>spring-mvc-forms-thymeleaf</module>
-                <module>spring-mvc-java</module>
-                <module>spring-mvc-kotlin</module>
-                <module>spring-mvc-simple</module>
-                <module>spring-mvc-simple-2</module>
-                <module>spring-mvc-velocity</module>
-                <module>spring-mvc-webflow</module>
-                <module>spring-mvc-xml</module>
+				<module>spring-mobile</module>
+				<module>spring-mockito</module>
+				<module>spring-mvc-forms-jsp</module>
+				<module>spring-mvc-forms-thymeleaf</module>
+				<module>spring-mvc-java</module>
+				<module>spring-mvc-kotlin</module>
+				<module>spring-mvc-simple</module>
+				<module>spring-mvc-simple-2</module>
+				<module>spring-mvc-velocity</module>
+				<module>spring-mvc-webflow</module>
+				<module>spring-mvc-xml</module>
 
-                <module>spring-protobuf</module>
-                <!-- <module>spring-security-cors</module> -->  <!-- PMD violation -->
+				<module>spring-protobuf</module>
+				<!-- <module>spring-security-cors</module> -->  <!-- PMD violation -->
 
-                <module>spring-quartz</module>
+				<module>spring-quartz</module>
 
-                <module>spring-reactive-kotlin</module>
-                <module>spring-reactor</module>
-                <module>spring-remoting</module>
-                <module>spring-rest</module>
-                <module>spring-rest-angular</module>
-                <module>spring-rest-full</module>
-                <module>spring-rest-hal-browser</module>
-                <module>spring-rest-query-language</module>
-                <module>spring-rest-shell</module>
-                <module>spring-rest-simple</module>
-                <module>spring-resttemplate</module>
-                <module>spring-roo</module>
+				<module>spring-reactive-kotlin</module>
+				<module>spring-reactor</module>
+				<module>spring-remoting</module>
+				<module>spring-rest</module>
+				<module>spring-rest-angular</module>
+				<module>spring-rest-full</module>
+				<module>spring-rest-hal-browser</module>
+				<module>spring-rest-query-language</module>
+				<module>spring-rest-shell</module>
+				<module>spring-rest-simple</module>
+				<module>spring-resttemplate</module>
+				<module>spring-roo</module>
 
-                <module>spring-security-acl</module>
-                <module>spring-security-angular/server</module>
-                <module>spring-security-cache-control</module>
+				<module>spring-security-acl</module>
+				<module>spring-security-angular/server</module>
+				<module>spring-security-cache-control</module>
 
-                <module>spring-security-client</module>
+				<module>spring-security-client</module>
 
-                <module>spring-security-core</module>
-                <module>spring-security-mvc-boot</module>
-                <module>spring-security-mvc-custom</module>
-                <module>spring-security-mvc-digest-auth</module>
-                <module>spring-security-mvc-ldap</module>
-                <module>spring-security-mvc-login</module>
-                <module>spring-security-mvc-persisted-remember-me</module>
-                <module>spring-security-mvc-session</module>
-                <module>spring-security-mvc-socket</module>
-                <module>spring-security-openid</module>
-                <!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
-                <module>spring-security-rest</module>
-                <module>spring-security-rest-basic-auth</module>
-                <module>spring-security-rest-custom</module>
-                <module>spring-security-sso</module>
-                <module>spring-security-stormpath</module>
-                <module>spring-security-thymeleaf</module>
-                <module>spring-security-x509</module>
-                <module>spring-session</module>
-                <module>spring-sleuth</module>
-                <module>spring-soap</module>
-                <module>spring-social-login</module>
-                <module>spring-spel</module>
-                <module>spring-state-machine</module>
-                <module>spring-static-resources</module>
-                <module>spring-swagger-codegen</module>
+				<module>spring-security-core</module>
+				<module>spring-security-mvc-boot</module>
+				<module>spring-security-mvc-custom</module>
+				<module>spring-security-mvc-digest-auth</module>
+				<module>spring-security-mvc-ldap</module>
+				<module>spring-security-mvc-login</module>
+				<module>spring-security-mvc-persisted-remember-me</module>
+				<module>spring-security-mvc</module>
+				<module>spring-security-mvc-socket</module>
+				<module>spring-security-openid</module>
+				<!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
+				<module>spring-security-rest</module>
+				<module>spring-security-rest-basic-auth</module>
+				<module>spring-security-rest-custom</module>
+				<module>spring-security-sso</module>
+				<module>spring-security-stormpath</module>
+				<module>spring-security-thymeleaf</module>
+				<module>spring-security-x509</module>
+				<module>spring-session</module>
+				<module>spring-sleuth</module>
+				<module>spring-soap</module>
+				<module>spring-social-login</module>
+				<module>spring-spel</module>
+				<module>spring-state-machine</module>
+				<module>spring-static-resources</module>
+				<module>spring-swagger-codegen</module>
 
-                <module>spring-thymeleaf</module>
+				<module>spring-thymeleaf</module>
 
-                <module>spring-userservice</module>
+				<module>spring-vault</module>
+				<module>spring-vertx</module>
 
-                <module>spring-vault</module>
-                <module>spring-vertx</module>
+				<module>spring-webflux-amqp</module> <!-- long -->
 
-                <module>spring-webflux-amqp</module> <!-- long -->
+				<module>spring-zuul</module>
 
-                <module>spring-zuul</module>
+				<module>static-analysis</module>
+				<module>stripe</module>
+				<module>structurizr</module>
+				<module>struts-2</module>
 
-                <module>static-analysis</module>
-                <module>stripe</module>
-                <module>structurizr</module>
-                <module>struts-2</module>
+				<module>testing-modules</module>
 
-                <module>testing-modules</module>
+				<module>twilio</module>
+				<module>twitter4j</module>
 
-                <module>twilio</module>
-                <module>Twitter4J</module>
+				<module>undertow</module>
 
-                <module>undertow</module>
+				<module>vertx</module>
+				<module>vertx-and-rxjava</module>
+				<module>video-tutorials</module>
+				<module>vraptor</module>
 
-                <module>vavr</module>
-                <module>vertx</module>
-                <module>vertx-and-rxjava</module>
-                <module>video-tutorials</module>
-                <module>vraptor</module>
+				<module>wicket</module>
 
-                <module>wicket</module>
+				<module>xml</module>
+				<module>xstream</module>
+			</modules>
 
-                <module>xml</module>
-                <module>xmlunit-2</module>
-                <module>xstream</module>
+		</profile>
 
-            </modules>
+		<profile>
+			<id>integration-heavy</id>
 
-        </profile>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<configuration>
+							<excludes>
+								<exclude>**/*ManualTest.java</exclude>
+								<exclude>**/*LiveTest.java</exclude>
+							</excludes>
+							<includes>
+								<include>**/*IntegrationTest.java</include>
+								<include>**/*IntTest.java</include>
+							</includes>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
 
-        <profile>
-            <id>integration-heavy</id>
+			<modules>
+				<module>parent-boot-1</module>
+				<module>parent-boot-2</module>
+				<module>parent-spring-4</module>
+				<module>parent-spring-5</module>
+				<module>parent-java</module>
+				<module>parent-kotlin</module>
 
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/*ManualTest.java</exclude>
-                                <exclude>**/*LiveTest.java</exclude>
-                            </excludes>
-                            <includes>
-                                <include>**/*IntegrationTest.java</include>
-                                <include>**/*IntTest.java</include>
-                            </includes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
+				<module>core-java-modules/core-java</module>
+				<module>core-java-modules/core-java-concurrency-advanced</module> <!-- very long running? -->
+				<module>core-kotlin</module> <!-- long running? -->
+				<module>core-kotlin-2</module>
 
-            <modules>
-                <module>parent-boot-1</module>
-                <module>parent-boot-2</module>
-                <module>parent-spring-4</module>
-                <module>parent-spring-5</module>
-                <module>parent-java</module>
-                <module>parent-kotlin</module>
+				<module>jenkins/hello-world</module>
+				<module>jhipster</module>
+				<module>jws</module>
 
-                <module>core-java-modules/core-java</module>
-                <module>core-java-modules/core-java-concurrency-advanced</module> <!-- very long running? -->
-                <module>core-kotlin</module> <!-- long running? -->
-                <module>core-kotlin-2</module>
+				<module>libraries</module> <!-- very long running -->
 
-                <module>jenkins/hello-world</module>
-                <module>jws</module>
+				<module>persistence-modules/hibernate5</module>
+				<module>persistence-modules/java-jpa</module>
+				<module>persistence-modules/java-jpa-2</module>
+				<module>persistence-modules/java-mongodb</module>
+				<module>persistence-modules/jnosql</module>
 
-                <module>libraries</module> <!-- very long running -->
+				<module>vaadin</module>
+				<module>vavr</module>
+			</modules>
 
-                <module>persistence-modules/hibernate5</module>
-                <module>persistence-modules/java-jpa</module>
-                <module>persistence-modules/java-mongodb</module>
-                <module>persistence-modules/jnosql</module>
-
-                <module>vaadin</module>
-            </modules>
-
-        </profile>
+		</profile>
 
 
 	</profiles>
@@ -1535,7 +1552,7 @@
 		<logback.version>1.1.7</logback.version>
 
 		<!-- plugins -->
-                <!-- can't upgrade the plugin yet; as there is an issue with 2.22 no longer running all the tests-->
+		<!-- can't upgrade the plugin yet; as there is an issue with 2.22 no longer running all the tests-->
 		<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
 		<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
 		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
@@ -1549,6 +1566,8 @@
 		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
 		<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
 		<commons-io.version>2.5</commons-io.version>
+		<commons-lang.version>2.6</commons-lang.version>
+		<commons-lang3.version>3.5</commons-lang3.version>
 		<commons-cli.version>1.4</commons-cli.version>
 		<maven-war-plugin.version>3.0.0</maven-war-plugin.version>
 		<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
@@ -1570,4 +1589,5 @@
 		<lombok.version>1.16.12</lombok.version>
 		<h2.version>1.4.197</h2.version>
 	</properties>
+
 </project>
diff --git a/quarkus/README.md b/quarkus/README.md
index 01009eab3e..3ff08c6f9e 100644
--- a/quarkus/README.md
+++ b/quarkus/README.md
@@ -1,3 +1,3 @@
-## Relevant articles:
+## Relevant Articles:
 
-- [Guide to QuarkusIO](hhttps://www.baeldung.com/quarkus-io)
+- [Guide to QuarkusIO](https://www.baeldung.com/quarkus-io)
diff --git a/quarkus/pom.xml b/quarkus/pom.xml
index d8f274df6d..ceb2e2c0d4 100644
--- a/quarkus/pom.xml
+++ b/quarkus/pom.xml
@@ -7,7 +7,7 @@
   <version>1.0-SNAPSHOT</version>
   <properties>
     <surefire-plugin.version>2.22.0</surefire-plugin.version>
-    <quarkus.version>0.13.1</quarkus.version>
+    <quarkus.version>0.15.0</quarkus.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>1.8</maven.compiler.target>
diff --git a/quarkus/src/main/java/com/baeldung/quarkus/HelloService.java b/quarkus/src/main/java/com/baeldung/quarkus/HelloService.java
index 4b19de1b63..4c505fbabe 100644
--- a/quarkus/src/main/java/com/baeldung/quarkus/HelloService.java
+++ b/quarkus/src/main/java/com/baeldung/quarkus/HelloService.java
@@ -8,7 +8,7 @@ import javax.enterprise.context.ApplicationScoped;
 public class HelloService {
 
     @ConfigProperty(name = "greeting")
-    private String greeting;
+    String greeting;
 
     public String politeHello(String name){
         return greeting + " " + name;
diff --git a/quarkus/src/test/java/com/baeldung/quarkus/HelloResourceTest.java b/quarkus/src/test/java/com/baeldung/quarkus/HelloResourceUnitTest.java
similarity index 91%
rename from quarkus/src/test/java/com/baeldung/quarkus/HelloResourceTest.java
rename to quarkus/src/test/java/com/baeldung/quarkus/HelloResourceUnitTest.java
index 3d0fff7562..a5ed99f585 100644
--- a/quarkus/src/test/java/com/baeldung/quarkus/HelloResourceTest.java
+++ b/quarkus/src/test/java/com/baeldung/quarkus/HelloResourceUnitTest.java
@@ -7,7 +7,7 @@ import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.is;
 
 @QuarkusTest
-public class HelloResourceTest {
+public class HelloResourceUnitTest {
 
     @Test
     public void testHelloEndpoint() {
diff --git a/quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java b/quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java
index 4b0606f588..9ada64b6a5 100644
--- a/quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java
+++ b/quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java
@@ -3,7 +3,7 @@ package com.baeldung.quarkus;
 import io.quarkus.test.junit.SubstrateTest;
 
 @SubstrateTest
-public class NativeHelloResourceIT extends HelloResourceTest {
+public class NativeHelloResourceIT extends HelloResourceUnitTest {
 
     // Execute the same tests but in native mode.
 }
\ No newline at end of file
diff --git a/ratpack/README.md b/ratpack/README.md
index 14bc3f6c74..78e2f8ccfc 100644
--- a/ratpack/README.md
+++ b/ratpack/README.md
@@ -6,3 +6,4 @@
 - [Ratpack with Hystrix](http://www.baeldung.com/ratpack-hystrix)
 - [Ratpack HTTP Client](https://www.baeldung.com/ratpack-http-client)
 - [Ratpack with RxJava](https://www.baeldung.com/ratpack-rxjava)
+- [Ratpack with Groovy](https://www.baeldung.com/ratpack-groovy)
diff --git a/rest-with-spark-java/README.md b/rest-with-spark-java/README.md
deleted file mode 100644
index ff12555376..0000000000
--- a/rest-with-spark-java/README.md
+++ /dev/null
@@ -1 +0,0 @@
-## Relevant articles:
diff --git a/rest-with-spark-java/pom.xml b/rest-with-spark-java/pom.xml
deleted file mode 100644
index fc78ac6b86..0000000000
--- a/rest-with-spark-java/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>rest-with-spark-java</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <name>rest-with-spark-java</name>
-    <url>http://maven.apache.org</url>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.sparkjava</groupId>
-            <artifactId>spark-core</artifactId>
-            <version>${spark-core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <spark-core.version>2.5.4</spark-core.version>
-    </properties>
-
-</project>
diff --git a/rest-with-spark-java/src/main/java/com/baeldung/Router.java b/rest-with-spark-java/src/main/java/com/baeldung/Router.java
deleted file mode 100644
index 3482184e1e..0000000000
--- a/rest-with-spark-java/src/main/java/com/baeldung/Router.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.baeldung;
-
-import static spark.Spark.after;
-import static spark.Spark.before;
-import static spark.Spark.delete;
-import static spark.Spark.get;
-import static spark.Spark.post;
-import static spark.Spark.port;
-
-import com.baeldung.domain.Book;
-import com.baeldung.service.LibraryService;
-
-public class Router {
-    
-    public static void main( String[] args ){
-    	
-    	port(8080);
-        
-    	before((request, response) -> {
-    		
-    		//do some filtering stuff
-    		
-    	});
-    	
-    	after((request, response) -> {
-    		response.type("application/json");
-    	});
-    	
-    	get("ListOfBooks", (request, response) -> {
-        	return LibraryService.view();
-        });
-    	
-    	get("SearchBook/:title", (request, response) -> {
-        	return LibraryService.view(request.params("title"));
-        });
-    	
-    	post("AddBook/:title/:author/:publisher", (request, response) -> {
-    		Book book = new Book();
-    		book.setTitle(request.params("title"));
-    		book.setAuthor(request.params("author"));
-    		book.setPublisher(request.params("publisher"));
-        	return LibraryService.add(book);
-        });
-    	
-    	delete("DeleteBook/:title", (request, response) -> {
-        	return LibraryService.delete(request.params("title"));
-        });
-    	
-    }
-}
diff --git a/rest-with-spark-java/src/main/java/com/baeldung/domain/Book.java b/rest-with-spark-java/src/main/java/com/baeldung/domain/Book.java
deleted file mode 100644
index 977d5d9f89..0000000000
--- a/rest-with-spark-java/src/main/java/com/baeldung/domain/Book.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.baeldung.domain;
-
-public class Book {
-
-	private String title;
-	private String author;
-	private String publisher;
-
-	public Book() {}
-	
-	public Book(String title, String author, String publisher) {
-		super();
-		this.title = title;
-		this.author = author;
-		this.publisher = publisher;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	public String getAuthor() {
-		return author;
-	}
-	
-	public void setAuthor(String author) {
-		this.author = author;
-	}
-	public String getPublisher() {
-		return publisher;
-	}
-	public void setPublisher(String publisher) {
-		this.publisher = publisher;
-	}
-	
-	protected boolean canEqual(Object other) {
-		return other instanceof Book;
-	}
-
-	@Override 
-	public boolean equals(Object o) {
-		if (o == this) return true;
-		if (!(o instanceof Book)) return false;
-		Book other = (Book) o;
-		if (!other.canEqual((Object)this)) return false;
-		if (this.getTitle() == null ? other.getTitle() != null : !this.getTitle().equals(other.getTitle())) return false;
-		return true;
-	}
-	
-}
diff --git a/rest-with-spark-java/src/main/java/com/baeldung/service/LibraryService.java b/rest-with-spark-java/src/main/java/com/baeldung/service/LibraryService.java
deleted file mode 100644
index e4ca4c270c..0000000000
--- a/rest-with-spark-java/src/main/java/com/baeldung/service/LibraryService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.baeldung.service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.baeldung.domain.Book;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
-
-public class LibraryService {
-
-	private static ObjectWriter mapper = new ObjectMapper().writer().withDefaultPrettyPrinter();
-	private static Map<String, Book> library = new HashMap<String,Book>();
-
-	public static String view() throws JsonProcessingException {
-		List<Book> books = new ArrayList<Book>();
-		library.forEach((key, value) -> {
-		    books.add(value);
-		});
-		return mapper.writeValueAsString(books);
-	}
-	
-	public static String view(String title) throws JsonProcessingException {
-		return mapper.writeValueAsString(library.get(title));
-	}
-	
-	public static String add(Book book) throws JsonProcessingException {
-		library.put(book.getTitle(), book);
-		return mapper.writeValueAsString(book);
-	}
-	
-	public static String delete(String title) throws JsonProcessingException {
-		Book deletedBook = library.remove(title);
-		return mapper.writeValueAsString(deletedBook);
-	}
-	
-}
diff --git a/rest-with-spark-java/src/test/java/com/baeldung/AppLiveTest.java b/rest-with-spark-java/src/test/java/com/baeldung/AppLiveTest.java
deleted file mode 100644
index 9e24879767..0000000000
--- a/rest-with-spark-java/src/test/java/com/baeldung/AppLiveTest.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.baeldung;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.baeldung.domain.Book;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class AppLiveTest extends TestCase {
-
-	ObjectMapper mapper = new ObjectMapper();
-
-    public AppLiveTest( String testName ) {
-        super( testName );
-    }
-
-    public static Test suite() {
-        return new TestSuite( AppLiveTest.class );
-    }
-
-    public void testApp() throws IOException, ClassNotFoundException {
-    
-    	URL url;
-    	HttpURLConnection conn;
-    	BufferedReader br;
-    	String output;
-    	StringBuffer resp;
-    	Book book;
-    	Book temp;
-    	
-    	url = new URL("http://localhost:8080/AddBook/Odessy/YannMartel/GreenLeaves");
-    	conn = (HttpURLConnection) url.openConnection();
-    	conn.setRequestMethod("POST");
-    	conn.getContent();
-		br = new BufferedReader(new InputStreamReader(
-				(conn.getInputStream())));
-		resp = new StringBuffer();
-		
-		while ((output = br.readLine()) != null) {
-			resp.append(output);
-		}
-		
-		book = mapper.readValue(resp.toString(), Book.class);
-		temp = new Book("Odessy","YannMartel","GreenLeaves");
-		
-		assertEquals(book, temp);
-		
-		url = new URL("http://localhost:8080/AddBook/Twilight/StephenieMeyer/LittleBrown");
-    	conn = (HttpURLConnection) url.openConnection();
-    	conn.setRequestMethod("POST");
-		br = new BufferedReader(new InputStreamReader(
-				(conn.getInputStream())));
-		resp = new StringBuffer();
-		
-		while ((output = br.readLine()) != null) {
-			resp.append(output);
-		}
-		
-		book = mapper.readValue(resp.toString(), Book.class);
-		temp = new Book("Twilight","StephenieMeyer","LittleBrown");
-		
-		assertEquals(book, temp);
-		
-    	url = new URL("http://localhost:8080/ListOfBooks");
-		conn = (HttpURLConnection) url.openConnection();		
-		conn.setRequestMethod("GET");
-		br = new BufferedReader(new InputStreamReader(
-				(conn.getInputStream())));
-		resp = new StringBuffer();
-		
-		while ((output = br.readLine()) != null) {
-			resp.append(output);
-		}
-		
-		List<Book> books = new ArrayList<Book>();
-		
-		books.add(new Book("Odessy","YannMartel","GreenLeaves"));
-		books.add(new Book("Twilight","StephenieMeyer","LittleBrown"));
-		
-		List<Book> listOfBooks = mapper.readValue(resp.toString(), new TypeReference<List<Book>>(){});
-		
-		assertEquals(books, listOfBooks);
-		
-    	url = new URL("http://localhost:8080/SearchBook/Twilight");
-		conn = (HttpURLConnection) url.openConnection();		
-		conn.setRequestMethod("GET");
-		br = new BufferedReader(new InputStreamReader(
-				(conn.getInputStream())));
-		resp = new StringBuffer();
-		
-		while ((output = br.readLine()) != null) {
-			resp.append(output);
-		}
-		
-		book = mapper.readValue(resp.toString(), Book.class);
-		temp = new Book("Twilight","StephenieMeyer","LittleBrown");
-		
-		assertEquals(book, temp);
-		
-		url = new URL("http://localhost:8080/DeleteBook/Twilight");
-    	conn = (HttpURLConnection) url.openConnection();
-    	conn.setRequestMethod("DELETE");
-		br = new BufferedReader(new InputStreamReader(
-				(conn.getInputStream())));
-    	resp = new StringBuffer();
-		
-		while ((output = br.readLine()) != null) {
-			resp.append(output);
-		}
-		
-		book = mapper.readValue(resp.toString(), Book.class);
-		temp = new Book("Twilight","StephenieMeyer","LittleBrown");
-		
-		assertEquals(book, temp);
-		
-    	url = new URL("http://localhost:8080/ListOfBooks");
-		conn = (HttpURLConnection) url.openConnection();		
-		conn.setRequestMethod("GET");
-		br = new BufferedReader(new InputStreamReader(
-				(conn.getInputStream())));
-		resp = new StringBuffer();
-		
-		while ((output = br.readLine()) != null) {
-			resp.append(output);
-		}
-		
-		books = new ArrayList<Book>();
-		
-		books.add(new Book("Odessy","YannMartel","GreenLeaves"));		
-		listOfBooks = mapper.readValue(resp.toString(), new TypeReference<List<Book>>(){});
-		
-		assertEquals(books, listOfBooks);
-		
-		conn.disconnect();
-		
-    }
-    
-}
diff --git a/resteasy/bin/README.md b/resteasy/bin/README.md
deleted file mode 100644
index f4dba1493a..0000000000
--- a/resteasy/bin/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-=========
-
-## A Guide to RESTEasy
-
-
-### Relevant Articles:
diff --git a/resteasy/pom.xml b/resteasy/pom.xml
index ca4124abca..8aea8077f9 100644
--- a/resteasy/pom.xml
+++ b/resteasy/pom.xml
@@ -143,7 +143,6 @@
 
     <properties>
         <resteasy.version>3.0.19.Final</resteasy.version>
-        <commons-io.version>2.5</commons-io.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
     </properties>
 
diff --git a/software-security/sql-injection-samples/pom.xml b/software-security/sql-injection-samples/pom.xml
index b12b479614..5c3256319e 100644
--- a/software-security/sql-injection-samples/pom.xml
+++ b/software-security/sql-injection-samples/pom.xml
@@ -16,13 +16,10 @@
     </parent>	
 
 	<dependencies>
-	
-	
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derby</artifactId>
@@ -43,18 +40,14 @@
 			<artifactId>lombok</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
-		
 		<dependency>
 		    <groupId>org.hibernate</groupId>
 		    <artifactId>hibernate-jpamodelgen</artifactId>
 		</dependency>
-
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
diff --git a/spf4j/README.md b/spf4j/README.md
new file mode 100644
index 0000000000..a39cd01b5e
--- /dev/null
+++ b/spf4j/README.md
@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Introduction to SPF4J](https://www.baeldung.com/spf4j)
diff --git a/spf4j/spf4j-aspects-app/pom.xml b/spf4j/spf4j-aspects-app/pom.xml
index 9fccec673a..1c707f4d87 100644
--- a/spf4j/spf4j-aspects-app/pom.xml
+++ b/spf4j/spf4j-aspects-app/pom.xml
@@ -6,12 +6,14 @@
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>spf4j-aspects-app</name>
+
     <parent>
         <artifactId>parent-modules</artifactId>
         <groupId>com.baeldung</groupId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
+
     <dependencies>
         <dependency>
             <groupId>org.spf4j</groupId>
@@ -29,6 +31,7 @@
             <version>${org.slf4j.version}</version>
         </dependency>
     </dependencies>
+
     <build>
         <finalName>spf4j-aspects-app</finalName>
         <plugins>
@@ -75,6 +78,7 @@
             </plugin>
         </plugins>
     </build>
+	
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spf4j.version>8.6.10</spf4j.version>
diff --git a/spf4j/spf4j-core-app/pom.xml b/spf4j/spf4j-core-app/pom.xml
index ae346065ef..9f490d9f06 100644
--- a/spf4j/spf4j-core-app/pom.xml
+++ b/spf4j/spf4j-core-app/pom.xml
@@ -6,12 +6,14 @@
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>spf4j-core-app</name>
+
     <parent>
         <artifactId>parent-modules</artifactId>
         <groupId>com.baeldung</groupId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
+
     <dependencies>
         <dependency>
             <groupId>org.spf4j</groupId>
@@ -29,6 +31,7 @@
             <version>${org.slf4j.version}</version>
         </dependency>
     </dependencies>
+
     <build>
         <finalName>spf4j-core-app</finalName>
         <plugins>
@@ -75,6 +78,7 @@
             </plugin>
         </plugins>
     </build>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spf4j.version>8.6.10</spf4j.version>
diff --git a/spring-4/src/test/java/org/baeldung/SpringContextTest.java b/spring-4/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..cccdaff0cd
--- /dev/null
+++ b/spring-4/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,20 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import com.baeldung.flips.ApplicationConfig;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = ApplicationConfig.class)
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-5-data-reactive/README.md b/spring-5-data-reactive/README.md
index f8886ac18b..f3205c23bc 100644
--- a/spring-5-data-reactive/README.md
+++ b/spring-5-data-reactive/README.md
@@ -6,3 +6,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 ### Relevant Articles
 - [Reactive Flow with MongoDB, Kotlin, and Spring WebFlux](http://www.baeldung.com/kotlin-mongodb-spring-webflux)
 - [Spring Data Reactive Repositories with MongoDB](http://www.baeldung.com/spring-data-mongodb-reactive)
+- [Spring Data MongoDB Tailable Cursors](https://www.baeldung.com/spring-data-mongodb-tailable-cursors)
diff --git a/spring-5-data-reactive/pom.xml b/spring-5-data-reactive/pom.xml
index 8c16851de0..5372803842 100644
--- a/spring-5-data-reactive/pom.xml
+++ b/spring-5-data-reactive/pom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-5-data-reactive</artifactId>
-	<name>spring-5-data-reactive</name>
+    <name>spring-5-data-reactive</name>
     <packaging>jar</packaging>
 
     <parent>
@@ -49,11 +49,11 @@
             <version>${kotlin.version}</version>
             <scope>test</scope>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -68,6 +68,44 @@
             <artifactId>de.flapdoodle.embed.mongo</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${spring-tx.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-r2dbc</artifactId>
+            <version>${spring-data-r2dbc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.r2dbc</groupId>
+            <artifactId>r2dbc-h2</artifactId>
+            <version>${r2dbc-h2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -79,7 +117,7 @@
             <plugin>
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <version>${kotlin-maven-plugin.version}</version>
-               <executions>
+                <executions>
                     <execution>
                         <id>compile</id>
                         <goals>
@@ -123,7 +161,7 @@
                     </dependency>
                 </dependencies>
             </plugin>
-             <plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
@@ -131,13 +169,13 @@
                     <target>${java.version}</target>
                 </configuration>
                 <executions>
-                    <!-- Replacing default-compile as it is treated specially 
+                    <!-- Replacing default-compile as it is treated specially
                         by maven -->
                     <execution>
                         <id>default-compile</id>
                         <phase>none</phase>
                     </execution>
-                    <!-- Replacing default-testCompile as it is treated specially 
+                    <!-- Replacing default-testCompile as it is treated specially
                         by maven -->
                     <execution>
                         <id>default-testCompile</id>
@@ -162,9 +200,30 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+
     <properties>
         <kotlin.version>1.2.40</kotlin.version>
         <kotlin-maven-plugin.version>1.2.40</kotlin-maven-plugin.version>
+        <spring-tx.version>5.2.0.M2</spring-tx.version>
+        <spring-data-r2dbc.version>1.0.0.M2</spring-data-r2dbc.version>
+        <r2dbc-h2.version>0.8.0.M8</r2dbc-h2.version>
+        <httpclient.version>4.5.2</httpclient.version>
+        <h2.version>1.4.199</h2.version>
     </properties>
 
 </project>
diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/R2dbcApplication.java b/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/R2dbcApplication.java
new file mode 100644
index 0000000000..557b6ff42a
--- /dev/null
+++ b/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/R2dbcApplication.java
@@ -0,0 +1,15 @@
+package com.baeldung.r2dbc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+@SpringBootApplication
+@ComponentScan(basePackages = "com.baeldung.r2dbc")
+public class R2dbcApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(R2dbcApplication.class, args);
+    }
+
+}
\ No newline at end of file
diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/configuration/R2DBCConfiguration.java b/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/configuration/R2DBCConfiguration.java
new file mode 100644
index 0000000000..17eac7fee2
--- /dev/null
+++ b/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/configuration/R2DBCConfiguration.java
@@ -0,0 +1,21 @@
+package com.baeldung.r2dbc.configuration;
+
+import io.r2dbc.h2.H2ConnectionConfiguration;
+import io.r2dbc.h2.H2ConnectionFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration;
+import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
+
+@Configuration
+//@EnableR2dbcRepositories(basePackages = "com.baeldung.r2dbc.repository")
+public class R2DBCConfiguration extends AbstractR2dbcConfiguration {
+    @Bean
+    public H2ConnectionFactory connectionFactory() {
+        return new H2ConnectionFactory(
+                H2ConnectionConfiguration.builder()
+                        .url("mem:testdb;DB_CLOSE_DELAY=-1;TRACE_LEVEL_FILE=4")
+                        .username("sa")
+                        .build());
+    }
+}
\ No newline at end of file
diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/model/Player.java b/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/model/Player.java
new file mode 100644
index 0000000000..1926997e97
--- /dev/null
+++ b/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/model/Player.java
@@ -0,0 +1,16 @@
+package com.baeldung.r2dbc.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Player {
+    @Id
+    Integer id;
+    String name;
+    Integer age;
+}
\ No newline at end of file
diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java b/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java
new file mode 100644
index 0000000000..33b653140e
--- /dev/null
+++ b/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java
@@ -0,0 +1,15 @@
+package com.baeldung.r2dbc.repository;
+
+import com.baeldung.r2dbc.model.Player;
+import org.springframework.data.r2dbc.repository.query.Query;
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
+import reactor.core.publisher.Flux;
+
+public interface PlayerRepository extends ReactiveCrudRepository<Player, Integer> {
+
+    @Query("select id, name, age from player where name = $1")
+    Flux<Player> findAllByName(String name);
+
+    @Query("select * from player where age = $1")
+    Flux<Player> findByAge(int age);
+}
\ No newline at end of file
diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/tailablecursor/service/InfoLogsCounter.java b/spring-5-data-reactive/src/main/java/com/baeldung/tailablecursor/service/InfoLogsCounter.java
index b30eba0b25..29301bffec 100644
--- a/spring-5-data-reactive/src/main/java/com/baeldung/tailablecursor/service/InfoLogsCounter.java
+++ b/spring-5-data-reactive/src/main/java/com/baeldung/tailablecursor/service/InfoLogsCounter.java
@@ -18,8 +18,8 @@ public class InfoLogsCounter implements LogsCounter {
 
     public InfoLogsCounter(LogsRepository repository) {
         Flux<Log> stream = repository.findByLevel(LogLevel.INFO);
-        this.subscription = stream.subscribe(l -> {
-          log.info("INFO log received: " + l);
+        this.subscription = stream.subscribe(logEntity -> {
+          log.info("INFO log received: " + logEntity);
           counter.incrementAndGet();
         });
     }
diff --git a/spring-5-data-reactive/src/main/java/com/baeldung/tailablecursor/service/WarnLogsCounter.java b/spring-5-data-reactive/src/main/java/com/baeldung/tailablecursor/service/WarnLogsCounter.java
index b21f61fa88..2dff8e8e40 100644
--- a/spring-5-data-reactive/src/main/java/com/baeldung/tailablecursor/service/WarnLogsCounter.java
+++ b/spring-5-data-reactive/src/main/java/com/baeldung/tailablecursor/service/WarnLogsCounter.java
@@ -3,7 +3,7 @@ package com.baeldung.tailablecursor.service;
 import com.baeldung.tailablecursor.domain.Log;
 import com.baeldung.tailablecursor.domain.LogLevel;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
 
@@ -21,10 +21,10 @@ public class WarnLogsCounter implements LogsCounter {
     private final AtomicInteger counter = new AtomicInteger();
     private final Disposable subscription;
 
-    public WarnLogsCounter(ReactiveMongoTemplate template) {
+    public WarnLogsCounter(ReactiveMongoOperations template) {
         Flux<Log> stream = template.tail(query(where(LEVEL_FIELD_NAME).is(LogLevel.WARN)), Log.class);
-        subscription = stream.subscribe(l -> {
-          log.warn("WARN log received: " + l);
+        subscription = stream.subscribe(logEntity -> {
+          log.warn("WARN log received: " + logEntity);
           counter.incrementAndGet();
         });
     }
diff --git a/spring-5-data-reactive/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java b/spring-5-data-reactive/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java
new file mode 100644
index 0000000000..a31ef4458d
--- /dev/null
+++ b/spring-5-data-reactive/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java
@@ -0,0 +1,125 @@
+package com.baeldung.r2dbc;
+
+
+import com.baeldung.r2dbc.model.Player;
+import com.baeldung.r2dbc.repository.PlayerRepository;
+import io.r2dbc.h2.H2ConnectionFactory;
+import org.junit.Before;
+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.r2dbc.core.DatabaseClient;
+import org.springframework.test.context.junit4.SpringRunner;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Hooks;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.util.Arrays;
+import java.util.List;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class R2dbcApplicationIntegrationTest {
+
+
+    @Autowired
+    PlayerRepository playerRepository;
+
+    @Autowired
+    DatabaseClient client;
+
+    @Autowired
+    H2ConnectionFactory factory;
+
+
+    @Before
+    public void setup() {
+
+        Hooks.onOperatorDebug();
+
+        List<String> statements = Arrays.asList(//
+                "DROP TABLE IF EXISTS player;",
+                "CREATE table player (id INT AUTO_INCREMENT NOT NULL, name VARCHAR2, age INT NOT NULL);");
+
+        statements.forEach(it -> client.execute() //
+                .sql(it) //
+                .fetch() //
+                .rowsUpdated() //
+                .as(StepVerifier::create) //
+                .expectNextCount(1) //
+                .verifyComplete());
+
+    }
+
+    @Test
+    public void whenDeleteAll_then0IsExpected() {
+
+
+        playerRepository.deleteAll()
+                .as(StepVerifier::create)
+                .expectNextCount(0)
+                .verifyComplete();
+    }
+
+    @Test
+    public void whenInsert6_then6AreExpected() {
+
+        insertPlayers();
+
+        playerRepository.findAll()
+                .as(StepVerifier::create)
+                .expectNextCount(6)
+                .verifyComplete();
+    }
+
+    @Test
+    public void whenSearchForCR7_then1IsExpected() {
+
+        insertPlayers();
+
+        playerRepository.findAllByName("CR7")
+                .as(StepVerifier::create)
+                .expectNextCount(1)
+                .verifyComplete();
+    }
+
+    @Test
+    public void whenSearchFor32YearsOld_then2AreExpected() {
+        insertPlayers();
+
+        playerRepository.findByAge(32)
+                .as(StepVerifier::create)
+                .expectNextCount(2)
+                .verifyComplete();
+    }
+
+    @Test
+    public void whenBatchHas2Operations_then2AreExpected() {
+        Mono.from(factory.create())
+          .flatMapMany(connection -> Flux.from(connection
+            .createBatch()
+            .add("select * from player")
+            .add("select * from player")
+            .execute()))
+          .as(StepVerifier::create)
+          .expectNextCount(2)
+          .verifyComplete();
+
+    }
+
+    private void insertPlayers() {
+        List<Player> players = Arrays.asList(
+                new Player(1, "Kaka", 37),
+                new Player(2, "Messi", 32),
+                new Player(3, "Mbappé", 20),
+                new Player(4, "CR7", 34),
+                new Player(5, "Lewandowski", 30),
+                new Player(6, "Cavani", 32)
+        );
+
+        playerRepository.saveAll(players).subscribe();
+    }
+}
+
diff --git a/spring-5-data-reactive/src/test/java/org/baeldung/SpringContextTest.java b/spring-5-data-reactive/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..c3ea1d8435
--- /dev/null
+++ b/spring-5-data-reactive/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.reactive.Spring5ReactiveApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Spring5ReactiveApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-5-mvc/README.md b/spring-5-mvc/README.md
index 7e83077f54..063945281f 100644
--- a/spring-5-mvc/README.md
+++ b/spring-5-mvc/README.md
@@ -1,4 +1,3 @@
 ### Relevant Articles:
 - [Spring Boot and Kotlin](http://www.baeldung.com/spring-boot-kotlin)
 - [Spring MVC Streaming and SSE Request Processing](https://www.baeldung.com/spring-mvc-sse-streams)
-- [Overview and Need for DelegatingFilterProxy in Spring](https://www.baeldung.com/spring-delegating-filter-proxy)
diff --git a/spring-5-mvc/pom.xml b/spring-5-mvc/pom.xml
index 5fb8f66f71..1d96df3d03 100644
--- a/spring-5-mvc/pom.xml
+++ b/spring-5-mvc/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
@@ -22,10 +23,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
@@ -51,12 +48,10 @@
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-jre8</artifactId>
-            <version>${kotlin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-reflect</artifactId>
-            <version>${kotlin.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
@@ -91,7 +86,6 @@
     </dependencies>
 
     <build>
-        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
         <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
         <plugins>
             <plugin>
@@ -132,11 +126,43 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${basedir}/src/main/java</source>
+                                <source>${basedir}/src/main/kotlin</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${basedir}/src/test/java</source>
+                                <source>${basedir}/src/test/kotlin</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
-    
+
     <properties>
         <jayway-rest-assured.version>2.9.0</jayway-rest-assured.version>
         <kotlin.version>1.1.2</kotlin.version>
+        <start-class>com.baeldung.Spring5Application</start-class>
     </properties>
 </project>
diff --git a/spring-5-mvc/src/main/java/com/baeldung/Spring5Application.java b/spring-5-mvc/src/main/java/com/baeldung/Spring5Application.java
index 74a348dea6..38b2d943f8 100644
--- a/spring-5-mvc/src/main/java/com/baeldung/Spring5Application.java
+++ b/spring-5-mvc/src/main/java/com/baeldung/Spring5Application.java
@@ -1,12 +1,8 @@
 package com.baeldung;
 
-import javax.servlet.Filter;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
-import org.springframework.web.filter.DelegatingFilterProxy;
-import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
 @SpringBootApplication( exclude = SecurityAutoConfiguration.class)
 public class Spring5Application {
@@ -14,32 +10,4 @@ public class Spring5Application {
     public static void main(String[] args) {
         SpringApplication.run(Spring5Application.class, args);
     }
-
-    public static class ApplicationInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
-
-        @Override
-        protected Class<?>[] getRootConfigClasses() {
-            return null;
-        }
-
-        @Override
-        protected Class<?>[] getServletConfigClasses() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        protected String[] getServletMappings() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        protected javax.servlet.Filter[] getServletFilters() {
-            DelegatingFilterProxy delegateFilterProxy = new DelegatingFilterProxy();
-            delegateFilterProxy.setTargetBeanName("loggingFilter");
-            return new Filter[] { delegateFilterProxy };
-        }
-    }
-
 }
diff --git a/spring-5-mvc/src/main/webapp/WEB-INF/web.xml b/spring-5-mvc/src/main/webapp/WEB-INF/web.xml
index 43c7143e5b..ab4d38ce1c 100644
--- a/spring-5-mvc/src/main/webapp/WEB-INF/web.xml
+++ b/spring-5-mvc/src/main/webapp/WEB-INF/web.xml
@@ -16,14 +16,5 @@
         <servlet-name>functional</servlet-name>
         <url-pattern>/</url-pattern>
     </servlet-mapping>
-	<filter>
-		<filter-name>loggingFilter</filter-name>
-		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>loggingFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
 
 </web-app>
\ No newline at end of file
diff --git a/spring-5-reactive-2/.gitignore b/spring-5-reactive-2/.gitignore
new file mode 100644
index 0000000000..dec013dfa4
--- /dev/null
+++ b/spring-5-reactive-2/.gitignore
@@ -0,0 +1,12 @@
+#folders#
+.idea
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file
diff --git a/spring-5-reactive-2/README.md b/spring-5-reactive-2/README.md
new file mode 100644
index 0000000000..bbb45e9f8c
--- /dev/null
+++ b/spring-5-reactive-2/README.md
@@ -0,0 +1 @@
+## Spring 5 Reactive Project
diff --git a/spring-5-reactive-2/pom.xml b/spring-5-reactive-2/pom.xml
new file mode 100644
index 0000000000..f1407ee1ad
--- /dev/null
+++ b/spring-5-reactive-2/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-5-reactive-2</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-5-reactive-2</name>
+    <packaging>jar</packaging>
+    <description>spring 5 sample project about new features</description>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        
+         <dependency>
+        	<groupId>com.github.tomakehurst</groupId>
+        	<artifactId>wiremock-jre8</artifactId>
+        	<version>${wiremock.version}</version>
+        	<scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.baeldung.webclient.WebClientApplication</mainClass>
+                    <layout>JAR</layout>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <properties>
+    	<wiremock.version>2.24.0</wiremock.version>
+    </properties>
+
+</project>
diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/webclient/Tweet.java b/spring-5-reactive-2/src/main/java/com/baeldung/webclient/Tweet.java
new file mode 100644
index 0000000000..8d294955f3
--- /dev/null
+++ b/spring-5-reactive-2/src/main/java/com/baeldung/webclient/Tweet.java
@@ -0,0 +1,13 @@
+package com.baeldung.webclient;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Tweet {
+    private String text;
+    private String username;
+}
diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/webclient/TweetsSlowServiceController.java b/spring-5-reactive-2/src/main/java/com/baeldung/webclient/TweetsSlowServiceController.java
new file mode 100644
index 0000000000..fecaca25ef
--- /dev/null
+++ b/spring-5-reactive-2/src/main/java/com/baeldung/webclient/TweetsSlowServiceController.java
@@ -0,0 +1,20 @@
+package com.baeldung.webclient;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+import java.util.List;
+
+@RestController
+public class TweetsSlowServiceController {
+
+    @GetMapping("/slow-service-tweets")
+    private List<Tweet> getAllTweets() throws Exception {
+        Thread.sleep(2000L); // delay
+        return Arrays.asList(
+          new Tweet("RestTemplate rules", "@user1"),
+          new Tweet("WebClient is better", "@user2"),
+          new Tweet("OK, both are useful", "@user1"));
+    }
+}
diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/webclient/WebClientApplication.java b/spring-5-reactive-2/src/main/java/com/baeldung/webclient/WebClientApplication.java
new file mode 100644
index 0000000000..751e3a9487
--- /dev/null
+++ b/spring-5-reactive-2/src/main/java/com/baeldung/webclient/WebClientApplication.java
@@ -0,0 +1,11 @@
+package com.baeldung.webclient;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class WebClientApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(WebClientApplication.class, args);
+    }
+}
diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/webclient/WebController.java b/spring-5-reactive-2/src/main/java/com/baeldung/webclient/WebController.java
new file mode 100644
index 0000000000..73f5724819
--- /dev/null
+++ b/spring-5-reactive-2/src/main/java/com/baeldung/webclient/WebController.java
@@ -0,0 +1,60 @@
+package com.baeldung.webclient;
+
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Flux;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+public class WebController {
+
+    private static final int DEFAULT_PORT = 8080;
+
+    @Setter
+    private int serverPort = DEFAULT_PORT;
+
+    @GetMapping("/tweets-blocking")
+    public List<Tweet> getTweetsBlocking() {
+        log.info("Starting BLOCKING Controller!");
+        final String uri = getSlowServiceUri();
+
+        RestTemplate restTemplate = new RestTemplate();
+        ResponseEntity<List<Tweet>> response = restTemplate.exchange(
+          uri, HttpMethod.GET, null,
+          new ParameterizedTypeReference<List<Tweet>>(){});
+
+        List<Tweet> result = response.getBody();
+        result.forEach(tweet -> log.info(tweet.toString()));
+        log.info("Exiting BLOCKING Controller!");
+        return result;
+    }
+
+    @GetMapping(value = "/tweets-non-blocking", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    public Flux<Tweet> getTweetsNonBlocking() {
+        log.info("Starting NON-BLOCKING Controller!");
+        Flux<Tweet> tweetFlux = WebClient.create()
+          .get()
+          .uri(getSlowServiceUri())
+          .retrieve()
+          .bodyToFlux(Tweet.class);
+
+        tweetFlux.subscribe(tweet -> log.info(tweet.toString()));
+        log.info("Exiting NON-BLOCKING Controller!");
+        return tweetFlux;
+    }
+
+    private String getSlowServiceUri() {
+        return "http://localhost:" + serverPort + "/slow-service-tweets";
+    }
+
+}
diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/webclient/filter/WebClientFilters.java b/spring-5-reactive-2/src/main/java/com/baeldung/webclient/filter/WebClientFilters.java
new file mode 100644
index 0000000000..c98caf67b4
--- /dev/null
+++ b/spring-5-reactive-2/src/main/java/com/baeldung/webclient/filter/WebClientFilters.java
@@ -0,0 +1,57 @@
+package com.baeldung.webclient.filter;
+
+import java.io.PrintStream;
+import java.net.URI;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpMethod;
+import org.springframework.web.reactive.function.client.ClientRequest;
+import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
+
+public class WebClientFilters {
+
+    private static final Logger LOG = LoggerFactory.getLogger(WebClientFilters.class);
+
+    public static ExchangeFilterFunction demoFilter() {
+        ExchangeFilterFunction filterFunction = (clientRequest, nextFilter) -> {
+            LOG.info("WebClient fitler executed");
+            return nextFilter.exchange(clientRequest);
+        };
+        return filterFunction;
+    }
+
+    public static ExchangeFilterFunction countingFilter(AtomicInteger getCounter) {
+        ExchangeFilterFunction countingFilter = (clientRequest, nextFilter) -> {
+            HttpMethod httpMethod = clientRequest.method();
+            if (httpMethod == HttpMethod.GET) {
+                getCounter.incrementAndGet();
+            }
+            return nextFilter.exchange(clientRequest);
+        };
+        return countingFilter;
+    }
+
+    public static ExchangeFilterFunction urlModifyingFilter(String version) {
+        ExchangeFilterFunction urlModifyingFilter = (clientRequest, nextFilter) -> {
+            String oldUrl = clientRequest.url()
+                .toString();
+            URI newUrl = URI.create(oldUrl + "/" + version);
+            ClientRequest filteredRequest = ClientRequest.from(clientRequest)
+                .url(newUrl)
+                .build();
+            return nextFilter.exchange(filteredRequest);
+        };
+        return urlModifyingFilter;
+    }
+
+    public static ExchangeFilterFunction loggingFilter(PrintStream printStream) {
+        ExchangeFilterFunction loggingFilter = (clientRequest, nextFilter) -> {
+            printStream.print("Sending request " + clientRequest.method() + " " + clientRequest.url());
+            return nextFilter.exchange(clientRequest);
+        };
+        return loggingFilter;
+    }
+
+}
diff --git a/spring-5-reactive-2/src/test/java/com/baeldung/webclient/WebControllerIntegrationTest.java b/spring-5-reactive-2/src/test/java/com/baeldung/webclient/WebControllerIntegrationTest.java
new file mode 100644
index 0000000000..09c3a5fb84
--- /dev/null
+++ b/spring-5-reactive-2/src/test/java/com/baeldung/webclient/WebControllerIntegrationTest.java
@@ -0,0 +1,51 @@
+package com.baeldung.webclient;
+
+import org.junit.Before;
+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.boot.web.server.LocalServerPort;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = WebClientApplication.class)
+public class WebControllerIntegrationTest {
+
+    @LocalServerPort
+    int randomServerPort;
+
+    @Autowired
+    private WebTestClient testClient;
+
+    @Autowired
+    private WebController webController;
+
+    @Before
+    public void setup() {
+        webController.setServerPort(randomServerPort);
+    }
+
+    @Test
+    public void whenEndpointWithBlockingClientIsCalled_thenThreeTweetsAreReceived() {
+        testClient.get()
+          .uri("/tweets-blocking")
+          .exchange()
+          .expectStatus()
+          .isOk()
+          .expectBodyList(Tweet.class)
+          .hasSize(3);
+    }
+
+    @Test
+    public void whenEndpointWithNonBlockingClientIsCalled_thenThreeTweetsAreReceived() {
+        testClient.get()
+          .uri("/tweets-non-blocking")
+          .exchange()
+          .expectStatus()
+          .isOk()
+          .expectBodyList(Tweet.class)
+          .hasSize(3);
+    }
+}
\ No newline at end of file
diff --git a/spring-5-reactive-2/src/test/java/com/baeldung/webclient/filter/FilteredWebClientUnitTest.java b/spring-5-reactive-2/src/test/java/com/baeldung/webclient/filter/FilteredWebClientUnitTest.java
new file mode 100644
index 0000000000..675cd03d10
--- /dev/null
+++ b/spring-5-reactive-2/src/test/java/com/baeldung/webclient/filter/FilteredWebClientUnitTest.java
@@ -0,0 +1,145 @@
+package com.baeldung.webclient.filter;
+
+import static com.baeldung.webclient.filter.WebClientFilters.countingFilter;
+import static com.baeldung.webclient.filter.WebClientFilters.loggingFilter;
+import static com.baeldung.webclient.filter.WebClientFilters.urlModifyingFilter;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.verify;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.URI;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.springframework.web.reactive.function.client.ExchangeFilterFunctions;
+import org.springframework.web.reactive.function.client.WebClient;
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
+public class FilteredWebClientUnitTest {
+
+    private static final String PATH = "/filter/test";
+
+    @Rule
+    public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().dynamicPort()
+        .dynamicHttpsPort());
+
+    @Test
+    public void whenNoUrlModifyingFilter_thenPathUnchanged() {
+        stubFor(get(urlPathEqualTo(PATH)).willReturn(aResponse().withStatus(200)
+            .withBody("done")));
+
+        WebClient webClient = WebClient.create();
+        String actual = sendGetRequest(webClient);
+
+        assertThat(actual).isEqualTo("done");
+        verify(getRequestedFor(urlPathEqualTo(PATH)));
+    }
+
+    @Test
+    public void whenUrlModifyingFilter_thenPathModified() {
+        stubFor(get(urlPathEqualTo(PATH + "/1.0")).willReturn(aResponse().withStatus(200)
+            .withBody("done")));
+
+        WebClient webClient = WebClient.builder()
+            .filter(urlModifyingFilter("1.0"))
+            .build();
+        String actual = sendGetRequest(webClient);
+
+        assertThat(actual).isEqualTo("done");
+        verify(getRequestedFor(urlPathEqualTo(PATH + "/1.0")));
+    }
+
+    @Test
+    public void givenCountingFilter_whenGet_thenIncreaseCounter() {
+        stubFor(get(urlPathEqualTo(PATH)).willReturn(aResponse().withStatus(200)
+            .withBody("done")));
+        AtomicInteger counter = new AtomicInteger(10);
+
+        WebClient webClient = WebClient.builder()
+            .filter(countingFilter(counter))
+            .build();
+        String actual = sendGetRequest(webClient);
+
+        assertThat(actual).isEqualTo("done");
+        assertThat(counter.get()).isEqualTo(11);
+    }
+
+    @Test
+    public void givenCountingFilter_whenPost_thenDoNotIncreaseCounter() {
+        stubFor(post(urlPathEqualTo(PATH)).willReturn(aResponse().withStatus(200)
+            .withBody("done")));
+        AtomicInteger counter = new AtomicInteger(10);
+
+        WebClient webClient = WebClient.builder()
+            .filter(countingFilter(counter))
+            .build();
+        String actual = sendPostRequest(webClient);
+
+        assertThat(actual).isEqualTo("done");
+        assertThat(counter.get()).isEqualTo(10);
+    }
+
+    @Test
+    public void testLoggingFilter() throws IOException {
+        stubFor(get(urlPathEqualTo(PATH)).willReturn(aResponse().withStatus(200)
+            .withBody("done")));
+
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream ps = new PrintStream(baos);) {
+            WebClient webClient = WebClient.builder()
+                .filter(loggingFilter(ps))
+                .build();
+            String actual = sendGetRequest(webClient);
+
+            assertThat(actual).isEqualTo("done");
+            assertThat(baos.toString()).isEqualTo("Sending request GET " + getUrl());
+        }
+    }
+
+    @Test
+    public void testBasicAuthFilter() {
+        stubFor(get(urlPathEqualTo(PATH)).willReturn(aResponse().withStatus(200)
+            .withBody("authorized")));
+
+        WebClient webClient = WebClient.builder()
+            .filter(ExchangeFilterFunctions.basicAuthentication("user", "password"))
+            .build();
+        String actual = sendGetRequest(webClient);
+
+        assertThat(actual).isEqualTo("authorized");
+        verify(getRequestedFor(urlPathEqualTo(PATH)).withHeader("Authorization", containing("Basic")));
+    }
+
+    private String sendGetRequest(WebClient webClient) {
+        return webClient.get()
+            .uri(getUrl())
+            .retrieve()
+            .bodyToMono(String.class)
+            .block();
+    }
+
+    private String sendPostRequest(WebClient webClient) {
+        return webClient.post()
+            .uri(URI.create(getUrl()))
+            .retrieve()
+            .bodyToMono(String.class)
+            .block();
+    }
+
+    private String getUrl() {
+        return "http://localhost:" + wireMockRule.port() + PATH;
+
+    }
+
+}
diff --git a/spring-5-reactive-client/README.md b/spring-5-reactive-client/README.md
index f94bd0b0c1..0df2bdd339 100644
--- a/spring-5-reactive-client/README.md
+++ b/spring-5-reactive-client/README.md
@@ -4,3 +4,4 @@
 The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles
+
diff --git a/spring-5-reactive-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-5-reactive-client/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..678d04897b
--- /dev/null
+++ b/spring-5-reactive-client/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.reactive.Spring5ReactiveTestApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Spring5ReactiveTestApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceReactiveHealthIndicator.java b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceHealthIndicator.java
similarity index 87%
rename from spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceReactiveHealthIndicator.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceHealthIndicator.java
index 7360def71e..81e77d9c61 100644
--- a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceReactiveHealthIndicator.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceHealthIndicator.java
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 
 @Component
-public class DownstreamServiceReactiveHealthIndicator implements ReactiveHealthIndicator {
+public class DownstreamServiceHealthIndicator implements ReactiveHealthIndicator {
 
     @Override
     public Mono<Health> health() {
diff --git a/spring-5-reactive-security/src/test/java/org/baeldung/SpringContextTest.java b/spring-5-reactive-security/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..479c35d986
--- /dev/null
+++ b/spring-5-reactive-security/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.reactive.security.SpringSecurity5Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringSecurity5Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-5-reactive/src/test/java/org/baeldung/SpringContextTest.java b/spring-5-reactive/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..c3ea1d8435
--- /dev/null
+++ b/spring-5-reactive/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.reactive.Spring5ReactiveApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Spring5ReactiveApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-5-security-cognito/pom.xml b/spring-5-security-cognito/pom.xml
index c7314d6f9f..431c9b8d9c 100644
--- a/spring-5-security-cognito/pom.xml
+++ b/spring-5-security-cognito/pom.xml
@@ -48,7 +48,6 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-oauth2-jose</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
diff --git a/spring-5-security/src/test/java/org/baeldung/SpringContextTest.java b/spring-5-security/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..729790bd14
--- /dev/null
+++ b/spring-5-security/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.dsl.CustomConfigurerApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = CustomConfigurerApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-5-webflux/pom.xml b/spring-5-webflux/pom.xml
index c1f537d2fe..6887f01753 100644
--- a/spring-5-webflux/pom.xml
+++ b/spring-5-webflux/pom.xml
@@ -28,11 +28,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <properties>
-        <java.version>1.8</java.version>
-        <spring-boot.version>2.2.0.M3</spring-boot.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -86,6 +81,7 @@
             <url>https://repo.spring.io/milestone</url>
         </repository>
     </repositories>
+
     <pluginRepositories>
         <pluginRepository>
             <id>spring-snapshots</id>
@@ -101,4 +97,8 @@
             <url>https://repo.spring.io/milestone</url>
         </pluginRepository>
     </pluginRepositories>
+
+    <properties>
+        <spring-boot.version>2.2.0.M3</spring-boot.version>
+    </properties>
 </project>
diff --git a/spring-5/src/main/java/com/baeldung/annotationconfigvscomponentscan/components/AccountService.java b/spring-5/src/main/java/com/baeldung/annotationconfigvscomponentscan/components/AccountService.java
new file mode 100644
index 0000000000..1997163954
--- /dev/null
+++ b/spring-5/src/main/java/com/baeldung/annotationconfigvscomponentscan/components/AccountService.java
@@ -0,0 +1,8 @@
+package com.baeldung.annotationconfigvscomponentscan.components;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class AccountService {
+
+}
diff --git a/spring-5/src/main/java/com/baeldung/annotationconfigvscomponentscan/components/UserService.java b/spring-5/src/main/java/com/baeldung/annotationconfigvscomponentscan/components/UserService.java
new file mode 100644
index 0000000000..8dd5ae2ef0
--- /dev/null
+++ b/spring-5/src/main/java/com/baeldung/annotationconfigvscomponentscan/components/UserService.java
@@ -0,0 +1,16 @@
+package com.baeldung.annotationconfigvscomponentscan.components;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class UserService {
+
+    @Autowired
+    private AccountService accountService;
+
+    public AccountService getAccountService() {
+        return accountService;
+    }
+
+}
diff --git a/spring-5/src/main/resources/annotationconfigvscomponentscan-beans.xml b/spring-5/src/main/resources/annotationconfigvscomponentscan-beans.xml
new file mode 100644
index 0000000000..ee4bbb6573
--- /dev/null
+++ b/spring-5/src/main/resources/annotationconfigvscomponentscan-beans.xml
@@ -0,0 +1,15 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <context:annotation-config />
+
+    <context:component-scan base-package="com.baeldung.annotationconfigvscomponentscan.components" />
+
+    <bean id="accountService" class="com.baeldung.annotationconfigvscomponentscan.components.AccountService"></bean>
+
+    <bean id="userService" class="com.baeldung.annotationconfigvscomponentscan.components.UserService">
+        <!-- If we have <context:annotation-config/> on top, then we don't need to set the properties(dependencies) in XML. -->
+        <!-- <property name="accountService" ref="accountService"></property> -->
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/spring-5/src/test/java/com/baeldung/SpringXMLConfigurationIntegrationTest.java b/spring-5/src/test/java/com/baeldung/SpringXMLConfigurationIntegrationTest.java
new file mode 100644
index 0000000000..7cd7b81def
--- /dev/null
+++ b/spring-5/src/test/java/com/baeldung/SpringXMLConfigurationIntegrationTest.java
@@ -0,0 +1,23 @@
+package com.baeldung;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import com.baeldung.annotationconfigvscomponentscan.components.AccountService;
+import com.baeldung.annotationconfigvscomponentscan.components.UserService;
+
+public class SpringXMLConfigurationIntegrationTest {
+
+    @Test
+    public void givenContextAnnotationConfigOrContextComponentScan_whenDependenciesAndBeansAnnotated_thenNoXMLNeeded() {
+        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:annotationconfigvscomponentscan-beans.xml");
+        UserService userService = context.getBean(UserService.class);
+        AccountService accountService = context.getBean(AccountService.class);
+        Assert.assertNotNull(userService);
+        Assert.assertNotNull(accountService);
+        Assert.assertNotNull(userService.getAccountService());
+    }
+
+}
diff --git a/spring-5/src/test/java/org/baeldung/SpringContextTest.java b/spring-5/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..56e8697f5c
--- /dev/null
+++ b/spring-5/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.Spring5Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Spring5Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-activiti/src/test/java/com/baeldung/SpringContextTest.java b/spring-activiti/src/test/java/com/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..14df617b1f
--- /dev/null
+++ b/spring-activiti/src/test/java/com/baeldung/SpringContextTest.java
@@ -0,0 +1,19 @@
+package com.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.activitiwithspring.ActivitiWithSpringApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ActivitiWithSpringApplication.class)
+@AutoConfigureTestDatabase
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-all/src/main/java/org/baeldung/primary/Config.java b/spring-all/src/main/java/org/baeldung/primary/Config.java
index b39f2b9db3..bdcfe019e6 100644
--- a/spring-all/src/main/java/org/baeldung/primary/Config.java
+++ b/spring-all/src/main/java/org/baeldung/primary/Config.java
@@ -10,13 +10,13 @@ import org.springframework.context.annotation.Primary;
 public class Config {
 
     @Bean
-    public Employee JohnEmployee(){
+    public Employee johnEmployee(){
         return new Employee("John");
     }
 
     @Bean
     @Primary
-    public Employee TonyEmployee(){
+    public Employee tonyEmployee(){
         return new Employee("Tony");
     }
 }
diff --git a/spring-all/src/main/java/org/baeldung/startup/ProfileManager.java b/spring-all/src/main/java/org/baeldung/startup/ProfileManager.java
new file mode 100644
index 0000000000..41db539265
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/startup/ProfileManager.java
@@ -0,0 +1,18 @@
+package org.baeldung.startup;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ProfileManager {
+
+    @Autowired
+    private Environment environment;
+
+    public void getActiveProfiles() {
+        for (final String profileName : environment.getActiveProfiles()) {
+            System.out.println("Currently active profile - " + profileName);
+        }   
+    }
+}
diff --git a/spring-all/src/test/java/org/baeldung/scopes/ScopesIntegrationTest.java b/spring-all/src/test/java/org/baeldung/scopes/ScopesIntegrationTest.java
index aa88a3775e..0ae99610f6 100644
--- a/spring-all/src/test/java/org/baeldung/scopes/ScopesIntegrationTest.java
+++ b/spring-all/src/test/java/org/baeldung/scopes/ScopesIntegrationTest.java
@@ -12,7 +12,7 @@ public class ScopesIntegrationTest {
     private static final String NAME_OTHER = "Anna Jones";
 
     @Test
-    public void testScopeSingleton() {
+    public void givenSingletonScope_whenSetName_thenEqualNames() {
         final ApplicationContext applicationContext = new ClassPathXmlApplicationContext("scopes.xml");
 
         final Person personSingletonA = (Person) applicationContext.getBean("personSingleton");
@@ -25,7 +25,7 @@ public class ScopesIntegrationTest {
     }
 
     @Test
-    public void testScopePrototype() {
+    public void givenPrototypeScope_whenSetNames_thenDifferentNames() {
         final ApplicationContext applicationContext = new ClassPathXmlApplicationContext("scopes.xml");
 
         final Person personPrototypeA = (Person) applicationContext.getBean("personPrototype");
diff --git a/spring-aop/src/test/java/org/baeldung/SpringContextTest.java b/spring-aop/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..4d3ed953c4
--- /dev/null
+++ b/spring-aop/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,15 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-apache-camel/.gitignore b/spring-apache-camel/.gitignore
new file mode 100644
index 0000000000..eac473ac50
--- /dev/null
+++ b/spring-apache-camel/.gitignore
@@ -0,0 +1 @@
+/src/test/destination-folder/*
\ No newline at end of file
diff --git a/spring-apache-camel/src/test/destination-folder/2016-12-18 22-00-11File2.txt b/spring-apache-camel/src/test/destination-folder/2016-12-18 22-00-11File2.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/spring-apache-camel/src/test/java/org/baeldung/SpringContextTest.java b/spring-apache-camel/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..1c098a56ab
--- /dev/null
+++ b/spring-apache-camel/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,13 @@
+package org.baeldung;
+
+import org.junit.Test;
+
+import com.baeldung.camel.main.App;
+
+public class SpringContextTest {
+
+	@Test
+    public final void testMain() throws Exception {
+        App.main(null);
+	}
+}
diff --git a/spring-batch/.gitignore b/spring-batch/.gitignore
new file mode 100644
index 0000000000..0ef6d10b38
--- /dev/null
+++ b/spring-batch/.gitignore
@@ -0,0 +1 @@
+output.csv
\ No newline at end of file
diff --git a/spring-batch/src/test/java/org/baeldung/SpringContextTest.java b/spring-batch/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..0de9a07b0a
--- /dev/null
+++ b/spring-batch/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,12 @@
+package org.baeldung;
+
+import org.baeldung.batch.App;
+import org.junit.Test;
+
+public class SpringContextTest {
+
+	@Test
+    public final void testMain() throws Exception {
+        App.main(null);
+	}
+}
diff --git a/spring-bom/src/test/java/org/baeldung/SpringContextTest.java b/spring-bom/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..783567cdfa
--- /dev/null
+++ b/spring-bom/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,13 @@
+package org.baeldung;
+
+import org.junit.Test;
+
+import com.baeldung.spring.bom.HelloWorldApp;
+
+public class SpringContextTest {
+
+	@Test
+    public final void testMain() throws Exception {
+		HelloWorldApp.main(null);
+	}
+}
diff --git a/spring-boot-admin/spring-boot-admin-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-admin/spring-boot-admin-client/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..834f26dacf
--- /dev/null
+++ b/spring-boot-admin/spring-boot-admin-client/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.springbootadminclient.SpringBootAdminClientApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringBootAdminClientApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot-admin/spring-boot-admin-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-admin/spring-boot-admin-server/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..c185456019
--- /dev/null
+++ b/spring-boot-admin/spring-boot-admin-server/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.springbootadminserver.SpringBootAdminServerApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringBootAdminServerApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot-angular-ecommerce/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-angular-ecommerce/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..961d756a68
--- /dev/null
+++ b/spring-boot-angular-ecommerce/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.ecommerce.EcommerceApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = EcommerceApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot-angular/pom.xml b/spring-boot-angular/pom.xml
index 6ea98eb3d0..71c46cb7f5 100644
--- a/spring-boot-angular/pom.xml
+++ b/spring-boot-angular/pom.xml
@@ -6,15 +6,13 @@
     <name>spring-boot-angular</name>
     <version>1.0</version>
     <packaging>jar</packaging>
+
     <parent>
         <artifactId>parent-boot-2</artifactId>
 	    <groupId>com.baeldung</groupId>
 	    <version>0.0.1-SNAPSHOT</version>
 	    <relativePath>../../parent-boot-2</relativePath>
     </parent>
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
 
     <dependencies>
         <dependency>
@@ -46,5 +44,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/spring-boot-autoconfiguration/README.MD b/spring-boot-autoconfiguration/README.MD
index a71af54dff..dc9cad539a 100644
--- a/spring-boot-autoconfiguration/README.MD
+++ b/spring-boot-autoconfiguration/README.MD
@@ -3,4 +3,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles:
 
-- [Create a Custom Auto-Configuration with Spring Boot](http://www.baeldung.com/spring-boot-custom-auto-configuration)
\ No newline at end of file
+- [Create a Custom Auto-Configuration with Spring Boot](http://www.baeldung.com/spring-boot-custom-auto-configuration)
+- [Guide to ApplicationContextRunner in Spring Boot](https://www.baeldung.com/spring-boot-context-runner)
diff --git a/spring-boot-autoconfiguration/pom.xml b/spring-boot-autoconfiguration/pom.xml
index 91692ebfff..5b3b0eb86c 100644
--- a/spring-boot-autoconfiguration/pom.xml
+++ b/spring-boot-autoconfiguration/pom.xml
@@ -38,6 +38,19 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <version>2.1.6.RELEASE</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -50,12 +63,10 @@
         </resources>
 
         <plugins>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
             </plugin>
-
         </plugins>
 
     </build>
diff --git a/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/annotationprocessor/AnnotationProcessorApplication.java b/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/annotationprocessor/AnnotationProcessorApplication.java
new file mode 100644
index 0000000000..91ea94e43e
--- /dev/null
+++ b/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/annotationprocessor/AnnotationProcessorApplication.java
@@ -0,0 +1,15 @@
+package com.baeldung.autoconfiguration.annotationprocessor;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.context.annotation.ComponentScan;
+
+import com.baeldung.autoconfiguration.MySQLAutoconfiguration;
+
+@EnableAutoConfiguration(exclude = { MySQLAutoconfiguration.class})
+@ComponentScan(basePackageClasses = {DatabaseProperties.class})
+public class AnnotationProcessorApplication {
+    public static void main(String[] args) {
+        new SpringApplicationBuilder(AnnotationProcessorApplication.class).run();
+    }
+}
diff --git a/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/annotationprocessor/DatabaseProperties.java b/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/annotationprocessor/DatabaseProperties.java
new file mode 100644
index 0000000000..4fb5b408a2
--- /dev/null
+++ b/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/annotationprocessor/DatabaseProperties.java
@@ -0,0 +1,73 @@
+package com.baeldung.autoconfiguration.annotationprocessor;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConfigurationProperties(prefix = "database")
+public class DatabaseProperties {
+
+    public static class Server {
+
+        /**
+         * The IP of the database server
+         */
+        private String ip;
+
+        /**
+         * The Port of the database server.
+         * The Default value is 443.
+         * The allowed values are in the range 400-4000.
+         */
+        @Min(400)
+        @Max(800)
+        private int port = 443;
+
+        public String getIp() {
+            return ip;
+        }
+
+        public void setIp(String ip) {
+            this.ip = ip;
+        }
+
+        public int getPort() {
+            return port;
+        }
+
+        public void setPort(int port) {
+            this.port = port;
+        }
+    }
+
+    private String username;
+    private String password;
+    private Server server;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public Server getServer() {
+        return server;
+    }
+
+    public void setServer(Server server) {
+        this.server = server;
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-autoconfiguration/src/test/java/com/baeldung/autoconfiguration/annotationprocessor/DatabasePropertiesIntegrationTest.java b/spring-boot-autoconfiguration/src/test/java/com/baeldung/autoconfiguration/annotationprocessor/DatabasePropertiesIntegrationTest.java
new file mode 100644
index 0000000000..350e65b465
--- /dev/null
+++ b/spring-boot-autoconfiguration/src/test/java/com/baeldung/autoconfiguration/annotationprocessor/DatabasePropertiesIntegrationTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.autoconfiguration.annotationprocessor;
+
+import org.junit.Assert;
+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.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = AnnotationProcessorApplication.class)
+@TestPropertySource("classpath:databaseproperties-test.properties")
+public class DatabasePropertiesIntegrationTest {
+
+    @Autowired
+    private DatabaseProperties databaseProperties;
+
+    @Test
+    public void whenSimplePropertyQueriedThenReturnsPropertyValue() throws Exception {
+        Assert.assertEquals("Incorrectly bound Username property", "baeldung", databaseProperties.getUsername());
+        Assert.assertEquals("Incorrectly bound Password property", "password", databaseProperties.getPassword());
+    }
+    
+    @Test
+    public void whenNestedPropertyQueriedThenReturnsPropertyValue() throws Exception {
+    	Assert.assertEquals("Incorrectly bound Server IP nested property", "127.0.0.1", databaseProperties.getServer().getIp());
+        Assert.assertEquals("Incorrectly bound Server Port nested property", 3306, databaseProperties.getServer().getPort());
+    }   
+
+}
diff --git a/spring-boot-autoconfiguration/src/test/resources/databaseproperties-test.properties b/spring-boot-autoconfiguration/src/test/resources/databaseproperties-test.properties
new file mode 100644
index 0000000000..c0d1d1f158
--- /dev/null
+++ b/spring-boot-autoconfiguration/src/test/resources/databaseproperties-test.properties
@@ -0,0 +1,7 @@
+#Simple Properties
+database.username=baeldung
+database.password=password
+
+#Nested Properties
+database.server.ip=127.0.0.1
+database.server.port=3306
\ No newline at end of file
diff --git a/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/Application.java b/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/Application.java
new file mode 100644
index 0000000000..d4c8010d2b
--- /dev/null
+++ b/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/Application.java
@@ -0,0 +1,20 @@
+package com.baeldung.springbootconfiguration;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+
+@ComponentScan(basePackages = {"com.baeldung.springbootconfiguration.*"})
+@SpringBootConfiguration
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+    @Bean
+    public PersonService personService() {
+        return new PersonServiceImpl();
+    }
+}
diff --git a/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/PersonService.java b/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/PersonService.java
new file mode 100644
index 0000000000..4909d957e5
--- /dev/null
+++ b/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/PersonService.java
@@ -0,0 +1,4 @@
+package com.baeldung.springbootconfiguration;
+
+public interface PersonService {
+}
diff --git a/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/PersonServiceImpl.java b/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/PersonServiceImpl.java
new file mode 100644
index 0000000000..9f2af33e8e
--- /dev/null
+++ b/spring-boot-bootstrap/src/main/java/com/baeldung/springbootconfiguration/PersonServiceImpl.java
@@ -0,0 +1,4 @@
+package com.baeldung.springbootconfiguration;
+
+public class PersonServiceImpl implements PersonService {
+}
diff --git a/spring-boot-bootstrap/src/test/java/com/baeldung/SpringContextTest.java b/spring-boot-bootstrap/src/test/java/com/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..4340e27fb4
--- /dev/null
+++ b/spring-boot-bootstrap/src/test/java/com/baeldung/SpringContextTest.java
@@ -0,0 +1,15 @@
+package com.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringContextTest {
+
+    @Test
+    public void contextLoads() {
+    }
+}
diff --git a/spring-boot-camel/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-camel/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..8324fabfca
--- /dev/null
+++ b/spring-boot-camel/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.camel.Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-client/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..9c3b83ea79
--- /dev/null
+++ b/spring-boot-client/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.boot.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot-crud/pom.xml b/spring-boot-crud/pom.xml
index 15ff6c5d11..1d956bdba6 100644
--- a/spring-boot-crud/pom.xml
+++ b/spring-boot-crud/pom.xml
@@ -54,7 +54,28 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+		    <configuration>
+                        <classifier>exec</classifier>
+                    </configuration>
             </plugin>
+	    <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>	
         </plugins>
     </build>
     
@@ -62,4 +83,4 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..ff3e795778
--- /dev/null
+++ b/spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,13 @@
+package org.baeldung;
+
+import org.junit.Test;
+
+import com.baeldung.parent.App;
+
+public class SpringContextTest {
+
+	@Test
+    public final void testMain() throws Exception {
+        App.main(new String[] {});
+	}
+}
diff --git a/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..e6ce83fab5
--- /dev/null
+++ b/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.greeter.autoconfigure.GreeterAutoConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = GreeterAutoConfiguration.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..b82b67df68
--- /dev/null
+++ b/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.greeter.sample.GreeterSampleApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = GreeterSampleApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot-data/pom.xml b/spring-boot-data/pom.xml
index 8735a54e7b..9c11e09f4a 100644
--- a/spring-boot-data/pom.xml
+++ b/spring-boot-data/pom.xml
@@ -15,6 +15,30 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <version>2.1.6.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+            <version>2.1.6.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <version>2.1.6.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.197</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
diff --git a/spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataJPA.java b/spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataJPA.java
new file mode 100644
index 0000000000..8e4ee76a25
--- /dev/null
+++ b/spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataJPA.java
@@ -0,0 +1,16 @@
+package com.baeldung.disableautoconfig;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class,
+        DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
+public class SpringDataJPA {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringDataJPA.class, args);
+    }
+}
diff --git a/spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataMongoDB.java b/spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataMongoDB.java
new file mode 100644
index 0000000000..865c137a8d
--- /dev/null
+++ b/spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataMongoDB.java
@@ -0,0 +1,14 @@
+package com.baeldung.disableautoconfig;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
+import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
+
+@SpringBootApplication(exclude = {MongoAutoConfiguration.class, MongoDataAutoConfiguration.class})
+public class SpringDataMongoDB {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringDataMongoDB.class, args);
+    }
+}
diff --git a/spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataRedis.java b/spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataRedis.java
new file mode 100644
index 0000000000..9ec831c446
--- /dev/null
+++ b/spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataRedis.java
@@ -0,0 +1,14 @@
+package com.baeldung.disableautoconfig;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration;
+
+@SpringBootApplication(exclude = {RedisAutoConfiguration.class, RedisRepositoriesAutoConfiguration.class})
+public class SpringDataRedis {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringDataRedis.class, args);
+    }
+}
diff --git a/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataJPAIntegrationTest.java b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataJPAIntegrationTest.java
new file mode 100644
index 0000000000..a465979b3c
--- /dev/null
+++ b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataJPAIntegrationTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.disableautoconfig;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.sql.DataSource;
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringDataJPA.class)
+public class SpringDataJPAIntegrationTest {
+
+    @Autowired
+    private ApplicationContext context;
+
+    @Test(expected = NoSuchBeanDefinitionException.class)
+    public void givenAutoconfigurationIsDisable_whenApplicationStarts_thenContextWillNotHaveTheAutoconfiguredClasses() {
+        context.getBean(DataSource.class);
+    }
+
+}
diff --git a/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataMongoDBIntegrationTest.java b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataMongoDBIntegrationTest.java
new file mode 100644
index 0000000000..bdfadf76ce
--- /dev/null
+++ b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataMongoDBIntegrationTest.java
@@ -0,0 +1,25 @@
+package com.baeldung.disableautoconfig;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.test.context.junit4.SpringRunner;
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringDataMongoDB.class)
+public class SpringDataMongoDBIntegrationTest {
+
+    @Autowired
+    private ApplicationContext context;
+
+    @Test(expected = NoSuchBeanDefinitionException.class)
+    public void givenAutoconfigurationIsDisable_whenApplicationStarts_thenContextWillNotHaveTheAutoconfiguredClasses() {
+        context.getBean(MongoTemplate.class);
+    }
+
+}
diff --git a/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataRedisIntegrationTest.java b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataRedisIntegrationTest.java
new file mode 100644
index 0000000000..10133cace3
--- /dev/null
+++ b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataRedisIntegrationTest.java
@@ -0,0 +1,25 @@
+package com.baeldung.disableautoconfig;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.test.context.junit4.SpringRunner;
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringDataRedis.class)
+public class SpringDataRedisIntegrationTest {
+
+    @Autowired
+    private ApplicationContext context;
+
+    @Test(expected = NoSuchBeanDefinitionException.class)
+    public void givenAutoconfigurationIsDisable_whenApplicationStarts_thenContextWillNotHaveTheAutoconfiguredClasses() {
+        context.getBean(RedisTemplate.class);
+    }
+
+}
diff --git a/spring-boot-di/README.MD b/spring-boot-di/README.MD
new file mode 100644
index 0000000000..78cd163668
--- /dev/null
+++ b/spring-boot-di/README.MD
@@ -0,0 +1,6 @@
+### The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
+### Relevant Articles:
+
+- [Spring Component Scanning](https://www.baeldung.com/spring-component-scanning)
diff --git a/spring-boot-di/pom.xml b/spring-boot-di/pom.xml
new file mode 100644
index 0000000000..ec40c04566
--- /dev/null
+++ b/spring-boot-di/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-boot-mvc</artifactId>
+    <name>spring-boot-mvc</name>
+    <packaging>jar</packaging>
+    <description>Module For Spring Boot DI</description>
+
+    <parent>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.baeldung.SpringBootDiApplication</mainClass>
+                    <layout>JAR</layout>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <start-class>com.baeldung.SpringBootDiApplication</start-class>
+    </properties>
+
+</project>
diff --git a/spring-boot-di/src/main/java/com/baeldung/SpringBootDiApplication.java b/spring-boot-di/src/main/java/com/baeldung/SpringBootDiApplication.java
new file mode 100644
index 0000000000..b9d2d7ecef
--- /dev/null
+++ b/spring-boot-di/src/main/java/com/baeldung/SpringBootDiApplication.java
@@ -0,0 +1,12 @@
+package com.baeldung;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringBootDiApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootDiApplication.class, args);
+    }
+}
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/ExampleBean.java b/spring-boot-di/src/main/java/com/baeldung/componentscan/ExampleBean.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/componentscan/ExampleBean.java
rename to spring-boot-di/src/main/java/com/baeldung/componentscan/ExampleBean.java
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springapp/SpringComponentScanApp.java b/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/SpringComponentScanApp.java
similarity index 88%
rename from spring-boot/src/main/java/com/baeldung/componentscan/springapp/SpringComponentScanApp.java
rename to spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/SpringComponentScanApp.java
index 2377ed7a56..83b91f7860 100644
--- a/spring-boot/src/main/java/com/baeldung/componentscan/springapp/SpringComponentScanApp.java
+++ b/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/SpringComponentScanApp.java
@@ -1,10 +1,6 @@
 package com.baeldung.componentscan.springapp;
 
-import org.springframework.context.annotation.FilterType;
-import org.springframework.stereotype.Component;
-
 import com.baeldung.componentscan.ExampleBean;
-import com.baeldung.componentscan.springapp.flowers.Rose;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springapp/animals/Cat.java b/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/animals/Cat.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/componentscan/springapp/animals/Cat.java
rename to spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/animals/Cat.java
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springapp/animals/Dog.java b/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/animals/Dog.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/componentscan/springapp/animals/Dog.java
rename to spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/animals/Dog.java
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springapp/flowers/Rose.java b/spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/flowers/Rose.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/componentscan/springapp/flowers/Rose.java
rename to spring-boot-di/src/main/java/com/baeldung/componentscan/springapp/flowers/Rose.java
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/SpringBootComponentScanApp.java b/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/SpringBootComponentScanApp.java
similarity index 88%
rename from spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/SpringBootComponentScanApp.java
rename to spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/SpringBootComponentScanApp.java
index ba29a4e1f5..4362caefbb 100644
--- a/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/SpringBootComponentScanApp.java
+++ b/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/SpringBootComponentScanApp.java
@@ -1,14 +1,11 @@
 package com.baeldung.componentscan.springbootapp;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.context.annotation.FilterType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 
 import com.baeldung.componentscan.ExampleBean;
-import com.baeldung.componentscan.springbootapp.flowers.Rose;
 
 @SpringBootApplication
 //@ComponentScan(basePackages = "com.baeldung.componentscan.springbootapp.animals")
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/animals/Cat.java b/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/animals/Cat.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/animals/Cat.java
rename to spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/animals/Cat.java
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/animals/Dog.java b/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/animals/Dog.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/animals/Dog.java
rename to spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/animals/Dog.java
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/flowers/Rose.java b/spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/flowers/Rose.java
similarity index 100%
rename from spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/flowers/Rose.java
rename to spring-boot-di/src/main/java/com/baeldung/componentscan/springbootapp/flowers/Rose.java
diff --git a/spring-boot-flowable/pom.xml b/spring-boot-flowable/pom.xml
index f9531a1e6a..f7fc943389 100644
--- a/spring-boot-flowable/pom.xml
+++ b/spring-boot-flowable/pom.xml
@@ -7,12 +7,14 @@
 	<packaging>war</packaging>
 	<name>spring-boot-flowable</name>
 	<description>Spring Boot Flowable Module</description>
+	
 	<parent>
 		<artifactId>parent-boot-2</artifactId>
 		<groupId>com.baeldung</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 		<relativePath>../parent-boot-2</relativePath>
 	</parent>
+	
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -44,6 +46,7 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	
 	<build>
 		<plugins>
 			<plugin>
@@ -52,6 +55,7 @@
 			</plugin>
 		</plugins>
 	</build>
+	
 	<properties>
 		<flowable.version>6.4.1</flowable.version>
 	</properties>
diff --git a/spring-boot-jasypt/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-jasypt/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..ab6e4557d5
--- /dev/null
+++ b/spring-boot-jasypt/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.jasypt.Main;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Main.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot-keycloak/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-keycloak/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..4effccc083
--- /dev/null
+++ b/spring-boot-keycloak/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.keycloak.SpringBoot;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringBoot.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot-kotlin/README.md b/spring-boot-kotlin/README.md
new file mode 100644
index 0000000000..dc50c24aa0
--- /dev/null
+++ b/spring-boot-kotlin/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Non-blocking Spring Boot with Kotlin Coroutines](http://www.baeldung.com/non-blocking-spring-boot-with-kotlin-coroutines)
diff --git a/spring-boot-kotlin/pom.xml b/spring-boot-kotlin/pom.xml
new file mode 100644
index 0000000000..25508c52b9
--- /dev/null
+++ b/spring-boot-kotlin/pom.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-boot-kotlin</artifactId>
+    <name>spring-boot-kotlin</name>
+    <packaging>jar</packaging>
+    <description>Demo project showing how to use non-blocking in Kotlin with Spring Boot</description>
+
+    <parent>
+        <artifactId>parent-kotlin</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../parent-kotlin</relativePath>
+    </parent>
+
+    <repositories>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-reflect</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-core</artifactId>
+            <version>${kotlinx-coroutines.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-reactor</artifactId>
+            <version>${kotlinx-coroutines.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+            <version>${spring-boot.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-kotlin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-r2dbc</artifactId>
+            <version>${r2dbc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.r2dbc</groupId>
+            <artifactId>r2dbc-h2</artifactId>
+            <version>${h2-r2dbc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.r2dbc</groupId>
+            <artifactId>r2dbc-spi</artifactId>
+            <version>${r2dbc-spi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <configuration>
+                    <args>
+                        <arg>-Xjsr305=strict</arg>
+                    </args>
+                    <compilerPlugins>
+                        <plugin>spring</plugin>
+                    </compilerPlugins>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-maven-allopen</artifactId>
+                        <version>${kotlin.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <kotlin.version>1.3.31</kotlin.version>
+        <r2dbc.version>1.0.0.M1</r2dbc.version>
+        <r2dbc-spi.version>1.0.0.M7</r2dbc-spi.version>
+        <h2-r2dbc.version>1.0.0.BUILD-SNAPSHOT</h2-r2dbc.version>
+        <kotlinx-coroutines.version>1.2.1</kotlinx-coroutines.version>
+        <spring-boot.version>2.2.0.M2</spring-boot.version>
+    </properties>
+
+</project>
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/SpringApplication.kt b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/SpringApplication.kt
new file mode 100644
index 0000000000..23af4fe90b
--- /dev/null
+++ b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/SpringApplication.kt
@@ -0,0 +1,11 @@
+package com.baeldung.nonblockingcoroutines
+
+import org.springframework.boot.SpringApplication.run
+import org.springframework.boot.autoconfigure.SpringBootApplication
+
+@SpringBootApplication
+class SpringApplication
+
+fun main(args: Array<String>) {
+    run(SpringApplication::class.java, *args)
+}
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/DatastoreConfig.kt b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/DatastoreConfig.kt
new file mode 100644
index 0000000000..52ef8a708b
--- /dev/null
+++ b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/DatastoreConfig.kt
@@ -0,0 +1,32 @@
+package com.baeldung.nonblockingcoroutines.config
+
+import io.r2dbc.h2.H2ConnectionConfiguration
+import io.r2dbc.h2.H2ConnectionFactory
+import io.r2dbc.spi.ConnectionFactory
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration
+import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories
+
+@Configuration
+@EnableR2dbcRepositories
+class DatastoreConfig : AbstractR2dbcConfiguration() {
+    @Value("\${spring.datasource.username}")
+    private val userName: String = ""
+
+    @Value("\${spring.datasource.password}")
+    private val password: String = ""
+
+    @Value("\${spring.datasource.dbname}")
+    private val dbName: String = ""
+
+    @Bean
+    override fun connectionFactory(): ConnectionFactory {
+        return H2ConnectionFactory(H2ConnectionConfiguration.builder()
+          .inMemory(dbName)
+          .username(userName)
+          .password(password)
+          .build())
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/RouterConfiguration.kt b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/RouterConfiguration.kt
new file mode 100644
index 0000000000..bda1d26278
--- /dev/null
+++ b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/RouterConfiguration.kt
@@ -0,0 +1,19 @@
+package com.baeldung.nonblockingcoroutines.config
+
+import com.baeldung.nonblockingcoroutines.handlers.ProductsHandler
+import kotlinx.coroutines.FlowPreview
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.web.reactive.function.server.coRouter
+
+@Configuration
+class RouterConfiguration {
+
+    @FlowPreview
+    @Bean
+    fun productRoutes(productsHandler: ProductsHandler) = coRouter {
+        GET("/", productsHandler::findAll)
+        GET("/{id}", productsHandler::findOne)
+        GET("/{id}/stock", productsHandler::findOneInStock)
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/WebClientConfiguration.kt b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/WebClientConfiguration.kt
new file mode 100644
index 0000000000..85938b8be2
--- /dev/null
+++ b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/config/WebClientConfiguration.kt
@@ -0,0 +1,12 @@
+package com.baeldung.nonblockingcoroutines.config
+
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.web.reactive.function.client.WebClient
+
+@Configuration
+class WebClientConfiguration {
+
+    @Bean
+    fun webClient() = WebClient.builder().baseUrl("http://localhost:8080").build()
+}
\ No newline at end of file
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductController.kt b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductController.kt
new file mode 100644
index 0000000000..91b091859a
--- /dev/null
+++ b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductController.kt
@@ -0,0 +1,49 @@
+package com.baeldung.nonblockingcoroutines.controller
+
+import com.baeldung.nonblockingcoroutines.model.Product
+import com.baeldung.nonblockingcoroutines.repository.ProductRepository
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.http.MediaType
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.reactive.function.client.WebClient
+import org.springframework.web.reactive.function.client.bodyToMono
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Mono
+
+class ProductController {
+    @Autowired
+    lateinit var webClient: WebClient
+    @Autowired
+    lateinit var productRepository: ProductRepository
+
+    @GetMapping("/{id}")
+    fun findOne(@PathVariable id: Int): Mono<Product> {
+        return productRepository
+          .getProductById(id)
+    }
+
+    @GetMapping("/{id}/stock")
+    fun findOneInStock(@PathVariable id: Int): Mono<ProductStockView> {
+        val product = productRepository.getProductById(id)
+
+        val stockQuantity = webClient.get()
+          .uri("/stock-service/product/$id/quantity")
+          .accept(MediaType.APPLICATION_JSON)
+          .retrieve()
+          .bodyToMono<Int>()
+        return product.zipWith(stockQuantity) { productInStock, stockQty ->
+            ProductStockView(productInStock, stockQty)
+        }
+    }
+
+    @GetMapping("/stock-service/product/{id}/quantity")
+    fun getStockQuantity(): Mono<Int> {
+        return Mono.just(2)
+    }
+
+    @GetMapping("/")
+    fun findAll(): Flux<Product> {
+        return productRepository.getAllProducts()
+    }
+}
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductControllerCoroutines.kt b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductControllerCoroutines.kt
new file mode 100644
index 0000000000..d70d352cda
--- /dev/null
+++ b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductControllerCoroutines.kt
@@ -0,0 +1,49 @@
+package com.baeldung.nonblockingcoroutines.controller
+
+import com.baeldung.nonblockingcoroutines.model.Product
+import com.baeldung.nonblockingcoroutines.repository.ProductRepositoryCoroutines
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.Flow
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.http.MediaType.APPLICATION_JSON
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.reactive.function.client.WebClient
+import org.springframework.web.reactive.function.client.awaitBody
+import org.springframework.web.reactive.function.client.awaitExchange
+
+class ProductControllerCoroutines {
+    @Autowired
+    lateinit var webClient: WebClient
+
+    @Autowired
+    lateinit var productRepository: ProductRepositoryCoroutines
+
+    @GetMapping("/{id}")
+    suspend fun findOne(@PathVariable id: Int): Product? {
+        return productRepository.getProductById(id)
+    }
+
+    @GetMapping("/{id}/stock")
+    suspend fun findOneInStock(@PathVariable id: Int): ProductStockView {
+        val product: Deferred<Product?> = GlobalScope.async {
+            productRepository.getProductById(id)
+        }
+        val quantity: Deferred<Int> = GlobalScope.async {
+            webClient.get()
+              .uri("/stock-service/product/$id/quantity")
+              .accept(APPLICATION_JSON)
+              .awaitExchange().awaitBody<Int>()
+        }
+        return ProductStockView(product.await()!!, quantity.await())
+    }
+
+    @FlowPreview
+    @GetMapping("/")
+    fun findAll(): Flow<Product> {
+        return productRepository.getAllProducts()
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductStockView.kt b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductStockView.kt
new file mode 100644
index 0000000000..44611fd1de
--- /dev/null
+++ b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/controller/ProductStockView.kt
@@ -0,0 +1,15 @@
+package com.baeldung.nonblockingcoroutines.controller
+
+import com.baeldung.nonblockingcoroutines.model.Product
+
+class ProductStockView(product: Product, var stockQuantity: Int) {
+    var id: Int = 0
+    var name: String = ""
+    var price: Float = 0.0f
+
+    init {
+        this.id = product.id
+        this.name = product.name
+        this.price = product.price
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/handlers/ProductsHandler.kt b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/handlers/ProductsHandler.kt
new file mode 100644
index 0000000000..41c4510e0d
--- /dev/null
+++ b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/handlers/ProductsHandler.kt
@@ -0,0 +1,49 @@
+package com.baeldung.nonblockingcoroutines.handlers
+
+import com.baeldung.nonblockingcoroutines.controller.ProductStockView
+import com.baeldung.nonblockingcoroutines.model.Product
+import com.baeldung.nonblockingcoroutines.repository.ProductRepositoryCoroutines
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.http.MediaType
+import org.springframework.stereotype.Component
+import org.springframework.web.reactive.function.client.WebClient
+import org.springframework.web.reactive.function.client.awaitBody
+import org.springframework.web.reactive.function.client.awaitExchange
+import org.springframework.web.reactive.function.server.ServerRequest
+import org.springframework.web.reactive.function.server.ServerResponse
+import org.springframework.web.reactive.function.server.bodyAndAwait
+import org.springframework.web.reactive.function.server.json
+
+@Component
+class ProductsHandler(
+  @Autowired var webClient: WebClient,
+  @Autowired var productRepository: ProductRepositoryCoroutines) {
+
+    @FlowPreview
+    suspend fun findAll(request: ServerRequest): ServerResponse =
+      ServerResponse.ok().json().bodyAndAwait(productRepository.getAllProducts())
+
+    suspend fun findOneInStock(request: ServerRequest): ServerResponse {
+        val id = request.pathVariable("id").toInt()
+
+        val product: Deferred<Product?> = GlobalScope.async {
+            productRepository.getProductById(id)
+        }
+        val quantity: Deferred<Int> = GlobalScope.async {
+            webClient.get()
+              .uri("/stock-service/product/$id/quantity")
+              .accept(MediaType.APPLICATION_JSON)
+              .awaitExchange().awaitBody<Int>()
+        }
+        return ServerResponse.ok().json().bodyAndAwait(ProductStockView(product.await()!!, quantity.await()))
+    }
+
+    suspend fun findOne(request: ServerRequest): ServerResponse {
+        val id = request.pathVariable("id").toInt()
+        return ServerResponse.ok().json().bodyAndAwait(productRepository.getProductById(id)!!)
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/model/Product.kt b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/model/Product.kt
new file mode 100644
index 0000000000..c6dcbdc9c4
--- /dev/null
+++ b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/model/Product.kt
@@ -0,0 +1,7 @@
+package com.baeldung.nonblockingcoroutines.model
+
+data class Product(
+  var id: Int = 0,
+  var name: String = "",
+  var price: Float = 0.0f
+)
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepository.kt b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepository.kt
new file mode 100644
index 0000000000..20c3827c26
--- /dev/null
+++ b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepository.kt
@@ -0,0 +1,34 @@
+package com.baeldung.nonblockingcoroutines.repository
+
+import com.baeldung.nonblockingcoroutines.model.Product
+import org.springframework.data.r2dbc.function.DatabaseClient
+import org.springframework.stereotype.Repository
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Mono
+
+@Repository
+class ProductRepository(private val client: DatabaseClient) {
+
+    fun getProductById(id: Int): Mono<Product> {
+        return client.execute().sql("SELECT * FROM products WHERE id = $1")
+          .bind(0, id)
+          .`as`(Product::class.java)
+          .fetch()
+          .one()
+    }
+
+    fun addNewProduct(name: String, price: Float): Mono<Void> {
+        return client.execute()
+          .sql("INSERT INTO products (name, price) VALUES($1, $2)")
+          .bind(0, name)
+          .bind(1, price)
+          .then()
+    }
+
+    fun getAllProducts(): Flux<Product> {
+        return client.select().from("products")
+          .`as`(Product::class.java)
+          .fetch()
+          .all()
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepositoryCoroutines.kt b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepositoryCoroutines.kt
new file mode 100644
index 0000000000..60a19d4d00
--- /dev/null
+++ b/spring-boot-kotlin/src/main/kotlin/com/baeldung/nonblockingcoroutines/repository/ProductRepositoryCoroutines.kt
@@ -0,0 +1,40 @@
+package com.baeldung.nonblockingcoroutines.repository
+
+
+import com.baeldung.nonblockingcoroutines.model.Product
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.reactive.awaitFirstOrNull
+import kotlinx.coroutines.reactive.flow.asFlow
+import org.springframework.data.r2dbc.function.DatabaseClient
+import org.springframework.stereotype.Repository
+
+@Repository
+class ProductRepositoryCoroutines(private val client: DatabaseClient) {
+
+    suspend fun getProductById(id: Int): Product? =
+      client.execute().sql("SELECT * FROM products WHERE id = $1")
+        .bind(0, id)
+        .`as`(Product::class.java)
+        .fetch()
+        .one()
+        .awaitFirstOrNull()
+
+    suspend fun addNewProduct(name: String, price: Float) =
+      client.execute()
+        .sql("INSERT INTO products (name, price) VALUES($1, $2)")
+        .bind(0, name)
+        .bind(1, price)
+        .then()
+        .awaitFirstOrNull()
+
+    @FlowPreview
+    fun getAllProducts(): Flow<Product> =
+      client.select()
+        .from("products")
+        .`as`(Product::class.java)
+        .fetch()
+        .all()
+        .log()
+        .asFlow()
+}
\ No newline at end of file
diff --git a/spring-boot-kotlin/src/main/resources/application.properties b/spring-boot-kotlin/src/main/resources/application.properties
new file mode 100644
index 0000000000..0f84ff2d75
--- /dev/null
+++ b/spring-boot-kotlin/src/main/resources/application.properties
@@ -0,0 +1,8 @@
+logging.level.org.springframework.data.r2dbc=DEBUG
+logging.level.org.springframework.web.reactive.function.client.ExchangeFunctions=TRACE
+spring.http.log-request-details=true
+spring.h2.console.enabled=true
+spring.datasource.username=sa
+spring.datasource.url=jdbc:h2:mem:testdb
+spring.datasource.password=
+spring.datasource.dbname=testdb
\ No newline at end of file
diff --git a/spring-security-mvc-boot/src/main/resources/logback.xml b/spring-boot-kotlin/src/main/resources/logback.xml
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/logback.xml
rename to spring-boot-kotlin/src/main/resources/logback.xml
diff --git a/spring-boot-kotlin/src/test/kotlin/com/baeldung/nonblockingcoroutines/ProductHandlerTest.kt b/spring-boot-kotlin/src/test/kotlin/com/baeldung/nonblockingcoroutines/ProductHandlerTest.kt
new file mode 100644
index 0000000000..53b1d50f21
--- /dev/null
+++ b/spring-boot-kotlin/src/test/kotlin/com/baeldung/nonblockingcoroutines/ProductHandlerTest.kt
@@ -0,0 +1,58 @@
+package com.baeldung.nonblockingcoroutines
+
+import com.baeldung.nonblockingcoroutines.config.RouterConfiguration
+import com.baeldung.nonblockingcoroutines.handlers.ProductsHandler
+import com.baeldung.nonblockingcoroutines.model.Product
+import com.baeldung.nonblockingcoroutines.repository.ProductRepositoryCoroutines
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.reactive.flow.asFlow
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.BDDMockito.given
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.autoconfigure.security.reactive.ReactiveSecurityAutoConfiguration
+import org.springframework.boot.autoconfigure.security.reactive.ReactiveUserDetailsServiceAutoConfiguration
+import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest
+import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.test.context.junit4.SpringRunner
+import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.reactive.server.expectBodyList
+import org.springframework.web.reactive.function.client.WebClient
+import reactor.core.publisher.Flux
+import org.springframework.test.context.ContextConfiguration
+
+@WebFluxTest(
+    excludeAutoConfiguration = [ReactiveUserDetailsServiceAutoConfiguration::class, ReactiveSecurityAutoConfiguration::class]
+)
+@RunWith(SpringRunner::class)
+@ContextConfiguration(classes = [ProductsHandler::class, RouterConfiguration::class])
+class ProductHandlerTest {
+
+    @Autowired
+    private lateinit var client: WebTestClient
+
+    @MockBean
+    private lateinit var webClient: WebClient
+
+    @MockBean
+    private lateinit var productsRepository: ProductRepositoryCoroutines
+
+
+    @FlowPreview
+    @Test
+    public fun `get all products`() {
+        val productsFlow = Flux.just(
+          Product(1, "product1", 1000.0F),
+          Product(2, "product2", 2000.0F),
+          Product(3, "product3", 3000.0F)
+        ).asFlow()
+        given(productsRepository.getAllProducts()).willReturn(productsFlow)
+        client.get()
+          .uri("/")
+          .exchange()
+          .expectStatus()
+          .isOk
+          .expectBodyList<Product>()
+    }
+
+}
diff --git a/spring-boot-logging-log4j2/pom.xml b/spring-boot-logging-log4j2/pom.xml
index 6cc60da52c..64696969ca 100644
--- a/spring-boot-logging-log4j2/pom.xml
+++ b/spring-boot-logging-log4j2/pom.xml
@@ -34,6 +34,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
         </dependency>
+        <dependency>
+        	<groupId>org.projectlombok</groupId>
+        	<artifactId>lombok</artifactId>
+        	<version>1.18.4</version>
+        	<scope>provided</scope>
+    	</dependency>
         
         <!-- for Graylog demo -->
         <dependency>
diff --git a/spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/LombokLoggingController.java b/spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/LombokLoggingController.java
new file mode 100644
index 0000000000..5f75dbd5a1
--- /dev/null
+++ b/spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/LombokLoggingController.java
@@ -0,0 +1,28 @@
+package com.baeldung.springbootlogging;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.extern.slf4j.Slf4j;
+
+//import lombok.extern.log4j.Log4j2;
+//import lombok.extern.apachecommons.CommonsLog;
+
+@RestController("LombokLoggingController")
+@Slf4j
+// @CommonsLog (Comment any other Lombok logging annotation and uncomment this
+// to work with Apache Commons Logging)
+// @Log4j2 (Comment any other Lombok logging annotation and uncomment this to
+// work directly with Log4j2)
+public class LombokLoggingController {
+
+	@GetMapping("/lombok")
+	public String index() {
+		log.trace("A TRACE Message");
+		log.debug("A DEBUG Message");
+		log.info("An INFO Message");
+		log.warn("A WARN Message");
+		log.error("An ERROR Message");
+		return "Howdy! Check out the Logs to see the output...";
+	}
+}
diff --git a/spring-boot-logging-log4j2/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-logging-log4j2/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..9817522e68
--- /dev/null
+++ b/spring-boot-logging-log4j2/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.springbootlogging.SpringBootLoggingApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringBootLoggingApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot-mvc-2/.gitignore b/spring-boot-mvc-2/.gitignore
new file mode 100644
index 0000000000..82eca336e3
--- /dev/null
+++ b/spring-boot-mvc-2/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
\ No newline at end of file
diff --git a/spring-boot-mvc-2/README.md b/spring-boot-mvc-2/README.md
new file mode 100644
index 0000000000..a405298cbe
--- /dev/null
+++ b/spring-boot-mvc-2/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles:
+
+- [Functional Controllers in Spring MVC]()
\ No newline at end of file
diff --git a/spring-boot-mvc-2/pom.xml b/spring-boot-mvc-2/pom.xml
new file mode 100644
index 0000000000..18121325a5
--- /dev/null
+++ b/spring-boot-mvc-2/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-boot-mvc-2</artifactId>
+    <name>spring-boot-mvc-2</name>
+    <packaging>jar</packaging>
+    <description>Module For Spring Boot MVC Web Fn</description>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.0.BUILD-SNAPSHOT</version>
+        <relativePath /> <!-- lookup parent from repository -->
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.baeldung.springbootmvc.SpringBootMvcFnApplication</mainClass>
+                    <layout>JAR</layout>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
+</project>
\ No newline at end of file
diff --git a/spring-boot-mvc-2/src/main/java/com/baeldung/springbootmvc/SpringBootMvcFnApplication.java b/spring-boot-mvc-2/src/main/java/com/baeldung/springbootmvc/SpringBootMvcFnApplication.java
new file mode 100644
index 0000000000..2a85550bd7
--- /dev/null
+++ b/spring-boot-mvc-2/src/main/java/com/baeldung/springbootmvc/SpringBootMvcFnApplication.java
@@ -0,0 +1,74 @@
+package com.baeldung.springbootmvc;
+
+import static org.springframework.web.servlet.function.RouterFunctions.route;
+import static org.springframework.web.servlet.function.ServerResponse.notFound;
+import static org.springframework.web.servlet.function.ServerResponse.status;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.servlet.function.RequestPredicates;
+import org.springframework.web.servlet.function.RouterFunction;
+import org.springframework.web.servlet.function.ServerResponse;
+
+import com.baeldung.springbootmvc.ctrl.ProductController;
+import com.baeldung.springbootmvc.svc.ProductService;
+
+@SpringBootApplication
+public class SpringBootMvcFnApplication {
+
+    private static final Logger LOG = LoggerFactory.getLogger(SpringBootMvcFnApplication.class);
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootMvcFnApplication.class, args);
+    }
+
+    @Bean
+    RouterFunction<ServerResponse> productListing(ProductController pc, ProductService ps) {
+        return pc.productListing(ps);
+    }
+
+    @Bean
+    RouterFunction<ServerResponse> allApplicationRoutes(ProductController pc, ProductService ps) {
+        return route().add(pc.remainingProductRoutes(ps))
+            .before(req -> {
+                LOG.info("Found a route which matches " + req.uri()
+                    .getPath());
+                return req;
+            })
+            .after((req, res) -> {
+                if (res.statusCode() == HttpStatus.OK) {
+                    LOG.info("Finished processing request " + req.uri()
+                        .getPath());
+                } else {
+                    LOG.info("There was an error while processing request" + req.uri());
+                }
+                return res;
+            })
+            .onError(Throwable.class, (e, res) -> {
+                LOG.error("Fatal exception has occurred", e);
+                return status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+            })
+            .build()
+            .and(route(RequestPredicates.all(), req -> notFound().build()));
+    }
+
+    public static class Error {
+        private String errorMessage;
+
+        public Error(String message) {
+            this.errorMessage = message;
+        }
+
+        public String getErrorMessage() {
+            return errorMessage;
+        }
+
+        public void setErrorMessage(String errorMessage) {
+            this.errorMessage = errorMessage;
+        }
+    }
+}
diff --git a/spring-boot-mvc-2/src/main/java/com/baeldung/springbootmvc/ctrl/ProductController.java b/spring-boot-mvc-2/src/main/java/com/baeldung/springbootmvc/ctrl/ProductController.java
new file mode 100644
index 0000000000..6a77e72cea
--- /dev/null
+++ b/spring-boot-mvc-2/src/main/java/com/baeldung/springbootmvc/ctrl/ProductController.java
@@ -0,0 +1,59 @@
+package com.baeldung.springbootmvc.ctrl;
+
+import static org.springframework.web.servlet.function.RouterFunctions.route;
+import static org.springframework.web.servlet.function.ServerResponse.ok;
+import static org.springframework.web.servlet.function.ServerResponse.status;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.function.EntityResponse;
+import org.springframework.web.servlet.function.RequestPredicates;
+import org.springframework.web.servlet.function.RouterFunction;
+import org.springframework.web.servlet.function.ServerRequest;
+import org.springframework.web.servlet.function.ServerResponse;
+
+import com.baeldung.springbootmvc.SpringBootMvcFnApplication.Error;
+import com.baeldung.springbootmvc.model.Product;
+import com.baeldung.springbootmvc.svc.ProductService;
+
+@Component
+public class ProductController {
+
+    public RouterFunction<ServerResponse> productListing(ProductService ps) {
+        return route().GET("/product", req -> ok().body(ps.findAll()))
+            .build();
+    }
+
+    public RouterFunction<ServerResponse> productSearch(ProductService ps) {
+        return route().nest(RequestPredicates.path("/product"), builder -> {
+            builder.GET("/name/{name}", req -> ok().body(ps.findByName(req.pathVariable("name"))))
+                .GET("/id/{id}", req -> ok().body(ps.findById(Integer.parseInt(req.pathVariable("id")))));
+        })
+            .onError(ProductService.ItemNotFoundException.class, (e, req) -> EntityResponse.fromObject(new Error(e.getMessage()))
+                .status(HttpStatus.NOT_FOUND)
+                .build())
+            .build();
+    }
+
+    public RouterFunction<ServerResponse> adminFunctions(ProductService ps) {
+        return route().POST("/product", req -> ok().body(ps.save(req.body(Product.class))))
+            .filter((req, next) -> authenticate(req) ? next.handle(req) : status(HttpStatus.UNAUTHORIZED).build())
+            .onError(IllegalArgumentException.class, (e, req) -> EntityResponse.fromObject(new Error(e.getMessage()))
+                .status(HttpStatus.BAD_REQUEST)
+                .build())
+            .build();
+    }
+
+    public RouterFunction<ServerResponse> remainingProductRoutes(ProductService ps) {
+        return route().add(productSearch(ps))
+            .add(adminFunctions(ps))
+            .build();
+    }
+
+    private boolean authenticate(ServerRequest req) {
+        return Boolean.TRUE;
+    }
+
+}
diff --git a/spring-boot-mvc-2/src/main/java/com/baeldung/springbootmvc/model/Product.java b/spring-boot-mvc-2/src/main/java/com/baeldung/springbootmvc/model/Product.java
new file mode 100644
index 0000000000..1213b3c11e
--- /dev/null
+++ b/spring-boot-mvc-2/src/main/java/com/baeldung/springbootmvc/model/Product.java
@@ -0,0 +1,72 @@
+package com.baeldung.springbootmvc.model;
+
+public class Product {
+    private String name;
+    private double price;
+    private int id;
+
+    public Product(String name, double price, int id) {
+        super();
+        this.name = name;
+        this.price = price;
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public double getPrice() {
+        return price;
+    }
+
+    public void setPrice(double price) {
+        this.price = price;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + id;
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        long temp;
+        temp = Double.doubleToLongBits(price);
+        result = prime * result + (int) (temp ^ (temp >>> 32));
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Product other = (Product) obj;
+        if (id != other.id)
+            return false;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        if (Double.doubleToLongBits(price) != Double.doubleToLongBits(other.price))
+            return false;
+        return true;
+    }
+
+}
diff --git a/spring-boot-mvc-2/src/main/java/com/baeldung/springbootmvc/svc/ProductService.java b/spring-boot-mvc-2/src/main/java/com/baeldung/springbootmvc/svc/ProductService.java
new file mode 100644
index 0000000000..e2d281d54f
--- /dev/null
+++ b/spring-boot-mvc-2/src/main/java/com/baeldung/springbootmvc/svc/ProductService.java
@@ -0,0 +1,63 @@
+package com.baeldung.springbootmvc.svc;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import com.baeldung.springbootmvc.model.Product;
+
+@Service
+public class ProductService {
+
+    private final Set<Product> products = new HashSet<>();
+
+    {
+        products.add(new Product("Book", 23.90, 1));
+        products.add(new Product("Pen", 44.34, 2));
+    }
+
+    public Product findById(int id) {
+        return products.stream()
+            .filter(obj -> obj.getId() == id)
+            .findFirst()
+            .orElseThrow(() -> new ItemNotFoundException("Product not found"));
+    }
+
+    public Product findByName(String name) {
+        return products.stream()
+            .filter(obj -> obj.getName()
+                .equalsIgnoreCase(name))
+            .findFirst()
+            .orElseThrow(() -> new ItemNotFoundException("Product not found"));
+    }
+
+    public Set<Product> findAll() {
+        return products;
+    }
+
+    public Product save(Product product) {
+        if (StringUtils.isEmpty(product.getName()) || product.getPrice() == 0.0) {
+            throw new IllegalArgumentException();
+        }
+        int newId = products.stream()
+            .mapToInt(Product::getId)
+            .max()
+            .getAsInt() + 1;
+        product.setId(newId);
+        products.add(product);
+        return product;
+    }
+
+    public static class ItemNotFoundException extends RuntimeException {
+        /**
+         * 
+         */
+        private static final long serialVersionUID = 1L;
+
+        public ItemNotFoundException(String msg) {
+            super(msg);
+        }
+    }
+}
diff --git a/spring-boot-mvc-2/src/main/resources/application.properties b/spring-boot-mvc-2/src/main/resources/application.properties
new file mode 100644
index 0000000000..709574239b
--- /dev/null
+++ b/spring-boot-mvc-2/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
diff --git a/spring-userservice/src/main/resources/logback.xml b/spring-boot-mvc-2/src/main/resources/logback.xml
similarity index 100%
rename from spring-userservice/src/main/resources/logback.xml
rename to spring-boot-mvc-2/src/main/resources/logback.xml
diff --git a/spring-boot-mvc-birt/pom.xml b/spring-boot-mvc-birt/pom.xml
index 8f41e8410a..bf6bbbf71d 100644
--- a/spring-boot-mvc-birt/pom.xml
+++ b/spring-boot-mvc-birt/pom.xml
@@ -9,10 +9,12 @@
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <description>Module For Spring Boot Integration with BIRT</description>
+
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.1.RELEASE</version>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-boot-mvc/README.md b/spring-boot-mvc/README.md
index d5a39cdc9f..e3e3dbdb74 100644
--- a/spring-boot-mvc/README.md
+++ b/spring-boot-mvc/README.md
@@ -12,3 +12,5 @@
 - [Setting Up Swagger 2 with a Spring REST API](http://www.baeldung.com/swagger-2-documentation-for-spring-rest-api)
 - [Conditionally Enable Scheduled Jobs in Spring](https://www.baeldung.com/spring-scheduled-enabled-conditionally)
 - [Accessing Spring MVC Model Objects in JavaScript](https://www.baeldung.com/spring-mvc-model-objects-js)
+- [Using Spring ResponseEntity to Manipulate the HTTP Response](http://www.baeldung.com/spring-response-entity)
+- [Spring Bean Annotations](http://www.baeldung.com/spring-bean-annotations)
diff --git a/spring-boot-mvc/pom.xml b/spring-boot-mvc/pom.xml
index e17c1d39b9..fee725847f 100644
--- a/spring-boot-mvc/pom.xml
+++ b/spring-boot-mvc/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>javax.faces</artifactId>
-            <version>2.3.7</version>
+            <version>${javax.faces.version}</version>
         </dependency>
 
         <!--Test -->
@@ -108,6 +108,7 @@
         <spring.fox.version>2.9.2</spring.fox.version>
         <!-- ROME for RSS -->
         <rome.version>1.10.0</rome.version>
+        <javax.faces.version>2.3.7</javax.faces.version>
         <start-class>com.baeldung.springbootmvc.SpringBootMvcApplication</start-class>
     </properties>
 
diff --git a/spring-boot-mvc/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-mvc/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..16e0708fc9
--- /dev/null
+++ b/spring-boot-mvc/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.springbootmvc.SpringBootMvcApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringBootMvcApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot-ops-2/pom.xml b/spring-boot-ops-2/pom.xml
index dc5280df48..74fcd79169 100644
--- a/spring-boot-ops-2/pom.xml
+++ b/spring-boot-ops-2/pom.xml
@@ -3,6 +3,10 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-boot-ops-2</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-boot-ops-2</name>
 
     <parent>
         <artifactId>parent-boot-2</artifactId>
@@ -11,11 +15,6 @@
         <relativePath>../parent-boot-2</relativePath>
     </parent>
 
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-boot-ops-2</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-boot-ops-2</name>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextTest.java b/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextTest.java
new file mode 100644
index 0000000000..11bbad8bb2
--- /dev/null
+++ b/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.springbootconfiguration;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringContextTest {
+
+    @Test
+    public void contextLoads() {
+    }
+}
diff --git a/spring-boot-parent/README.md b/spring-boot-parent/README.md
new file mode 100644
index 0000000000..c3bb4c700d
--- /dev/null
+++ b/spring-boot-parent/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles
+
+- [The Spring Boot Starter Parent](https://www.baeldung.com/spring-boot-starter-parent)
diff --git a/spring-boot-performance/README.md b/spring-boot-performance/README.md
new file mode 100644
index 0000000000..015dd759a8
--- /dev/null
+++ b/spring-boot-performance/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles
+
+- [Lazy Initialization in Spring Boot 2](https://www.baeldung.com/spring-boot-lazy-initialization)
diff --git a/spring-boot-performance/pom.xml b/spring-boot-performance/pom.xml
index bbee7493cc..a4efa4a8d7 100644
--- a/spring-boot-performance/pom.xml
+++ b/spring-boot-performance/pom.xml
@@ -8,17 +8,12 @@
     <description>This is a simple Spring Boot application taking advantage of the latest Spring Boot improvements/features. Current version: 2.2</description>
 
     <parent>
-        <artifactId>parent-boot-performance</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-performance</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
-    <properties>
-        <!-- The main class to start by executing java -jar -->
-        <start-class>com.baeldung.lazyinitialization.Application</start-class>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -42,4 +37,9 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+
+    <properties>
+        <!-- The main class to start by executing java -jar -->
+        <start-class>com.baeldung.lazyinitialization.Application</start-class>
+    </properties>
+</project>
diff --git a/spring-boot-properties/README.md b/spring-boot-properties/README.md
new file mode 100644
index 0000000000..c43cf4865c
--- /dev/null
+++ b/spring-boot-properties/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Reloading Properties in Spring](https://www.baeldung.com/reloading-properties-files-in-spring/)
\ No newline at end of file
diff --git a/spring-boot-properties/extra.properties b/spring-boot-properties/extra.properties
new file mode 100644
index 0000000000..8e28a6f889
--- /dev/null
+++ b/spring-boot-properties/extra.properties
@@ -0,0 +1 @@
+application.theme.color=blue
\ No newline at end of file
diff --git a/spring-boot-properties/extra2.properties b/spring-boot-properties/extra2.properties
new file mode 100644
index 0000000000..2c46edc584
--- /dev/null
+++ b/spring-boot-properties/extra2.properties
@@ -0,0 +1 @@
+application.theme.background=red
\ No newline at end of file
diff --git a/spring-boot-properties/pom.xml b/spring-boot-properties/pom.xml
new file mode 100644
index 0000000000..27ac48252b
--- /dev/null
+++ b/spring-boot-properties/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-boot-properties</artifactId>
+    <packaging>jar</packaging>
+    <name>spring-boot-properties</name>
+    <description>Spring Boot Properties Module</description>
+
+    <parent>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>${commons-configuration.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <finalName>spring-boot-properties</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>integration</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>**/*LiveTest.java</exclude>
+                                        <exclude>**/*IntegrationTest.java</exclude>
+                                        <exclude>**/*IntTest.java</exclude>
+                                    </excludes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <test.mime>json</test.mime>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <properties>
+        <java.version>1.8</java.version>
+        <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+        <commons-configuration.version>1.10</commons-configuration.version>
+    </properties>
+
+</project>
diff --git a/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/SpringBootPropertiesApplication.java b/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/SpringBootPropertiesApplication.java
new file mode 100644
index 0000000000..6f76379a99
--- /dev/null
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/SpringBootPropertiesApplication.java
@@ -0,0 +1,44 @@
+package com.baeldung.properties.reloading;
+
+import com.baeldung.properties.reloading.configs.ReloadableProperties;
+import java.io.File;
+import java.util.Properties;
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+
+@SpringBootApplication
+public class SpringBootPropertiesApplication {
+
+    @Bean
+    @ConditionalOnProperty(name = "spring.config.location", matchIfMissing = false)
+    public PropertiesConfiguration propertiesConfiguration(
+      @Value("${spring.config.location}") String path,
+      @Value("${spring.properties.refreshDelay}") long refreshDelay) throws Exception {
+        String filePath = path.substring("file:".length());
+        PropertiesConfiguration configuration = new PropertiesConfiguration(new File(filePath).getCanonicalPath());
+        FileChangedReloadingStrategy fileChangedReloadingStrategy = new FileChangedReloadingStrategy();
+        fileChangedReloadingStrategy.setRefreshDelay(refreshDelay);
+        configuration.setReloadingStrategy(fileChangedReloadingStrategy);
+        return configuration;
+    }
+
+    @Bean
+    @ConditionalOnBean(PropertiesConfiguration.class)
+    @Primary
+    public Properties properties(PropertiesConfiguration propertiesConfiguration) throws Exception {
+        ReloadableProperties properties = new ReloadableProperties(propertiesConfiguration);
+        return properties;
+    }
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootPropertiesApplication.class, args);
+    }
+
+}
diff --git a/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/configs/PropertiesException.java b/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/configs/PropertiesException.java
new file mode 100644
index 0000000000..09c18aef33
--- /dev/null
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/configs/PropertiesException.java
@@ -0,0 +1,10 @@
+package com.baeldung.properties.reloading.configs;
+
+public class PropertiesException extends RuntimeException {
+    public PropertiesException() {
+    }
+
+    public PropertiesException(Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/configs/ReloadableProperties.java b/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/configs/ReloadableProperties.java
new file mode 100644
index 0000000000..e90e68d09a
--- /dev/null
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/configs/ReloadableProperties.java
@@ -0,0 +1,49 @@
+package com.baeldung.properties.reloading.configs;
+
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.util.Properties;
+import javax.naming.OperationNotSupportedException;
+import org.apache.commons.configuration.PropertiesConfiguration;
+
+public class ReloadableProperties extends Properties {
+    private PropertiesConfiguration propertiesConfiguration;
+
+    public ReloadableProperties(PropertiesConfiguration propertiesConfiguration) throws IOException {
+        super.load(new FileReader(propertiesConfiguration.getFile()));
+        this.propertiesConfiguration = propertiesConfiguration;
+    }
+
+    @Override
+    public synchronized Object setProperty(String key, String value) {
+        propertiesConfiguration.setProperty(key, value);
+        return super.setProperty(key, value);
+    }
+
+    @Override
+    public String getProperty(String key) {
+        String val = propertiesConfiguration.getString(key);
+        super.setProperty(key, val);
+        return val;
+    }
+
+    @Override
+    public String getProperty(String key, String defaultValue) {
+        String val = propertiesConfiguration.getString(key, defaultValue);
+        super.setProperty(key, val);
+        return val;
+    }
+
+    @Override
+    public synchronized void load(Reader reader) throws IOException {
+        throw new PropertiesException(new OperationNotSupportedException());
+    }
+
+    @Override
+    public synchronized void load(InputStream inStream) throws IOException {
+        throw new PropertiesException(new OperationNotSupportedException());
+    }
+
+}
diff --git a/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/configs/ReloadablePropertySource.java b/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/configs/ReloadablePropertySource.java
new file mode 100644
index 0000000000..6d76a2e1e2
--- /dev/null
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/configs/ReloadablePropertySource.java
@@ -0,0 +1,33 @@
+package com.baeldung.properties.reloading.configs;
+
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy;
+import org.springframework.core.env.PropertySource;
+import org.springframework.util.StringUtils;
+
+public class ReloadablePropertySource extends PropertySource {
+
+    PropertiesConfiguration propertiesConfiguration;
+
+    public ReloadablePropertySource(String name, PropertiesConfiguration propertiesConfiguration) {
+        super(name);
+        this.propertiesConfiguration = propertiesConfiguration;
+    }
+
+    public ReloadablePropertySource(String name, String path) {
+        super(StringUtils.isEmpty(name) ? path : name);
+        try {
+            this.propertiesConfiguration = new PropertiesConfiguration(path);
+            FileChangedReloadingStrategy strategy = new FileChangedReloadingStrategy();
+            strategy.setRefreshDelay(1000);
+            this.propertiesConfiguration.setReloadingStrategy(strategy);
+        } catch (Exception e) {
+            throw new PropertiesException(e);
+        }
+    }
+
+    @Override
+    public Object getProperty(String s) {
+        return propertiesConfiguration.getProperty(s);
+    }
+}
diff --git a/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/configs/ReloadablePropertySourceConfig.java b/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/configs/ReloadablePropertySourceConfig.java
new file mode 100644
index 0000000000..dd70e3842e
--- /dev/null
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/configs/ReloadablePropertySourceConfig.java
@@ -0,0 +1,29 @@
+package com.baeldung.properties.reloading.configs;
+
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MutablePropertySources;
+
+@Configuration
+public class ReloadablePropertySourceConfig {
+
+    private ConfigurableEnvironment env;
+
+    public ReloadablePropertySourceConfig(@Autowired ConfigurableEnvironment env) {
+        this.env = env;
+    }
+
+    @Bean
+    @ConditionalOnProperty(name = "spring.config.location", matchIfMissing = false)
+    public ReloadablePropertySource reloadablePropertySource(PropertiesConfiguration properties) {
+        ReloadablePropertySource ret = new ReloadablePropertySource("dynamic", properties);
+        MutablePropertySources sources = env.getPropertySources();
+        sources.addFirst(ret);
+        return ret;
+    }
+
+}
diff --git a/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/configs/ReloadablePropertySourceFactory.java b/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/configs/ReloadablePropertySourceFactory.java
new file mode 100644
index 0000000000..2a620b0b2d
--- /dev/null
+++ b/spring-boot-properties/src/main/java/com/baeldung/properties/reloading/configs/ReloadablePropertySourceFactory.java
@@ -0,0 +1,25 @@
+package com.baeldung.properties.reloading.configs;
+
+import java.io.IOException;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.FileUrlResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.DefaultPropertySourceFactory;
+import org.springframework.core.io.support.EncodedResource;
+
+public class ReloadablePropertySourceFactory extends DefaultPropertySourceFactory {
+    @Override
+    public PropertySource<?> createPropertySource(String s, EncodedResource encodedResource) throws IOException {
+        Resource internal = encodedResource.getResource();
+        if (internal instanceof FileSystemResource) {
+            return new ReloadablePropertySource(s, ((FileSystemResource) internal).getPath());
+        }
+        if (internal instanceof FileUrlResource) {
+            return new ReloadablePropertySource(s, ((FileUrlResource) internal)
+              .getURL()
+              .getPath());
+        }
+        return super.createPropertySource(s, encodedResource);
+    }
+}
diff --git a/spring-boot-properties/src/main/resources/application.properties b/spring-boot-properties/src/main/resources/application.properties
new file mode 100644
index 0000000000..f976004a04
--- /dev/null
+++ b/spring-boot-properties/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+management.endpoints.web.exposure.include=refresh
+spring.properties.refreshDelay=1000
+spring.config.location=file:extra.properties
diff --git a/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/PropertiesReloadIntegrationTest.java b/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/PropertiesReloadIntegrationTest.java
new file mode 100644
index 0000000000..0c28cb085b
--- /dev/null
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/PropertiesReloadIntegrationTest.java
@@ -0,0 +1,161 @@
+package com.baeldung.properties.reloading;
+
+import com.baeldung.properties.reloading.beans.ConfigurationPropertiesRefreshConfigBean;
+import com.baeldung.properties.reloading.beans.EnvironmentConfigBean;
+import com.baeldung.properties.reloading.beans.PropertiesConfigBean;
+import com.baeldung.properties.reloading.beans.ValueRefreshConfigBean;
+import java.io.FileOutputStream;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = SpringBootPropertiesTestApplication.class)
+public class PropertiesReloadIntegrationTest {
+
+    protected MockMvc mvc;
+
+    protected long refreshDelay = 3000;
+
+    @Autowired
+    WebApplicationContext webApplicationContext;
+
+    @Autowired
+    ValueRefreshConfigBean valueRefreshConfigBean;
+
+    @Autowired
+    ConfigurationPropertiesRefreshConfigBean configurationPropertiesRefreshConfigBean;
+
+    @Autowired
+    EnvironmentConfigBean environmentConfigBean;
+
+    @Autowired
+    PropertiesConfigBean propertiesConfigBean;
+
+    @Autowired
+    @Qualifier("singletonValueRefreshConfigBean")
+    ValueRefreshConfigBean singletonValueRefreshConfigBean;
+
+
+    @Before
+    public void setUp() throws Exception {
+        mvc = MockMvcBuilders
+          .webAppContextSetup(webApplicationContext)
+          .build();
+        createConfig("extra.properties", "application.theme.color", "blue");
+        createConfig("extra2.properties", "application.theme.background", "red");
+        Thread.sleep(refreshDelay);
+        callRefresh();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        createConfig("extra.properties", "application.theme.color", "blue");
+        createConfig("extra2.properties", "application.theme.background", "red");
+    }
+
+    @Test
+    public void givenEnvironmentReader_whenColorChanged_thenExpectChangeValue() throws Exception {
+        Assert.assertEquals("blue", environmentConfigBean.getColor());
+
+        createConfig("extra.properties", "application.theme.color", "red");
+        Thread.sleep(refreshDelay);
+
+        Assert.assertEquals("red", environmentConfigBean.getColor());
+    }
+
+    @Test
+    public void givenEnvironmentReader_whenBackgroundChanged_thenExpectChangeValue() throws Exception {
+        Assert.assertEquals("red", environmentConfigBean.getBackgroundColor());
+
+        createConfig("extra2.properties", "application.theme.background", "blue");
+        Thread.sleep(refreshDelay);
+
+        Assert.assertEquals("blue", environmentConfigBean.getBackgroundColor());
+    }
+
+    @Test
+    public void givenPropertiesReader_whenColorChanged_thenExpectChangeValue() throws Exception {
+        Assert.assertEquals("blue", propertiesConfigBean.getColor());
+
+        createConfig("extra.properties", "application.theme.color", "red");
+        Thread.sleep(refreshDelay);
+
+        Assert.assertEquals("red", propertiesConfigBean.getColor());
+    }
+
+    @Test
+    public void givenRefreshScopedValueReader_whenColorChangedAndRefreshCalled_thenExpectChangeValue() throws Exception {
+        Assert.assertEquals("blue", valueRefreshConfigBean.getColor());
+
+        createConfig("extra.properties", "application.theme.color", "red");
+        Thread.sleep(refreshDelay);
+
+        Assert.assertEquals("blue", valueRefreshConfigBean.getColor());
+
+        callRefresh();
+
+        Assert.assertEquals("red", valueRefreshConfigBean.getColor());
+    }
+
+    @Test
+    public void givenSingletonRefreshScopedValueReader_whenColorChangedAndRefreshCalled_thenExpectOldValue() throws Exception {
+
+        Assert.assertEquals("blue", singletonValueRefreshConfigBean.getColor());
+
+        createConfig("extra.properties", "application.theme.color", "red");
+        Thread.sleep(refreshDelay);
+
+        Assert.assertEquals("blue", singletonValueRefreshConfigBean.getColor());
+
+        callRefresh();
+
+        Assert.assertEquals("blue", singletonValueRefreshConfigBean.getColor());
+    }
+
+    @Test
+    public void givenRefreshScopedConfigurationPropertiesReader_whenColorChangedAndRefreshCalled_thenExpectChangeValue() throws Exception {
+
+        Assert.assertEquals("blue", configurationPropertiesRefreshConfigBean.getColor());
+
+        createConfig("extra.properties", "application.theme.color", "red");
+        Thread.sleep(refreshDelay);
+
+        Assert.assertEquals("blue", configurationPropertiesRefreshConfigBean.getColor());
+
+        callRefresh();
+
+        Assert.assertEquals("red", configurationPropertiesRefreshConfigBean.getColor());
+    }
+
+    public void callRefresh() throws Exception {
+        MvcResult mvcResult = mvc
+          .perform(MockMvcRequestBuilders
+            .post("/actuator/refresh")
+            .accept(MediaType.APPLICATION_JSON_VALUE))
+          .andReturn();
+        MockHttpServletResponse response = mvcResult.getResponse();
+        Assert.assertEquals(response.getStatus(), 200);
+    }
+
+    public void createConfig(String file, String key, String value) throws Exception {
+        FileOutputStream fo = new FileOutputStream(file);
+        fo.write(String
+          .format("%s=%s", key, value)
+          .getBytes());
+        fo.close();
+    }
+}
diff --git a/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/SpringBootPropertiesTestApplication.java b/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/SpringBootPropertiesTestApplication.java
new file mode 100644
index 0000000000..50e8ef5b62
--- /dev/null
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/SpringBootPropertiesTestApplication.java
@@ -0,0 +1,28 @@
+package com.baeldung.properties.reloading;
+
+import com.baeldung.properties.reloading.beans.ValueRefreshConfigBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Scope;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@SpringBootApplication
+@WebAppConfiguration
+public class SpringBootPropertiesTestApplication {
+
+    @Bean("singletonValueRefreshConfigBean")
+    @RefreshScope
+    @Scope("singleton")
+    public ValueRefreshConfigBean singletonValueRefreshConfigBean(@Value("${application.theme.color:null}") String val) {
+        return new ValueRefreshConfigBean(val);
+    }
+
+    @Bean
+    @RefreshScope
+    public ValueRefreshConfigBean valueRefreshConfigBean(@Value("${application.theme.color:null}") String val) {
+        return new ValueRefreshConfigBean(val);
+    }
+
+}
diff --git a/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/beans/ConfigurationPropertiesRefreshConfigBean.java b/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/beans/ConfigurationPropertiesRefreshConfigBean.java
new file mode 100644
index 0000000000..16892b904b
--- /dev/null
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/beans/ConfigurationPropertiesRefreshConfigBean.java
@@ -0,0 +1,20 @@
+package com.baeldung.properties.reloading.beans;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "application.theme")
+@RefreshScope
+public class ConfigurationPropertiesRefreshConfigBean {
+    private String color;
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+}
diff --git a/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/beans/EnvironmentConfigBean.java b/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/beans/EnvironmentConfigBean.java
new file mode 100644
index 0000000000..325e8c658e
--- /dev/null
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/beans/EnvironmentConfigBean.java
@@ -0,0 +1,26 @@
+package com.baeldung.properties.reloading.beans;
+
+import com.baeldung.properties.reloading.configs.ReloadablePropertySourceFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+@Component
+@PropertySource(value = "file:extra2.properties", factory = ReloadablePropertySourceFactory.class)
+public class EnvironmentConfigBean {
+
+    private Environment environment;
+
+    public EnvironmentConfigBean(@Autowired Environment environment) {
+        this.environment = environment;
+    }
+
+    public String getColor() {
+        return environment.getProperty("application.theme.color");
+    }
+
+    public String getBackgroundColor() {
+        return environment.getProperty("application.theme.background");
+    }
+}
diff --git a/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/beans/PropertiesConfigBean.java b/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/beans/PropertiesConfigBean.java
new file mode 100644
index 0000000000..8118f6156e
--- /dev/null
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/beans/PropertiesConfigBean.java
@@ -0,0 +1,19 @@
+package com.baeldung.properties.reloading.beans;
+
+import java.util.Properties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class PropertiesConfigBean {
+
+    private Properties properties;
+
+    public PropertiesConfigBean(@Autowired Properties properties) {
+        this.properties = properties;
+    }
+
+    public String getColor() {
+        return properties.getProperty("application.theme.color");
+    }
+}
diff --git a/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/beans/ValueRefreshConfigBean.java b/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/beans/ValueRefreshConfigBean.java
new file mode 100644
index 0000000000..1018d7c9f5
--- /dev/null
+++ b/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/beans/ValueRefreshConfigBean.java
@@ -0,0 +1,13 @@
+package com.baeldung.properties.reloading.beans;
+
+public class ValueRefreshConfigBean {
+    private String color;
+
+    public ValueRefreshConfigBean(String color) {
+        this.color = color;
+    }
+
+    public String getColor() {
+        return color;
+    }
+}
diff --git a/spring-boot-properties/src/test/resources/application.properties b/spring-boot-properties/src/test/resources/application.properties
new file mode 100644
index 0000000000..6fc241a106
--- /dev/null
+++ b/spring-boot-properties/src/test/resources/application.properties
@@ -0,0 +1,3 @@
+management.endpoints.web.exposure.include=refresh
+spring.properties.refreshDelay=1000
+spring.config.location=file:extra.properties
\ No newline at end of file
diff --git a/spring-boot-property-exp/property-exp-custom-config/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-property-exp/property-exp-custom-config/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..874c4f582f
--- /dev/null
+++ b/spring-boot-property-exp/property-exp-custom-config/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.propertyexpansion.SpringBootPropertyExpansionApp;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringBootPropertyExpansionApp.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot-property-exp/property-exp-default-config/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-property-exp/property-exp-default-config/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..874c4f582f
--- /dev/null
+++ b/spring-boot-property-exp/property-exp-default-config/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.propertyexpansion.SpringBootPropertyExpansionApp;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringBootPropertyExpansionApp.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/exception/BadRequestException.java b/spring-boot-rest/src/main/java/com/baeldung/web/exception/BadRequestException.java
new file mode 100644
index 0000000000..9ebf885d4b
--- /dev/null
+++ b/spring-boot-rest/src/main/java/com/baeldung/web/exception/BadRequestException.java
@@ -0,0 +1,8 @@
+package com.baeldung.web.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(value = HttpStatus.BAD_REQUEST)
+public class BadRequestException extends RuntimeException {
+}
diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/exception/ResourceNotFoundException.java b/spring-boot-rest/src/main/java/com/baeldung/web/exception/ResourceNotFoundException.java
new file mode 100644
index 0000000000..a80802eadf
--- /dev/null
+++ b/spring-boot-rest/src/main/java/com/baeldung/web/exception/ResourceNotFoundException.java
@@ -0,0 +1,8 @@
+package com.baeldung.web.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(value = HttpStatus.NOT_FOUND)
+public class ResourceNotFoundException extends RuntimeException {
+}
diff --git a/spring-boot-rest/src/test/java/com/baeldung/SpringContextTest.java b/spring-boot-rest/src/test/java/com/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..9cba7f8fc1
--- /dev/null
+++ b/spring-boot-rest/src/test/java/com/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = {SpringBootRestApplication.class})
+public class SpringContextTest {
+
+    @Test
+    public void contextLoads() {
+    }
+
+}
diff --git a/spring-boot-security/src/main/java/com/baeldung/springbootsecurity/basic_auth/config/BasicAuthConfiguration.java b/spring-boot-security/src/main/java/com/baeldung/springbootsecurity/basic_auth/config/BasicConfiguration.java
similarity index 94%
rename from spring-boot-security/src/main/java/com/baeldung/springbootsecurity/basic_auth/config/BasicAuthConfiguration.java
rename to spring-boot-security/src/main/java/com/baeldung/springbootsecurity/basic_auth/config/BasicConfiguration.java
index 592ef5354d..3cfa45421c 100644
--- a/spring-boot-security/src/main/java/com/baeldung/springbootsecurity/basic_auth/config/BasicAuthConfiguration.java
+++ b/spring-boot-security/src/main/java/com/baeldung/springbootsecurity/basic_auth/config/BasicConfiguration.java
@@ -10,7 +10,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 
 @Configuration
 @EnableWebSecurity
-public class BasicAuthConfiguration extends WebSecurityConfigurerAdapter {
+public class BasicConfiguration extends WebSecurityConfigurerAdapter {
 
     @Override
     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
diff --git a/spring-boot-security/src/test/java/com/baeldung/springbootsecurity/basic_auth/BasicAuthConfigurationIntegrationTest.java b/spring-boot-security/src/test/java/com/baeldung/springbootsecurity/basic_auth/BasicConfigurationIntegrationTest.java
similarity index 90%
rename from spring-boot-security/src/test/java/com/baeldung/springbootsecurity/basic_auth/BasicAuthConfigurationIntegrationTest.java
rename to spring-boot-security/src/test/java/com/baeldung/springbootsecurity/basic_auth/BasicConfigurationIntegrationTest.java
index c091aa6d75..f221712513 100644
--- a/spring-boot-security/src/test/java/com/baeldung/springbootsecurity/basic_auth/BasicAuthConfigurationIntegrationTest.java
+++ b/spring-boot-security/src/test/java/com/baeldung/springbootsecurity/basic_auth/BasicConfigurationIntegrationTest.java
@@ -1,27 +1,26 @@
 package com.baeldung.springbootsecurity.basic_auth;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = RANDOM_PORT, classes = SpringBootSecurityApplication.class)
-public class BasicAuthConfigurationIntegrationTest {
+public class BasicConfigurationIntegrationTest {
 
     TestRestTemplate restTemplate;
     URL base;
@@ -45,7 +44,7 @@ public class BasicAuthConfigurationIntegrationTest {
     }
 
     @Test
-    public void whenUserWithWrongCredentialsRequestsHomePage_ThenUnauthorizedPage() throws IllegalStateException, IOException {
+    public void whenUserWithWrongCredentials_thenUnauthorizedPage() throws IllegalStateException, IOException {
         restTemplate = new TestRestTemplate("user", "wrongpassword");
         ResponseEntity<String> response = restTemplate.getForEntity(base.toString(), String.class);
 
diff --git a/spring-boot-testing/pom.xml b/spring-boot-testing/pom.xml
index 84107070bd..12fb14b366 100644
--- a/spring-boot-testing/pom.xml
+++ b/spring-boot-testing/pom.xml
@@ -15,6 +15,10 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -33,6 +37,13 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- Embedded Redis Server -->
+        <dependency>
+            <groupId>it.ozimov</groupId>
+            <artifactId>embedded-redis</artifactId>
+            <version>0.7.2</version>
+            <scope>test</scope>
+        </dependency>
         <!-- Spock & Spring -->
         <dependency>
             <groupId>org.spockframework</groupId>
diff --git a/spring-boot-testing/src/main/java/com/baeldung/boot/embeddedRedis/configuration/RedisConfiguration.java b/spring-boot-testing/src/main/java/com/baeldung/boot/embeddedRedis/configuration/RedisConfiguration.java
new file mode 100644
index 0000000000..6b5b20892f
--- /dev/null
+++ b/spring-boot-testing/src/main/java/com/baeldung/boot/embeddedRedis/configuration/RedisConfiguration.java
@@ -0,0 +1,24 @@
+package com.baeldung.boot.embeddedRedis.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
+
+@Configuration
+@EnableRedisRepositories
+public class RedisConfiguration {
+
+    @Bean
+    public LettuceConnectionFactory redisConnectionFactory(final RedisProperties redisProperties) {
+        return new LettuceConnectionFactory(redisProperties.getRedisHost(), redisProperties.getRedisPort());
+    }
+
+    @Bean
+    public RedisTemplate<?, ?> redisTemplate(final LettuceConnectionFactory connectionFactory) {
+        RedisTemplate<byte[], byte[]> template = new RedisTemplate<>();
+        template.setConnectionFactory(connectionFactory);
+        return template;
+    }
+}
diff --git a/spring-boot-testing/src/main/java/com/baeldung/boot/embeddedRedis/configuration/RedisProperties.java b/spring-boot-testing/src/main/java/com/baeldung/boot/embeddedRedis/configuration/RedisProperties.java
new file mode 100644
index 0000000000..76f2e1bbfe
--- /dev/null
+++ b/spring-boot-testing/src/main/java/com/baeldung/boot/embeddedRedis/configuration/RedisProperties.java
@@ -0,0 +1,23 @@
+package com.baeldung.boot.embeddedRedis.configuration;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class RedisProperties {
+    private final int redisPort;
+    private final String redisHost;
+
+    public RedisProperties(@Value("${spring.redis.port}") final int redisPort, @Value("${spring.redis.host}") final String redisHost) {
+        this.redisPort = redisPort;
+        this.redisHost = redisHost;
+    }
+
+    public int getRedisPort() {
+        return redisPort;
+    }
+
+    public String getRedisHost() {
+        return redisHost;
+    }
+}
diff --git a/spring-boot-testing/src/main/java/com/baeldung/boot/embeddedRedis/domain/User.java b/spring-boot-testing/src/main/java/com/baeldung/boot/embeddedRedis/domain/User.java
new file mode 100644
index 0000000000..41657aaa66
--- /dev/null
+++ b/spring-boot-testing/src/main/java/com/baeldung/boot/embeddedRedis/domain/User.java
@@ -0,0 +1,25 @@
+package com.baeldung.boot.embeddedRedis.domain;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.redis.core.RedisHash;
+
+import java.util.UUID;
+
+@RedisHash("user")
+public class User {
+    @Id private UUID id;
+    private String name;
+
+    public User(UUID id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/spring-boot-testing/src/main/java/com/baeldung/boot/embeddedRedis/domain/repository/UserRepository.java b/spring-boot-testing/src/main/java/com/baeldung/boot/embeddedRedis/domain/repository/UserRepository.java
new file mode 100644
index 0000000000..0558bb8482
--- /dev/null
+++ b/spring-boot-testing/src/main/java/com/baeldung/boot/embeddedRedis/domain/repository/UserRepository.java
@@ -0,0 +1,10 @@
+package com.baeldung.boot.embeddedRedis.domain.repository;
+
+import com.baeldung.boot.embeddedRedis.domain.User;
+import org.springframework.data.repository.CrudRepository;
+
+import java.util.UUID;
+
+public interface UserRepository extends CrudRepository<User, UUID> {
+
+}
diff --git a/spring-boot-testing/src/main/resources/application.properties b/spring-boot-testing/src/main/resources/application.properties
index e378aacdd5..8dc7f6e3c3 100644
--- a/spring-boot-testing/src/main/resources/application.properties
+++ b/spring-boot-testing/src/main/resources/application.properties
@@ -1,3 +1,6 @@
+# embedded redis
+spring.redis.host= localhost
+spring.redis.port= 6379
 
 # security
 spring.security.user.name=john
diff --git a/spring-boot-testing/src/test/java/com/baeldung/boot/SpringContextTest.java b/spring-boot-testing/src/test/java/com/baeldung/boot/SpringContextTest.java
new file mode 100644
index 0000000000..f3c8b9a954
--- /dev/null
+++ b/spring-boot-testing/src/test/java/com/baeldung/boot/SpringContextTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.boot;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot-testing/src/test/java/com/baeldung/boot/embeddedRedis/TestRedisConfiguration.java b/spring-boot-testing/src/test/java/com/baeldung/boot/embeddedRedis/TestRedisConfiguration.java
new file mode 100644
index 0000000000..b4748bcd38
--- /dev/null
+++ b/spring-boot-testing/src/test/java/com/baeldung/boot/embeddedRedis/TestRedisConfiguration.java
@@ -0,0 +1,28 @@
+package com.baeldung.boot.embeddedRedis;
+
+import com.baeldung.boot.embeddedRedis.configuration.RedisProperties;
+import org.springframework.boot.test.context.TestConfiguration;
+import redis.embedded.RedisServer;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+@TestConfiguration
+public class TestRedisConfiguration {
+
+    private final RedisServer redisServer;
+
+    public TestRedisConfiguration(final RedisProperties redisProperties) {
+        this.redisServer = new RedisServer(redisProperties.getRedisPort());
+    }
+
+    @PostConstruct
+    public void postConstruct() {
+        redisServer.start();
+    }
+
+    @PreDestroy
+    public void preDestroy() {
+        redisServer.stop();
+    }
+}
diff --git a/spring-boot-testing/src/test/java/com/baeldung/boot/embeddedRedis/domain/repository/UserRepositoryIntegrationTest.java b/spring-boot-testing/src/test/java/com/baeldung/boot/embeddedRedis/domain/repository/UserRepositoryIntegrationTest.java
new file mode 100644
index 0000000000..9577ccf0e8
--- /dev/null
+++ b/spring-boot-testing/src/test/java/com/baeldung/boot/embeddedRedis/domain/repository/UserRepositoryIntegrationTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.boot.embeddedRedis.domain.repository;
+
+import com.baeldung.boot.embeddedRedis.TestRedisConfiguration;
+import com.baeldung.boot.embeddedRedis.domain.User;
+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.test.context.junit4.SpringRunner;
+
+import java.util.UUID;
+
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = TestRedisConfiguration.class)
+public class UserRepositoryIntegrationTest {
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Test
+    public void shouldSaveUser_toRedis() {
+        final UUID id = UUID.randomUUID();
+        final User user = new User(id, "name");
+
+        final User saved = userRepository.save(user);
+
+        assertNotNull(saved);
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-testing/src/test/resources/application-test.properties b/spring-boot-testing/src/test/resources/application-test.properties
new file mode 100644
index 0000000000..a2c9b6d480
--- /dev/null
+++ b/spring-boot-testing/src/test/resources/application-test.properties
@@ -0,0 +1,2 @@
+# test properties
+spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
\ No newline at end of file
diff --git a/spring-boot-testing/src/test/resources/application.properties b/spring-boot-testing/src/test/resources/application.properties
new file mode 100644
index 0000000000..0c5b0e13e6
--- /dev/null
+++ b/spring-boot-testing/src/test/resources/application.properties
@@ -0,0 +1,6 @@
+#embedded redis
+spring.redis.host= localhost
+spring.redis.port= 6370
+# security
+spring.security.user.name=john
+spring.security.user.password=123
\ No newline at end of file
diff --git a/spring-boot-vue/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-vue/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..16e0708fc9
--- /dev/null
+++ b/spring-boot-vue/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.springbootmvc.SpringBootMvcApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringBootMvcApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-boot/.attach_pid12812 b/spring-boot/.attach_pid12812
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/spring-boot/README.MD b/spring-boot/README.MD
index d7af3f4614..e159220cbc 100644
--- a/spring-boot/README.MD
+++ b/spring-boot/README.MD
@@ -5,7 +5,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 - [A Guide to Spring in Eclipse STS](http://www.baeldung.com/eclipse-sts-spring)
 - [The @ServletComponentScan Annotation in Spring Boot](http://www.baeldung.com/spring-servletcomponentscan)
-- [Intro to Building an Application with Spring Boot](http://www.baeldung.com/intro-to-spring-boot)
 - [How to Register a Servlet in Java](http://www.baeldung.com/register-servlet)
 - [Guide to Spring WebUtils and ServletRequestUtils](http://www.baeldung.com/spring-webutils-servletrequestutils)
 - [Using Custom Banners in Spring Boot](http://www.baeldung.com/spring-boot-custom-banners)
@@ -30,10 +29,9 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Spring Shutdown Callbacks](http://www.baeldung.com/spring-shutdown-callbacks)
 - [Container Configuration in Spring Boot 2](http://www.baeldung.com/embeddedservletcontainercustomizer-configurableembeddedservletcontainer-spring-boot)
 - [Introduction to Chaos Monkey](https://www.baeldung.com/spring-boot-chaos-monkey)
-- [Spring Component Scanning](https://www.baeldung.com/spring-component-scanning)
 - [Load Spring Boot Properties From a JSON File](https://www.baeldung.com/spring-boot-json-properties)
 - [Display Auto-Configuration Report in Spring Boot](https://www.baeldung.com/spring-boot-auto-configuration-report)
 - [Injecting Git Information Into Spring](https://www.baeldung.com/spring-git-information)
 - [Validation in Spring Boot](https://www.baeldung.com/spring-boot-bean-validation)
 - [Guide to Creating and Running a Jar File in Java](https://www.baeldung.com/java-create-jar)
-- [Entity To DTO Conversion for a Spring REST API](https://www.baeldung.com/entity-to-and-from-dto-for-a-java-spring-application)
+- [Guide to @EnableConfigurationProperties](https://www.baeldung.com/spring-enable-config-properties)
diff --git a/spring-boot/src/main/java/com/baeldung/properties/conversion/Employee.java b/spring-boot/src/main/java/com/baeldung/properties/conversion/Employee.java
new file mode 100644
index 0000000000..52c7881dfc
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/properties/conversion/Employee.java
@@ -0,0 +1,30 @@
+package com.baeldung.properties.conversion;
+
+public class Employee {
+
+    private String name;
+    private double salary;
+
+    public Employee(String name, double salary) {
+        super();
+        this.name = name;
+        this.salary = salary;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public double getSalary() {
+        return salary;
+    }
+
+    public void setSalary(double salary) {
+        this.salary = salary;
+    }
+
+}
diff --git a/spring-boot/src/main/java/com/baeldung/properties/conversion/EmployeeConverter.java b/spring-boot/src/main/java/com/baeldung/properties/conversion/EmployeeConverter.java
new file mode 100644
index 0000000000..6ec19cae72
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/properties/conversion/EmployeeConverter.java
@@ -0,0 +1,16 @@
+package com.baeldung.properties.conversion;
+
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationPropertiesBinding
+public class EmployeeConverter implements Converter<String, Employee> {
+
+    @Override
+    public Employee convert(String from) {
+        String[] data = from.split(",");
+        return new Employee(data[0], Double.parseDouble(data[1]));
+    }
+}
diff --git a/spring-boot/src/main/java/com/baeldung/properties/conversion/PropertiesConversionApplication.java b/spring-boot/src/main/java/com/baeldung/properties/conversion/PropertiesConversionApplication.java
new file mode 100644
index 0000000000..f00a26e9c4
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/properties/conversion/PropertiesConversionApplication.java
@@ -0,0 +1,14 @@
+package com.baeldung.properties.conversion;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+@SpringBootApplication
+@ComponentScan(basePackageClasses = { PropertyConversion.class, EmployeeConverter.class })
+public class PropertiesConversionApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(PropertiesConversionApplication.class, args);
+    }
+
+}
diff --git a/spring-boot/src/main/java/com/baeldung/properties/conversion/PropertyConversion.java b/spring-boot/src/main/java/com/baeldung/properties/conversion/PropertyConversion.java
new file mode 100644
index 0000000000..b9c890306f
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/properties/conversion/PropertyConversion.java
@@ -0,0 +1,92 @@
+package com.baeldung.properties.conversion;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.convert.DataSizeUnit;
+import org.springframework.boot.convert.DurationUnit;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.util.unit.DataSize;
+import org.springframework.util.unit.DataUnit;
+
+@Configuration
+@PropertySource("classpath:conversion.properties")
+@ConfigurationProperties(prefix = "conversion")
+public class PropertyConversion {
+    private Duration timeInDefaultUnit;
+
+    private Duration timeInNano;
+
+    @DurationUnit(ChronoUnit.DAYS)
+    private Duration timeInDays;
+
+    private DataSize sizeInDefaultUnit;
+
+    private DataSize sizeInGB;
+
+    @DataSizeUnit(DataUnit.TERABYTES)
+    private DataSize sizeInTB;
+
+    private Employee employee;
+
+    // Getters and setters
+
+    public Duration getTimeInDefaultUnit() {
+        return timeInDefaultUnit;
+    }
+
+    public void setTimeInDefaultUnit(Duration timeInDefaultUnit) {
+        this.timeInDefaultUnit = timeInDefaultUnit;
+    }
+
+    public Duration getTimeInNano() {
+        return timeInNano;
+    }
+
+    public void setTimeInNano(Duration timeInNano) {
+        this.timeInNano = timeInNano;
+    }
+
+    public Duration getTimeInDays() {
+        return timeInDays;
+    }
+
+    public void setTimeInDays(Duration timeInDays) {
+        this.timeInDays = timeInDays;
+    }
+
+    public DataSize getSizeInDefaultUnit() {
+        return sizeInDefaultUnit;
+    }
+
+    public void setSizeInDefaultUnit(DataSize sizeInDefaultUnit) {
+        this.sizeInDefaultUnit = sizeInDefaultUnit;
+    }
+
+    public DataSize getSizeInGB() {
+        return sizeInGB;
+    }
+
+    public void setSizeInGB(DataSize sizeInGB) {
+        this.sizeInGB = sizeInGB;
+    }
+
+    public DataSize getSizeInTB() {
+        return sizeInTB;
+    }
+
+    public void setSizeInTB(DataSize sizeInTB) {
+        this.sizeInTB = sizeInTB;
+    }
+
+    public Employee getEmployee() {
+        return employee;
+    }
+
+    public void setEmployee(Employee employee) {
+        this.employee = employee;
+    }
+
+}
diff --git a/spring-boot/src/test/java/com/baeldung/properties/conversion/PropertiesConversionIntegrationTest.java b/spring-boot/src/test/java/com/baeldung/properties/conversion/PropertiesConversionIntegrationTest.java
new file mode 100644
index 0000000000..53bad329ea
--- /dev/null
+++ b/spring-boot/src/test/java/com/baeldung/properties/conversion/PropertiesConversionIntegrationTest.java
@@ -0,0 +1,46 @@
+package com.baeldung.properties.conversion;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.time.Duration;
+
+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.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.unit.DataSize;
+
+import com.baeldung.properties.conversion.PropertiesConversionApplication;
+import com.baeldung.properties.conversion.PropertyConversion;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = PropertiesConversionApplication.class)
+@TestPropertySource("classpath:conversion.properties")
+public class PropertiesConversionIntegrationTest {
+
+    @Autowired
+    private PropertyConversion properties;
+
+    @Test
+    public void whenUseTimeUnitPropertyConversion_thenSuccess() throws Exception {
+        assertEquals(Duration.ofMillis(10), properties.getTimeInDefaultUnit());
+        assertEquals(Duration.ofNanos(9), properties.getTimeInNano());
+        assertEquals(Duration.ofDays(2), properties.getTimeInDays());
+    }
+
+    @Test
+    public void whenUseDataSizePropertyConversion_thenSuccess() throws Exception {
+        assertEquals(DataSize.ofBytes(300), properties.getSizeInDefaultUnit());
+        assertEquals(DataSize.ofGigabytes(2), properties.getSizeInGB());
+        assertEquals(DataSize.ofTerabytes(4), properties.getSizeInTB());        
+    }
+   
+    @Test
+    public void whenUseCustomPropertyConverter_thenSuccess() throws Exception {
+        assertEquals("john", properties.getEmployee().getName());
+        assertEquals(2000.0, properties.getEmployee().getSalary());
+    }
+    
+}
diff --git a/spring-boot/src/test/resources/conversion.properties b/spring-boot/src/test/resources/conversion.properties
new file mode 100644
index 0000000000..640442ec33
--- /dev/null
+++ b/spring-boot/src/test/resources/conversion.properties
@@ -0,0 +1,11 @@
+###### time unit
+conversion.timeInDefaultUnit=10
+conversion.timeInNano=9ns
+conversion.timeInDays=2
+
+###### data size
+conversion.sizeInDefaultUnit=300
+conversion.sizeInGB=2GB
+conversion.sizeInTB=4
+
+conversion.employee=john,2000
\ No newline at end of file
diff --git a/spring-cloud-bus/spring-cloud-config-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-bus/spring-cloud-config-client/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..a5ab1342a1
--- /dev/null
+++ b/spring-cloud-bus/spring-cloud-config-client/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.SpringCloudConfigClientApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringCloudConfigClientApplication.class)
+public class SpringContextTest {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}
diff --git a/spring-cloud-bus/spring-cloud-config-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-bus/spring-cloud-config-server/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..19ca53c4a7
--- /dev/null
+++ b/spring-cloud-bus/spring-cloud-config-server/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.SpringCloudConfigServerApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringCloudConfigServerApplication.class)
+public class SpringContextTest {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}
diff --git a/spring-cloud-data-flow/batch-job/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-data-flow/batch-job/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..3ac11452d3
--- /dev/null
+++ b/spring-cloud-data-flow/batch-job/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.baeldung.spring.cloud.JobConfiguration;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@ContextConfiguration(classes = JobConfiguration.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud-data-flow/data-flow-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-data-flow/data-flow-server/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..83cb8067cf
--- /dev/null
+++ b/spring-cloud-data-flow/data-flow-server/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.spring.cloud.DataFlowServerApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = DataFlowServerApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud-data-flow/data-flow-shell/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-data-flow/data-flow-shell/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..c456f69979
--- /dev/null
+++ b/spring-cloud-data-flow/data-flow-shell/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.baeldung.spring.cloud.DataFlowShellApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = DataFlowShellApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void contextLoads() {
+    }
+
+}
diff --git a/spring-cloud-data-flow/log-sink/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-data-flow/log-sink/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..42903189d3
--- /dev/null
+++ b/spring-cloud-data-flow/log-sink/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.baeldung.spring.cloud.LogSinkApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = LogSinkApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void contextLoads() {
+    }
+
+}
diff --git a/spring-cloud-data-flow/time-processor/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-data-flow/time-processor/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..d090e626d2
--- /dev/null
+++ b/spring-cloud-data-flow/time-processor/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.baeldung.spring.cloud.TimeProcessorApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = TimeProcessorApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void contextLoads() {
+    }
+
+}
diff --git a/spring-cloud-data-flow/time-source/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud-data-flow/time-source/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..e19b88de90
--- /dev/null
+++ b/spring-cloud-data-flow/time-source/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.baeldung.spring.cloud.TimeSourceApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = TimeSourceApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void contextLoads() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextTest.java b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextTest.java
new file mode 100644
index 0000000000..7e38329f88
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.spring.cloud.archaius.additionalsources;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = AdditionalSourcesSimpleApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-userservice/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextIntegrationTest.java
similarity index 54%
rename from spring-userservice/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextIntegrationTest.java
index 825b89eb10..818e313c98 100644
--- a/spring-userservice/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextIntegrationTest.java
@@ -1,18 +1,16 @@
-package org.baeldung;
+package com.baeldung.spring.cloud.archaius.basic;
 
-import org.baeldung.custom.config.MvcConfig;
-import org.baeldung.custom.config.PersistenceDerbyJPAConfig;
-import org.baeldung.custom.config.SecSecurityConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = { MvcConfig.class, PersistenceDerbyJPAConfig.class, SecSecurityConfig.class })
+@SpringBootTest
 public class SpringContextIntegrationTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
     }
+
 }
diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextTest.java b/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextTest.java
new file mode 100644
index 0000000000..e88ec436c6
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.archaius.basic;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..7674713ff8
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.archaius.basic.BasicArchaiusApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = BasicArchaiusApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..a03bd8c23b
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.archaius.extraconfigs.ExtraConfigsApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ExtraConfigsApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextTest.java b/spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextTest.java
new file mode 100644
index 0000000000..5d3bc8e741
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.spring.cloud.archaius.jdbconfig;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = JdbcSourcesApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-aws/.attach_pid23938 b/spring-cloud/spring-cloud-aws/.attach_pid23938
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/spring-cloud/spring-cloud-bootstrap/config/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-bootstrap/config/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..98ae3e4895
--- /dev/null
+++ b/spring-cloud/spring-cloud-bootstrap/config/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.bootstrap.config.ConfigApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ConfigApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml b/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml
index 4f9c60a26a..6cbaa5ac2d 100644
--- a/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml
+++ b/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml
@@ -97,6 +97,7 @@
             </plugin>
         </plugins>
     </build>
+
     <properties>
         <spring-cloud-dependencies.version>Dalston.RELEASE</spring-cloud-dependencies.version>
     </properties>
diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..dc635cd003
--- /dev/null
+++ b/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextIntegrationTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.bootstrap.gateway;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringContextIntegrationTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextTest.java b/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextTest.java
new file mode 100644
index 0000000000..a2d1cd1087
--- /dev/null
+++ b/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.bootstrap.gateway;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-bootstrap/zipkin/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-bootstrap/zipkin/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..76b7539b6b
--- /dev/null
+++ b/spring-cloud/spring-cloud-bootstrap/zipkin/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.bootstrap.zipkin.ZipkinApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ZipkinApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-config/client/pom.xml b/spring-cloud/spring-cloud-config/client/pom.xml
index c55f9bc471..14b0d2f9b1 100644
--- a/spring-cloud/spring-cloud-config/client/pom.xml
+++ b/spring-cloud/spring-cloud-config/client/pom.xml
@@ -20,8 +20,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            </dependency>
-
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-cloud/spring-cloud-config/server/pom.xml b/spring-cloud/spring-cloud-config/server/pom.xml
index b4be7663e2..674749a48d 100644
--- a/spring-cloud/spring-cloud-config/server/pom.xml
+++ b/spring-cloud/spring-cloud-config/server/pom.xml
@@ -24,8 +24,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            </dependency>
-
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java b/spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java
new file mode 100644
index 0000000000..d879737553
--- /dev/null
+++ b/spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.config.server;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = ConfigServer.class)
+@WebAppConfiguration
+public class SpringContextTest {
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextTest.java b/spring-cloud/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextTest.java
new file mode 100644
index 0000000000..c6066027f5
--- /dev/null
+++ b/spring-cloud/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextTest.java
@@ -0,0 +1,17 @@
+package com.baeldung.spring.cloud.connectors.heroku;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.connectors.heroku.ConnectorsHerokuApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ConnectorsHerokuApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-contract/pom.xml b/spring-cloud/spring-cloud-contract/pom.xml
index ea71891648..a7ee52e954 100644
--- a/spring-cloud/spring-cloud-contract/pom.xml
+++ b/spring-cloud/spring-cloud-contract/pom.xml
@@ -56,7 +56,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
         <spring-cloud.version>2.1.1.RELEASE</spring-cloud.version>
         <spring-boot.version>2.1.4.RELEASE</spring-boot.version>
     </properties>
diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..e9098b1467
--- /dev/null
+++ b/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.springcloudcontractconsumer.SpringCloudContractConsumerApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringCloudContractConsumerApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/pom.xml b/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/pom.xml
index dffbd29206..7a0fa7db10 100644
--- a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/pom.xml
+++ b/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/pom.xml
@@ -31,6 +31,7 @@
             <artifactId>spring-boot-starter-data-rest</artifactId>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..7d77cbbd7a
--- /dev/null
+++ b/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.springcloudcontractproducer.SpringCloudContractProducerApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringCloudContractProducerApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-eureka/pom.xml b/spring-cloud/spring-cloud-eureka/pom.xml
index e8e3d67805..5afb006d41 100644
--- a/spring-cloud/spring-cloud-eureka/pom.xml
+++ b/spring-cloud/spring-cloud-eureka/pom.xml
@@ -9,18 +9,18 @@
     <description>Spring Cloud Eureka Server and Sample Clients</description>
     <packaging>pom</packaging>
 
-    <modules>
-        <module>spring-cloud-eureka-server</module>
-        <module>spring-cloud-eureka-client</module>
-        <module>spring-cloud-eureka-feign-client</module>
-    </modules>
-
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
+
+    <modules>
+        <module>spring-cloud-eureka-server</module>
+        <module>spring-cloud-eureka-client</module>
+        <module>spring-cloud-eureka-feign-client</module>
+    </modules>
     
     <dependencies>
         <dependency>
diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java
new file mode 100644
index 0000000000..a3ed012abb
--- /dev/null
+++ b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.eureka.client;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringContextTest {
+    
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextTest.java b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextTest.java
new file mode 100644
index 0000000000..ac8150defa
--- /dev/null
+++ b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.feign.client;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java
new file mode 100644
index 0000000000..e7996bd316
--- /dev/null
+++ b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.eureka.server;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-functions/pom.xml b/spring-cloud/spring-cloud-functions/pom.xml
index 7a44e4ae0f..82147cea28 100644
--- a/spring-cloud/spring-cloud-functions/pom.xml
+++ b/spring-cloud/spring-cloud-functions/pom.xml
@@ -29,7 +29,7 @@
          <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-function-web</artifactId>
-            <version>1.0.1.RELEASE</version>
+            <version>${spring-cloud-function.version}</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-core</artifactId>
-            <version>1.1.0</version>
+            <version>${aws-lambda-java-core.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -87,6 +87,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <spring-cloud-function.version>1.0.1.RELEASE</spring-cloud-function.version>
         <aws-lambda-events.version>2.0.2</aws-lambda-events.version>
+        <aws-lambda-java-core.version>1.1.0</aws-lambda-java-core.version>
         <spring-boot.version>2.0.4.RELEASE</spring-boot.version>
     </properties>
 
diff --git a/spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextTest.java b/spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextTest.java
new file mode 100644
index 0000000000..67411ebd4a
--- /dev/null
+++ b/spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.spring.cloudfunction.aws;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = CloudFunctionAwsApplication.class)
+public class SpringContextTest {
+    
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-gateway/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..b7e2acf7a8
--- /dev/null
+++ b/spring-cloud/spring-cloud-gateway/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.GatewayApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = GatewayApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java b/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java
new file mode 100644
index 0000000000..d5f8180f20
--- /dev/null
+++ b/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java
@@ -0,0 +1,18 @@
+package com.baeldung.spring.cloud.hystrix.rest.consumer;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = RestConsumerFeignApplication.class)
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java b/spring-cloud/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java
new file mode 100644
index 0000000000..d3260a4517
--- /dev/null
+++ b/spring-cloud/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java
@@ -0,0 +1,18 @@
+package com.baeldung.spring.cloud.hystrix.rest.consumer;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = RestConsumerApplication.class)
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java b/spring-cloud/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java
new file mode 100644
index 0000000000..bd871fc1da
--- /dev/null
+++ b/spring-cloud/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.hystrix.rest.producer;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-kubernetes/client-service/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-kubernetes/client-service/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..af59614f7c
--- /dev/null
+++ b/spring-cloud/spring-cloud-kubernetes/client-service/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.kubernetes.client.Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void contextLoads() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-kubernetes/demo-backend/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-kubernetes/demo-backend/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..af393cb697
--- /dev/null
+++ b/spring-cloud/spring-cloud-kubernetes/demo-backend/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.kubernetes.backend.KubernetesBackendApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = KubernetesBackendApplication.class)
+public class SpringContextTest {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}
diff --git a/spring-cloud/spring-cloud-kubernetes/demo-frontend/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-kubernetes/demo-frontend/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..17cb5a5f39
--- /dev/null
+++ b/spring-cloud/spring-cloud-kubernetes/demo-frontend/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.kubernetes.frontend.KubernetesFrontendApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = KubernetesFrontendApplication.class)
+public class SpringContextTest {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}
diff --git a/spring-cloud/spring-cloud-kubernetes/liveness-example/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-kubernetes/liveness-example/src/test/java/com/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..7c605567d8
--- /dev/null
+++ b/spring-cloud/spring-cloud-kubernetes/liveness-example/src/test/java/com/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package com.baeldung;
+
+import com.baeldung.liveness.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}
diff --git a/spring-cloud/spring-cloud-kubernetes/readiness-example/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-kubernetes/readiness-example/src/test/java/com/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..59802d220a
--- /dev/null
+++ b/spring-cloud/spring-cloud-kubernetes/readiness-example/src/test/java/com/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package com.baeldung;
+
+import com.baeldung.readiness.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}
diff --git a/spring-cloud/spring-cloud-kubernetes/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextTest.java b/spring-cloud/spring-cloud-kubernetes/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextTest.java
new file mode 100644
index 0000000000..6e7f99fb0d
--- /dev/null
+++ b/spring-cloud/spring-cloud-kubernetes/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.kubernetes.travelagency;
+
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+    
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-openfeign/pom.xml b/spring-cloud/spring-cloud-openfeign/pom.xml
index 002a333749..92de33572b 100644
--- a/spring-cloud/spring-cloud-openfeign/pom.xml
+++ b/spring-cloud/spring-cloud-openfeign/pom.xml
@@ -9,7 +9,6 @@
     <name>openfeign</name>
     <description>OpenFeign project for Spring Boot</description>
 
-
     <parent>
         <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
@@ -17,12 +16,6 @@
         <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
-    <properties>
-        <spring-boot.version>2.0.1.RELEASE</spring-boot.version>
-        <spring-cloud.version>Finchley.SR2</spring-cloud.version>
-    </properties>
-
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -58,4 +51,9 @@
         </dependencies>
     </dependencyManagement>
 
+    <properties>
+        <spring-boot.version>2.0.1.RELEASE</spring-boot.version>
+        <spring-cloud.version>Finchley.SR2</spring-cloud.version>
+    </properties>
+
 </project>
diff --git a/spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java b/spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java
new file mode 100644
index 0000000000..4bf35f74f4
--- /dev/null
+++ b/spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.cloud.openfeign;
+
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ExampleApplication.class)
+public class SpringContextTest {
+    
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..1b4083e7a6
--- /dev/null
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,15 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringCloudRestConfigApplication.class)
+public class SpringContextTest {
+    @Test
+    public void contextLoads() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-ribbon-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-ribbon-client/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..23dbcf8ff6
--- /dev/null
+++ b/spring-cloud/spring-cloud-ribbon-client/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.ribbon.client.ServerLocationApp;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ServerLocationApp.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-security/auth-client/pom.xml b/spring-cloud/spring-cloud-security/auth-client/pom.xml
index 4152552640..c414e584e5 100644
--- a/spring-cloud/spring-cloud-security/auth-client/pom.xml
+++ b/spring-cloud/spring-cloud-security/auth-client/pom.xml
@@ -13,6 +13,18 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -78,18 +90,6 @@
         </plugins>
     </build>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <properties>
         <js-cookie.version>2.2.0</js-cookie.version>
         <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
diff --git a/spring-cloud/spring-cloud-security/auth-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-security/auth-client/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..02c429acf5
--- /dev/null
+++ b/spring-cloud/spring-cloud-security/auth-client/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.CloudSite;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = CloudSite.class)
+public class SpringContextTest {
+
+	@Test
+	public void contextLoads() {
+	}
+
+}
diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-security/auth-resource/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..a061928bf5
--- /dev/null
+++ b/spring-cloud/spring-cloud-security/auth-resource/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void contextLoads() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-security/auth-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-security/auth-server/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..aec56a574c
--- /dev/null
+++ b/spring-cloud/spring-cloud-security/auth-server/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.AuthServer;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = AuthServer.class)
+public class SpringContextTest {
+
+    @Test
+    public void contextLoads() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextTest.java b/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextTest.java
new file mode 100644
index 0000000000..d78a18d557
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.twitterhdfs.aggregate;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = AggregateApp.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml
new file mode 100644
index 0000000000..13ad18810e
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml
@@ -0,0 +1,109 @@
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+
+    <artifactId>spring-cloud-stream-kafka</artifactId>
+    <name>spring-cloud-stream-kafka</name>
+    <description>Simple Spring Cloud Stream</description>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.1.5.RELEASE</version>
+    </parent>
+
+    <properties>
+        <java.version>1.8</java.version>
+        <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-stream-binder-kafka</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-stream-schema</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-stream-test-support</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.confluent</groupId>
+            <artifactId>kafka-avro-serializer</artifactId>
+            <version>4.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro-compiler</artifactId>
+            <version>1.8.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.avro</groupId>
+            <artifactId>avro-maven-plugin</artifactId>
+            <version>1.8.2</version>
+        </dependency>
+
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.avro</groupId>
+                <artifactId>avro-maven-plugin</artifactId>
+                <version>1.8.2</version>
+                <executions>
+                    <execution>
+                        <id>schemas</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>schema</goal>
+                            <goal>protocol</goal>
+                            <goal>idl-protocol</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirectory>${project.basedir}/src/main/resources/</sourceDirectory>
+                            <outputDirectory>${project.basedir}/src/main/java/</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>confluent</id>
+            <url>https://packages.confluent.io/maven/</url>
+        </repository>
+    </repositories>
+
+</project>
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/AvroKafkaApplication.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/AvroKafkaApplication.java
new file mode 100644
index 0000000000..47c060c143
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/AvroKafkaApplication.java
@@ -0,0 +1,18 @@
+package com.baeldung;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.stream.annotation.EnableBinding;
+import org.springframework.cloud.stream.messaging.Processor;
+import org.springframework.cloud.stream.schema.client.EnableSchemaRegistryClient;
+
+@SpringBootApplication
+@EnableBinding(Processor.class)
+@EnableSchemaRegistryClient
+public class AvroKafkaApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(AvroKafkaApplication.class, args);
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/config/SchemRegistryConfig.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/config/SchemRegistryConfig.java
new file mode 100644
index 0000000000..38ac94d952
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/config/SchemRegistryConfig.java
@@ -0,0 +1,18 @@
+package com.baeldung.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.stream.schema.client.ConfluentSchemaRegistryClient;
+import org.springframework.cloud.stream.schema.client.SchemaRegistryClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class SchemRegistryConfig {
+
+    @Bean
+    public SchemaRegistryClient schemaRegistryClient(@Value("${spring.cloud.stream.kafka.binder.producer-properties.schema.registry.url}") String endPoint) {
+        ConfluentSchemaRegistryClient client = new ConfluentSchemaRegistryClient();
+        client.setEndpoint(endPoint);
+        return client;
+    }
+}
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/consumer/AvroConsumer.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/consumer/AvroConsumer.java
new file mode 100644
index 0000000000..477946dd73
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/consumer/AvroConsumer.java
@@ -0,0 +1,21 @@
+package com.baeldung.consumer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.stream.annotation.StreamListener;
+import org.springframework.cloud.stream.messaging.Processor;
+import org.springframework.stereotype.Service;
+
+import com.baeldung.schema.Employee;
+
+@Service
+public class AvroConsumer {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AvroConsumer.class);
+
+    @StreamListener(Processor.INPUT)
+    public void consumeEmployeeDetails(Employee employeeDetails) {
+        LOGGER.info("Let's process employee details: {}", employeeDetails);
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/controller/AvroController.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/controller/AvroController.java
new file mode 100644
index 0000000000..b98b27c9fe
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/controller/AvroController.java
@@ -0,0 +1,22 @@
+package com.baeldung.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baeldung.producer.AvroProducer;
+
+@RestController
+public class AvroController {
+
+    @Autowired
+    private AvroProducer avroProducer;
+
+    @PostMapping("/employees/{id}/{firstName}/{lastName}")
+    public String producerAvroMessage(@PathVariable int id, @PathVariable String firstName, @PathVariable String lastName) {
+        avroProducer.produceEmployeeDetails(id, firstName, lastName);
+        return "Sent employee details to consumer";
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/producer/AvroProducer.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/producer/AvroProducer.java
new file mode 100644
index 0000000000..ff7729dd8c
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/producer/AvroProducer.java
@@ -0,0 +1,42 @@
+package com.baeldung.producer;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.stream.messaging.Processor;
+import org.springframework.kafka.support.KafkaHeaders;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.support.MessageBuilder;
+import org.springframework.stereotype.Service;
+
+import com.baeldung.schema.Employee;
+import com.baeldung.schema.EmployeeKey;
+
+@Service
+public class AvroProducer {
+
+    @Autowired
+    private Processor processor;
+
+    public void produceEmployeeDetails(int empId, String firstName, String lastName) {
+
+        // creating employee details
+        Employee employee = new Employee();
+        employee.setId(empId);
+        employee.setFirstName(firstName);
+        employee.setLastName(lastName);
+        employee.setDepartment("IT");
+        employee.setDesignation("Engineer");
+
+        // creating partition key for kafka topic
+        EmployeeKey employeeKey = new EmployeeKey();
+        employeeKey.setId(empId);
+        employeeKey.setDepartmentName("IT");
+
+        Message<Employee> message = MessageBuilder.withPayload(employee)
+            .setHeader(KafkaHeaders.MESSAGE_KEY, employeeKey)
+            .build();
+
+        processor.output()
+            .send(message);
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/application.yaml b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/application.yaml
new file mode 100644
index 0000000000..2e30c07374
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/application.yaml
@@ -0,0 +1,29 @@
+spring:
+  cloud:
+    stream:
+      default: 
+         producer: 
+          useNativeEncoding: true
+         consumer:  
+          useNativeEncoding: true     
+      bindings:
+        input:
+          destination: employee-details
+          content-type: application/*+avro
+          group: group-1
+          concurrency: 3
+        output:
+          destination: employee-details
+          content-type: application/*+avro
+      kafka:
+          binder:        
+           producer-properties:
+             key.serializer: io.confluent.kafka.serializers.KafkaAvroSerializer
+             value.serializer: io.confluent.kafka.serializers.KafkaAvroSerializer
+             schema.registry.url: http://localhost:8081 
+           consumer-properties:
+             key.deserializer: io.confluent.kafka.serializers.KafkaAvroDeserializer
+             value.deserializer: io.confluent.kafka.serializers.KafkaAvroDeserializer
+             schema.registry.url: http://localhost:8081
+             specific.avro.reader: true
+                           
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-key-schema.avsc b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-key-schema.avsc
new file mode 100644
index 0000000000..d18d657e99
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-key-schema.avsc
@@ -0,0 +1,14 @@
+{
+	"type": "record",
+	"name": "EmployeeKey",
+	"namespace": "com.baeldung.schema",
+	"fields": [
+	 {
+		"name": "id",
+		"type": "int"
+	},
+	{
+		"name": "departmentName",
+		"type": "string"
+	}]
+}
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-schema.avsc b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-schema.avsc
new file mode 100644
index 0000000000..2abf57e4a2
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-schema.avsc
@@ -0,0 +1,29 @@
+{
+	"type": "record",
+	"name": "Employee",
+	"namespace": "com.baeldung.schema",
+	"fields": [
+	{
+		"name": "id",
+		"type": "int"
+	},
+	{
+		"name": "firstName",
+		"type": "string"
+	},
+	{
+		"name": "lastName",
+		"type": "string"
+	},
+	{
+		"name": "department",
+		"type": "string",
+		 "default": "IT "
+	},
+	{
+		"name": "designation",
+		"type": "string",
+		 "default": "Software Engineer"
+	}
+	]
+}
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..0f3b8de901
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.stream.rabbit.MultipleOutputsServiceApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = MultipleOutputsServiceApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..51f0926429
--- /dev/null
+++ b/spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.SpringCloudTaskFinal.SpringCloudTaskSinkApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringCloudTaskSinkApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-vault/pom.xml b/spring-cloud/spring-cloud-vault/pom.xml
index 9a1be3f5c0..faf27b6ac8 100644
--- a/spring-cloud/spring-cloud-vault/pom.xml
+++ b/spring-cloud/spring-cloud-vault/pom.xml
@@ -42,6 +42,18 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
+        <dependency>
+        	<groupId>org.springframework.boot</groupId>
+        	<artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <dependency>
+        	<groupId>org.springframework.boot</groupId>
+        	<artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+        	<groupId>org.springframework.boot</groupId>
+        	<artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
diff --git a/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/AccountRepo.java b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/AccountRepo.java
new file mode 100644
index 0000000000..318cc84957
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/AccountRepo.java
@@ -0,0 +1,10 @@
+package org.baeldung.spring.cloud.vaultsample;
+
+import org.baeldung.spring.cloud.vaultsample.domain.Account;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface AccountRepo extends JpaRepository<Account, Long>{
+
+}
diff --git a/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/AccountResource.java b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/AccountResource.java
new file mode 100644
index 0000000000..8fcaa9e2aa
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/AccountResource.java
@@ -0,0 +1,27 @@
+package org.baeldung.spring.cloud.vaultsample;
+
+import org.baeldung.spring.cloud.vaultsample.domain.Account;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class AccountResource {
+    @Autowired
+    private AccountRepo repo;
+
+    @GetMapping("/account/{id}")
+    public ResponseEntity<Account> getAccount(@PathVariable("id") Long id) {
+        
+        Account acc = repo.findById(id).orElse(null);
+        if ( acc != null ) {
+            return new ResponseEntity<Account>(acc, HttpStatus.OK);
+        }
+        else {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }        
+    } 
+}
diff --git a/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/SecretResource.java b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/SecretResource.java
new file mode 100644
index 0000000000..c4579da045
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/SecretResource.java
@@ -0,0 +1,37 @@
+/**
+ * 
+ */
+package org.baeldung.spring.cloud.vaultsample;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Philippe
+ *
+ */
+@RestController
+public class SecretResource {
+    
+    @Autowired
+    Environment env;
+    
+    @GetMapping("/secret/{key}")
+    public ResponseEntity<String> readSecret(@PathVariable("key") String key) {
+        
+        String value = env.getProperty(key);
+        
+        if ( value != null ) {        
+            return new ResponseEntity<String>(value, HttpStatus.OK);
+        }
+        else {
+            return new ResponseEntity<String>("not found", HttpStatus.NOT_FOUND);
+        }              
+    }
+}
diff --git a/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/domain/Account.java b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/domain/Account.java
new file mode 100644
index 0000000000..df4778831b
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/src/main/java/org/baeldung/spring/cloud/vaultsample/domain/Account.java
@@ -0,0 +1,133 @@
+/**
+ * 
+ */
+package org.baeldung.spring.cloud.vaultsample.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author Philippe
+ *
+ */
+@Entity
+@Table(name = "account")
+public class Account {
+
+    @Id
+    private Long id;
+
+    @NotNull
+    private String name;
+
+    private Long branchId;
+    private Long customerId;
+
+    /**
+     * @return the id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * @param id the id to set
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name the name to set
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * @return the branchId
+     */
+    public Long getBranchId() {
+        return branchId;
+    }
+
+    /**
+     * @param branchId the branchId to set
+     */
+    public void setBranchId(Long branchId) {
+        this.branchId = branchId;
+    }
+
+    /**
+     * @return the customerId
+     */
+    public Long getCustomerId() {
+        return customerId;
+    }
+
+    /**
+     * @param customerId the customerId to set
+     */
+    public void setCustomerId(Long customerId) {
+        this.customerId = customerId;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((branchId == null) ? 0 : branchId.hashCode());
+        result = prime * result + ((customerId == null) ? 0 : customerId.hashCode());
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Account other = (Account) obj;
+        if (branchId == null) {
+            if (other.branchId != null)
+                return false;
+        } else if (!branchId.equals(other.branchId))
+            return false;
+        if (customerId == null) {
+            if (other.customerId != null)
+                return false;
+        } else if (!customerId.equals(other.customerId))
+            return false;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id))
+            return false;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        return true;
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-vault/src/main/resources/application.yml b/spring-cloud/spring-cloud-vault/src/main/resources/application.yml
index 3d347ec855..1c75ac21e6 100644
--- a/spring-cloud/spring-cloud-vault/src/main/resources/application.yml
+++ b/spring-cloud/spring-cloud-vault/src/main/resources/application.yml
@@ -1,6 +1,11 @@
-spring:
-  application:
-    name: fakebank
-    
-  datasource:
-    url: jdbc:mysql://localhost:3306/fakebank
+spring:
+  application:
+    name: fakebank
+    
+  datasource:
+    url: jdbc:mysql://localhost:3306/fakebank?serverTimezone=GMT-3
+    hikari:
      connection-test-query: select 1
+      idle-timeout: 5000
+      max-lifetime: 120000
+      maximum-pool-size: 5
+      minimum-idle: 5
diff --git a/spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml b/spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml
index 1e837c4920..7d38b06c0f 100644
--- a/spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml
+++ b/spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml
@@ -4,8 +4,6 @@ spring:
       uri: https://localhost:8200
       connection-timeout: 5000
       read-timeout: 15000
-      config:
-          order: -10
           
       ssl:
         trust-store: classpath:/vault.jks
@@ -15,17 +13,19 @@ spring:
         enabled: true
         application-name: fakebank
         
-      kv:
-        enabled: false
-        backend: kv
-        application-name: fakebank
-        
+#      kv:
+#        enabled: false
+#        backend: kv
+#        application-name: fakebank
+#        
       database:
         enabled: true
         role: fakebank-accounts-rw
-#        backend: database
-#        username-property: spring.datasource.username
-#        password-property: spring.datasource.password
+        backend: database
+        username-property: spring.datasource.username
+        password-property: spring.datasource.password
+#
+#        
         
               
         
diff --git a/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/SpringContextTest.java b/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/SpringContextTest.java
new file mode 100644
index 0000000000..73fcbe55f0
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/src/test/java/org/baeldung/spring/cloud/vaultsample/SpringContextTest.java
@@ -0,0 +1,15 @@
+package org.baeldung.spring.cloud.vaultsample;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = VaultSampleApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-vault/src/test/vault-config/vault-test.hcl b/spring-cloud/spring-cloud-vault/src/test/vault-config/vault-test.hcl
index c880f2d744..d16665a744 100644
--- a/spring-cloud/spring-cloud-vault/src/test/vault-config/vault-test.hcl
+++ b/spring-cloud/spring-cloud-vault/src/test/vault-config/vault-test.hcl
@@ -17,4 +17,7 @@ listener "tcp" {
   tls_key_file = "./src/test/vault-config/localhost.key"
 }
 
+// Audit to stdout
+
+
 
diff --git a/spring-cloud/spring-cloud-vault/vault-cheatsheet.txt b/spring-cloud/spring-cloud-vault/vault-cheatsheet.txt
index b965a95321..2d5f2363ac 100644
--- a/spring-cloud/spring-cloud-vault/vault-cheatsheet.txt
+++ b/spring-cloud/spring-cloud-vault/vault-cheatsheet.txt
@@ -5,16 +5,13 @@
 2. Open another shell and execute the command below:
 > vault operator init
 
-Vault will output the unseal keys and root token: STORE THEM SAFELY !!!
+Unseal Key 1: Iwvpd4IVofhcmQ2HEIPs5HMUbz4tz6JhqmLZ6+1MhAPx
+Unseal Key 2: ANQDXUFGGtLtt6grX25YsdmeKELhM/ioKWzwFukJIe2f
+Unseal Key 3: 8MHyzFnOvlwVQzdWYJ3BIN4xPDOn8a4VemZ/Qe5HgurU
+Unseal Key 4: ywT9YR9OfxIpA4l1RniNNCvSZWAuNZsAEFRyD7aqFOrp
+Unseal Key 5: q1c7M+lnlT72jGLoCH+jjri6KGSBhc5lCzlT0I1R9URU
 
-Example output:
-Unseal Key 1: OfCseaSZzjTZmrxhfx+5clKobwLGCNiJdAlfixSG9E3o
-Unseal Key 2: iplVLPTHW0n0WL5XuI6QWwyNtWbKTek1SoKcG0gR7vdT
-Unseal Key 3: K0TleK3OYUvWFF+uIDsQuf5a+/gkv1PtZ3O47ornzRoF
-Unseal Key 4: +5zhysLAO4hIdZs0kiZpkrRovw11uQacfloiBwnZBJA/
-Unseal Key 5: GDwSq18lXV3Cw4MoHsKIH137kuI0mdl36UiD9WxOdulc
-
-Initial Root Token: d341fdaf-1cf9-936a-3c38-cf5eec94b5c0
+Initial Root Token: dee7107a-8819-0719-62a3-cea3ea854589
 
 ...
 
@@ -73,8 +70,8 @@ flush privileges;
 > vault write database/roles/fakebank-accounts-rw ^
     db_name=mysql-fakebank ^
     creation_statements="CREATE USER '{{name}}'@'%' IDENTIFIED BY '{{password}}';GRANT SELECT,INSERT,UPDATE ON fakebank.* TO '{{name}}'@'%';" ^
-    default_ttl="1m" ^
-    max_ttl="2m"  
+    default_ttl="5m" ^
+    max_ttl="30m"  
 	
 === Get credentials
 > vault read database/creds/fakebank-accounts-rw
diff --git a/spring-cloud/spring-cloud-vault/vault-unseal.bat b/spring-cloud/spring-cloud-vault/vault-unseal.bat
index 8133f90892..1e3f229fcf 100644
--- a/spring-cloud/spring-cloud-vault/vault-unseal.bat
+++ b/spring-cloud/spring-cloud-vault/vault-unseal.bat
@@ -1,7 +1,7 @@
 
 call %~dp0%/vault-env.bat
 
-vault operator unseal OfCseaSZzjTZmrxhfx+5clKobwLGCNiJdAlfixSG9E3o
-vault operator unseal iplVLPTHW0n0WL5XuI6QWwyNtWbKTek1SoKcG0gR7vdT
-vault operator unseal iplVLPTHW0n0WL5XuI6QWwyNtWbKTek1SoKcG0gR7vdT
-vault operator unseal K0TleK3OYUvWFF+uIDsQuf5a+/gkv1PtZ3O47ornzRoF
+vault operator unseal Iwvpd4IVofhcmQ2HEIPs5HMUbz4tz6JhqmLZ6+1MhAPx
+vault operator unseal ANQDXUFGGtLtt6grX25YsdmeKELhM/ioKWzwFukJIe2f
+vault operator unseal 8MHyzFnOvlwVQzdWYJ3BIN4xPDOn8a4VemZ/Qe5HgurU
+
diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/test/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-zookeeper/Greeting/src/test/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..b45e7b9889
--- /dev/null
+++ b/spring-cloud/spring-cloud-zookeeper/Greeting/src/test/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.ribbon.client.ServerLocationApp;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = GreetingApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java b/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java
new file mode 100644
index 0000000000..df7335dfa6
--- /dev/null
+++ b/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.helloworld;
+
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = HelloWorldApplication.class)
+public class SpringContextTest {
+    
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java
new file mode 100644
index 0000000000..9e3680b244
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.eureka.client;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java
new file mode 100644
index 0000000000..e7996bd316
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.eureka.server;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextTest.java b/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextTest.java
new file mode 100644
index 0000000000..a5350655fb
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.zuul.config;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-zuul/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java b/spring-cloud/spring-cloud-zuul/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java
new file mode 100644
index 0000000000..b5ddf6f65c
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java
@@ -0,0 +1,17 @@
+package com.baeldung.spring.cloud.zuulratelimitdemo.controller;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.cloud.zuulratelimitdemo.ZuulRatelimitDemoApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ZuulRatelimitDemoApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-core-2/pom.xml b/spring-core-2/pom.xml
new file mode 100644
index 0000000000..20cd900e00
--- /dev/null
+++ b/spring-core-2/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-core-2</artifactId>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-spring-5</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-spring-5</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.1</version>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <spring.version>5.1.4.RELEASE</spring.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-core-2/src/main/java/com/baeldung/getbean/AnnotationConfig.java b/spring-core-2/src/main/java/com/baeldung/getbean/AnnotationConfig.java
new file mode 100644
index 0000000000..12e3ab55e3
--- /dev/null
+++ b/spring-core-2/src/main/java/com/baeldung/getbean/AnnotationConfig.java
@@ -0,0 +1,22 @@
+package com.baeldung.getbean;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
+
+@Configuration
+class AnnotationConfig {
+
+    @Bean(name = {"tiger", "kitty"})
+    @Scope(value = "prototype")
+    Tiger getTiger(String name) {
+        return new Tiger(name);
+    }
+
+    @Bean(name = "lion")
+    Lion getLion() {
+        return new Lion("Hardcoded lion name");
+    }
+
+    interface Animal {}
+}
diff --git a/spring-core-2/src/main/java/com/baeldung/getbean/Lion.java b/spring-core-2/src/main/java/com/baeldung/getbean/Lion.java
new file mode 100644
index 0000000000..96c569aeb9
--- /dev/null
+++ b/spring-core-2/src/main/java/com/baeldung/getbean/Lion.java
@@ -0,0 +1,13 @@
+package com.baeldung.getbean;
+
+class Lion implements AnnotationConfig.Animal {
+    private String name;
+
+    Lion(String name) {
+        this.name = name;
+    }
+
+    String getName() {
+        return name;
+    }
+}
diff --git a/spring-core-2/src/main/java/com/baeldung/getbean/Tiger.java b/spring-core-2/src/main/java/com/baeldung/getbean/Tiger.java
new file mode 100644
index 0000000000..85b9626c79
--- /dev/null
+++ b/spring-core-2/src/main/java/com/baeldung/getbean/Tiger.java
@@ -0,0 +1,13 @@
+package com.baeldung.getbean;
+
+class Tiger implements AnnotationConfig.Animal {
+    private String name;
+
+    Tiger(String name) {
+        this.name = name;
+    }
+
+    String getName() {
+        return name;
+    }
+}
diff --git a/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByNameAndTypeUnitTest.java b/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByNameAndTypeUnitTest.java
new file mode 100644
index 0000000000..e06804c28e
--- /dev/null
+++ b/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByNameAndTypeUnitTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.getbean;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.springframework.beans.factory.BeanNotOfRequiredTypeException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class GetBeanByNameAndTypeUnitTest {
+    private ApplicationContext context;
+
+    @BeforeAll
+    void setup() {
+        context = new AnnotationConfigApplicationContext(AnnotationConfig.class);
+    }
+
+    @Test
+    void whenSpecifiedMatchingNameAndType_thenShouldReturnRelatedBean() {
+        Lion lion = context.getBean("lion", Lion.class);
+
+        assertEquals("Hardcoded lion name", lion.getName());
+    }
+
+    @Test
+    void whenSpecifiedNotMatchingNameAndType_thenShouldThrowException() {
+        assertThrows(BeanNotOfRequiredTypeException.class, () -> context.getBean("lion", Tiger.class));
+    }
+}
diff --git a/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByNameUnitTest.java b/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByNameUnitTest.java
new file mode 100644
index 0000000000..4d6d77e39d
--- /dev/null
+++ b/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByNameUnitTest.java
@@ -0,0 +1,40 @@
+package com.baeldung.getbean;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class GetBeanByNameUnitTest {
+    private ApplicationContext context;
+
+    @BeforeAll
+    void setup() {
+        context = new AnnotationConfigApplicationContext(AnnotationConfig.class);
+    }
+
+    @Test
+    void whenGivenExistingBeanName_shouldReturnThatBean() {
+        Object lion = context.getBean("lion");
+
+        assertEquals(lion.getClass(), Lion.class);
+    }
+
+    @Test
+    void whenGivenNonExistingBeanName_shouldThrowException() {
+        assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean("non-existing"));
+    }
+
+    @Test
+    void whenCastingToWrongType_thenShouldThrowException() {
+        assertThrows(ClassCastException.class, () -> {
+            Tiger tiger = (Tiger) context.getBean("lion");
+        });
+    }
+}
diff --git a/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByNameWithConstructorParametersUnitTest.java b/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByNameWithConstructorParametersUnitTest.java
new file mode 100644
index 0000000000..32d37e4ff2
--- /dev/null
+++ b/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByNameWithConstructorParametersUnitTest.java
@@ -0,0 +1,44 @@
+package com.baeldung.getbean;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.springframework.beans.factory.UnsatisfiedDependencyException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class GetBeanByNameWithConstructorParametersUnitTest {
+    private ApplicationContext context;
+
+    @BeforeAll
+    void setup() {
+        context = new AnnotationConfigApplicationContext(AnnotationConfig.class);
+    }
+
+    @Test
+    void whenGivenCorrectName_thenShouldReturnBeanWithSpecifiedName() {
+        Tiger tiger = (Tiger) context.getBean("tiger", "Siberian");
+
+        assertEquals("Siberian", tiger.getName());
+    }
+
+    @Test
+    void whenGivenCorrectNameOrAlias_shouldReturnBeanWithSpecifiedName() {
+        Tiger tiger = (Tiger) context.getBean("tiger", "Siberian");
+        Tiger secondTiger = (Tiger) context.getBean("tiger", "Striped");
+
+        assertEquals("Siberian", tiger.getName());
+        assertEquals("Striped", secondTiger.getName());
+    }
+
+    @Test
+    void whenNoArgumentSpecifiedForPrototypeBean_thenShouldThrowException() {
+        assertThrows(UnsatisfiedDependencyException.class, () -> {
+            Tiger tiger = (Tiger) context.getBean("tiger");
+        });
+    }
+}
diff --git a/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByTypeUnitTest.java b/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByTypeUnitTest.java
new file mode 100644
index 0000000000..a4d4ab732b
--- /dev/null
+++ b/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByTypeUnitTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.getbean;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class GetBeanByTypeUnitTest {
+    private ApplicationContext context;
+
+    @BeforeAll
+    void setup() {
+        context = new AnnotationConfigApplicationContext(AnnotationConfig.class);
+    }
+
+    @Test
+    void whenGivenExistingUniqueType_thenShouldReturnRelatedBean() {
+        Lion lion = context.getBean(Lion.class);
+
+        assertNotNull(lion);
+    }
+
+    @Test
+    void whenGivenAmbiguousType_thenShouldThrowException() {
+        assertThrows(NoUniqueBeanDefinitionException.class, () -> context.getBean(AnnotationConfig.Animal.class));
+    }
+}
diff --git a/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByTypeWithConstructorParametersUnitTest.java b/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByTypeWithConstructorParametersUnitTest.java
new file mode 100644
index 0000000000..08bcb92145
--- /dev/null
+++ b/spring-core-2/src/test/java/com/baeldung/getbean/GetBeanByTypeWithConstructorParametersUnitTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.getbean;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class GetBeanByTypeWithConstructorParametersUnitTest {
+    private ApplicationContext context;
+
+    @BeforeAll
+    void setup() {
+        context = new AnnotationConfigApplicationContext(AnnotationConfig.class);
+    }
+
+    @Test
+    void whenGivenExistingTypeAndValidParameters_thenShouldReturnRelatedBean() {
+        Tiger tiger = context.getBean(Tiger.class, "Shere Khan");
+
+        assertEquals("Shere Khan", tiger.getName());
+    }
+}
diff --git a/spring-core/README.md b/spring-core/README.md
index d542fa8ed1..18d14b7ecf 100644
--- a/spring-core/README.md
+++ b/spring-core/README.md
@@ -8,7 +8,6 @@
 - [Spring YAML Configuration](http://www.baeldung.com/spring-yaml)
 - [Introduction to Spring’s StreamUtils](http://www.baeldung.com/spring-stream-utils)
 - [Using Spring @Value with Defaults](http://www.baeldung.com/spring-value-defaults)
-- [Groovy Bean Definitions](http://www.baeldung.com/spring-groovy-beans)
 - [XML-Based Injection in Spring](http://www.baeldung.com/spring-xml-injection)
 - [A Quick Guide to the Spring @Lazy Annotation](http://www.baeldung.com/spring-lazy-annotation)
 - [Injecting Prototype Beans into a Singleton Instance in Spring](http://www.baeldung.com/spring-inject-prototype-bean-into-singleton)
@@ -24,3 +23,4 @@
 - [What is a Spring Bean?](https://www.baeldung.com/spring-bean)
 - [Spring PostConstruct and PreDestroy Annotations](https://www.baeldung.com/spring-postconstruct-predestroy)
 - [Guice vs Spring – Dependency Injection](https://www.baeldung.com/guice-spring-dependency-injection)
+- [Circular Dependencies in Spring](http://www.baeldung.com/circular-dependencies-in-spring)
diff --git a/spring-core/pom.xml b/spring-core/pom.xml
index 75e9fd7131..7e5a9b3feb 100644
--- a/spring-core/pom.xml
+++ b/spring-core/pom.xml
@@ -87,7 +87,6 @@
         <mockito.spring.boot.version>1.4.4.RELEASE</mockito.spring.boot.version>
         <javax.inject.version>1</javax.inject.version>
         <guava.version>20.0</guava.version>
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <commons.io.version>2.5</commons.io.version>
         <spring-boot.version>1.5.2.RELEASE</spring-boot.version>
         <mockito.version>1.10.19</mockito.version>
diff --git a/spring-mvc-java/src/main/java/com/baeldung/circulardependency/CircularDependencyA.java b/spring-core/src/main/java/com/baeldung/circulardependency/CircularDependencyA.java
similarity index 100%
rename from spring-mvc-java/src/main/java/com/baeldung/circulardependency/CircularDependencyA.java
rename to spring-core/src/main/java/com/baeldung/circulardependency/CircularDependencyA.java
diff --git a/spring-mvc-java/src/main/java/com/baeldung/circulardependency/CircularDependencyB.java b/spring-core/src/main/java/com/baeldung/circulardependency/CircularDependencyB.java
similarity index 100%
rename from spring-mvc-java/src/main/java/com/baeldung/circulardependency/CircularDependencyB.java
rename to spring-core/src/main/java/com/baeldung/circulardependency/CircularDependencyB.java
diff --git a/spring-mvc-java/src/test/java/com/baeldung/circulardependency/CircularDependencyIntegrationTest.java b/spring-core/src/test/java/com/baeldung/circulardependency/CircularDependencyIntegrationTest.java
similarity index 100%
rename from spring-mvc-java/src/test/java/com/baeldung/circulardependency/CircularDependencyIntegrationTest.java
rename to spring-core/src/test/java/com/baeldung/circulardependency/CircularDependencyIntegrationTest.java
diff --git a/spring-mvc-java/src/test/java/com/baeldung/circulardependency/TestConfig.java b/spring-core/src/test/java/com/baeldung/circulardependency/TestConfig.java
similarity index 100%
rename from spring-mvc-java/src/test/java/com/baeldung/circulardependency/TestConfig.java
rename to spring-core/src/test/java/com/baeldung/circulardependency/TestConfig.java
diff --git a/spring-core/src/test/java/com/baeldung/resource/SpringResourceIntegrationTest.java b/spring-core/src/test/java/com/baeldung/resource/SpringResourceIntegrationTest.java
index a7a2a9032a..c7a2984045 100644
--- a/spring-core/src/test/java/com/baeldung/resource/SpringResourceIntegrationTest.java
+++ b/spring-core/src/test/java/com/baeldung/resource/SpringResourceIntegrationTest.java
@@ -4,6 +4,7 @@ import static org.junit.Assert.assertEquals;
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -77,7 +78,7 @@ public class SpringResourceIntegrationTest {
 
     @Test
     public void whenResourceUtils_thenReadSuccessful() throws IOException {
-        final File employeeFile = ResourceUtils.getFile("classpath:data/employees.dat");
+        final File employeeFile = loadEmployeesWithSpringInternalClass();
         final String employees = new String(Files.readAllBytes(employeeFile.toPath()));
         assertEquals(EMPLOYEES_EXPECTED, employees);
     }
@@ -112,4 +113,8 @@ public class SpringResourceIntegrationTest {
         final String employees = new String(Files.readAllBytes(resource.toPath()));
         assertEquals(EMPLOYEES_EXPECTED, employees);
     }
+    
+    public File loadEmployeesWithSpringInternalClass() throws FileNotFoundException {
+        return ResourceUtils.getFile("classpath:data/employees.dat");
+    }
 }
diff --git a/spring-cucumber/src/test/java/org/baeldung/SpringContextTest.java b/spring-cucumber/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..7b8fa74fc9
--- /dev/null
+++ b/spring-cucumber/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.SpringDemoApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringDemoApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-data-rest-querydsl/src/test/java/org/baeldung/SpringContextTest.java b/spring-data-rest-querydsl/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..5e68a8e64f
--- /dev/null
+++ b/spring-data-rest-querydsl/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-data-rest/src/main/java/com/baeldung/SpringDataRestApplication.java b/spring-data-rest/src/main/java/com/baeldung/books/SpringDataRestApplication.java
similarity index 91%
rename from spring-data-rest/src/main/java/com/baeldung/SpringDataRestApplication.java
rename to spring-data-rest/src/main/java/com/baeldung/books/SpringDataRestApplication.java
index 702acb5b65..097a6aabd7 100644
--- a/spring-data-rest/src/main/java/com/baeldung/SpringDataRestApplication.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/SpringDataRestApplication.java
@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.books;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-data-rest/src/main/java/com/baeldung/config/DbConfig.java b/spring-data-rest/src/main/java/com/baeldung/books/config/DbConfig.java
similarity index 94%
rename from spring-data-rest/src/main/java/com/baeldung/config/DbConfig.java
rename to spring-data-rest/src/main/java/com/baeldung/books/config/DbConfig.java
index 3ca728ec94..20008eb583 100644
--- a/spring-data-rest/src/main/java/com/baeldung/config/DbConfig.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/config/DbConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.config;
+package com.baeldung.books.config;
 
 import java.util.Properties;
 
@@ -16,7 +16,7 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 
 @Configuration
-@EnableJpaRepositories(basePackages = "com.baeldung.repositories")
+@EnableJpaRepositories(basePackages = "com.baeldung.books.repositories")
 // @PropertySource("persistence-h2.properties")
 // @PropertySource("persistence-hsqldb.properties")
 // @PropertySource("persistence-derby.properties")
@@ -40,7 +40,7 @@ public class DbConfig {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "com.baeldung.models" });
+        em.setPackagesToScan(new String[] { "com.baeldung.books.models" });
         em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
         em.setJpaProperties(additionalProperties());
         return em;
diff --git a/spring-data-rest/src/main/java/com/baeldung/config/MvcConfig.java b/spring-data-rest/src/main/java/com/baeldung/books/config/MvcConfig.java
similarity index 85%
rename from spring-data-rest/src/main/java/com/baeldung/config/MvcConfig.java
rename to spring-data-rest/src/main/java/com/baeldung/books/config/MvcConfig.java
index 9d0d3a6687..69e984ad06 100644
--- a/spring-data-rest/src/main/java/com/baeldung/config/MvcConfig.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/config/MvcConfig.java
@@ -1,13 +1,14 @@
-package com.baeldung.config;
+package com.baeldung.books.config;
 
-import com.baeldung.events.AuthorEventHandler;
-import com.baeldung.events.BookEventHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import com.baeldung.books.events.AuthorEventHandler;
+import com.baeldung.books.events.BookEventHandler;
+
 @Configuration
 @EnableWebMvc
 public class MvcConfig implements WebMvcConfigurer {
diff --git a/spring-data-rest/src/main/java/com/baeldung/config/RestConfig.java b/spring-data-rest/src/main/java/com/baeldung/books/config/RestConfig.java
similarity index 86%
rename from spring-data-rest/src/main/java/com/baeldung/config/RestConfig.java
rename to spring-data-rest/src/main/java/com/baeldung/books/config/RestConfig.java
index 47cb95693b..1c6f04331e 100644
--- a/spring-data-rest/src/main/java/com/baeldung/config/RestConfig.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/config/RestConfig.java
@@ -1,7 +1,8 @@
-package com.baeldung.config;
+package com.baeldung.books.config;
+
+import com.baeldung.books.models.WebsiteUser;
+import com.baeldung.books.projections.CustomBook;
 
-import com.baeldung.models.WebsiteUser;
-import com.baeldung.projections.CustomBook;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.data.rest.core.mapping.ExposureConfiguration;
diff --git a/spring-data-rest/src/main/java/com/baeldung/config/ValidatorEventRegister.java b/spring-data-rest/src/main/java/com/baeldung/books/config/ValidatorEventRegister.java
similarity index 94%
rename from spring-data-rest/src/main/java/com/baeldung/config/ValidatorEventRegister.java
rename to spring-data-rest/src/main/java/com/baeldung/books/config/ValidatorEventRegister.java
index 632ad9183a..bbaf9a2771 100644
--- a/spring-data-rest/src/main/java/com/baeldung/config/ValidatorEventRegister.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/config/ValidatorEventRegister.java
@@ -1,4 +1,4 @@
-package com.baeldung.config;
+package com.baeldung.books.config;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/spring-data-rest/src/main/java/com/baeldung/dialect/SQLiteDialect.java b/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteDialect.java
similarity index 98%
rename from spring-data-rest/src/main/java/com/baeldung/dialect/SQLiteDialect.java
rename to spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteDialect.java
index 4512f7d34d..6e840eec43 100644
--- a/spring-data-rest/src/main/java/com/baeldung/dialect/SQLiteDialect.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteDialect.java
@@ -1,4 +1,4 @@
-package com.baeldung.dialect;
+package com.baeldung.books.dialect;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.identity.IdentityColumnSupport;
diff --git a/spring-data-rest/src/main/java/com/baeldung/dialect/SQLiteIdentityColumnSupport.java b/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteIdentityColumnSupport.java
similarity index 94%
rename from spring-data-rest/src/main/java/com/baeldung/dialect/SQLiteIdentityColumnSupport.java
rename to spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteIdentityColumnSupport.java
index cf6e3a9a97..682d82c6f1 100644
--- a/spring-data-rest/src/main/java/com/baeldung/dialect/SQLiteIdentityColumnSupport.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteIdentityColumnSupport.java
@@ -1,4 +1,4 @@
-package com.baeldung.dialect;
+package com.baeldung.books.dialect;
 
 import org.hibernate.MappingException;
 import org.hibernate.dialect.identity.IdentityColumnSupportImpl;
diff --git a/spring-data-rest/src/main/java/com/baeldung/events/AuthorEventHandler.java b/spring-data-rest/src/main/java/com/baeldung/books/events/AuthorEventHandler.java
similarity index 89%
rename from spring-data-rest/src/main/java/com/baeldung/events/AuthorEventHandler.java
rename to spring-data-rest/src/main/java/com/baeldung/books/events/AuthorEventHandler.java
index 485dc8e221..b390a529ba 100644
--- a/spring-data-rest/src/main/java/com/baeldung/events/AuthorEventHandler.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/events/AuthorEventHandler.java
@@ -1,9 +1,10 @@
-package com.baeldung.events;
+package com.baeldung.books.events;
 
-import com.baeldung.models.Author;
-import com.baeldung.models.Book;
 import org.springframework.data.rest.core.annotation.*;
 
+import com.baeldung.books.models.Author;
+import com.baeldung.books.models.Book;
+
 import java.util.logging.Logger;
 
 @RepositoryEventHandler
diff --git a/spring-data-rest/src/main/java/com/baeldung/events/BookEventHandler.java b/spring-data-rest/src/main/java/com/baeldung/books/events/BookEventHandler.java
similarity index 86%
rename from spring-data-rest/src/main/java/com/baeldung/events/BookEventHandler.java
rename to spring-data-rest/src/main/java/com/baeldung/books/events/BookEventHandler.java
index 36ae62b926..0afb3a6279 100644
--- a/spring-data-rest/src/main/java/com/baeldung/events/BookEventHandler.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/events/BookEventHandler.java
@@ -1,13 +1,15 @@
-package com.baeldung.events;
+package com.baeldung.books.events;
 
 import java.util.logging.Logger;
-import com.baeldung.models.Author;
-import com.baeldung.models.Book;
+
 import org.apache.commons.logging.Log;
 import org.springframework.data.rest.core.annotation.HandleAfterDelete;
 import org.springframework.data.rest.core.annotation.HandleBeforeCreate;
 import org.springframework.data.rest.core.annotation.RepositoryEventHandler;
 
+import com.baeldung.books.models.Author;
+import com.baeldung.books.models.Book;
+
 @RepositoryEventHandler
 public class BookEventHandler {
     Logger logger = Logger.getLogger("Class BookEventHandler");
diff --git a/spring-data-rest/src/main/java/com/baeldung/exception/handlers/RestResponseEntityExceptionHandler.java b/spring-data-rest/src/main/java/com/baeldung/books/exception/handlers/RestResponseEntityExceptionHandler.java
similarity index 94%
rename from spring-data-rest/src/main/java/com/baeldung/exception/handlers/RestResponseEntityExceptionHandler.java
rename to spring-data-rest/src/main/java/com/baeldung/books/exception/handlers/RestResponseEntityExceptionHandler.java
index a3ef91f6d6..4a961e5250 100644
--- a/spring-data-rest/src/main/java/com/baeldung/exception/handlers/RestResponseEntityExceptionHandler.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/exception/handlers/RestResponseEntityExceptionHandler.java
@@ -1,4 +1,4 @@
-package com.baeldung.exception.handlers;
+package com.baeldung.books.exception.handlers;
 
 import org.springframework.data.rest.core.RepositoryConstraintViolationException;
 import org.springframework.http.HttpHeaders;
diff --git a/spring-data-rest/src/main/java/com/baeldung/models/Address.java b/spring-data-rest/src/main/java/com/baeldung/books/models/Address.java
similarity index 96%
rename from spring-data-rest/src/main/java/com/baeldung/models/Address.java
rename to spring-data-rest/src/main/java/com/baeldung/books/models/Address.java
index 713af58ae6..3c36db0f3c 100644
--- a/spring-data-rest/src/main/java/com/baeldung/models/Address.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/models/Address.java
@@ -1,4 +1,4 @@
-package com.baeldung.models;
+package com.baeldung.books.models;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/spring-data-rest/src/main/java/com/baeldung/models/Author.java b/spring-data-rest/src/main/java/com/baeldung/books/models/Author.java
similarity index 97%
rename from spring-data-rest/src/main/java/com/baeldung/models/Author.java
rename to spring-data-rest/src/main/java/com/baeldung/books/models/Author.java
index 3f43af9c47..aec2e62ebf 100644
--- a/spring-data-rest/src/main/java/com/baeldung/models/Author.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/models/Author.java
@@ -1,4 +1,4 @@
-package com.baeldung.models;
+package com.baeldung.books.models;
 
 import java.util.List;
 
diff --git a/spring-data-rest/src/main/java/com/baeldung/models/Book.java b/spring-data-rest/src/main/java/com/baeldung/books/models/Book.java
similarity index 97%
rename from spring-data-rest/src/main/java/com/baeldung/models/Book.java
rename to spring-data-rest/src/main/java/com/baeldung/books/models/Book.java
index 07b0d08b84..7451b04b3b 100644
--- a/spring-data-rest/src/main/java/com/baeldung/models/Book.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/models/Book.java
@@ -1,4 +1,4 @@
-package com.baeldung.models;
+package com.baeldung.books.models;
 
 import java.util.List;
 
diff --git a/spring-data-rest/src/main/java/com/baeldung/models/Library.java b/spring-data-rest/src/main/java/com/baeldung/books/models/Library.java
similarity index 97%
rename from spring-data-rest/src/main/java/com/baeldung/models/Library.java
rename to spring-data-rest/src/main/java/com/baeldung/books/models/Library.java
index 091975f5d0..5f95169a9b 100644
--- a/spring-data-rest/src/main/java/com/baeldung/models/Library.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/models/Library.java
@@ -1,4 +1,4 @@
-package com.baeldung.models;
+package com.baeldung.books.models;
 
 import java.util.List;
 
diff --git a/spring-data-rest/src/main/java/com/baeldung/models/Subject.java b/spring-data-rest/src/main/java/com/baeldung/books/models/Subject.java
similarity index 94%
rename from spring-data-rest/src/main/java/com/baeldung/models/Subject.java
rename to spring-data-rest/src/main/java/com/baeldung/books/models/Subject.java
index 4e5fa82148..11a4425fdd 100644
--- a/spring-data-rest/src/main/java/com/baeldung/models/Subject.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/models/Subject.java
@@ -1,4 +1,4 @@
-package com.baeldung.models;
+package com.baeldung.books.models;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/spring-data-rest/src/main/java/com/baeldung/models/WebsiteUser.java b/spring-data-rest/src/main/java/com/baeldung/books/models/WebsiteUser.java
similarity index 95%
rename from spring-data-rest/src/main/java/com/baeldung/models/WebsiteUser.java
rename to spring-data-rest/src/main/java/com/baeldung/books/models/WebsiteUser.java
index 4eb9773e36..e632623019 100644
--- a/spring-data-rest/src/main/java/com/baeldung/models/WebsiteUser.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/models/WebsiteUser.java
@@ -1,4 +1,4 @@
-package com.baeldung.models;
+package com.baeldung.books.models;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/spring-data-rest/src/main/java/com/baeldung/projections/CustomBook.java b/spring-data-rest/src/main/java/com/baeldung/books/projections/CustomBook.java
similarity index 77%
rename from spring-data-rest/src/main/java/com/baeldung/projections/CustomBook.java
rename to spring-data-rest/src/main/java/com/baeldung/books/projections/CustomBook.java
index 3dc6938f5c..5fe78c869d 100644
--- a/spring-data-rest/src/main/java/com/baeldung/projections/CustomBook.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/projections/CustomBook.java
@@ -1,12 +1,12 @@
-package com.baeldung.projections;
+package com.baeldung.books.projections;
 
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.rest.core.config.Projection;
 
-import com.baeldung.models.Author;
-import com.baeldung.models.Book;
+import com.baeldung.books.models.Author;
+import com.baeldung.books.models.Book;
 
 @Projection(name = "customBook", types = { Book.class })
 public interface CustomBook {
diff --git a/spring-data-rest/src/main/java/com/baeldung/repositories/AddressRepository.java b/spring-data-rest/src/main/java/com/baeldung/books/repositories/AddressRepository.java
similarity index 62%
rename from spring-data-rest/src/main/java/com/baeldung/repositories/AddressRepository.java
rename to spring-data-rest/src/main/java/com/baeldung/books/repositories/AddressRepository.java
index 1cc7527e80..5e3900f439 100644
--- a/spring-data-rest/src/main/java/com/baeldung/repositories/AddressRepository.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/repositories/AddressRepository.java
@@ -1,8 +1,8 @@
-package com.baeldung.repositories;
+package com.baeldung.books.repositories;
 
 import org.springframework.data.repository.CrudRepository;
 
-import com.baeldung.models.Address;
+import com.baeldung.books.models.Address;
 
 public interface AddressRepository extends CrudRepository<Address, Long> {
 
diff --git a/spring-data-rest/src/main/java/com/baeldung/repositories/AuthorRepository.java b/spring-data-rest/src/main/java/com/baeldung/books/repositories/AuthorRepository.java
similarity index 62%
rename from spring-data-rest/src/main/java/com/baeldung/repositories/AuthorRepository.java
rename to spring-data-rest/src/main/java/com/baeldung/books/repositories/AuthorRepository.java
index 2d470367ef..837e13b1d2 100644
--- a/spring-data-rest/src/main/java/com/baeldung/repositories/AuthorRepository.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/repositories/AuthorRepository.java
@@ -1,8 +1,8 @@
-package com.baeldung.repositories;
+package com.baeldung.books.repositories;
 
 import org.springframework.data.repository.CrudRepository;
 
-import com.baeldung.models.Author;
+import com.baeldung.books.models.Author;
 
 public interface AuthorRepository extends CrudRepository<Author, Long> {
 
diff --git a/spring-data-rest/src/main/java/com/baeldung/repositories/BookRepository.java b/spring-data-rest/src/main/java/com/baeldung/books/repositories/BookRepository.java
similarity index 67%
rename from spring-data-rest/src/main/java/com/baeldung/repositories/BookRepository.java
rename to spring-data-rest/src/main/java/com/baeldung/books/repositories/BookRepository.java
index eee44f35d4..5d7e277526 100644
--- a/spring-data-rest/src/main/java/com/baeldung/repositories/BookRepository.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/repositories/BookRepository.java
@@ -1,10 +1,10 @@
-package com.baeldung.repositories;
+package com.baeldung.books.repositories;
 
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 
-import com.baeldung.models.Book;
-import com.baeldung.projections.CustomBook;
+import com.baeldung.books.models.Book;
+import com.baeldung.books.projections.CustomBook;
 
 @RepositoryRestResource(excerptProjection = CustomBook.class)
 public interface BookRepository extends CrudRepository<Book, Long> {
diff --git a/spring-data-rest/src/main/java/com/baeldung/repositories/LibraryRepository.java b/spring-data-rest/src/main/java/com/baeldung/books/repositories/LibraryRepository.java
similarity index 62%
rename from spring-data-rest/src/main/java/com/baeldung/repositories/LibraryRepository.java
rename to spring-data-rest/src/main/java/com/baeldung/books/repositories/LibraryRepository.java
index c00787f03c..92518339a0 100644
--- a/spring-data-rest/src/main/java/com/baeldung/repositories/LibraryRepository.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/repositories/LibraryRepository.java
@@ -1,8 +1,8 @@
-package com.baeldung.repositories;
+package com.baeldung.books.repositories;
 
 import org.springframework.data.repository.CrudRepository;
 
-import com.baeldung.models.Library;
+import com.baeldung.books.models.Library;
 
 public interface LibraryRepository extends CrudRepository<Library, Long> {
 
diff --git a/spring-data-rest/src/main/java/com/baeldung/repositories/SubjectRepository.java b/spring-data-rest/src/main/java/com/baeldung/books/repositories/SubjectRepository.java
similarity index 85%
rename from spring-data-rest/src/main/java/com/baeldung/repositories/SubjectRepository.java
rename to spring-data-rest/src/main/java/com/baeldung/books/repositories/SubjectRepository.java
index 76e34b0799..187b01f222 100644
--- a/spring-data-rest/src/main/java/com/baeldung/repositories/SubjectRepository.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/repositories/SubjectRepository.java
@@ -1,11 +1,12 @@
-package com.baeldung.repositories;
+package com.baeldung.books.repositories;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.data.rest.core.annotation.RestResource;
-import com.baeldung.models.Subject;
+
+import com.baeldung.books.models.Subject;
 
 public interface SubjectRepository extends PagingAndSortingRepository<Subject, Long> {
 
diff --git a/spring-data-rest/src/main/java/com/baeldung/repositories/UserRepository.java b/spring-data-rest/src/main/java/com/baeldung/books/repositories/UserRepository.java
similarity index 91%
rename from spring-data-rest/src/main/java/com/baeldung/repositories/UserRepository.java
rename to spring-data-rest/src/main/java/com/baeldung/books/repositories/UserRepository.java
index a3fed1c318..f0823338bc 100644
--- a/spring-data-rest/src/main/java/com/baeldung/repositories/UserRepository.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/repositories/UserRepository.java
@@ -1,11 +1,12 @@
-package com.baeldung.repositories;
+package com.baeldung.books.repositories;
 
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.data.rest.core.annotation.RestResource;
 import org.springframework.web.bind.annotation.CrossOrigin;
-import com.baeldung.models.WebsiteUser;
+
+import com.baeldung.books.models.WebsiteUser;
 
 @CrossOrigin
 @RepositoryRestResource(collectionResourceRel = "users", path = "users")
diff --git a/spring-data-rest/src/main/java/com/baeldung/validators/WebsiteUserValidator.java b/spring-data-rest/src/main/java/com/baeldung/books/validators/WebsiteUserValidator.java
similarity index 87%
rename from spring-data-rest/src/main/java/com/baeldung/validators/WebsiteUserValidator.java
rename to spring-data-rest/src/main/java/com/baeldung/books/validators/WebsiteUserValidator.java
index 0380332708..ad7511c2ba 100644
--- a/spring-data-rest/src/main/java/com/baeldung/validators/WebsiteUserValidator.java
+++ b/spring-data-rest/src/main/java/com/baeldung/books/validators/WebsiteUserValidator.java
@@ -1,10 +1,10 @@
-package com.baeldung.validators;
+package com.baeldung.books.validators;
 
 import org.springframework.stereotype.Component;
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
 
-import com.baeldung.models.WebsiteUser;
+import com.baeldung.books.models.WebsiteUser;
 
 @Component("beforeCreateWebsiteUserValidator")
 public class WebsiteUserValidator implements Validator {
diff --git a/spring-data-rest/src/test/java/com/baeldung/events/AuthorEventHandlerUnitTest.java b/spring-data-rest/src/test/java/com/baeldung/books/events/AuthorEventHandlerUnitTest.java
similarity index 86%
rename from spring-data-rest/src/test/java/com/baeldung/events/AuthorEventHandlerUnitTest.java
rename to spring-data-rest/src/test/java/com/baeldung/books/events/AuthorEventHandlerUnitTest.java
index c01d5882a0..719c4d7c86 100644
--- a/spring-data-rest/src/test/java/com/baeldung/events/AuthorEventHandlerUnitTest.java
+++ b/spring-data-rest/src/test/java/com/baeldung/books/events/AuthorEventHandlerUnitTest.java
@@ -1,6 +1,8 @@
-package com.baeldung.events;
+package com.baeldung.books.events;
+
+import com.baeldung.books.events.AuthorEventHandler;
+import com.baeldung.books.models.Author;
 
-import com.baeldung.models.Author;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.data.rest.core.annotation.RepositoryEventHandler;
diff --git a/spring-data-rest/src/test/java/com/baeldung/events/BookEventHandlerUnitTest.java b/spring-data-rest/src/test/java/com/baeldung/books/events/BookEventHandlerUnitTest.java
similarity index 81%
rename from spring-data-rest/src/test/java/com/baeldung/events/BookEventHandlerUnitTest.java
rename to spring-data-rest/src/test/java/com/baeldung/books/events/BookEventHandlerUnitTest.java
index d6b8b3b25e..4b9d77afa2 100644
--- a/spring-data-rest/src/test/java/com/baeldung/events/BookEventHandlerUnitTest.java
+++ b/spring-data-rest/src/test/java/com/baeldung/books/events/BookEventHandlerUnitTest.java
@@ -1,7 +1,9 @@
-package com.baeldung.events;
+package com.baeldung.books.events;
+
+import com.baeldung.books.events.BookEventHandler;
+import com.baeldung.books.models.Author;
+import com.baeldung.books.models.Book;
 
-import com.baeldung.models.Author;
-import com.baeldung.models.Book;
 import org.junit.Test;
 import org.mockito.Mockito;
 
diff --git a/spring-data-rest/src/test/java/com/baeldung/projection/SpringDataProjectionLiveTest.java b/spring-data-rest/src/test/java/com/baeldung/books/projections/SpringDataProjectionLiveTest.java
similarity index 91%
rename from spring-data-rest/src/test/java/com/baeldung/projection/SpringDataProjectionLiveTest.java
rename to spring-data-rest/src/test/java/com/baeldung/books/projections/SpringDataProjectionLiveTest.java
index 274ae3bc1d..98b5831b96 100644
--- a/spring-data-rest/src/test/java/com/baeldung/projection/SpringDataProjectionLiveTest.java
+++ b/spring-data-rest/src/test/java/com/baeldung/books/projections/SpringDataProjectionLiveTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.projection;
+package com.baeldung.books.projections;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -16,11 +16,11 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.SpringDataRestApplication;
-import com.baeldung.models.Author;
-import com.baeldung.models.Book;
-import com.baeldung.repositories.AuthorRepository;
-import com.baeldung.repositories.BookRepository;
+import com.baeldung.books.SpringDataRestApplication;
+import com.baeldung.books.models.Author;
+import com.baeldung.books.models.Book;
+import com.baeldung.books.repositories.AuthorRepository;
+import com.baeldung.books.repositories.BookRepository;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringDataRestApplication.class, webEnvironment = WebEnvironment.DEFINED_PORT)
diff --git a/spring-data-rest/src/test/java/com/baeldung/validator/SpringDataRestValidatorIntegrationTest.java b/spring-data-rest/src/test/java/com/baeldung/books/validator/SpringDataRestValidatorIntegrationTest.java
similarity index 97%
rename from spring-data-rest/src/test/java/com/baeldung/validator/SpringDataRestValidatorIntegrationTest.java
rename to spring-data-rest/src/test/java/com/baeldung/books/validator/SpringDataRestValidatorIntegrationTest.java
index 6da76d6a33..75733475e7 100644
--- a/spring-data-rest/src/test/java/com/baeldung/validator/SpringDataRestValidatorIntegrationTest.java
+++ b/spring-data-rest/src/test/java/com/baeldung/books/validator/SpringDataRestValidatorIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.validator;
+package com.baeldung.books.validator;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -19,8 +19,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.baeldung.SpringDataRestApplication;
-import com.baeldung.models.WebsiteUser;
+import com.baeldung.books.SpringDataRestApplication;
+import com.baeldung.books.models.WebsiteUser;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/spring-data-rest/src/test/java/com/baeldung/springdatawebsupport/application/test/UserControllerIntegrationTest.java b/spring-data-rest/src/test/java/com/baeldung/springdatawebsupport/application/test/UserControllerIntegrationTest.java
index e1aff7e09d..d7ef361783 100644
--- a/spring-data-rest/src/test/java/com/baeldung/springdatawebsupport/application/test/UserControllerIntegrationTest.java
+++ b/spring-data-rest/src/test/java/com/baeldung/springdatawebsupport/application/test/UserControllerIntegrationTest.java
@@ -42,7 +42,7 @@ public class UserControllerIntegrationTest {
 
     @Test
     public void whenGetRequestToUserEndPointWithNameRequestParameter_thenCorrectResponse() throws Exception {
-        mockMvc.perform(MockMvcRequestBuilders.get("/user").param("name", "John").contentType(MediaType.APPLICATION_JSON_UTF8)).andExpect(MockMvcResultMatchers.status().isOk())
+        mockMvc.perform(MockMvcRequestBuilders.get("/users").param("name", "John").contentType(MediaType.APPLICATION_JSON_UTF8)).andExpect(MockMvcResultMatchers.status().isOk())
                 .andExpect(MockMvcResultMatchers.jsonPath("$['content'][0].['name']").value("John"));
     }
 
diff --git a/spring-data-rest/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-data-rest/src/test/java/org/baeldung/SpringContextIntegrationTest.java
index 0380e3dc2f..c2682855b8 100644
--- a/spring-data-rest/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/spring-data-rest/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -5,7 +5,7 @@ import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.SpringDataRestApplication;
+import com.baeldung.books.SpringDataRestApplication;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringDataRestApplication.class)
diff --git a/spring-data-rest/src/test/java/org/baeldung/SpringContextTest.java b/spring-data-rest/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..7e7fccadef
--- /dev/null
+++ b/spring-data-rest/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.books.SpringDataRestApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringDataRestApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-dispatcher-servlet/pom.xml b/spring-dispatcher-servlet/pom.xml
index eb0fdfea46..6f816986be 100644
--- a/spring-dispatcher-servlet/pom.xml
+++ b/spring-dispatcher-servlet/pom.xml
@@ -96,7 +96,6 @@
 
     <properties>
         <tomcat8-maven-plugin.version>3.0-r1655215</tomcat8-maven-plugin.version>
-        <maven-war-plugin.version>3.0.0</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-dispatcher-servlet/src/test/java/org/baeldung/SpringContextTest.java b/spring-dispatcher-servlet/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..d1de77b1e6
--- /dev/null
+++ b/spring-dispatcher-servlet/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,19 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import com.baeldung.springdispatcherservlet.configuration.AppConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = AppConfig.class)
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-drools/src/test/java/org/baeldung/SpringContextTest.java b/spring-drools/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..9a36a521f1
--- /dev/null
+++ b/spring-drools/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.spring.drools.service.TaxiFareConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = TaxiFareConfiguration.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-ejb/spring-ejb-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-ejb/spring-ejb-client/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..3e9af8a336
--- /dev/null
+++ b/spring-ejb/spring-ejb-client/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.springejbclient.SpringEjbClientApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringEjbClientApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml
index ff28ac89bb..45c80f2c9f 100644
--- a/spring-exceptions/pom.xml
+++ b/spring-exceptions/pom.xml
@@ -192,7 +192,6 @@
 
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
 
         <httpcore.version>4.4.5</httpcore.version>
         <httpclient.version>4.5.2</httpclient.version>
@@ -200,7 +199,6 @@
         <rest-assured.version>2.9.0</rest-assured.version>
 
         <!-- maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
 
diff --git a/spring-freemarker/src/test/java/org/baeldung/SpringContextTest.java b/spring-freemarker/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..49b8fe94d1
--- /dev/null
+++ b/spring-freemarker/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,20 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import com.baeldung.freemarker.config.SpringWebConfig;
+import com.baeldung.freemarker.config.WebConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { SpringWebConfig.class, WebConfiguration.class })
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-groovy/README.md b/spring-groovy/README.md
index ff12555376..36404230a9 100644
--- a/spring-groovy/README.md
+++ b/spring-groovy/README.md
@@ -1 +1,3 @@
-## Relevant articles:
+## Relevant Articles:
+
+- [Groovy Bean Definitions](https://www.baeldung.com/spring-groovy-beans)
diff --git a/spring-integration/src/test/java/org/baeldung/SpringContextTest.java b/spring-integration/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..e45997b71e
--- /dev/null
+++ b/spring-integration/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,21 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.si.security.MessageConsumer;
+import com.baeldung.si.security.SecuredDirectChannel;
+import com.baeldung.si.security.SecurityConfig;
+import com.baeldung.si.security.SecurityPubSubChannel;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { SecurityConfig.class, SecuredDirectChannel.class, SecurityPubSubChannel.class,
+		MessageConsumer.class })
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-jenkins-pipeline/src/test/java/org/baeldung/SpringContextTest.java b/spring-jenkins-pipeline/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..79ab2f48b8
--- /dev/null
+++ b/spring-jenkins-pipeline/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,19 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.SpringJenkinsPipelineApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringJenkinsPipelineApplication.class)
+@DirtiesContext
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-jersey/pom.xml b/spring-jersey/pom.xml
index 5a12d27180..e053ee7b4b 100644
--- a/spring-jersey/pom.xml
+++ b/spring-jersey/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${servlet-api-version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -223,11 +223,10 @@
 
     <properties>
         <jersey.version>2.27</jersey.version>
-        <maven-war-plugin.version>3.2.0</maven-war-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
         <httpcore.version>4.4.9</httpcore.version>
         <httpclient.version>4.5.5</httpclient.version>
-        <servlet-api-version>4.0.0</servlet-api-version>
+        <javax.servlet-api.version>4.0.0</javax.servlet-api.version>
         <wiremock.version>1.58</wiremock.version>
         <assertj-core.version>3.10.0</assertj-core.version>
         <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
diff --git a/spring-jersey/src/test/java/org/baeldung/SpringContextTest.java b/spring-jersey/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..f480e597b3
--- /dev/null
+++ b/spring-jersey/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.server.config.RestConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = RestConfig.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-jinq/src/test/java/org/baeldung/SpringContextTest.java b/spring-jinq/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..e0da75c7af
--- /dev/null
+++ b/spring-jinq/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.jinq.JinqApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = JinqApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-jms/pom.xml b/spring-jms/pom.xml
index 2ed58c0c95..ea4af32216 100644
--- a/spring-jms/pom.xml
+++ b/spring-jms/pom.xml
@@ -64,7 +64,6 @@
     <properties>
         <springframework.version>4.3.4.RELEASE</springframework.version>
         <activemq.version>5.14.1</activemq.version>
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
     </properties>
 
 </project>
diff --git a/spring-jms/src/test/java/org/baeldung/SpringContextTest.java b/spring-jms/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..e89faeebb7
--- /dev/null
+++ b/spring-jms/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,15 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:applicationContext.xml", "classpath:EmbeddedActiveMQ.xml"})
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-jooq/pom.xml b/spring-jooq/pom.xml
index 8bce500a86..8a1fa877da 100644
--- a/spring-jooq/pom.xml
+++ b/spring-jooq/pom.xml
@@ -102,7 +102,7 @@
                     <dependency>
                         <groupId>com.h2database</groupId>
                         <artifactId>h2</artifactId>
-                        <version>${com.h2database.version}</version>
+                        <version>${h2.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -189,8 +189,6 @@
 
     <properties>
         <org.jooq.version>3.11.7</org.jooq.version>
-        <com.h2database.version>1.4.193</com.h2database.version>
-
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
         <sql-maven-plugin.version>1.5</sql-maven-plugin.version>
         <properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
diff --git a/spring-kafka/pom.xml b/spring-kafka/pom.xml
index 2fb4c776fe..3d08aaa928 100644
--- a/spring-kafka/pom.xml
+++ b/spring-kafka/pom.xml
@@ -33,7 +33,7 @@
     </dependencies>
 
     <properties>
-        <spring-kafka.version>2.2.2.RELEASE</spring-kafka.version>
+        <spring-kafka.version>2.2.7.RELEASE</spring-kafka.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-kafka/src/main/java/com/baeldung/spring/kafka/KafkaConsumerConfig.java b/spring-kafka/src/main/java/com/baeldung/spring/kafka/KafkaConsumerConfig.java
index 9353e63ff6..933d2353aa 100644
--- a/spring-kafka/src/main/java/com/baeldung/spring/kafka/KafkaConsumerConfig.java
+++ b/spring-kafka/src/main/java/com/baeldung/spring/kafka/KafkaConsumerConfig.java
@@ -29,39 +29,36 @@ public class KafkaConsumerConfig {
         props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
         return new DefaultKafkaConsumerFactory<>(props);
     }
+    
+    public ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerContainerFactory(String groupId) {
+        ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(consumerFactory(groupId));
+        return factory;
+    }
 
     @Bean
     public ConcurrentKafkaListenerContainerFactory<String, String> fooKafkaListenerContainerFactory() {
-        ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();
-        factory.setConsumerFactory(consumerFactory("foo"));
-        return factory;
+        return kafkaListenerContainerFactory("foo");
     }
 
     @Bean
     public ConcurrentKafkaListenerContainerFactory<String, String> barKafkaListenerContainerFactory() {
-        ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();
-        factory.setConsumerFactory(consumerFactory("bar"));
-        return factory;
+        return kafkaListenerContainerFactory("bar");
     }
 
     @Bean
     public ConcurrentKafkaListenerContainerFactory<String, String> headersKafkaListenerContainerFactory() {
-        ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();
-        factory.setConsumerFactory(consumerFactory("headers"));
-        return factory;
+        return kafkaListenerContainerFactory("headers");
     }
     
     @Bean
     public ConcurrentKafkaListenerContainerFactory<String, String> partitionsKafkaListenerContainerFactory() {
-        ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();
-        factory.setConsumerFactory(consumerFactory("partitions"));
-        return factory;
+        return kafkaListenerContainerFactory("partitions");
     }
     
     @Bean
     public ConcurrentKafkaListenerContainerFactory<String, String> filterKafkaListenerContainerFactory() {
-        ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();
-        factory.setConsumerFactory(consumerFactory("filter"));
+        ConcurrentKafkaListenerContainerFactory<String, String> factory = kafkaListenerContainerFactory("filter");
         factory.setRecordFilterStrategy(record -> record.value()
             .contains("World"));
         return factory;
diff --git a/spring-katharsis/pom.xml b/spring-katharsis/pom.xml
index 74786e7926..18bf198948 100644
--- a/spring-katharsis/pom.xml
+++ b/spring-katharsis/pom.xml
@@ -137,7 +137,6 @@
         <katharsis.version>3.0.2</katharsis.version>
         <reflections.version>0.9.10</reflections.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
-        <commons-lang3.version>3.7</commons-lang3.version>
     </properties>
 
 </project>
diff --git a/spring-katharsis/src/test/java/org/baeldung/SpringContextTest.java b/spring-katharsis/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..769a436778
--- /dev/null
+++ b/spring-katharsis/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-ldap/src/test/java/org/baeldung/SpringContextTest.java b/spring-ldap/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..8f0c3d4612
--- /dev/null
+++ b/spring-ldap/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.ldap.javaconfig.AppConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = AppConfig.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-mobile/src/test/java/org/baeldung/SpringContextTest.java b/spring-mobile/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..5e68a8e64f
--- /dev/null
+++ b/spring-mobile/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-mockito/src/test/java/org/baeldung/SpringContextTest.java b/spring-mockito/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..b6a4e8e389
--- /dev/null
+++ b/spring-mockito/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.MocksApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = MocksApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-mvc-session/src/test/resources/.gitignore b/spring-mvc-basics/.gitignore
similarity index 100%
rename from spring-security-mvc-session/src/test/resources/.gitignore
rename to spring-mvc-basics/.gitignore
diff --git a/spring-mvc-basics/README.md b/spring-mvc-basics/README.md
new file mode 100644
index 0000000000..b257b3587b
--- /dev/null
+++ b/spring-mvc-basics/README.md
@@ -0,0 +1,18 @@
+=========
+
+## Spring MVC Basics with Java Configuration Example Project
+
+### The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
+### Relevant Articles: 
+- [Spring MVC Tutorial](https://www.baeldung.com/spring-mvc-tutorial)
+- [The Spring @Controller and @RestController Annotations](http://www.baeldung.com/spring-controller-vs-restcontroller)
+- [A Guide to the ViewResolver in Spring MVC](http://www.baeldung.com/spring-mvc-view-resolver-tutorial)
+- [Guide to Spring Handler Mappings](http://www.baeldung.com/spring-handler-mappings)
+- [Spring MVC Content Negotiation](http://www.baeldung.com/spring-mvc-content-negotiation-json-xml)
+- [Spring @RequestMapping New Shortcut Annotations](http://www.baeldung.com/spring-new-requestmapping-shortcuts)
+- [Spring MVC Custom Validation](http://www.baeldung.com/spring-mvc-custom-validator)
+- [Using Spring @ResponseStatus to Set HTTP Status Code](http://www.baeldung.com/spring-response-status)
+- [Spring MVC and the @ModelAttribute Annotation](http://www.baeldung.com/spring-mvc-and-the-modelattribute-annotation)
+- [The HttpMediaTypeNotAcceptableException in Spring MVC](http://www.baeldung.com/spring-httpmediatypenotacceptable)
\ No newline at end of file
diff --git a/spring-mvc-basics/pom.xml b/spring-mvc-basics/pom.xml
new file mode 100644
index 0000000000..8c52c60b65
--- /dev/null
+++ b/spring-mvc-basics/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-mvc-basics</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-mvc-basics</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <!-- to enable JSP -->
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.baeldung.Application</mainClass>
+                    <layout>JAR</layout>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+
diff --git a/spring-mvc-basics/src/main/java/com/baeldung/Application.java b/spring-mvc-basics/src/main/java/com/baeldung/Application.java
new file mode 100644
index 0000000000..d58049fb35
--- /dev/null
+++ b/spring-mvc-basics/src/main/java/com/baeldung/Application.java
@@ -0,0 +1,11 @@
+package com.baeldung;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/spring-mvc-basics/src/main/java/com/baeldung/config/AppInitializer.java b/spring-mvc-basics/src/main/java/com/baeldung/config/AppInitializer.java
new file mode 100644
index 0000000000..a76d955e4f
--- /dev/null
+++ b/spring-mvc-basics/src/main/java/com/baeldung/config/AppInitializer.java
@@ -0,0 +1,27 @@
+package com.baeldung.config;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+
+import org.springframework.web.WebApplicationInitializer;
+import org.springframework.web.context.ContextLoaderListener;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.springframework.web.servlet.DispatcherServlet;
+
+public class AppInitializer implements WebApplicationInitializer {
+
+    @Override
+    public void onStartup(ServletContext container) throws ServletException {
+        AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
+
+        context.scan("com.baeldung");
+
+        container.addListener(new ContextLoaderListener(context));
+
+        ServletRegistration.Dynamic dispatcher = container.addServlet("mvc", new DispatcherServlet(context));
+        dispatcher.setLoadOnStartup(1);
+        dispatcher.addMapping("/");
+    }
+
+}
diff --git a/spring-mvc-java/src/main/java/com/baeldung/customvalidator/ContactNumberConstraint.java b/spring-mvc-basics/src/main/java/com/baeldung/customvalidator/ContactNumberConstraint.java
similarity index 89%
rename from spring-mvc-java/src/main/java/com/baeldung/customvalidator/ContactNumberConstraint.java
rename to spring-mvc-basics/src/main/java/com/baeldung/customvalidator/ContactNumberConstraint.java
index dbd38c1122..42e441f8f9 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/customvalidator/ContactNumberConstraint.java
+++ b/spring-mvc-basics/src/main/java/com/baeldung/customvalidator/ContactNumberConstraint.java
@@ -1,24 +1,24 @@
-package com.baeldung.customvalidator;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-@Documented
-@Constraint(validatedBy = ContactNumberValidator.class)
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ContactNumberConstraint {
-
-    String message() default "Invalid phone number";
-
-    Class<?>[] groups() default {};
-
-    Class<? extends Payload>[] payload() default {};
-
-}
+package com.baeldung.customvalidator;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+@Documented
+@Constraint(validatedBy = ContactNumberValidator.class)
+@Target({ ElementType.METHOD, ElementType.FIELD })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ContactNumberConstraint {
+
+    String message() default "Invalid phone number";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+}
diff --git a/spring-mvc-java/src/main/java/com/baeldung/customvalidator/ContactNumberValidator.java b/spring-mvc-basics/src/main/java/com/baeldung/customvalidator/ContactNumberValidator.java
similarity index 97%
rename from spring-mvc-java/src/main/java/com/baeldung/customvalidator/ContactNumberValidator.java
rename to spring-mvc-basics/src/main/java/com/baeldung/customvalidator/ContactNumberValidator.java
index dea6b9099b..fe14f3ccf1 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/customvalidator/ContactNumberValidator.java
+++ b/spring-mvc-basics/src/main/java/com/baeldung/customvalidator/ContactNumberValidator.java
@@ -1,17 +1,17 @@
-package com.baeldung.customvalidator;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-public class ContactNumberValidator implements ConstraintValidator<ContactNumberConstraint, String> {
-
-    @Override
-    public void initialize(ContactNumberConstraint contactNumber) {
-    }
-
-    @Override
-    public boolean isValid(String contactField, ConstraintValidatorContext cxt) {
-        return contactField != null && contactField.matches("[0-9]+") && (contactField.length() > 8) && (contactField.length() < 14);
-    }
-
-}
+package com.baeldung.customvalidator;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+public class ContactNumberValidator implements ConstraintValidator<ContactNumberConstraint, String> {
+
+    @Override
+    public void initialize(ContactNumberConstraint contactNumber) {
+    }
+
+    @Override
+    public boolean isValid(String contactField, ConstraintValidatorContext cxt) {
+        return contactField != null && contactField.matches("[0-9]+") && (contactField.length() > 8) && (contactField.length() < 14);
+    }
+
+}
diff --git a/spring-mvc-java/src/main/java/com/baeldung/customvalidator/FieldsValueMatch.java b/spring-mvc-basics/src/main/java/com/baeldung/customvalidator/FieldsValueMatch.java
similarity index 100%
rename from spring-mvc-java/src/main/java/com/baeldung/customvalidator/FieldsValueMatch.java
rename to spring-mvc-basics/src/main/java/com/baeldung/customvalidator/FieldsValueMatch.java
diff --git a/spring-mvc-java/src/main/java/com/baeldung/customvalidator/FieldsValueMatchValidator.java b/spring-mvc-basics/src/main/java/com/baeldung/customvalidator/FieldsValueMatchValidator.java
similarity index 100%
rename from spring-mvc-java/src/main/java/com/baeldung/customvalidator/FieldsValueMatchValidator.java
rename to spring-mvc-basics/src/main/java/com/baeldung/customvalidator/FieldsValueMatchValidator.java
diff --git a/spring-mvc-java/src/main/java/com/baeldung/exception/HttpMediaTypeNotAcceptableExceptionExampleController.java b/spring-mvc-basics/src/main/java/com/baeldung/exception/HttpMediaTypeNotAcceptableExceptionExampleController.java
similarity index 92%
rename from spring-mvc-java/src/main/java/com/baeldung/exception/HttpMediaTypeNotAcceptableExceptionExampleController.java
rename to spring-mvc-basics/src/main/java/com/baeldung/exception/HttpMediaTypeNotAcceptableExceptionExampleController.java
index 539a6032a6..1e3591b7aa 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/exception/HttpMediaTypeNotAcceptableExceptionExampleController.java
+++ b/spring-mvc-basics/src/main/java/com/baeldung/exception/HttpMediaTypeNotAcceptableExceptionExampleController.java
@@ -1,16 +1,18 @@
 package com.baeldung.exception;
 
+import java.util.Collections;
+import java.util.Map;
+
 import org.springframework.http.MediaType;
 import org.springframework.web.HttpMediaTypeNotAcceptableException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Collections;
-import java.util.Map;
-
 @RestController
+@ControllerAdvice
 public class HttpMediaTypeNotAcceptableExceptionExampleController {
 
     @PostMapping(value = "/test", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
diff --git a/spring-mvc-basics/src/main/java/com/baeldung/model/Book.java b/spring-mvc-basics/src/main/java/com/baeldung/model/Book.java
new file mode 100644
index 0000000000..bdfa1d835a
--- /dev/null
+++ b/spring-mvc-basics/src/main/java/com/baeldung/model/Book.java
@@ -0,0 +1,42 @@
+package com.baeldung.model;
+
+public class Book {
+
+    private int id;
+    private String author;
+    private String title;
+
+    public Book() {
+    }
+
+    public Book(int id, String author, String title) {
+        this.id = id;
+        this.author = author;
+        this.title = title;
+    }
+
+    public int getId() {
+        return id;
+    }
+    
+    public void setId(int id) {
+        this.id = id;
+    }
+    
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    
+}
diff --git a/spring-mvc-basics/src/main/java/com/baeldung/model/Employee.java b/spring-mvc-basics/src/main/java/com/baeldung/model/Employee.java
new file mode 100644
index 0000000000..fb0a452219
--- /dev/null
+++ b/spring-mvc-basics/src/main/java/com/baeldung/model/Employee.java
@@ -0,0 +1,61 @@
+package com.baeldung.model;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class Employee {
+
+    private long id;
+    private String name;
+    private String contactNumber;
+    private String workingArea;
+
+    public Employee() {
+        super();
+    }
+
+    public Employee(final long id, final String name, final String contactNumber, final String workingArea) {
+        this.id = id;
+        this.name = name;
+        this.contactNumber = contactNumber;
+        this.workingArea = workingArea;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(final long id) {
+        this.id = id;
+    }
+
+    public String getContactNumber() {
+        return contactNumber;
+    }
+
+    public void setContactNumber(final String contactNumber) {
+        this.contactNumber = contactNumber;
+    }
+
+    public String getWorkingArea() {
+        return workingArea;
+    }
+
+    public void setWorkingArea(final String workingArea) {
+        this.workingArea = workingArea;
+    }
+
+    @Override
+    public String toString() {
+        return "Employee [id=" + id + ", name=" + name + ", contactNumber=" + contactNumber + ", workingArea=" + workingArea + "]";
+    }
+
+}
diff --git a/spring-mvc-java/src/main/java/com/baeldung/model/NewUserForm.java b/spring-mvc-basics/src/main/java/com/baeldung/model/NewUserForm.java
similarity index 82%
rename from spring-mvc-java/src/main/java/com/baeldung/model/NewUserForm.java
rename to spring-mvc-basics/src/main/java/com/baeldung/model/NewUserForm.java
index 12969b6002..b4fe82ab4a 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/model/NewUserForm.java
+++ b/spring-mvc-basics/src/main/java/com/baeldung/model/NewUserForm.java
@@ -2,10 +2,7 @@ package com.baeldung.model;
 
 import com.baeldung.customvalidator.FieldsValueMatch;
 
-@FieldsValueMatch.List({ 
-    @FieldsValueMatch(field = "password", fieldMatch = "verifyPassword", message = "Passwords do not match!"), 
-    @FieldsValueMatch(field = "email", fieldMatch = "verifyEmail", message = "Email addresses do not match!")
-})
+@FieldsValueMatch.List({ @FieldsValueMatch(field = "password", fieldMatch = "verifyPassword", message = "Passwords do not match!"), @FieldsValueMatch(field = "email", fieldMatch = "verifyEmail", message = "Email addresses do not match!") })
 public class NewUserForm {
     private String email;
     private String verifyEmail;
diff --git a/spring-mvc-java/src/main/java/com/baeldung/model/ValidatedPhone.java b/spring-mvc-basics/src/main/java/com/baeldung/model/ValidatedPhone.java
similarity index 94%
rename from spring-mvc-java/src/main/java/com/baeldung/model/ValidatedPhone.java
rename to spring-mvc-basics/src/main/java/com/baeldung/model/ValidatedPhone.java
index be702a8517..8cea915e6e 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/model/ValidatedPhone.java
+++ b/spring-mvc-basics/src/main/java/com/baeldung/model/ValidatedPhone.java
@@ -1,22 +1,22 @@
-package com.baeldung.model;
-
-import com.baeldung.customvalidator.ContactNumberConstraint;
-
-public class ValidatedPhone {
-
-    @ContactNumberConstraint
-    private String phone;
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    @Override
-    public String toString() {
-        return phone;
-    }
-}
+package com.baeldung.model;
+
+import com.baeldung.customvalidator.ContactNumberConstraint;
+
+public class ValidatedPhone {
+
+    @ContactNumberConstraint
+    private String phone;
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    @Override
+    public String toString() {
+        return phone;
+    }
+}
diff --git a/spring-mvc-basics/src/main/java/com/baeldung/spring/web/config/WebConfig.java b/spring-mvc-basics/src/main/java/com/baeldung/spring/web/config/WebConfig.java
new file mode 100644
index 0000000000..9a321f65a2
--- /dev/null
+++ b/spring-mvc-basics/src/main/java/com/baeldung/spring/web/config/WebConfig.java
@@ -0,0 +1,67 @@
+package com.baeldung.spring.web.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.http.MediaType;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.view.InternalResourceViewResolver;
+import org.springframework.web.servlet.view.JstlView;
+import org.springframework.web.servlet.view.ResourceBundleViewResolver;
+import org.springframework.web.servlet.view.XmlViewResolver;
+
+//@EnableWebMvc
+//@ComponentScan(basePackages = { "com.baeldung.web.controller" })
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addViewControllers(final ViewControllerRegistry registry) {
+        registry.addViewController("/")
+            .setViewName("index");
+    }
+
+    @Bean
+    public ViewResolver viewResolver() {
+        final InternalResourceViewResolver bean = new InternalResourceViewResolver();
+        bean.setViewClass(JstlView.class);
+        bean.setPrefix("/WEB-INF/view/");
+        bean.setSuffix(".jsp");
+        bean.setOrder(2);
+        return bean;
+    }
+
+    @Bean
+    public ViewResolver resourceBundleViewResolver() {
+        final ResourceBundleViewResolver bean = new ResourceBundleViewResolver();
+        bean.setBasename("views");
+        bean.setOrder(0);
+        return bean;
+    }
+
+    @Bean
+    public ViewResolver xmlViewResolver() {
+        final XmlViewResolver bean = new XmlViewResolver();
+        bean.setLocation(new ClassPathResource("views.xml"));
+        bean.setOrder(1);
+        return bean;
+    }
+
+    /**
+     * Spring Boot allows configuring Content Negotiation using properties
+     */
+    @Override
+    public void configureContentNegotiation(final ContentNegotiationConfigurer configurer) {
+        configurer.favorPathExtension(true)
+            .favorParameter(true)
+            .parameterName("mediaType")
+            .ignoreAcceptHeader(false)
+            .useRegisteredExtensionsOnly(false)
+            .defaultContentType(MediaType.APPLICATION_JSON)
+            .mediaType("xml", MediaType.APPLICATION_XML)
+            .mediaType("json", MediaType.APPLICATION_JSON);
+    }
+}
\ No newline at end of file
diff --git a/spring-mvc-basics/src/main/java/com/baeldung/web/controller/EmployeeController.java b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/EmployeeController.java
new file mode 100644
index 0000000000..cbea4c98c6
--- /dev/null
+++ b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/EmployeeController.java
@@ -0,0 +1,60 @@
+package com.baeldung.web.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.baeldung.model.Employee;
+
+@Controller
+public class EmployeeController {
+
+    Map<Long, Employee> employeeMap = new HashMap<>();
+
+    @ModelAttribute("employees")
+    public void initEmployees() {
+        employeeMap.put(1L, new Employee(1L, "John", "223334411", "rh"));
+        employeeMap.put(2L, new Employee(2L, "Peter", "22001543", "informatics"));
+        employeeMap.put(3L, new Employee(3L, "Mike", "223334411", "admin"));
+    }
+
+    @RequestMapping(value = "/employee", method = RequestMethod.GET)
+    public ModelAndView showForm() {
+        return new ModelAndView("employeeHome", "employee", new Employee());
+    }
+
+    @RequestMapping(value = "/employee/{Id}", produces = { "application/json", "application/xml" }, method = RequestMethod.GET)
+    public @ResponseBody Employee getEmployeeById(@PathVariable final Long Id) {
+        return employeeMap.get(Id);
+    }
+
+    @RequestMapping(value = "/addEmployee", method = RequestMethod.POST)
+    public String submit(@ModelAttribute("employee") final Employee employee, final BindingResult result, final ModelMap model) {
+        if (result.hasErrors()) {
+            return "error";
+        }
+        model.addAttribute("name", employee.getName());
+        model.addAttribute("contactNumber", employee.getContactNumber());
+        model.addAttribute("workingArea", employee.getWorkingArea());
+        model.addAttribute("id", employee.getId());
+
+        employeeMap.put(employee.getId(), employee);
+
+        return "employeeView";
+    }
+
+    @ModelAttribute
+    public void addAttributes(final Model model) {
+        model.addAttribute("msg", "Welcome to the Netherlands!");
+    }
+}
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/NewUserController.java b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/NewUserController.java
similarity index 100%
rename from spring-mvc-java/src/main/java/com/baeldung/web/controller/NewUserController.java
rename to spring-mvc-basics/src/main/java/com/baeldung/web/controller/NewUserController.java
diff --git a/spring-mvc-basics/src/main/java/com/baeldung/web/controller/RequestMappingShortcutsController.java b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/RequestMappingShortcutsController.java
new file mode 100644
index 0000000000..e91a914c6d
--- /dev/null
+++ b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/RequestMappingShortcutsController.java
@@ -0,0 +1,47 @@
+package com.baeldung.web.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class RequestMappingShortcutsController {
+
+    @GetMapping("/get")
+    public @ResponseBody ResponseEntity<String> get() {
+        return new ResponseEntity<String>("GET Response", HttpStatus.OK);
+    }
+
+    @GetMapping("/get/{id}")
+    public @ResponseBody ResponseEntity<String> getById(@PathVariable String id) {
+        return new ResponseEntity<String>("GET Response : " + id, HttpStatus.OK);
+    }
+
+    @PostMapping("/post")
+    public @ResponseBody ResponseEntity<String> post() {
+        return new ResponseEntity<String>("POST Response", HttpStatus.OK);
+    }
+
+    @PutMapping("/put")
+    public @ResponseBody ResponseEntity<String> put() {
+        return new ResponseEntity<String>("PUT Response", HttpStatus.OK);
+    }
+
+    @DeleteMapping("/delete")
+    public @ResponseBody ResponseEntity<String> delete() {
+        return new ResponseEntity<String>("DELETE Response", HttpStatus.OK);
+    }
+
+    @PatchMapping("/patch")
+    public @ResponseBody ResponseEntity<String> patch() {
+        return new ResponseEntity<String>("PATCH Response", HttpStatus.OK);
+    }
+
+}
diff --git a/spring-mvc-basics/src/main/java/com/baeldung/web/controller/ResponseStatusRestController.java b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/ResponseStatusRestController.java
new file mode 100644
index 0000000000..4cc7589bc8
--- /dev/null
+++ b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/ResponseStatusRestController.java
@@ -0,0 +1,48 @@
+package com.baeldung.web.controller;
+
+import java.util.concurrent.ThreadLocalRandom;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baeldung.model.Book;
+
+@RestController
+public class ResponseStatusRestController {
+
+    @GetMapping("/teapot")
+    @ResponseStatus(HttpStatus.I_AM_A_TEAPOT)
+    public void teaPot() {
+    }
+
+    @GetMapping("empty")
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void emptyResponse() {
+    }
+
+    @GetMapping("empty-no-responsestatus")
+    public void emptyResponseWithoutResponseStatus() {
+    }
+
+    @PostMapping("create")
+    @ResponseStatus(HttpStatus.CREATED)
+    public Book createEntity() {
+        // here we would create and persist an entity
+        int randomInt = ThreadLocalRandom.current()
+            .nextInt(1, 100);
+        Book entity = new Book(randomInt, "author" + randomInt, "title" + randomInt);
+        return entity;
+    }
+    
+    @PostMapping("create-no-responsestatus")
+    public Book createEntityWithoutResponseStatus() {
+        // here we would create and persist an entity
+        int randomInt = ThreadLocalRandom.current()
+            .nextInt(1, 100);
+        Book entity = new Book(randomInt, "author" + randomInt, "title" + randomInt);
+        return entity;
+    }
+}
diff --git a/spring-mvc-basics/src/main/java/com/baeldung/web/controller/SampleController.java b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/SampleController.java
new file mode 100644
index 0000000000..ce89669fde
--- /dev/null
+++ b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/SampleController.java
@@ -0,0 +1,24 @@
+package com.baeldung.web.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class SampleController {
+
+    @GetMapping("/sample")
+    public String showForm() {
+        return "sample";
+    }
+    
+    @GetMapping("/sample2")
+    public String showForm2() {
+        return "sample2";
+    }
+    
+    @GetMapping("/sample3")
+    public String showForm3() {
+        return "sample3";
+    }
+
+}
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/SimpleBookController.java b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/SimpleBookController.java
similarity index 100%
rename from spring-mvc-java/src/main/java/com/baeldung/web/controller/SimpleBookController.java
rename to spring-mvc-basics/src/main/java/com/baeldung/web/controller/SimpleBookController.java
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/SimpleBookRestController.java b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/SimpleBookRestController.java
similarity index 100%
rename from spring-mvc-java/src/main/java/com/baeldung/web/controller/SimpleBookRestController.java
rename to spring-mvc-basics/src/main/java/com/baeldung/web/controller/SimpleBookRestController.java
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/ValidatedPhoneController.java b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/ValidatedPhoneController.java
similarity index 96%
rename from spring-mvc-java/src/main/java/com/baeldung/web/controller/ValidatedPhoneController.java
rename to spring-mvc-basics/src/main/java/com/baeldung/web/controller/ValidatedPhoneController.java
index 9b3a6b3a4c..73e1e4bb25 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/web/controller/ValidatedPhoneController.java
+++ b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/ValidatedPhoneController.java
@@ -1,32 +1,32 @@
-package com.baeldung.web.controller;
-
-import com.baeldung.model.ValidatedPhone;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import javax.validation.Valid;
-
-@Controller
-public class ValidatedPhoneController {
-
-    @GetMapping("/validatePhone")
-    public String loadFormPage(Model m) {
-        m.addAttribute("validatedPhone", new ValidatedPhone());
-        return "phoneHome";
-    }
-
-    @PostMapping("/addValidatePhone")
-    public String submitForm(@Valid ValidatedPhone validatedPhone, BindingResult result, Model m) {
-        if (result.hasErrors()) {
-            return "phoneHome";
-        }
-
-        m.addAttribute("message", "Successfully saved phone: " + validatedPhone.toString());
-        return "phoneHome";
-    }
-
-
-}
+package com.baeldung.web.controller;
+
+import javax.validation.Valid;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import com.baeldung.model.ValidatedPhone;
+
+@Controller
+public class ValidatedPhoneController {
+
+    @GetMapping("/validatePhone")
+    public String loadFormPage(Model m) {
+        m.addAttribute("validatedPhone", new ValidatedPhone());
+        return "phoneHome";
+    }
+
+    @PostMapping("/addValidatePhone")
+    public String submitForm(@Valid ValidatedPhone validatedPhone, BindingResult result, Model m) {
+        if (result.hasErrors()) {
+            return "phoneHome";
+        }
+
+        m.addAttribute("message", "Successfully saved phone: " + validatedPhone.toString());
+        return "phoneHome";
+    }
+
+}
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/handlermapping/BeanNameHandlerMappingController.java b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/handlermapping/BeanNameHandlerMappingController.java
similarity index 100%
rename from spring-mvc-java/src/main/java/com/baeldung/web/controller/handlermapping/BeanNameHandlerMappingController.java
rename to spring-mvc-basics/src/main/java/com/baeldung/web/controller/handlermapping/BeanNameHandlerMappingController.java
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/handlermapping/SimpleUrlMappingController.java b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/handlermapping/SimpleUrlMappingController.java
similarity index 100%
rename from spring-mvc-java/src/main/java/com/baeldung/web/controller/handlermapping/SimpleUrlMappingController.java
rename to spring-mvc-basics/src/main/java/com/baeldung/web/controller/handlermapping/SimpleUrlMappingController.java
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/handlermapping/WelcomeController.java b/spring-mvc-basics/src/main/java/com/baeldung/web/controller/handlermapping/WelcomeController.java
similarity index 100%
rename from spring-mvc-java/src/main/java/com/baeldung/web/controller/handlermapping/WelcomeController.java
rename to spring-mvc-basics/src/main/java/com/baeldung/web/controller/handlermapping/WelcomeController.java
diff --git a/spring-mvc-basics/src/main/resources/application.properties b/spring-mvc-basics/src/main/resources/application.properties
new file mode 100644
index 0000000000..b8a9be0b40
--- /dev/null
+++ b/spring-mvc-basics/src/main/resources/application.properties
@@ -0,0 +1,7 @@
+server.servlet.context-path=/spring-mvc-basics
+
+### Content Negotiation (already defined programatically)
+spring.mvc.pathmatch.use-suffix-pattern=true
+#spring.mvc.contentnegotiation.favor-path-extension=true
+#spring.mvc.contentnegotiation.favor-parameter=true
+#spring.mvc.contentnegotiation.parameter-name=mediaType
diff --git a/spring-mvc-basics/src/main/resources/mvc-configuration.xml b/spring-mvc-basics/src/main/resources/mvc-configuration.xml
new file mode 100644
index 0000000000..7505614c99
--- /dev/null
+++ b/spring-mvc-basics/src/main/resources/mvc-configuration.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:mvc="http://www.springframework.org/schema/mvc"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<context:component-scan base-package="org.baeldung.controller.xml" />
+	<mvc:annotation-driven />
+
+	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+		<property name="prefix">
+			<value>/WEB-INF/view/</value>
+		</property>
+		<property name="suffix">
+			<value>.jsp</value>
+		</property>
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/spring-mvc-basics/src/main/resources/views.properties b/spring-mvc-basics/src/main/resources/views.properties
new file mode 100644
index 0000000000..06d042b446
--- /dev/null
+++ b/spring-mvc-basics/src/main/resources/views.properties
@@ -0,0 +1,3 @@
+sample2.(class)=org.springframework.web.servlet.view.JstlView
+sample2.url=/WEB-INF/view2/sample2.jsp
+
diff --git a/spring-mvc-java/src/main/resources/views.xml b/spring-mvc-basics/src/main/resources/views.xml
similarity index 63%
rename from spring-mvc-java/src/main/resources/views.xml
rename to spring-mvc-basics/src/main/resources/views.xml
index 83bca5293d..a44d3deae4 100644
--- a/spring-mvc-java/src/main/resources/views.xml
+++ b/spring-mvc-basics/src/main/resources/views.xml
@@ -1,10 +1,10 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-4.2.xsd">
- 
-    <bean id="sample" class="org.springframework.web.servlet.view.JstlView">
-        <property name="url" value="/WEB-INF/view/sample.jsp" />
-    </bean>
-    
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans-4.2.xsd">
+ 
+    <bean id="sample3" class="org.springframework.web.servlet.view.JstlView">
+        <property name="url" value="/WEB-INF/view3/sample3.jsp" />
+    </bean>
+    
 </beans>
\ No newline at end of file
diff --git a/spring-mvc-basics/src/main/webapp/WEB-INF/view/employeeHome.jsp b/spring-mvc-basics/src/main/webapp/WEB-INF/view/employeeHome.jsp
new file mode 100644
index 0000000000..fa5812faea
--- /dev/null
+++ b/spring-mvc-basics/src/main/webapp/WEB-INF/view/employeeHome.jsp
@@ -0,0 +1,33 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Form Example - Register an Employee</title>
+</head>
+<body>
+	<h3>Welcome, Enter The Employee Details</h3>
+
+	<form:form method="POST" action="/spring-mvc-basics/addEmployee" modelAttribute="employee">
+		<table>
+			<tr>
+				<td><form:label path="name">Name</form:label></td>
+				<td><form:input path="name" /></td>
+			</tr>
+			<tr>
+				<td><form:label path="id">Id</form:label></td>
+				<td><form:input path="id" /></td>
+			</tr>
+			<tr>
+				<td><form:label path="contactNumber">Contact Number</form:label></td>
+				<td><form:input path="contactNumber" /></td>
+			</tr>
+			<tr>
+				<td><input type="submit" value="Submit" /></td>
+			</tr>
+		</table>
+	</form:form>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/spring-mvc-basics/src/main/webapp/WEB-INF/view/employeeView.jsp b/spring-mvc-basics/src/main/webapp/WEB-INF/view/employeeView.jsp
new file mode 100644
index 0000000000..9a9b879a35
--- /dev/null
+++ b/spring-mvc-basics/src/main/webapp/WEB-INF/view/employeeView.jsp
@@ -0,0 +1,25 @@
+<%@taglib uri="http://www.springframework.org/tags/form" prefix="form"%>
+<html>
+<head>
+<title>Spring MVC Form Handling</title>
+</head>
+<body>
+
+	<h2>Submitted Employee Information</h2>
+	<h3>${msg}</h3>
+	<table>
+		<tr>
+			<td>Name :</td>
+			<td>${name}</td>
+		</tr>
+		<tr>
+			<td>ID :</td>
+			<td>${id}</td>
+		</tr>
+		<tr>
+			<td>Contact Number :</td>
+			<td>${contactNumber}</td>
+		</tr>
+	</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-mvc-basics/src/main/webapp/WEB-INF/view/index.jsp b/spring-mvc-basics/src/main/webapp/WEB-INF/view/index.jsp
new file mode 100644
index 0000000000..4f4eb0068d
--- /dev/null
+++ b/spring-mvc-basics/src/main/webapp/WEB-INF/view/index.jsp
@@ -0,0 +1,7 @@
+<html>
+<head></head>
+
+<body>
+	<h1>This is the body of the index view</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-mvc-java/src/main/webapp/WEB-INF/view/phoneHome.jsp b/spring-mvc-basics/src/main/webapp/WEB-INF/view/phoneHome.jsp
similarity index 89%
rename from spring-mvc-java/src/main/webapp/WEB-INF/view/phoneHome.jsp
rename to spring-mvc-basics/src/main/webapp/WEB-INF/view/phoneHome.jsp
index b873e9bc5f..ebc9052639 100644
--- a/spring-mvc-java/src/main/webapp/WEB-INF/view/phoneHome.jsp
+++ b/spring-mvc-basics/src/main/webapp/WEB-INF/view/phoneHome.jsp
@@ -1,38 +1,38 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-
-<!DOCTYPE HTML>
-<html>
-  <head>
-    <title>Sample Form</title>
-    <style>
-    	body { background-color: #eee; font: helvetica; }
-    	#container { width: 500px; background-color: #fff; margin: 30px auto; padding: 30px; border-radius: 5px; }
-    	.green { font-weight: bold; color: green; }
-    	.message { margin-bottom: 10px; }
-    	label {width:70px; display:inline-block;}
-    	input { display:inline-block; margin-right: 10px; }
-    	form {line-height: 160%; }
-    	.hide { display: none; }
-    	.error { color: red; font-size: 0.9em; font-weight: bold; }
-    </style>
-  </head>
-  <body>
-	
-	<div id="container">
-	
-		<h2>Phone Number</h2>
-		<c:if test="${not empty message}"><div class="message green">${message}</div></c:if>
-		
-		<form:form action="/spring-mvc-java/addValidatePhone" modelAttribute="validatedPhone">
-			
-			<label for="phoneInput">Phone: </label>
-			<form:input path="phone" id="phoneInput" />
-			<form:errors path="phone" cssClass="error" />
-			<br/>
-			
-			<input type="submit" value="Submit" />
-		</form:form>
-	</div>
-  </body>
-</html>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <title>Sample Form</title>
+    <style>
+    	body { background-color: #eee; font: helvetica; }
+    	#container { width: 500px; background-color: #fff; margin: 30px auto; padding: 30px; border-radius: 5px; }
+    	.green { font-weight: bold; color: green; }
+    	.message { margin-bottom: 10px; }
+    	label {width:70px; display:inline-block;}
+    	input { display:inline-block; margin-right: 10px; }
+    	form {line-height: 160%; }
+    	.hide { display: none; }
+    	.error { color: red; font-size: 0.9em; font-weight: bold; }
+    </style>
+  </head>
+  <body>
+	
+	<div id="container">
+	
+		<h2>Phone Number</h2>
+		<c:if test="${not empty message}"><div class="message green">${message}</div></c:if>
+		
+		<form:form action="/spring-mvc-basics/addValidatePhone" modelAttribute="validatedPhone">
+			
+			<label for="phoneInput">Phone: </label>
+			<form:input path="phone" id="phoneInput" />
+			<form:errors path="phone" cssClass="error" />
+			<br/>
+			
+			<input type="submit" value="Submit" />
+		</form:form>
+	</div>
+  </body>
+</html>
diff --git a/spring-mvc-basics/src/main/webapp/WEB-INF/view/sample.jsp b/spring-mvc-basics/src/main/webapp/WEB-INF/view/sample.jsp
new file mode 100644
index 0000000000..7cc14b5dcd
--- /dev/null
+++ b/spring-mvc-basics/src/main/webapp/WEB-INF/view/sample.jsp
@@ -0,0 +1,7 @@
+<html>
+<head></head>
+
+<body>
+	<h1>This is the body of the sample view</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-mvc-basics/src/main/webapp/WEB-INF/view2/sample2.jsp b/spring-mvc-basics/src/main/webapp/WEB-INF/view2/sample2.jsp
new file mode 100644
index 0000000000..c826700a75
--- /dev/null
+++ b/spring-mvc-basics/src/main/webapp/WEB-INF/view2/sample2.jsp
@@ -0,0 +1,7 @@
+<html>
+<head></head>
+
+<body>
+	<h1>This is the body of the sample2 view</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-mvc-basics/src/main/webapp/WEB-INF/view3/sample3.jsp b/spring-mvc-basics/src/main/webapp/WEB-INF/view3/sample3.jsp
new file mode 100644
index 0000000000..b58a0973da
--- /dev/null
+++ b/spring-mvc-basics/src/main/webapp/WEB-INF/view3/sample3.jsp
@@ -0,0 +1,7 @@
+<html>
+<head></head>
+
+<body>
+	<h1>This is the body of the sample3 view</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-mvc-basics/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-mvc-basics/src/test/java/com/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..2feb9efce1
--- /dev/null
+++ b/spring-mvc-basics/src/test/java/com/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,13 @@
+package com.baeldung;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+public class SpringContextIntegrationTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+
+    }
+}
diff --git a/spring-mvc-java/src/test/java/com/baeldung/config/BeanNameUrlHandlerMappingConfig.java b/spring-mvc-basics/src/test/java/com/baeldung/config/BeanNameUrlHandlerMappingConfig.java
similarity index 76%
rename from spring-mvc-java/src/test/java/com/baeldung/config/BeanNameUrlHandlerMappingConfig.java
rename to spring-mvc-basics/src/test/java/com/baeldung/config/BeanNameUrlHandlerMappingConfig.java
index e3dcb15de8..577825d8c5 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/config/BeanNameUrlHandlerMappingConfig.java
+++ b/spring-mvc-basics/src/test/java/com/baeldung/config/BeanNameUrlHandlerMappingConfig.java
@@ -1,11 +1,10 @@
 package com.baeldung.config;
 
-import com.baeldung.web.controller.handlermapping.WelcomeController;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping;
-import org.springframework.web.servlet.view.InternalResourceViewResolver;
+
+import com.baeldung.web.controller.handlermapping.WelcomeController;
 
 @Configuration
 public class BeanNameUrlHandlerMappingConfig {
@@ -16,7 +15,7 @@ public class BeanNameUrlHandlerMappingConfig {
     }
 
     @Bean("/beanNameUrl")
-    public WelcomeController welcome() {
+    public WelcomeController welcomeBeanNameMappingConfig() {
         return new WelcomeController();
     }
 
diff --git a/spring-mvc-java/src/test/java/com/baeldung/config/HandlerMappingDefaultConfig.java b/spring-mvc-basics/src/test/java/com/baeldung/config/HandlerMappingDefaultConfig.java
similarity index 90%
rename from spring-mvc-java/src/test/java/com/baeldung/config/HandlerMappingDefaultConfig.java
rename to spring-mvc-basics/src/test/java/com/baeldung/config/HandlerMappingDefaultConfig.java
index d3a329a387..4072278fee 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/config/HandlerMappingDefaultConfig.java
+++ b/spring-mvc-basics/src/test/java/com/baeldung/config/HandlerMappingDefaultConfig.java
@@ -16,7 +16,7 @@ public class HandlerMappingDefaultConfig {
     }
 
     @Bean
-    public WelcomeController welcome() {
+    public WelcomeController welcomeDefaultMappingConfig() {
         return new WelcomeController();
     }
 
diff --git a/spring-mvc-java/src/test/java/com/baeldung/config/HandlerMappingPrioritiesConfig.java b/spring-mvc-basics/src/test/java/com/baeldung/config/HandlerMappingPrioritiesConfig.java
similarity index 89%
rename from spring-mvc-java/src/test/java/com/baeldung/config/HandlerMappingPrioritiesConfig.java
rename to spring-mvc-basics/src/test/java/com/baeldung/config/HandlerMappingPrioritiesConfig.java
index 2d80dbfeaf..c5fec171a7 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/config/HandlerMappingPrioritiesConfig.java
+++ b/spring-mvc-basics/src/test/java/com/baeldung/config/HandlerMappingPrioritiesConfig.java
@@ -16,14 +16,14 @@ import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 public class HandlerMappingPrioritiesConfig {
 
     @Bean
-    BeanNameUrlHandlerMapping beanNameUrlHandlerMapping() {
+    BeanNameUrlHandlerMapping beanNameUrlHandlerMappingOrder1() {
         BeanNameUrlHandlerMapping beanNameUrlHandlerMapping = new BeanNameUrlHandlerMapping();
         beanNameUrlHandlerMapping.setOrder(1);
         return beanNameUrlHandlerMapping;
     }
 
     @Bean
-    public SimpleUrlHandlerMapping simpleUrlHandlerMapping() {
+    public SimpleUrlHandlerMapping simpleUrlHandlerMappingOrder0() {
         SimpleUrlHandlerMapping simpleUrlHandlerMapping = new SimpleUrlHandlerMapping();
         simpleUrlHandlerMapping.setOrder(0);
         Map<String, Object> urlMap = new HashMap<>();
@@ -37,7 +37,7 @@ public class HandlerMappingPrioritiesConfig {
         return new SimpleUrlMappingController();
     }
 
-    @Bean("/welcome")
+    @Bean("/welcome-priorities")
     public BeanNameHandlerMappingController beanNameHandlerMapping() {
         return new BeanNameHandlerMappingController();
     }
diff --git a/spring-mvc-java/src/test/java/com/baeldung/config/SimpleUrlHandlerMappingConfig.java b/spring-mvc-basics/src/test/java/com/baeldung/config/SimpleUrlHandlerMappingConfig.java
similarity index 85%
rename from spring-mvc-java/src/test/java/com/baeldung/config/SimpleUrlHandlerMappingConfig.java
rename to spring-mvc-basics/src/test/java/com/baeldung/config/SimpleUrlHandlerMappingConfig.java
index c7921c2706..7a366ecbd7 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/config/SimpleUrlHandlerMappingConfig.java
+++ b/spring-mvc-basics/src/test/java/com/baeldung/config/SimpleUrlHandlerMappingConfig.java
@@ -18,7 +18,7 @@ import org.springframework.web.servlet.view.InternalResourceViewResolver;
 public class SimpleUrlHandlerMappingConfig {
 
     @Bean
-    public ViewResolver viewResolver() {
+    public ViewResolver viewResolverSimpleMappingConfig() {
         InternalResourceViewResolver viewResolver = new InternalResourceViewResolver();
         viewResolver.setPrefix("/");
         viewResolver.setSuffix(".jsp");
@@ -29,13 +29,13 @@ public class SimpleUrlHandlerMappingConfig {
     public SimpleUrlHandlerMapping simpleUrlHandlerMapping() {
         SimpleUrlHandlerMapping simpleUrlHandlerMapping = new SimpleUrlHandlerMapping();
         Map<String, Object> urlMap = new HashMap<>();
-        urlMap.put("/simpleUrlWelcome", welcome());
+        urlMap.put("/simpleUrlWelcome", welcomeSimpleMappingConfig());
         simpleUrlHandlerMapping.setUrlMap(urlMap);
         return simpleUrlHandlerMapping;
     }
 
     @Bean
-    public WelcomeController welcome() {
+    public WelcomeController welcomeSimpleMappingConfig() {
         return new WelcomeController();
     }
 
diff --git a/spring-mvc-basics/src/test/java/com/baeldung/exception/HttpMediaTypeNotAcceptableExceptionControllerIntegrationTest.java b/spring-mvc-basics/src/test/java/com/baeldung/exception/HttpMediaTypeNotAcceptableExceptionControllerIntegrationTest.java
new file mode 100644
index 0000000000..797e489080
--- /dev/null
+++ b/spring-mvc-basics/src/test/java/com/baeldung/exception/HttpMediaTypeNotAcceptableExceptionControllerIntegrationTest.java
@@ -0,0 +1,30 @@
+package com.baeldung.exception;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+
+import com.baeldung.Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+@AutoConfigureMockMvc
+public class HttpMediaTypeNotAcceptableExceptionControllerIntegrationTest {
+
+    @Autowired
+    MockMvc mockMvc;
+
+    @Test
+    public void whenHttpMediaTypeNotAcceptableExceptionTriggered_thenExceptionHandled() throws Exception {
+        mockMvc.perform(post("/test").contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_PDF))
+            .andExpect(content().string("acceptable MIME type:application/json"));
+    }
+}
diff --git a/spring-mvc-java/src/test/java/com/baeldung/handlermappings/BeanNameMappingConfigIntegrationTest.java b/spring-mvc-basics/src/test/java/com/baeldung/handlermappings/BeanNameMappingConfigIntegrationTest.java
similarity index 100%
rename from spring-mvc-java/src/test/java/com/baeldung/handlermappings/BeanNameMappingConfigIntegrationTest.java
rename to spring-mvc-basics/src/test/java/com/baeldung/handlermappings/BeanNameMappingConfigIntegrationTest.java
diff --git a/spring-mvc-java/src/test/java/com/baeldung/handlermappings/HandlerMappingDefaultConfigIntegrationTest.java b/spring-mvc-basics/src/test/java/com/baeldung/handlermappings/HandlerMappingDefaultConfigIntegrationTest.java
similarity index 100%
rename from spring-mvc-java/src/test/java/com/baeldung/handlermappings/HandlerMappingDefaultConfigIntegrationTest.java
rename to spring-mvc-basics/src/test/java/com/baeldung/handlermappings/HandlerMappingDefaultConfigIntegrationTest.java
diff --git a/spring-mvc-java/src/test/java/com/baeldung/handlermappings/HandlerMappingPriorityConfigIntegrationTest.java b/spring-mvc-basics/src/test/java/com/baeldung/handlermappings/HandlerMappingPriorityConfigIntegrationTest.java
similarity index 100%
rename from spring-mvc-java/src/test/java/com/baeldung/handlermappings/HandlerMappingPriorityConfigIntegrationTest.java
rename to spring-mvc-basics/src/test/java/com/baeldung/handlermappings/HandlerMappingPriorityConfigIntegrationTest.java
diff --git a/spring-mvc-java/src/test/java/com/baeldung/handlermappings/SimpleUrlMappingConfigIntegrationTest.java b/spring-mvc-basics/src/test/java/com/baeldung/handlermappings/SimpleUrlMappingConfigIntegrationTest.java
similarity index 100%
rename from spring-mvc-java/src/test/java/com/baeldung/handlermappings/SimpleUrlMappingConfigIntegrationTest.java
rename to spring-mvc-basics/src/test/java/com/baeldung/handlermappings/SimpleUrlMappingConfigIntegrationTest.java
diff --git a/spring-mvc-java/src/test/java/com/baeldung/web/controller/ClassValidationMvcIntegrationTest.java b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/ClassValidationMvcIntegrationTest.java
similarity index 51%
rename from spring-mvc-java/src/test/java/com/baeldung/web/controller/ClassValidationMvcIntegrationTest.java
rename to spring-mvc-basics/src/test/java/com/baeldung/web/controller/ClassValidationMvcIntegrationTest.java
index 2cd225a775..24182f492a 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/web/controller/ClassValidationMvcIntegrationTest.java
+++ b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/ClassValidationMvcIntegrationTest.java
@@ -5,46 +5,47 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 public class ClassValidationMvcIntegrationTest {
-  private MockMvc mockMvc;
-    
-    @Before
-    public void setup(){
-        this.mockMvc = MockMvcBuilders.standaloneSetup(new NewUserController()).build();
+    private MockMvc mockMvc;
+
+    @BeforeEach
+    public void setup() {
+        this.mockMvc = MockMvcBuilders.standaloneSetup(new NewUserController())
+            .build();
     }
-    
+
     @Test
     public void givenMatchingEmailPassword_whenPostNewUserForm_thenOk() throws Exception {
         this.mockMvc.perform(MockMvcRequestBuilders.post("/user")
-                .accept(MediaType.TEXT_HTML)
-                .param("email", "john@yahoo.com")
-                .param("verifyEmail", "john@yahoo.com")
-                .param("password", "pass")
-                .param("verifyPassword", "pass"))
-                .andExpect(model().attribute("message", "Valid form"))
-                .andExpect(view().name("userHome"))
-                .andExpect(status().isOk())
-                .andDo(print());
+            .accept(MediaType.TEXT_HTML)
+            .param("email", "john@yahoo.com")
+            .param("verifyEmail", "john@yahoo.com")
+            .param("password", "pass")
+            .param("verifyPassword", "pass"))
+            .andExpect(model().attribute("message", "Valid form"))
+            .andExpect(view().name("userHome"))
+            .andExpect(status().isOk())
+            .andDo(print());
     }
-    
+
     @Test
     public void givenNotMatchingEmailPassword_whenPostNewUserForm_thenOk() throws Exception {
         this.mockMvc.perform(MockMvcRequestBuilders.post("/user")
-                .accept(MediaType.TEXT_HTML)
-                .param("email", "john@yahoo.com")
-                .param("verifyEmail", "john@yahoo.commmm")
-                .param("password", "pass")
-                .param("verifyPassword", "passsss"))
-                .andExpect(model().errorCount(2))
-                .andExpect(view().name("userHome"))
-                .andExpect(status().isOk())
-                .andDo(print());
+            .accept(MediaType.TEXT_HTML)
+            .param("email", "john@yahoo.com")
+            .param("verifyEmail", "john@yahoo.commmm")
+            .param("password", "pass")
+            .param("verifyPassword", "passsss"))
+            .andExpect(model().errorCount(2))
+            .andExpect(view().name("userHome"))
+            .andExpect(status().isOk())
+            .andDo(print());
     }
 }
diff --git a/spring-mvc-java/src/test/java/com/baeldung/web/controller/CustomMVCValidatorIntegrationTest.java b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/CustomMVCValidatorIntegrationTest.java
similarity index 63%
rename from spring-mvc-java/src/test/java/com/baeldung/web/controller/CustomMVCValidatorIntegrationTest.java
rename to spring-mvc-basics/src/test/java/com/baeldung/web/controller/CustomMVCValidatorIntegrationTest.java
index 013cf9c91d..11b72e1650 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/web/controller/CustomMVCValidatorIntegrationTest.java
+++ b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/CustomMVCValidatorIntegrationTest.java
@@ -1,41 +1,43 @@
-package com.baeldung.web.controller;
-
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-
-public class CustomMVCValidatorIntegrationTest {
-    
-    private MockMvc mockMvc;
-    
-    @Before
-    public void setup(){
-        this.mockMvc = MockMvcBuilders.standaloneSetup(new ValidatedPhoneController()).build();
-    }
-    
-    @Test
-    public void givenPhonePageUri_whenMockMvc_thenReturnsPhonePage() throws Exception{
-        this.mockMvc.perform(get("/validatePhone")).andExpect(view().name("phoneHome"));
-    }
-    
-    @Test
-    public void givenPhoneURIWithPostAndFormData_whenMockMVC_thenVerifyErrorResponse() throws Exception {
-        this.mockMvc.perform(MockMvcRequestBuilders.post("/addValidatePhone").
-                accept(MediaType.TEXT_HTML).
-                param("phoneInput", "123")).
-                andExpect(model().attributeHasFieldErrorCode("validatedPhone", "phone","ContactNumberConstraint")).
-                andExpect(view().name("phoneHome")).
-                andExpect(status().isOk()).
-                andDo(print());
-    }
-    
-}
+package com.baeldung.web.controller;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+public class CustomMVCValidatorIntegrationTest {
+
+    private MockMvc mockMvc;
+
+    @BeforeEach
+    public void setup() {
+        this.mockMvc = MockMvcBuilders.standaloneSetup(new ValidatedPhoneController())
+            .build();
+    }
+
+    @Test
+    public void givenPhonePageUri_whenMockMvc_thenReturnsPhonePage() throws Exception {
+        this.mockMvc.perform(get("/validatePhone"))
+            .andExpect(view().name("phoneHome"));
+    }
+
+    @Test
+    public void givenPhoneURIWithPostAndFormData_whenMockMVC_thenVerifyErrorResponse() throws Exception {
+        this.mockMvc.perform(MockMvcRequestBuilders.post("/addValidatePhone")
+            .accept(MediaType.TEXT_HTML)
+            .param("phoneInput", "123"))
+            .andExpect(model().attributeHasFieldErrorCode("validatedPhone", "phone", "ContactNumberConstraint"))
+            .andExpect(view().name("phoneHome"))
+            .andExpect(status().isOk())
+            .andDo(print());
+    }
+
+}
diff --git a/spring-mvc-basics/src/test/java/com/baeldung/web/controller/EmployeeControllerContentNegotiationIntegrationTest.java b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/EmployeeControllerContentNegotiationIntegrationTest.java
new file mode 100644
index 0000000000..6500955d23
--- /dev/null
+++ b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/EmployeeControllerContentNegotiationIntegrationTest.java
@@ -0,0 +1,63 @@
+package com.baeldung.web.controller;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+public class EmployeeControllerContentNegotiationIntegrationTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    public void whenEndpointUsingJsonSuffixCalled_thenJsonResponseObtained() throws Exception {
+        this.mockMvc.perform(get("/employee/1.json"))
+            .andExpect(status().isOk())
+            .andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE));
+    }
+
+    @Test
+    public void whenEndpointUsingXmlSuffixCalled_thenXmlResponseObtained() throws Exception {
+        this.mockMvc.perform(get("/employee/1.xml"))
+            .andExpect(status().isOk())
+            .andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_XML_VALUE));
+    }
+
+    @Test
+    public void whenEndpointUsingJsonParameterCalled_thenJsonResponseObtained() throws Exception {
+        this.mockMvc.perform(get("/employee/1?mediaType=json"))
+            .andExpect(status().isOk())
+            .andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE));
+    }
+
+    @Test
+    public void whenEndpointUsingXmlParameterCalled_thenXmlResponseObtained() throws Exception {
+        this.mockMvc.perform(get("/employee/1?mediaType=xml"))
+            .andExpect(status().isOk())
+            .andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_XML_VALUE));
+    }
+
+    @Test
+    public void whenEndpointUsingJsonAcceptHeaderCalled_thenJsonResponseObtained() throws Exception {
+        this.mockMvc.perform(get("/employee/1").header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE));
+    }
+
+    @Test
+    public void whenEndpointUsingXmlAcceptHeaderCalled_thenXmlResponseObtained() throws Exception {
+        this.mockMvc.perform(get("/employee/1").header(HttpHeaders.ACCEPT, MediaType.APPLICATION_XML_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_XML_VALUE));
+    }
+}
diff --git a/spring-mvc-basics/src/test/java/com/baeldung/web/controller/EmployeeControllerModelAttributeIntegrationTest.java b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/EmployeeControllerModelAttributeIntegrationTest.java
new file mode 100644
index 0000000000..5195adabd5
--- /dev/null
+++ b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/EmployeeControllerModelAttributeIntegrationTest.java
@@ -0,0 +1,40 @@
+package com.baeldung.web.controller;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+public class EmployeeControllerModelAttributeIntegrationTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    public void givenUrlEncodedFormData_whenAddEmployeeEndpointCalled_thenModelContainsMsgAttribute() throws Exception {
+        Collection<NameValuePair> formData = Arrays.asList(new BasicNameValuePair("name", "employeeName"), new BasicNameValuePair("id", "99"), new BasicNameValuePair("contactNumber", "123456789"));
+        String urlEncodedFormData = EntityUtils.toString(new UrlEncodedFormEntity(formData));
+
+        mockMvc.perform(post("/addEmployee").contentType(MediaType.APPLICATION_FORM_URLENCODED)
+            .content(urlEncodedFormData))
+            .andExpect(status().isOk())
+            .andExpect(view().name("employeeView"))
+            .andExpect(model().attribute("msg", "Welcome to the Netherlands!"));
+    }
+}
diff --git a/spring-mvc-basics/src/test/java/com/baeldung/web/controller/RequestMapingShortcutsIntegrationTest.java b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/RequestMapingShortcutsIntegrationTest.java
new file mode 100644
index 0000000000..3fbb5da75e
--- /dev/null
+++ b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/RequestMapingShortcutsIntegrationTest.java
@@ -0,0 +1,97 @@
+package com.baeldung.web.controller;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+public class RequestMapingShortcutsIntegrationTest {
+
+    private MockMvc mockMvc;
+
+    @BeforeEach
+    public void setup() {
+        this.mockMvc = MockMvcBuilders.standaloneSetup(new RequestMappingShortcutsController())
+            .build();
+    }
+
+    @Test
+    public void giventUrl_whenGetRequest_thenFindGetResponse() throws Exception {
+
+        MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.get("/get");
+
+        ResultMatcher contentMatcher = MockMvcResultMatchers.content()
+            .string("GET Response");
+
+        this.mockMvc.perform(builder)
+            .andExpect(contentMatcher)
+            .andExpect(MockMvcResultMatchers.status()
+                .isOk());
+
+    }
+
+    @Test
+    public void giventUrl_whenPostRequest_thenFindPostResponse() throws Exception {
+
+        MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.post("/post");
+
+        ResultMatcher contentMatcher = MockMvcResultMatchers.content()
+            .string("POST Response");
+
+        this.mockMvc.perform(builder)
+            .andExpect(contentMatcher)
+            .andExpect(MockMvcResultMatchers.status()
+                .isOk());
+
+    }
+
+    @Test
+    public void giventUrl_whenPutRequest_thenFindPutResponse() throws Exception {
+
+        MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.put("/put");
+
+        ResultMatcher contentMatcher = MockMvcResultMatchers.content()
+            .string("PUT Response");
+
+        this.mockMvc.perform(builder)
+            .andExpect(contentMatcher)
+            .andExpect(MockMvcResultMatchers.status()
+                .isOk());
+
+    }
+
+    @Test
+    public void giventUrl_whenDeleteRequest_thenFindDeleteResponse() throws Exception {
+
+        MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.delete("/delete");
+
+        ResultMatcher contentMatcher = MockMvcResultMatchers.content()
+            .string("DELETE Response");
+
+        this.mockMvc.perform(builder)
+            .andExpect(contentMatcher)
+            .andExpect(MockMvcResultMatchers.status()
+                .isOk());
+
+    }
+
+    @Test
+    public void giventUrl_whenPatchRequest_thenFindPatchResponse() throws Exception {
+
+        MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.patch("/patch");
+
+        ResultMatcher contentMatcher = MockMvcResultMatchers.content()
+            .string("PATCH Response");
+
+        this.mockMvc.perform(builder)
+            .andExpect(contentMatcher)
+            .andExpect(MockMvcResultMatchers.status()
+                .isOk());
+
+    }
+
+}
diff --git a/spring-mvc-basics/src/test/java/com/baeldung/web/controller/ResponseStatusRestControllerIntegrationTest.java b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/ResponseStatusRestControllerIntegrationTest.java
new file mode 100644
index 0000000000..1f37a3750c
--- /dev/null
+++ b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/ResponseStatusRestControllerIntegrationTest.java
@@ -0,0 +1,52 @@
+package com.baeldung.web.controller;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+public class ResponseStatusRestControllerIntegrationTest {
+
+    private MockMvc mockMvc;
+
+    @BeforeEach
+    public void setup() {
+        this.mockMvc = MockMvcBuilders.standaloneSetup(new ResponseStatusRestController())
+            .build();
+    }
+
+    @Test
+    public void whenTeapotEndpointCalled_thenTeapotResponseObtained() throws Exception {
+        this.mockMvc.perform(get("/teapot"))
+            .andExpect(status().isIAmATeapot());
+    }
+
+    @Test
+    public void whenEmptyNoContentEndpointCalled_thenNoContentResponseObtained() throws Exception {
+        this.mockMvc.perform(get("/empty"))
+            .andExpect(status().isNoContent());
+    }
+
+    @Test
+    public void whenEmptyWithoutResponseStatusEndpointCalled_then200ResponseObtained() throws Exception {
+        this.mockMvc.perform(get("/empty-no-responsestatus"))
+            .andExpect(status().isOk());
+    }
+
+    @Test
+    public void whenCreateWithCreatedEndpointCalled_thenCreatedResponseObtained() throws Exception {
+        this.mockMvc.perform(post("/create"))
+            .andExpect(status().isCreated());
+    }
+
+    @Test
+    public void whenCreateWithoutResponseStatusEndpointCalled_thenCreatedResponseObtained() throws Exception {
+        this.mockMvc.perform(post("/create-no-responsestatus"))
+            .andExpect(status().isOk());
+    }
+
+}
diff --git a/spring-mvc-basics/src/test/java/com/baeldung/web/controller/SampleControllerLiveTest.java b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/SampleControllerLiveTest.java
new file mode 100644
index 0000000000..0b958996c9
--- /dev/null
+++ b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/SampleControllerLiveTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.web.controller;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.http.HttpStatus;
+
+import io.restassured.RestAssured;
+
+public class SampleControllerLiveTest {
+
+    private static final String SERVICE_BASE_URL = "/spring-mvc-basics";
+
+    @Test
+    public void whenSampleEndpointCalled_thenOkResponseObtained() throws Exception {
+        RestAssured.get(SERVICE_BASE_URL + "/sample")
+            .then()
+            .statusCode(HttpStatus.OK.value());
+    }
+
+    @Test
+    public void whenSample2EndpointCalled_thenOkResponseObtained() throws Exception {
+        RestAssured.get(SERVICE_BASE_URL + "/sample2")
+            .then()
+            .statusCode(HttpStatus.OK.value());
+    }
+
+    @Test
+    public void whenSample3EndpointCalled_thenOkResponseObtained() throws Exception {
+        RestAssured.get(SERVICE_BASE_URL + "/sample3")
+            .then()
+            .statusCode(HttpStatus.OK.value());
+    }
+
+}
diff --git a/spring-mvc-java/src/test/java/com/baeldung/web/controller/SimpleBookControllerIntegrationTest.java b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/SimpleBookControllerIntegrationTest.java
similarity index 90%
rename from spring-mvc-java/src/test/java/com/baeldung/web/controller/SimpleBookControllerIntegrationTest.java
rename to spring-mvc-basics/src/test/java/com/baeldung/web/controller/SimpleBookControllerIntegrationTest.java
index 23be3a1655..87d70c2d29 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/web/controller/SimpleBookControllerIntegrationTest.java
+++ b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/SimpleBookControllerIntegrationTest.java
@@ -5,19 +5,17 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import com.baeldung.web.controller.SimpleBookController;
-
 public class SimpleBookControllerIntegrationTest {
 
     private MockMvc mockMvc;
     private static final String CONTENT_TYPE = "application/json;charset=UTF-8";
 
-    @Before
+    @BeforeEach
     public void setup() {
         this.mockMvc = MockMvcBuilders.standaloneSetup(new SimpleBookController()).build();
     }
diff --git a/spring-mvc-java/src/test/java/com/baeldung/web/controller/SimpleBookRestControllerIntegrationTest.java b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/SimpleBookRestControllerIntegrationTest.java
similarity index 85%
rename from spring-mvc-java/src/test/java/com/baeldung/web/controller/SimpleBookRestControllerIntegrationTest.java
rename to spring-mvc-basics/src/test/java/com/baeldung/web/controller/SimpleBookRestControllerIntegrationTest.java
index c5bd53f1a7..294943f2e2 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/web/controller/SimpleBookRestControllerIntegrationTest.java
+++ b/spring-mvc-basics/src/test/java/com/baeldung/web/controller/SimpleBookRestControllerIntegrationTest.java
@@ -5,27 +5,25 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import com.baeldung.web.controller.SimpleBookController;
-
 public class SimpleBookRestControllerIntegrationTest {
 
     private MockMvc mockMvc;
     private static final String CONTENT_TYPE = "application/json;charset=UTF-8";
 
-    @Before
+    @BeforeEach
     public void setup() {
-        this.mockMvc = MockMvcBuilders.standaloneSetup(new SimpleBookController()).build();
+        this.mockMvc = MockMvcBuilders.standaloneSetup(new SimpleBookRestController()).build();
     }
 
     @Test
     public void givenBookId_whenMockMVC_thenVerifyResponse() throws Exception {
         this.mockMvc
-            .perform(get("/books/42"))
+            .perform(get("/books-rest/42"))
             .andExpect(status().isOk())
             .andExpect(content().contentType(CONTENT_TYPE))
             .andExpect(jsonPath("$.id").value(42));
diff --git a/spring-mvc-java/src/test/resources/BeanNameUrlHandlerMappingConfig.xml b/spring-mvc-basics/src/test/resources/BeanNameUrlHandlerMappingConfig.xml
similarity index 100%
rename from spring-mvc-java/src/test/resources/BeanNameUrlHandlerMappingConfig.xml
rename to spring-mvc-basics/src/test/resources/BeanNameUrlHandlerMappingConfig.xml
diff --git a/spring-mvc-java/src/test/resources/ControllerClassNameHandlerMappingConfig.xml b/spring-mvc-basics/src/test/resources/ControllerClassNameHandlerMappingConfig.xml
similarity index 100%
rename from spring-mvc-java/src/test/resources/ControllerClassNameHandlerMappingConfig.xml
rename to spring-mvc-basics/src/test/resources/ControllerClassNameHandlerMappingConfig.xml
diff --git a/spring-mvc-java/src/test/resources/HandlerMappingConfiguringPriorities.xml b/spring-mvc-basics/src/test/resources/HandlerMappingConfiguringPriorities.xml
similarity index 100%
rename from spring-mvc-java/src/test/resources/HandlerMappingConfiguringPriorities.xml
rename to spring-mvc-basics/src/test/resources/HandlerMappingConfiguringPriorities.xml
diff --git a/spring-mvc-java/src/test/resources/SimpleUrlHandlerMappingConfig.xml b/spring-mvc-basics/src/test/resources/SimpleUrlHandlerMappingConfig.xml
similarity index 100%
rename from spring-mvc-java/src/test/resources/SimpleUrlHandlerMappingConfig.xml
rename to spring-mvc-basics/src/test/resources/SimpleUrlHandlerMappingConfig.xml
diff --git a/spring-mvc-forms-jsp/pom.xml b/spring-mvc-forms-jsp/pom.xml
index 20912e71e5..5ce2d19414 100644
--- a/spring-mvc-forms-jsp/pom.xml
+++ b/spring-mvc-forms-jsp/pom.xml
@@ -99,7 +99,6 @@
     </profiles>
 
     <properties>
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
         <fileupload.version>1.3.3</fileupload.version>
         <hibernate.version>5.2.5.Final</hibernate.version>
diff --git a/spring-mvc-forms-jsp/src/test/java/org/baeldung/SpringContextTest.java b/spring-mvc-forms-jsp/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..e35fc8c86c
--- /dev/null
+++ b/spring-mvc-forms-jsp/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,19 @@
+package org.baeldung;
+
+import com.baeldung.springmvcforms.configuration.ApplicationConfiguration;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = ApplicationConfiguration.class)
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-mvc-forms-thymeleaf/src/test/java/org/baeldung/listbindingexample/SpringContextTest.java b/spring-mvc-forms-thymeleaf/src/test/java/org/baeldung/listbindingexample/SpringContextTest.java
new file mode 100644
index 0000000000..751df882f9
--- /dev/null
+++ b/spring-mvc-forms-thymeleaf/src/test/java/org/baeldung/listbindingexample/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung.listbindingexample;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.listbindingexample.ListBindingApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = {ListBindingApplication.class})
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-mvc-forms-thymeleaf/src/test/java/org/baeldung/sessionattrs/SpringContextTest.java b/spring-mvc-forms-thymeleaf/src/test/java/org/baeldung/sessionattrs/SpringContextTest.java
new file mode 100644
index 0000000000..0b308319b1
--- /dev/null
+++ b/spring-mvc-forms-thymeleaf/src/test/java/org/baeldung/sessionattrs/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung.sessionattrs;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.sessionattrs.SessionAttrsApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = {SessionAttrsApplication.class})
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-mvc-java/README.md b/spring-mvc-java/README.md
index 3deeb21afc..e67d4f30a1 100644
--- a/spring-mvc-java/README.md
+++ b/spring-mvc-java/README.md
@@ -6,29 +6,16 @@
 The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
-- [Spring Bean Annotations](http://www.baeldung.com/spring-bean-annotations)
 - [Introduction to Pointcut Expressions in Spring](http://www.baeldung.com/spring-aop-pointcut-tutorial)
 - [Introduction to Advice Types in Spring](http://www.baeldung.com/spring-aop-advice-tutorial)
-- [A Guide to the ViewResolver in Spring MVC](http://www.baeldung.com/spring-mvc-view-resolver-tutorial)
 - [Integration Testing in Spring](http://www.baeldung.com/integration-testing-in-spring)
 - [A Quick Guide to Spring MVC Matrix Variables](http://www.baeldung.com/spring-mvc-matrix-variables)
 - [Intro to WebSockets with Spring](http://www.baeldung.com/websockets-spring)
 - [File Upload with Spring MVC](http://www.baeldung.com/spring-file-upload)
-- [Spring MVC Content Negotiation](http://www.baeldung.com/spring-mvc-content-negotiation-json-xml)
-- [Circular Dependencies in Spring](http://www.baeldung.com/circular-dependencies-in-spring)
 - [Introduction to HtmlUnit](http://www.baeldung.com/htmlunit)
-- [Spring @RequestMapping New Shortcut Annotations](http://www.baeldung.com/spring-new-requestmapping-shortcuts)
-- [Guide to Spring Handler Mappings](http://www.baeldung.com/spring-handler-mappings)
 - [Upload and Display Excel Files with Spring MVC](http://www.baeldung.com/spring-mvc-excel-files)
-- [Spring MVC Custom Validation](http://www.baeldung.com/spring-mvc-custom-validator)
 - [web.xml vs Initializer with Spring](http://www.baeldung.com/spring-xml-vs-java-config)
-- [The HttpMediaTypeNotAcceptableException in Spring MVC](http://www.baeldung.com/spring-httpmediatypenotacceptable)
-- [Spring MVC and the @ModelAttribute Annotation](http://www.baeldung.com/spring-mvc-and-the-modelattribute-annotation)
-- [The Spring @Controller and @RestController Annotations](http://www.baeldung.com/spring-controller-vs-restcontroller)
 - [Spring MVC @PathVariable with a dot (.) gets truncated](http://www.baeldung.com/spring-mvc-pathvariable-dot)
 - [A Quick Example of Spring Websockets’ @SendToUser Annotation](http://www.baeldung.com/spring-websockets-sendtouser)
-- [Using Spring ResponseEntity to Manipulate the HTTP Response](http://www.baeldung.com/spring-response-entity)
-- [Using Spring @ResponseStatus to Set HTTP Status Code](http://www.baeldung.com/spring-response-status)
-- [Spring MVC Tutorial](https://www.baeldung.com/spring-mvc-tutorial)
 - [Working with Date Parameters in Spring](https://www.baeldung.com/spring-date-parameters)
 - [A Java Web Application Without a web.xml](https://www.baeldung.com/java-web-app-without-web-xml)
diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml
index 853d8db64c..cb16e91bc4 100644
--- a/spring-mvc-java/pom.xml
+++ b/spring-mvc-java/pom.xml
@@ -15,8 +15,8 @@
     </parent>
 
     <dependencies>
-    <dependency>
-         <groupId>org.springframework</groupId>
+        <dependency>
+            <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
             <version>${spring.version}</version>
         </dependency>
@@ -34,7 +34,6 @@
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
             <version>${jstl.version}</version>
-            
         </dependency>
         <!-- Jackson -->
         <dependency>
@@ -134,17 +133,22 @@
             <artifactId>gson</artifactId>
             <version>2.8.5</version>
         </dependency>
-     <dependency>
-    <groupId>org.springframework</groupId>
-    <artifactId>spring-websocket</artifactId>
-    <version>${spring.version}</version>
-</dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-websocket</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
  
-<dependency>
-    <groupId>org.springframework</groupId>
-    <artifactId>spring-messaging</artifactId>
-    <version>${spring.version}</version>
-</dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-messaging</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.el</artifactId>
+            <version>${javax.el.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -291,7 +295,7 @@
         <!-- excel -->
         <poi.version>3.16-beta1</poi.version>
 
-        <javax.el.version>3.0.1-b06</javax.el.version>
+        <javax.el.version>3.0.1-b09</javax.el.version>
 		
     </properties>
 
diff --git a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebConfig.java b/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebConfig.java
index 191d721dfb..44fef92917 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebConfig.java
+++ b/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebConfig.java
@@ -12,13 +12,11 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Description;
 import org.springframework.context.support.ResourceBundleMessageSource;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 import org.springframework.web.servlet.ViewResolver;
-import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
@@ -26,8 +24,6 @@ import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 import org.springframework.web.servlet.view.JstlView;
-import org.springframework.web.servlet.view.ResourceBundleViewResolver;
-import org.springframework.web.servlet.view.XmlViewResolver;
 import org.springframework.web.util.UrlPathHelper;
 import org.thymeleaf.spring4.SpringTemplateEngine;
 import org.thymeleaf.spring4.view.ThymeleafViewResolver;
@@ -97,11 +93,6 @@ public class WebConfig implements WebMvcConfigurer {
         registry.addResourceHandler("/resources/**").addResourceLocations("/resources/");
     }
     
-    @Override
-    public void configureContentNegotiation(final ContentNegotiationConfigurer configurer) {
-        configurer.favorPathExtension(false).favorParameter(true).parameterName("mediaType").ignoreAcceptHeader(true).useRegisteredExtensionsOnly(false).defaultContentType(MediaType.APPLICATION_JSON).mediaType("xml", MediaType.APPLICATION_XML).mediaType("json",
-                MediaType.APPLICATION_JSON);
-    }
     @Bean(name = "multipartResolver")
     public CommonsMultipartResolver multipartResolver() {
 
@@ -110,22 +101,6 @@ public class WebConfig implements WebMvcConfigurer {
 
         return multipartResolver;
     }
-    
-    @Bean
-    public ViewResolver xmlViewResolver() {
-        final XmlViewResolver bean = new XmlViewResolver();
-        bean.setLocation(new ClassPathResource("views.xml"));
-        bean.setOrder(1);
-        return bean;
-    }
-
-    @Bean
-    public ViewResolver resourceBundleViewResolver() {
-        final ResourceBundleViewResolver bean = new ResourceBundleViewResolver();
-        bean.setBasename("views");
-        bean.setOrder(0);
-        return bean;
-    }
 
     @Override
     public void extendMessageConverters(final List<HttpMessageConverter<?>> converters) {
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/EmployeeController.java b/spring-mvc-java/src/main/java/com/baeldung/web/controller/EmployeeController.java
index ef76059567..251287dff8 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/web/controller/EmployeeController.java
+++ b/spring-mvc-java/src/main/java/com/baeldung/web/controller/EmployeeController.java
@@ -1,20 +1,29 @@
 package com.baeldung.web.controller;
 
-import com.baeldung.model.Employee;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.MatrixVariable;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.SessionAttributes;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.*;
+import com.baeldung.model.Employee;
 
 @SessionAttributes("employees")
 @Controller
-@ControllerAdvice
 public class EmployeeController {
 
     Map<Long, Employee> employeeMap = new HashMap<>();
@@ -35,7 +44,7 @@ public class EmployeeController {
     public @ResponseBody Employee getEmployeeById(@PathVariable final long Id) {
         return employeeMap.get(Id);
     }
-
+    
     @RequestMapping(value = "/addEmployee", method = RequestMethod.POST)
     public String submit(@ModelAttribute("employee") final Employee employee, final BindingResult result, final ModelMap model) {
         if (result.hasErrors()) {
@@ -51,11 +60,6 @@ public class EmployeeController {
         return "employeeView";
     }
 
-    @ModelAttribute
-    public void addAttributes(final Model model) {
-        model.addAttribute("msg", "Welcome to the Netherlands!");
-    }
-
     @RequestMapping(value = "/employees/{name}", method = RequestMethod.GET)
     @ResponseBody
     public ResponseEntity<List<Employee>> getEmployeeByNameAndBeginContactNumber(@PathVariable final String name, @MatrixVariable final String beginContactNumber) {
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/RequestMappingShortcutsController.java b/spring-mvc-java/src/main/java/com/baeldung/web/controller/RequestMappingShortcutsController.java
deleted file mode 100644
index 5d4cbe9d78..0000000000
--- a/spring-mvc-java/src/main/java/com/baeldung/web/controller/RequestMappingShortcutsController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.baeldung.web.controller;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PatchMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class RequestMappingShortcutsController {
-
-	@GetMapping("/get")
-	public @ResponseBody ResponseEntity<String> get() {
-		return new ResponseEntity<String>("GET Response", HttpStatus.OK);
-	}
-	
-	@GetMapping("/get/{id}")
-	public @ResponseBody ResponseEntity<String> getById(@PathVariable String id) {
-	    return new ResponseEntity<String>("GET Response : " + id, HttpStatus.OK);
-	}
-	
-	@PostMapping("/post")
-	public @ResponseBody ResponseEntity<String> post() {
-		return new ResponseEntity<String>("POST Response", HttpStatus.OK);
-	}
-	
-	@PutMapping("/put")
-	public @ResponseBody ResponseEntity<String> put() {
-		return new ResponseEntity<String>("PUT Response", HttpStatus.OK);
-	}
-	
-	@DeleteMapping("/delete")
-	public @ResponseBody ResponseEntity<String> delete() {
-		return new ResponseEntity<String>("DELETE Response", HttpStatus.OK);
-	}
-	
-	@PatchMapping("/patch")
-	public @ResponseBody ResponseEntity<String> patch() {
-		return new ResponseEntity<String>("PATCH Response", HttpStatus.OK);
-	}
-	
-}
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/MessageController.java b/spring-mvc-java/src/main/java/com/baeldung/web/controller/message/MessageController.java
similarity index 94%
rename from spring-mvc-java/src/main/java/com/baeldung/web/controller/MessageController.java
rename to spring-mvc-java/src/main/java/com/baeldung/web/controller/message/MessageController.java
index 111bf023f7..fdb0d75530 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/web/controller/MessageController.java
+++ b/spring-mvc-java/src/main/java/com/baeldung/web/controller/message/MessageController.java
@@ -1,4 +1,4 @@
-package com.baeldung.web.controller;
+package com.baeldung.web.controller.message;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
diff --git a/spring-mvc-java/src/main/resources/views.properties b/spring-mvc-java/src/main/resources/views.properties
deleted file mode 100644
index 95687cb62a..0000000000
--- a/spring-mvc-java/src/main/resources/views.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-sample.(class)=org.springframework.web.servlet.view.JstlView
-sample.url=/WEB-INF/view/sample.jsp
-
diff --git a/spring-mvc-java/src/main/webapp/WEB-INF/view/employeeHome.jsp b/spring-mvc-java/src/main/webapp/WEB-INF/view/employeeHome.jsp
index 8a32fd12b6..268f0a055a 100644
--- a/spring-mvc-java/src/main/webapp/WEB-INF/view/employeeHome.jsp
+++ b/spring-mvc-java/src/main/webapp/WEB-INF/view/employeeHome.jsp
@@ -8,7 +8,7 @@
 <body>
 	<h3>Welcome, Enter The Employee Details</h3>
 
-	<form:form method="POST" action="/spring-mvc-java/addEmployee" modelAttribute="employee">
+	<form:form method="POST" action="/spring-mvc-basics/addEmployee" modelAttribute="employee">
 		<table>
 			<tr>
 				<td><form:label path="name">Name</form:label></td>
diff --git a/spring-mvc-java/src/main/webapp/WEB-INF/view/employeeView.jsp b/spring-mvc-java/src/main/webapp/WEB-INF/view/employeeView.jsp
index 627a9d9ddb..1457bc5fc8 100644
--- a/spring-mvc-java/src/main/webapp/WEB-INF/view/employeeView.jsp
+++ b/spring-mvc-java/src/main/webapp/WEB-INF/view/employeeView.jsp
@@ -6,7 +6,6 @@
 <body>
 
 	<h2>Submitted Employee Information</h2>
-	<h3>${msg}</h3>
 	<table>
 		<tr>
 			<td>Name :</td>
@@ -20,10 +19,6 @@
 			<td>Contact Number :</td>
 			<td>${contactNumber}</td>
 		</tr>
-		<tr>
-			<td>Working Area :</td>
-			<td>${workingArea}</td>
-		</tr>
 	</table>
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-mvc-java/src/test/java/com/baeldung/SpringContextTest.java b/spring-mvc-java/src/test/java/com/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..9777addb61
--- /dev/null
+++ b/spring-mvc-java/src/test/java/com/baeldung/SpringContextTest.java
@@ -0,0 +1,21 @@
+package com.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import com.baeldung.config.AppInitializer;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { AppInitializer.class }, loader = AnnotationConfigContextLoader.class)
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+        
+    }
+}
diff --git a/spring-mvc-java/src/test/java/com/baeldung/htmlunit/TestConfig.java b/spring-mvc-java/src/test/java/com/baeldung/htmlunit/TestConfig.java
index 529879fada..75efd57ae4 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/htmlunit/TestConfig.java
+++ b/spring-mvc-java/src/test/java/com/baeldung/htmlunit/TestConfig.java
@@ -15,7 +15,7 @@ import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
 
 @Configuration
 @EnableWebMvc
-@ComponentScan(basePackages = { "com.baeldung.web.controller" })
+@ComponentScan(basePackages = { "com.baeldung.web.controller.message" })
 public class TestConfig implements WebMvcConfigurer {
 
     @Autowired
@@ -44,5 +44,4 @@ public class TestConfig implements WebMvcConfigurer {
         templateEngine.setTemplateResolver(templateResolver());
         return templateEngine;
     }
-
 }
diff --git a/spring-mvc-java/src/test/java/com/baeldung/web/controller/EmployeeIntegrationTest.java b/spring-mvc-java/src/test/java/com/baeldung/web/controller/EmployeeIntegrationTest.java
deleted file mode 100644
index 0c2aa3de1b..0000000000
--- a/spring-mvc-java/src/test/java/com/baeldung/web/controller/EmployeeIntegrationTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.baeldung.web.controller;
-
-import org.junit.Before;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
-import com.baeldung.model.Employee;
-import com.baeldung.spring.web.config.WebConfig;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration(classes = WebConfig.class)
-public class EmployeeIntegrationTest {
-
-    @Autowired
-    private EmployeeController employeeController;
-
-    @Before
-    public void setup() {
-        employeeController.initEmployees();
-    }
-
-    @Test
-    public void whenInitEmployees_thenVerifyValuesInitiation() {
-
-        Employee employee1 = employeeController.employeeMap.get(1L);
-        Employee employee2 = employeeController.employeeMap.get(2L);
-        Employee employee3 = employeeController.employeeMap.get(3L);
-
-        Assert.assertTrue(employee1.getId() == 1L);
-        Assert.assertTrue(employee1.getName().equals("John"));
-        Assert.assertTrue(employee1.getContactNumber().equals("223334411"));
-        Assert.assertTrue(employee1.getWorkingArea().equals("rh"));
-
-        Assert.assertTrue(employee2.getId() == 2L);
-        Assert.assertTrue(employee2.getName().equals("Peter"));
-        Assert.assertTrue(employee2.getContactNumber().equals("22001543"));
-        Assert.assertTrue(employee2.getWorkingArea().equals("informatics"));
-
-        Assert.assertTrue(employee3.getId() == 3L);
-        Assert.assertTrue(employee3.getName().equals("Mike"));
-        Assert.assertTrue(employee3.getContactNumber().equals("223334411"));
-        Assert.assertTrue(employee3.getWorkingArea().equals("admin"));
-    }
-
-}
diff --git a/spring-mvc-java/src/test/java/com/baeldung/web/controller/RequestMapingShortcutsIntegrationTest.java b/spring-mvc-java/src/test/java/com/baeldung/web/controller/RequestMapingShortcutsIntegrationTest.java
deleted file mode 100644
index fb21905027..0000000000
--- a/spring-mvc-java/src/test/java/com/baeldung/web/controller/RequestMapingShortcutsIntegrationTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.baeldung.web.controller;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.ResultMatcher;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
-import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.web.context.WebApplicationContext;
-
-import com.baeldung.spring.web.config.WebConfig;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration(classes = WebConfig.class)
-public class RequestMapingShortcutsIntegrationTest {
-	
-	@Autowired
-    private WebApplicationContext ctx;
-	
-    private MockMvc mockMvc;
-    
-    @Before
-    public void setup () {
-        DefaultMockMvcBuilder builder = MockMvcBuilders.webAppContextSetup(this.ctx);
-        this.mockMvc = builder.build();
-    }
-
-	@Test 
-	public void giventUrl_whenGetRequest_thenFindGetResponse() throws Exception {
-	    
-		MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.get("/get");
-		
-		ResultMatcher contentMatcher = MockMvcResultMatchers.content().string("GET Response");
-		
-		this.mockMvc.perform(builder).andExpect(contentMatcher).andExpect(MockMvcResultMatchers.status().isOk());
-		
-	}
-	
-	@Test 
-	public void giventUrl_whenPostRequest_thenFindPostResponse() throws Exception {
-	    
-		MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.post("/post");
-		
-		ResultMatcher contentMatcher = MockMvcResultMatchers.content().string("POST Response");
-		
-		this.mockMvc.perform(builder).andExpect(contentMatcher).andExpect(MockMvcResultMatchers.status().isOk());
-		
-	}
-	
-	@Test 
-	public void giventUrl_whenPutRequest_thenFindPutResponse() throws Exception {
-	    
-		MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.put("/put");
-		
-		ResultMatcher contentMatcher = MockMvcResultMatchers.content().string("PUT Response");
-		
-		this.mockMvc.perform(builder).andExpect(contentMatcher).andExpect(MockMvcResultMatchers.status().isOk());
-		
-	}
-	
-	@Test 
-	public void giventUrl_whenDeleteRequest_thenFindDeleteResponse() throws Exception {
-	    
-		MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.delete("/delete");
-		
-		ResultMatcher contentMatcher = MockMvcResultMatchers.content().string("DELETE Response");
-		
-		this.mockMvc.perform(builder).andExpect(contentMatcher).andExpect(MockMvcResultMatchers.status().isOk());
-		
-	}
-
-	@Test 
-	public void giventUrl_whenPatchRequest_thenFindPatchResponse() throws Exception {
-	    
-		MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.patch("/patch");
-		
-		ResultMatcher contentMatcher = MockMvcResultMatchers.content().string("PATCH Response");
-		
-		this.mockMvc.perform(builder).andExpect(contentMatcher).andExpect(MockMvcResultMatchers.status().isOk());
-		
-	}
-	
-}
diff --git a/spring-mvc-kotlin/.gitignore b/spring-mvc-kotlin/.gitignore
new file mode 100644
index 0000000000..416395ffea
--- /dev/null
+++ b/spring-mvc-kotlin/.gitignore
@@ -0,0 +1 @@
+transaction.log
\ No newline at end of file
diff --git a/spring-mvc-kotlin/README.md b/spring-mvc-kotlin/README.md
index e5167f69fc..cc6827eb1b 100644
--- a/spring-mvc-kotlin/README.md
+++ b/spring-mvc-kotlin/README.md
@@ -2,3 +2,4 @@
 - [Spring MVC Setup with Kotlin](http://www.baeldung.com/spring-mvc-kotlin)
 - [Working with Kotlin and JPA](http://www.baeldung.com/kotlin-jpa)
 - [Kotlin-allopen and Spring](http://www.baeldung.com/kotlin-allopen-spring)
+- [MockMvc Kotlin DSL](https://www.baeldung.com/mockmvc-kotlin-dsl)
diff --git a/spring-mvc-kotlin/pom.xml b/spring-mvc-kotlin/pom.xml
index fc76f58727..fb1f242644 100644
--- a/spring-mvc-kotlin/pom.xml
+++ b/spring-mvc-kotlin/pom.xml
@@ -15,12 +15,12 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-json</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.thymeleaf</groupId>
@@ -46,8 +46,8 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/spring-mvc-kotlin/src/main/kotlin/com/baeldung/kotlin/mockmvc/MockMvcController.kt b/spring-mvc-kotlin/src/main/kotlin/com/baeldung/kotlin/mockmvc/MockMvcController.kt
new file mode 100644
index 0000000000..68ab5f31a6
--- /dev/null
+++ b/spring-mvc-kotlin/src/main/kotlin/com/baeldung/kotlin/mockmvc/MockMvcController.kt
@@ -0,0 +1,26 @@
+package com.baeldung.kotlin.mockmvc
+
+import org.springframework.http.MediaType
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestMethod
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+@RequestMapping("/mockmvc")
+class MockMvcController {
+
+    @RequestMapping(value = ["/validate"], method = [RequestMethod.POST], produces = [MediaType.APPLICATION_JSON_VALUE])
+    fun validate(@RequestBody request: Request): Response {
+        val error = if (request.name.first == "admin") {
+            null
+        } else {
+            ERROR
+        }
+        return Response(error)
+    }
+
+    companion object {
+        const val ERROR = "invalid user"
+    }
+}
\ No newline at end of file
diff --git a/spring-mvc-kotlin/src/main/kotlin/com/baeldung/kotlin/mockmvc/MockMvcModel.kt b/spring-mvc-kotlin/src/main/kotlin/com/baeldung/kotlin/mockmvc/MockMvcModel.kt
new file mode 100644
index 0000000000..3231b6f186
--- /dev/null
+++ b/spring-mvc-kotlin/src/main/kotlin/com/baeldung/kotlin/mockmvc/MockMvcModel.kt
@@ -0,0 +1,10 @@
+package com.baeldung.kotlin.mockmvc
+
+import com.fasterxml.jackson.annotation.JsonInclude
+
+data class Name(val first: String, val last: String)
+
+data class Request(val name: Name)
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+data class Response(val error: String?)
\ No newline at end of file
diff --git a/spring-mvc-kotlin/src/test/kotlin/com/baeldung/kotlin/mockmvc/MockMvcControllerTest.kt b/spring-mvc-kotlin/src/test/kotlin/com/baeldung/kotlin/mockmvc/MockMvcControllerTest.kt
new file mode 100644
index 0000000000..802cd4c1e7
--- /dev/null
+++ b/spring-mvc-kotlin/src/test/kotlin/com/baeldung/kotlin/mockmvc/MockMvcControllerTest.kt
@@ -0,0 +1,61 @@
+package com.baeldung.kotlin.mockmvc
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
+import org.springframework.http.MediaType
+import org.springframework.http.ResponseEntity.status
+import org.springframework.test.context.junit4.SpringRunner
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.post
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders
+import org.springframework.test.web.servlet.result.MockMvcResultHandlers
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers
+
+@RunWith(SpringRunner::class)
+@WebMvcTest
+class MockMvcControllerTest {
+
+    @Autowired lateinit var mockMvc: MockMvc
+    @Autowired lateinit var mapper: ObjectMapper
+
+    @Test
+    fun `when supported user is given then raw MockMvc-based validation is successful`() {
+        mockMvc.perform(MockMvcRequestBuilders
+                                .post("/mockmvc/validate")
+                                .accept(MediaType.APPLICATION_JSON)
+                                .contentType(MediaType.APPLICATION_JSON)
+                                .content(mapper.writeValueAsString(Request(Name("admin", "")))))
+                .andExpect(MockMvcResultMatchers.status().isOk)
+                .andExpect(MockMvcResultMatchers.content().contentType(MediaType.APPLICATION_JSON))
+                .andExpect(MockMvcResultMatchers.content().string("{}"))
+    }
+
+    @Test
+    fun `when supported user is given then kotlin DSL-based validation is successful`() {
+        doTest(Request(Name("admin", "")), Response(null))
+    }
+
+    @Test
+    fun `when unsupported user is given then validation is failed`() {
+        doTest(Request(Name("some-name", "some-surname")), Response(MockMvcController.ERROR))
+    }
+
+    private fun doTest(input: Request, expectation: Response) {
+        mockMvc.post("/mockmvc/validate") {
+            contentType = MediaType.APPLICATION_JSON
+            content = mapper.writeValueAsString(input)
+            accept = MediaType.APPLICATION_JSON
+        }.andExpect {
+            status { isOk }
+            content { contentType(MediaType.APPLICATION_JSON) }
+            content { json(mapper.writeValueAsString(expectation)) }
+        }
+    }
+}
+
+@SpringBootApplication
+class MockMvcApplication
\ No newline at end of file
diff --git a/spring-mvc-simple/pom.xml b/spring-mvc-simple/pom.xml
index a767cf3c37..580a40e50b 100644
--- a/spring-mvc-simple/pom.xml
+++ b/spring-mvc-simple/pom.xml
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>${fileupload.version}</version>
+            <version>${commons-fileupload.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -162,18 +162,16 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <maven-war-plugin.version>3.2.0</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <javax.servlet.jsp-api.version>2.3.2-b02</javax.servlet.jsp-api.version>
         <javax.servlet-api.version>4.0.0</javax.servlet-api.version>
         <hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
         <deploy-path>enter-location-of-server</deploy-path>
-        <fileupload.version>1.3.2</fileupload.version>
+        <commons-fileupload.version>1.3.2</commons-fileupload.version>
         <org.thymeleaf-version>3.0.7.RELEASE</org.thymeleaf-version>
         <groovy.version>2.4.12</groovy.version>
         <freemarker.version>2.3.27-incubating</freemarker.version>
         <jade.version>1.2.5</jade.version>
-        <junit.platform.version>1.0.2</junit.platform.version>
         <rome.version>1.9.0</rome.version>
         <xstream.version>1.4.9</xstream.version>
         <scribejava.version>5.1.0</scribejava.version>
diff --git a/spring-mvc-simple/src/test/java/com/baeldung/SpringContextTest.java b/spring-mvc-simple/src/test/java/com/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..ab0b23c4a5
--- /dev/null
+++ b/spring-mvc-simple/src/test/java/com/baeldung/SpringContextTest.java
@@ -0,0 +1,21 @@
+package com.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import com.baeldung.spring.configuration.ApplicationConfiguration;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes={ApplicationConfiguration.class})
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
+
diff --git a/spring-mvc-velocity/pom.xml b/spring-mvc-velocity/pom.xml
index df19b67e8e..5954e48e8f 100644
--- a/spring-mvc-velocity/pom.xml
+++ b/spring-mvc-velocity/pom.xml
@@ -115,7 +115,6 @@
         <rest-assured.version>2.9.0</rest-assured.version>
 
         <!-- Maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
 
diff --git a/spring-mvc-velocity/src/test/java/org/baeldung/SpringContextTest.java b/spring-mvc-velocity/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..22a4486aa7
--- /dev/null
+++ b/spring-mvc-velocity/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,20 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import com.baeldung.mvc.velocity.spring.config.WebConfig;
+import com.baeldung.mvc.velocity.test.config.TestConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { TestConfig.class, WebConfig.class })
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-mvc-webflow/pom.xml b/spring-mvc-webflow/pom.xml
index c8de990da0..219a2be689 100644
--- a/spring-mvc-webflow/pom.xml
+++ b/spring-mvc-webflow/pom.xml
@@ -94,7 +94,6 @@
         <httpclient.version>4.5.2</httpclient.version>
 
         <!-- Maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
 
diff --git a/spring-mvc-webflow/src/test/java/org/baeldung/SpringContextTest.java b/spring-mvc-webflow/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..122dc18bad
--- /dev/null
+++ b/spring-mvc-webflow/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,19 @@
+package org.baeldung;
+
+import org.baeldung.spring.WebFlowConfig;
+import org.baeldung.spring.WebMvcConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = {WebFlowConfig.class, WebMvcConfig.class})
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-mvc-xml/pom.xml b/spring-mvc-xml/pom.xml
index 46af321d1b..9f7a24b358 100644
--- a/spring-mvc-xml/pom.xml
+++ b/spring-mvc-xml/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>javax.el</artifactId>
-            <version>3.0.1-b08</version>
+            <version>${javax.el.version}</version>
         </dependency>
 
         <dependency>
@@ -129,18 +129,13 @@
 
         <!-- various -->
         <hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
-        <jstl.version>1.2</jstl.version>
-        <javax.servlet.version>3.1.0</javax.servlet.version>
-        <jackson.version>2.9.6</jackson.version>
+        <javax.el.version>3.0.1-b08</javax.el.version>
 
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
-        <commons-io.version>2.5</commons-io.version>
         <geoip2.version>2.8.0</geoip2.version>
 
         <!-- Maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
 
     </properties>
diff --git a/spring-mvc-xml/src/test/java/org/baeldung/SpringContextTest.java b/spring-mvc-xml/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..27dcb83bd4
--- /dev/null
+++ b/spring-mvc-xml/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,19 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import com.baeldung.spring.ClientWebConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = ClientWebConfig.class)
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-protobuf/src/test/java/org/baeldung/SpringContextTest.java b/spring-protobuf/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..4f655277b7
--- /dev/null
+++ b/spring-protobuf/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,19 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.protobuf.Application;
+
+@DirtiesContext
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-quartz/pom.xml b/spring-quartz/pom.xml
index 58e72c1d51..4c7ac6eee9 100644
--- a/spring-quartz/pom.xml
+++ b/spring-quartz/pom.xml
@@ -32,6 +32,16 @@
             <artifactId>quartz</artifactId>
             <version>${quartz.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.mchange</groupId>
+            <artifactId>c3p0</artifactId>
+            <version>${c3p0.version}</version>
+        </dependency>
+        <!-- h2 in-memory database -->
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -44,7 +54,8 @@
     </build>
 
     <properties>
-        <quartz.version>2.2.3</quartz.version>
+        <quartz.version>2.3.0</quartz.version>
+        <c3p0.version>0.9.5.2</c3p0.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/QrtzScheduler.java b/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/QrtzScheduler.java
index 6601df6c94..ccf9fca8c1 100644
--- a/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/QrtzScheduler.java
+++ b/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/QrtzScheduler.java
@@ -10,17 +10,20 @@ import javax.annotation.PostConstruct;
 
 import org.baeldung.springquartz.config.AutoWiringSpringBeanJobFactory;
 import org.quartz.*;
-import org.quartz.impl.StdSchedulerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.PropertiesFactoryBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 import org.springframework.scheduling.quartz.SpringBeanJobFactory;
 
+import java.util.Properties;
+
 @Configuration
 @ConditionalOnExpression("'${using.spring.schedulerFactory}'=='false'")
 public class QrtzScheduler {
@@ -45,14 +48,9 @@ public class QrtzScheduler {
     }
 
     @Bean
-    public Scheduler scheduler(Trigger trigger, JobDetail job) throws SchedulerException, IOException {
-
-        StdSchedulerFactory factory = new StdSchedulerFactory();
-        factory.initialize(new ClassPathResource("quartz.properties").getInputStream());
-
+    public Scheduler scheduler(Trigger trigger, JobDetail job, SchedulerFactoryBean factory) throws SchedulerException {
         logger.debug("Getting a handle to the Scheduler");
         Scheduler scheduler = factory.getScheduler();
-        scheduler.setJobFactory(springBeanJobFactory());
         scheduler.scheduleJob(job, trigger);
 
         logger.debug("Starting Scheduler threads");
@@ -60,6 +58,21 @@ public class QrtzScheduler {
         return scheduler;
     }
 
+    @Bean
+    public SchedulerFactoryBean schedulerFactoryBean() throws IOException {
+        SchedulerFactoryBean factory = new SchedulerFactoryBean();
+        factory.setJobFactory(springBeanJobFactory());
+        factory.setQuartzProperties(quartzProperties());
+        return factory;
+    }
+
+    public Properties quartzProperties() throws IOException {
+        PropertiesFactoryBean propertiesFactoryBean = new PropertiesFactoryBean();
+        propertiesFactoryBean.setLocation(new ClassPathResource("/quartz.properties"));
+        propertiesFactoryBean.afterPropertiesSet();
+        return propertiesFactoryBean.getObject();
+    }
+
     @Bean
     public JobDetail jobDetail() {
 
diff --git a/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/SpringQrtzScheduler.java b/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/SpringQrtzScheduler.java
index 9978f61522..f824765efe 100644
--- a/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/SpringQrtzScheduler.java
+++ b/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/SpringQrtzScheduler.java
@@ -1,6 +1,7 @@
 package org.baeldung.springquartz.basics.scheduler;
 
 import javax.annotation.PostConstruct;
+import javax.sql.DataSource;
 
 import org.baeldung.springquartz.config.AutoWiringSpringBeanJobFactory;
 import org.quartz.JobDetail;
@@ -9,7 +10,11 @@ import org.quartz.Trigger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.quartz.QuartzDataSource;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -20,6 +25,7 @@ import org.springframework.scheduling.quartz.SimpleTriggerFactoryBean;
 import org.springframework.scheduling.quartz.SpringBeanJobFactory;
 
 @Configuration
+@EnableAutoConfiguration
 @ConditionalOnExpression("'${using.spring.schedulerFactory}'=='true'")
 public class SpringQrtzScheduler {
 
@@ -43,7 +49,7 @@ public class SpringQrtzScheduler {
     }
 
     @Bean
-    public SchedulerFactoryBean scheduler(Trigger trigger, JobDetail job) {
+    public SchedulerFactoryBean scheduler(Trigger trigger, JobDetail job, DataSource quartzDataSource) {
 
         SchedulerFactoryBean schedulerFactory = new SchedulerFactoryBean();
         schedulerFactory.setConfigLocation(new ClassPathResource("quartz.properties"));
@@ -53,6 +59,9 @@ public class SpringQrtzScheduler {
         schedulerFactory.setJobDetails(job);
         schedulerFactory.setTriggers(trigger);
 
+        // Comment the following line to use the default Quartz job store.
+        schedulerFactory.setDataSource(quartzDataSource);
+
         return schedulerFactory;
     }
 
@@ -81,4 +90,12 @@ public class SpringQrtzScheduler {
         trigger.setName("Qrtz_Trigger");
         return trigger;
     }
+
+    @Bean
+    @QuartzDataSource
+    @ConfigurationProperties(prefix = "spring.datasource")
+    public DataSource quartzDataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
 }
diff --git a/spring-quartz/src/main/java/org/baeldung/springquartz/basics/service/SampleJobService.java b/spring-quartz/src/main/java/org/baeldung/springquartz/basics/service/SampleJobService.java
index ddf4efc2c5..6f66352616 100644
--- a/spring-quartz/src/main/java/org/baeldung/springquartz/basics/service/SampleJobService.java
+++ b/spring-quartz/src/main/java/org/baeldung/springquartz/basics/service/SampleJobService.java
@@ -4,20 +4,31 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 @Service
 public class SampleJobService {
 
+    public static final long EXECUTION_TIME = 5000L;
+
     private Logger logger = LoggerFactory.getLogger(getClass());
 
+    private AtomicInteger count = new AtomicInteger();
+
     public void executeSampleJob() {
 
         logger.info("The sample job has begun...");
         try {
-            Thread.sleep(5000);
+            Thread.sleep(EXECUTION_TIME);
         } catch (InterruptedException e) {
             logger.error("Error while executing sample job", e);
         } finally {
+            count.incrementAndGet();
             logger.info("Sample job has finished...");
         }
     }
+
+    public int getNumberOfInvocations() {
+        return count.get();
+    }
 }
diff --git a/spring-quartz/src/main/resources/application.properties b/spring-quartz/src/main/resources/application.properties
index 7bdd647e25..557349af2e 100644
--- a/spring-quartz/src/main/resources/application.properties
+++ b/spring-quartz/src/main/resources/application.properties
@@ -1 +1,10 @@
-using.spring.schedulerFactory=true
\ No newline at end of file
+using.spring.schedulerFactory=true
+
+spring.quartz.job-store-type=jdbc
+# Always create the Quartz database on startup
+spring.quartz.jdbc.initialize-schema=always
+
+spring.datasource.jdbc-url=jdbc:h2:mem:spring-quartz;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.driverClassName=org.h2.Driver
+spring.datasource.username=sa
+spring.datasource.password=
diff --git a/spring-quartz/src/main/resources/quartz.properties b/spring-quartz/src/main/resources/quartz.properties
index cefaaef8e4..662bb83eb0 100644
--- a/spring-quartz/src/main/resources/quartz.properties
+++ b/spring-quartz/src/main/resources/quartz.properties
@@ -4,7 +4,19 @@ org.quartz.threadPool.threadCount=2
 org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true
 
 # job-store
-org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore
+# Enable this property for RAMJobStore
+#org.quartz.jobStore.class=org.quartz.simpl.RAMJobStore
 
-# others
-org.quartz.jobStore.misfireThreshold = 60000
\ No newline at end of file
+# Enable these properties for a JDBCJobStore using JobStoreTX
+org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreTX
+org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+org.quartz.jobStore.dataSource=quartzDataSource
+# Enable this property for JobStoreCMT
+#org.quartz.jobStore.nonManagedTXDataSource=quartzDataSource
+
+# H2 database
+# use an in-memory database & initialise Quartz using their standard SQL script
+org.quartz.dataSource.quartzDataSource.URL=jdbc:h2:mem:spring-quartz;INIT=RUNSCRIPT FROM 'classpath:/org/quartz/impl/jdbcjobstore/tables_h2.sql'
+org.quartz.dataSource.quartzDataSource.driver=org.h2.Driver
+org.quartz.dataSource.quartzDataSource.user=sa
+org.quartz.dataSource.quartzDataSource.password=
diff --git a/spring-quartz/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-quartz/src/test/java/org/baeldung/SpringContextIntegrationTest.java
index 516cc587a7..fec47f045c 100644
--- a/spring-quartz/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/spring-quartz/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -1,16 +1,30 @@
 package org.baeldung;
 
 import org.baeldung.springquartz.SpringQuartzApp;
+import org.baeldung.springquartz.basics.service.SampleJobService;
 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.test.context.junit4.SpringRunner;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringQuartzApp.class)
 public class SpringContextIntegrationTest {
 
+    @Autowired
+    private SampleJobService sampleJobService;
+
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
     }
+
+    @Test
+    public void whenSchedulerStarts_thenJobsRun() throws InterruptedException {
+        assertThat(sampleJobService.getNumberOfInvocations()).isEqualTo(0);
+        Thread.sleep(SampleJobService.EXECUTION_TIME);
+        assertThat(sampleJobService.getNumberOfInvocations()).isEqualTo(1);
+    }
 }
diff --git a/spring-quartz/src/test/java/org/baeldung/SpringContextTest.java b/spring-quartz/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..a210e847c8
--- /dev/null
+++ b/spring-quartz/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.springquartz.SpringQuartzApp;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringQuartzApp.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-reactor/src/test/java/org/baeldung/SpringContextTest.java b/spring-reactor/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..5e68a8e64f
--- /dev/null
+++ b/spring-reactor/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-remoting/remoting-amqp/remoting-amqp-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting/remoting-amqp/remoting-amqp-client/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..fe20382ab4
--- /dev/null
+++ b/spring-remoting/remoting-amqp/remoting-amqp-client/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.client.AmqpClient;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = AmqpClient.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..4325b0ddef
--- /dev/null
+++ b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.client.BurlapClient;
+import com.baeldung.client.HessianClient;
+
+@SpringBootTest(classes = {BurlapClient.class, HessianClient.class})
+@RunWith(SpringRunner.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..e676bb0ff2
--- /dev/null
+++ b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.server.Server;
+
+@SpringBootTest(classes = Server.class)
+@RunWith(SpringRunner.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-remoting/remoting-http/remoting-http-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting/remoting-http/remoting-http-server/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..e676bb0ff2
--- /dev/null
+++ b/spring-remoting/remoting-http/remoting-http-server/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.server.Server;
+
+@SpringBootTest(classes = Server.class)
+@RunWith(SpringRunner.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-remoting/remoting-jms/remoting-jms-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting/remoting-jms/remoting-jms-client/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..95721b6eaa
--- /dev/null
+++ b/spring-remoting/remoting-jms/remoting-jms-client/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.client.JmsClient;
+
+@SpringBootTest(classes = JmsClient.class)
+@RunWith(SpringRunner.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-remoting/remoting-rmi/remoting-rmi-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting/remoting-rmi/remoting-rmi-server/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..6cae1b66fc
--- /dev/null
+++ b/spring-remoting/remoting-rmi/remoting-rmi-server/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.server.RmiServer;
+
+@SpringBootTest(classes = RmiServer.class)
+@RunWith(SpringRunner.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-rest-angular/pom.xml b/spring-rest-angular/pom.xml
index 5240ae24e7..69becfb4ae 100644
--- a/spring-rest-angular/pom.xml
+++ b/spring-rest-angular/pom.xml
@@ -74,7 +74,6 @@
 
     <properties>
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <start-class>org.baeldung.web.main.Application</start-class>
     </properties>
 
diff --git a/spring-rest-angular/src/test/java/org/baeldung/SpringContextTest.java b/spring-rest-angular/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..9136ce43eb
--- /dev/null
+++ b/spring-rest-angular/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.web.main.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-rest-full/pom.xml b/spring-rest-full/pom.xml
index a85393b7a8..5bc3a70ed5 100644
--- a/spring-rest-full/pom.xml
+++ b/spring-rest-full/pom.xml
@@ -287,7 +287,6 @@
 
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <javassist.version>3.25.0-GA</javassist.version>
 
         <!-- Maven plugins -->
diff --git a/spring-rest-full/src/test/java/org/baeldung/SpringContextTest.java b/spring-rest-full/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..8debddc40a
--- /dev/null
+++ b/spring-rest-full/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.spring.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-rest-query-language/pom.xml b/spring-rest-query-language/pom.xml
index 70fea91f31..7ee658d8ba 100644
--- a/spring-rest-query-language/pom.xml
+++ b/spring-rest-query-language/pom.xml
@@ -353,7 +353,6 @@
 		
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.7.0</cargo-maven2-plugin.version>
diff --git a/spring-rest-query-language/src/test/java/com/baeldung/SpringContextTest.java b/spring-rest-query-language/src/test/java/com/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..57886a232a
--- /dev/null
+++ b/spring-rest-query-language/src/test/java/com/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package com.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-rest-simple/README.md b/spring-rest-simple/README.md
index 882d0ac301..c01f27bd98 100644
--- a/spring-rest-simple/README.md
+++ b/spring-rest-simple/README.md
@@ -5,3 +5,4 @@
 - [Spring RequestMapping](http://www.baeldung.com/spring-requestmapping)
 - [Spring and Apache FileUpload](http://www.baeldung.com/spring-apache-file-upload)
 - [Test a REST API with curl](http://www.baeldung.com/curl-rest)
+- [CORS with Spring](https://www.baeldung.com/spring-cors)
diff --git a/spring-rest-simple/pom.xml b/spring-rest-simple/pom.xml
index d301957eb9..263e451c62 100644
--- a/spring-rest-simple/pom.xml
+++ b/spring-rest-simple/pom.xml
@@ -323,7 +323,6 @@
         <kryo.version>4.0.0</kryo.version>
         <protobuf-java-format.version>1.4</protobuf-java-format.version>
         <protobuf-java.version>3.1.0</protobuf-java.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <xstream.version>1.4.9</xstream.version>
 
         <!-- util -->
diff --git a/spring-rest-simple/src/main/java/org/baeldung/config/Application.java b/spring-rest-simple/src/main/java/com/baeldung/Application.java
similarity index 90%
rename from spring-rest-simple/src/main/java/org/baeldung/config/Application.java
rename to spring-rest-simple/src/main/java/com/baeldung/Application.java
index 5c9a186619..dc6bfcb970 100644
--- a/spring-rest-simple/src/main/java/org/baeldung/config/Application.java
+++ b/spring-rest-simple/src/main/java/com/baeldung/Application.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package com.baeldung;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -7,8 +7,8 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 import org.springframework.context.annotation.ComponentScan;
 
 @EnableAutoConfiguration
-@ComponentScan("org.baeldung")
 @SpringBootApplication
+@ComponentScan("com.baeldung.cors")
 public class Application extends SpringBootServletInitializer {
 
     public static void main(final String[] args) {
diff --git a/spring-rest-simple/src/main/java/org/baeldung/config/WebConfig.java b/spring-rest-simple/src/main/java/com/baeldung/config/MvcConfig.java
similarity index 86%
rename from spring-rest-simple/src/main/java/org/baeldung/config/WebConfig.java
rename to spring-rest-simple/src/main/java/com/baeldung/config/MvcConfig.java
index 191b87a8f2..d169f7e9d4 100644
--- a/spring-rest-simple/src/main/java/org/baeldung/config/WebConfig.java
+++ b/spring-rest-simple/src/main/java/com/baeldung/config/MvcConfig.java
@@ -1,6 +1,5 @@
-package org.baeldung.config;
+package com.baeldung.config;
 
-import org.baeldung.config.converter.KryoHttpMessageConverter;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
@@ -13,9 +12,12 @@ import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConve
 import org.springframework.http.converter.xml.MarshallingHttpMessageConverter;
 import org.springframework.oxm.xstream.XStreamMarshaller;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import com.baeldung.config.converter.KryoHttpMessageConverter;
+
 import java.text.SimpleDateFormat;
 import java.util.List;
 
@@ -24,10 +26,10 @@ import java.util.List;
  */
 @Configuration
 @EnableWebMvc
-@ComponentScan({ "org.baeldung.web" })
-public class WebConfig implements WebMvcConfigurer {
+@ComponentScan({ "com.baeldung.web" })
+public class MvcConfig implements WebMvcConfigurer {
 
-    public WebConfig() {
+    public MvcConfig() {
         super();
     }
 
@@ -64,4 +66,10 @@ public class WebConfig implements WebMvcConfigurer {
     public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
         configurer.defaultContentType(MediaType.APPLICATION_JSON);
     }
+    
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**");
+    }
 }
diff --git a/spring-rest-simple/src/main/java/org/baeldung/config/converter/KryoHttpMessageConverter.java b/spring-rest-simple/src/main/java/com/baeldung/config/converter/KryoHttpMessageConverter.java
similarity index 95%
rename from spring-rest-simple/src/main/java/org/baeldung/config/converter/KryoHttpMessageConverter.java
rename to spring-rest-simple/src/main/java/com/baeldung/config/converter/KryoHttpMessageConverter.java
index 6af54c379a..7ab8282350 100644
--- a/spring-rest-simple/src/main/java/org/baeldung/config/converter/KryoHttpMessageConverter.java
+++ b/spring-rest-simple/src/main/java/com/baeldung/config/converter/KryoHttpMessageConverter.java
@@ -1,13 +1,13 @@
-package org.baeldung.config.converter;
+package com.baeldung.config.converter;
 
 import java.io.IOException;
 
-import org.baeldung.web.dto.Foo;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.AbstractHttpMessageConverter;
 
+import com.baeldung.web.dto.Foo;
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
diff --git a/spring-rest-simple/src/main/java/com/baeldung/cors/Account.java b/spring-rest-simple/src/main/java/com/baeldung/cors/Account.java
new file mode 100644
index 0000000000..429b0c102e
--- /dev/null
+++ b/spring-rest-simple/src/main/java/com/baeldung/cors/Account.java
@@ -0,0 +1,18 @@
+package com.baeldung.cors;
+
+public class Account {
+    private Long id;
+
+    public Account(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+}
diff --git a/spring-rest-simple/src/main/java/com/baeldung/cors/AccountController.java b/spring-rest-simple/src/main/java/com/baeldung/cors/AccountController.java
new file mode 100644
index 0000000000..c387eb2121
--- /dev/null
+++ b/spring-rest-simple/src/main/java/com/baeldung/cors/AccountController.java
@@ -0,0 +1,24 @@
+package com.baeldung.cors;
+
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@CrossOrigin(maxAge = 3600)
+@RestController
+@RequestMapping("/account")
+public class AccountController {
+
+    @CrossOrigin("http://example.com")
+    @RequestMapping("/{id}")
+    public Account retrieve(@PathVariable Long id) {
+        return new Account(id);
+    }
+
+    @RequestMapping(method = RequestMethod.DELETE, path = "/{id}")
+    public void remove(@PathVariable Long id) {
+        // ...
+    }
+}
\ No newline at end of file
diff --git a/spring-rest-simple/src/main/java/org/baeldung/web/controller/BarMappingExamplesController.java b/spring-rest-simple/src/main/java/com/baeldung/web/controller/BarMappingExamplesController.java
similarity index 97%
rename from spring-rest-simple/src/main/java/org/baeldung/web/controller/BarMappingExamplesController.java
rename to spring-rest-simple/src/main/java/com/baeldung/web/controller/BarMappingExamplesController.java
index 1c3a1086ca..3611a4e6cc 100644
--- a/spring-rest-simple/src/main/java/org/baeldung/web/controller/BarMappingExamplesController.java
+++ b/spring-rest-simple/src/main/java/com/baeldung/web/controller/BarMappingExamplesController.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.controller;
+package com.baeldung.web.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/spring-rest-simple/src/main/java/org/baeldung/web/controller/BazzNewMappingsExampleController.java b/spring-rest-simple/src/main/java/com/baeldung/web/controller/BazzNewMappingsExampleController.java
similarity index 96%
rename from spring-rest-simple/src/main/java/org/baeldung/web/controller/BazzNewMappingsExampleController.java
rename to spring-rest-simple/src/main/java/com/baeldung/web/controller/BazzNewMappingsExampleController.java
index 4bcafc04fc..6c7da0296f 100644
--- a/spring-rest-simple/src/main/java/org/baeldung/web/controller/BazzNewMappingsExampleController.java
+++ b/spring-rest-simple/src/main/java/com/baeldung/web/controller/BazzNewMappingsExampleController.java
@@ -1,9 +1,8 @@
-package org.baeldung.web.controller;
+package com.baeldung.web.controller;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.baeldung.web.dto.Bazz;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -15,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.baeldung.web.dto.Bazz;
 import com.fasterxml.jackson.core.JsonProcessingException;
 
 @RestController
diff --git a/spring-rest-simple/src/main/java/org/baeldung/web/controller/FooController.java b/spring-rest-simple/src/main/java/com/baeldung/web/controller/FooController.java
similarity index 96%
rename from spring-rest-simple/src/main/java/org/baeldung/web/controller/FooController.java
rename to spring-rest-simple/src/main/java/com/baeldung/web/controller/FooController.java
index c68d586667..bab315c027 100644
--- a/spring-rest-simple/src/main/java/org/baeldung/web/controller/FooController.java
+++ b/spring-rest-simple/src/main/java/com/baeldung/web/controller/FooController.java
@@ -1,11 +1,9 @@
-package org.baeldung.web.controller;
+package com.baeldung.web.controller;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
 import java.util.List;
 
-import org.baeldung.web.dto.Foo;
-import org.baeldung.web.dto.FooProtos;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
+import com.baeldung.web.dto.Foo;
+import com.baeldung.web.dto.FooProtos;
 import com.google.common.collect.Lists;
 
 @Controller
diff --git a/spring-rest-simple/src/main/java/org/baeldung/web/controller/FooMappingExamplesController.java b/spring-rest-simple/src/main/java/com/baeldung/web/controller/FooMappingExamplesController.java
similarity index 98%
rename from spring-rest-simple/src/main/java/org/baeldung/web/controller/FooMappingExamplesController.java
rename to spring-rest-simple/src/main/java/com/baeldung/web/controller/FooMappingExamplesController.java
index 5fb92d6d87..ec75e4c859 100644
--- a/spring-rest-simple/src/main/java/org/baeldung/web/controller/FooMappingExamplesController.java
+++ b/spring-rest-simple/src/main/java/com/baeldung/web/controller/FooMappingExamplesController.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.controller;
+package com.baeldung.web.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/spring-rest-simple/src/main/java/org/baeldung/web/controller/status/ExampleController.java b/spring-rest-simple/src/main/java/com/baeldung/web/controller/status/ExampleController.java
similarity index 94%
rename from spring-rest-simple/src/main/java/org/baeldung/web/controller/status/ExampleController.java
rename to spring-rest-simple/src/main/java/com/baeldung/web/controller/status/ExampleController.java
index ceda138768..0cc657f0f2 100644
--- a/spring-rest-simple/src/main/java/org/baeldung/web/controller/status/ExampleController.java
+++ b/spring-rest-simple/src/main/java/com/baeldung/web/controller/status/ExampleController.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.controller.status;
+package com.baeldung.web.controller.status;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/spring-rest-simple/src/main/java/org/baeldung/web/controller/status/ForbiddenException.java b/spring-rest-simple/src/main/java/com/baeldung/web/controller/status/ForbiddenException.java
similarity index 88%
rename from spring-rest-simple/src/main/java/org/baeldung/web/controller/status/ForbiddenException.java
rename to spring-rest-simple/src/main/java/com/baeldung/web/controller/status/ForbiddenException.java
index 458bdaf170..301a25d070 100644
--- a/spring-rest-simple/src/main/java/org/baeldung/web/controller/status/ForbiddenException.java
+++ b/spring-rest-simple/src/main/java/com/baeldung/web/controller/status/ForbiddenException.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.controller.status;
+package com.baeldung.web.controller.status;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/spring-rest-simple/src/main/java/org/baeldung/web/dto/Bazz.java b/spring-rest-simple/src/main/java/com/baeldung/web/dto/Bazz.java
similarity index 91%
rename from spring-rest-simple/src/main/java/org/baeldung/web/dto/Bazz.java
rename to spring-rest-simple/src/main/java/com/baeldung/web/dto/Bazz.java
index d9a495b726..861b4009b5 100644
--- a/spring-rest-simple/src/main/java/org/baeldung/web/dto/Bazz.java
+++ b/spring-rest-simple/src/main/java/com/baeldung/web/dto/Bazz.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.dto;
+package com.baeldung.web.dto;
 
 public class Bazz {
 
diff --git a/spring-rest-simple/src/main/java/org/baeldung/web/dto/Foo.java b/spring-rest-simple/src/main/java/com/baeldung/web/dto/Foo.java
similarity index 95%
rename from spring-rest-simple/src/main/java/org/baeldung/web/dto/Foo.java
rename to spring-rest-simple/src/main/java/com/baeldung/web/dto/Foo.java
index 240b368b50..5a54539927 100644
--- a/spring-rest-simple/src/main/java/org/baeldung/web/dto/Foo.java
+++ b/spring-rest-simple/src/main/java/com/baeldung/web/dto/Foo.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.dto;
+package com.baeldung.web.dto;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
diff --git a/spring-rest-simple/src/main/java/org/baeldung/web/dto/FooProtos.java b/spring-rest-simple/src/main/java/com/baeldung/web/dto/FooProtos.java
similarity index 90%
rename from spring-rest-simple/src/main/java/org/baeldung/web/dto/FooProtos.java
rename to spring-rest-simple/src/main/java/com/baeldung/web/dto/FooProtos.java
index 8ca96c38fc..db7cb66f87 100644
--- a/spring-rest-simple/src/main/java/org/baeldung/web/dto/FooProtos.java
+++ b/spring-rest-simple/src/main/java/com/baeldung/web/dto/FooProtos.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: FooProtos.proto
 
-package org.baeldung.web.dto;
+package com.baeldung.web.dto;
 
 public final class FooProtos {
     private FooProtos() {
@@ -115,11 +115,11 @@ public final class FooProtos {
         }
 
         public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-            return org.baeldung.web.dto.FooProtos.internal_static_baeldung_Foo_descriptor;
+            return com.baeldung.web.dto.FooProtos.internal_static_baeldung_Foo_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() {
-            return org.baeldung.web.dto.FooProtos.internal_static_baeldung_Foo_fieldAccessorTable.ensureFieldAccessorsInitialized(org.baeldung.web.dto.FooProtos.Foo.class, org.baeldung.web.dto.FooProtos.Foo.Builder.class);
+            return com.baeldung.web.dto.FooProtos.internal_static_baeldung_Foo_fieldAccessorTable.ensureFieldAccessorsInitialized(com.baeldung.web.dto.FooProtos.Foo.class, com.baeldung.web.dto.FooProtos.Foo.Builder.class);
         }
 
         public static com.google.protobuf.Parser<Foo> PARSER = new com.google.protobuf.AbstractParser<Foo>() {
@@ -255,43 +255,43 @@ public final class FooProtos {
             return super.writeReplace();
         }
 
-        public static org.baeldung.web.dto.FooProtos.Foo parseFrom(com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException {
+        public static com.baeldung.web.dto.FooProtos.Foo parseFrom(com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException {
             return PARSER.parseFrom(data);
         }
 
-        public static org.baeldung.web.dto.FooProtos.Foo parseFrom(com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException {
+        public static com.baeldung.web.dto.FooProtos.Foo parseFrom(com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException {
             return PARSER.parseFrom(data, extensionRegistry);
         }
 
-        public static org.baeldung.web.dto.FooProtos.Foo parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+        public static com.baeldung.web.dto.FooProtos.Foo parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
             return PARSER.parseFrom(data);
         }
 
-        public static org.baeldung.web.dto.FooProtos.Foo parseFrom(byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException {
+        public static com.baeldung.web.dto.FooProtos.Foo parseFrom(byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException {
             return PARSER.parseFrom(data, extensionRegistry);
         }
 
-        public static org.baeldung.web.dto.FooProtos.Foo parseFrom(java.io.InputStream input) throws java.io.IOException {
+        public static com.baeldung.web.dto.FooProtos.Foo parseFrom(java.io.InputStream input) throws java.io.IOException {
             return PARSER.parseFrom(input);
         }
 
-        public static org.baeldung.web.dto.FooProtos.Foo parseFrom(java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
+        public static com.baeldung.web.dto.FooProtos.Foo parseFrom(java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
             return PARSER.parseFrom(input, extensionRegistry);
         }
 
-        public static org.baeldung.web.dto.FooProtos.Foo parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+        public static com.baeldung.web.dto.FooProtos.Foo parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
             return PARSER.parseDelimitedFrom(input);
         }
 
-        public static org.baeldung.web.dto.FooProtos.Foo parseDelimitedFrom(java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
+        public static com.baeldung.web.dto.FooProtos.Foo parseDelimitedFrom(java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
             return PARSER.parseDelimitedFrom(input, extensionRegistry);
         }
 
-        public static org.baeldung.web.dto.FooProtos.Foo parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+        public static com.baeldung.web.dto.FooProtos.Foo parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException {
             return PARSER.parseFrom(input);
         }
 
-        public static org.baeldung.web.dto.FooProtos.Foo parseFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
+        public static com.baeldung.web.dto.FooProtos.Foo parseFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
             return PARSER.parseFrom(input, extensionRegistry);
         }
 
@@ -303,7 +303,7 @@ public final class FooProtos {
             return newBuilder();
         }
 
-        public static Builder newBuilder(org.baeldung.web.dto.FooProtos.Foo prototype) {
+        public static Builder newBuilder(com.baeldung.web.dto.FooProtos.Foo prototype) {
             return newBuilder().mergeFrom(prototype);
         }
 
@@ -322,13 +322,13 @@ public final class FooProtos {
          */
         public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder> implements
                 // @@protoc_insertion_point(builder_implements:baeldung.Foo)
-                org.baeldung.web.dto.FooProtos.FooOrBuilder {
+                com.baeldung.web.dto.FooProtos.FooOrBuilder {
             public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-                return org.baeldung.web.dto.FooProtos.internal_static_baeldung_Foo_descriptor;
+                return com.baeldung.web.dto.FooProtos.internal_static_baeldung_Foo_descriptor;
             }
 
             protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() {
-                return org.baeldung.web.dto.FooProtos.internal_static_baeldung_Foo_fieldAccessorTable.ensureFieldAccessorsInitialized(org.baeldung.web.dto.FooProtos.Foo.class, org.baeldung.web.dto.FooProtos.Foo.Builder.class);
+                return com.baeldung.web.dto.FooProtos.internal_static_baeldung_Foo_fieldAccessorTable.ensureFieldAccessorsInitialized(com.baeldung.web.dto.FooProtos.Foo.class, com.baeldung.web.dto.FooProtos.Foo.Builder.class);
             }
 
             // Construct using org.baeldung.web.dto.FooProtos.Foo.newBuilder()
@@ -364,23 +364,23 @@ public final class FooProtos {
             }
 
             public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-                return org.baeldung.web.dto.FooProtos.internal_static_baeldung_Foo_descriptor;
+                return com.baeldung.web.dto.FooProtos.internal_static_baeldung_Foo_descriptor;
             }
 
-            public org.baeldung.web.dto.FooProtos.Foo getDefaultInstanceForType() {
-                return org.baeldung.web.dto.FooProtos.Foo.getDefaultInstance();
+            public com.baeldung.web.dto.FooProtos.Foo getDefaultInstanceForType() {
+                return com.baeldung.web.dto.FooProtos.Foo.getDefaultInstance();
             }
 
-            public org.baeldung.web.dto.FooProtos.Foo build() {
-                org.baeldung.web.dto.FooProtos.Foo result = buildPartial();
+            public com.baeldung.web.dto.FooProtos.Foo build() {
+                com.baeldung.web.dto.FooProtos.Foo result = buildPartial();
                 if (!result.isInitialized()) {
                     throw newUninitializedMessageException(result);
                 }
                 return result;
             }
 
-            public org.baeldung.web.dto.FooProtos.Foo buildPartial() {
-                org.baeldung.web.dto.FooProtos.Foo result = new org.baeldung.web.dto.FooProtos.Foo(this);
+            public com.baeldung.web.dto.FooProtos.Foo buildPartial() {
+                com.baeldung.web.dto.FooProtos.Foo result = new com.baeldung.web.dto.FooProtos.Foo(this);
                 int from_bitField0_ = bitField0_;
                 int to_bitField0_ = 0;
                 if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -397,16 +397,16 @@ public final class FooProtos {
             }
 
             public Builder mergeFrom(com.google.protobuf.Message other) {
-                if (other instanceof org.baeldung.web.dto.FooProtos.Foo) {
-                    return mergeFrom((org.baeldung.web.dto.FooProtos.Foo) other);
+                if (other instanceof com.baeldung.web.dto.FooProtos.Foo) {
+                    return mergeFrom((com.baeldung.web.dto.FooProtos.Foo) other);
                 } else {
                     super.mergeFrom(other);
                     return this;
                 }
             }
 
-            public Builder mergeFrom(org.baeldung.web.dto.FooProtos.Foo other) {
-                if (other == org.baeldung.web.dto.FooProtos.Foo.getDefaultInstance())
+            public Builder mergeFrom(com.baeldung.web.dto.FooProtos.Foo other) {
+                if (other == com.baeldung.web.dto.FooProtos.Foo.getDefaultInstance())
                     return this;
                 if (other.hasId()) {
                     setId(other.getId());
@@ -433,11 +433,11 @@ public final class FooProtos {
             }
 
             public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
-                org.baeldung.web.dto.FooProtos.Foo parsedMessage = null;
+                com.baeldung.web.dto.FooProtos.Foo parsedMessage = null;
                 try {
                     parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
                 } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                    parsedMessage = (org.baeldung.web.dto.FooProtos.Foo) e.getUnfinishedMessage();
+                    parsedMessage = (com.baeldung.web.dto.FooProtos.Foo) e.getUnfinishedMessage();
                     throw e;
                 } finally {
                     if (parsedMessage != null) {
diff --git a/spring-rest-simple/src/main/java/org/baeldung/web/util/LinkUtil.java b/spring-rest-simple/src/main/java/com/baeldung/web/util/LinkUtil.java
similarity index 96%
rename from spring-rest-simple/src/main/java/org/baeldung/web/util/LinkUtil.java
rename to spring-rest-simple/src/main/java/com/baeldung/web/util/LinkUtil.java
index b2137aeeff..3ebba8ae1c 100644
--- a/spring-rest-simple/src/main/java/org/baeldung/web/util/LinkUtil.java
+++ b/spring-rest-simple/src/main/java/com/baeldung/web/util/LinkUtil.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.util;
+package com.baeldung.web.util;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/spring-rest-simple/src/main/webapp/WEB-INF/spring-web-config.xml b/spring-rest-simple/src/main/webapp/WEB-INF/spring-web-config.xml
new file mode 100644
index 0000000000..e83e13be71
--- /dev/null
+++ b/spring-rest-simple/src/main/webapp/WEB-INF/spring-web-config.xml
@@ -0,0 +1,25 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/mvc
+        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+    <mvc:cors>
+
+        <mvc:mapping path="/api/**"
+                     allowed-origins="http://domain1.com, http://domain2.com"
+                     allowed-methods="GET, PUT"
+                     allowed-headers="header1, header2, header3"
+                     exposed-headers="header1, header2" allow-credentials="false"
+                     max-age="123" />
+
+        <mvc:mapping path="/resources/**"
+                     allowed-origins="http://domain1.com" />
+
+    </mvc:cors>
+
+    <mvc:view-controller path="/welcome.html"/>
+
+</beans>
diff --git a/spring-rest-simple/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-rest-simple/src/test/java/com/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..b66e642b80
--- /dev/null
+++ b/spring-rest-simple/src/test/java/com/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,15 @@
+package com.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextIntegrationTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-rest-simple/src/test/java/org/baeldung/web/controller/mediatypes/TestConfig.java b/spring-rest-simple/src/test/java/com/baeldung/web/controller/mediatypes/TestConfig.java
similarity index 66%
rename from spring-rest-simple/src/test/java/org/baeldung/web/controller/mediatypes/TestConfig.java
rename to spring-rest-simple/src/test/java/com/baeldung/web/controller/mediatypes/TestConfig.java
index 66ffe4947d..4bbfa2818e 100644
--- a/spring-rest-simple/src/test/java/org/baeldung/web/controller/mediatypes/TestConfig.java
+++ b/spring-rest-simple/src/test/java/com/baeldung/web/controller/mediatypes/TestConfig.java
@@ -1,11 +1,11 @@
-package org.baeldung.web.controller.mediatypes;
+package com.baeldung.web.controller.mediatypes;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 
 @Configuration
-@ComponentScan({ "org.baeldung.web" })
+@ComponentScan({ "com.baeldung.web" })
 public class TestConfig {
 
 }
diff --git a/spring-rest-simple/src/test/java/org/baeldung/web/controller/status/ExampleControllerIntegrationTest.java b/spring-rest-simple/src/test/java/com/baeldung/web/controller/status/ExampleControllerIntegrationTest.java
similarity index 92%
rename from spring-rest-simple/src/test/java/org/baeldung/web/controller/status/ExampleControllerIntegrationTest.java
rename to spring-rest-simple/src/test/java/com/baeldung/web/controller/status/ExampleControllerIntegrationTest.java
index 7f78146b84..d1ae7f65c6 100644
--- a/spring-rest-simple/src/test/java/org/baeldung/web/controller/status/ExampleControllerIntegrationTest.java
+++ b/spring-rest-simple/src/test/java/com/baeldung/web/controller/status/ExampleControllerIntegrationTest.java
@@ -1,9 +1,7 @@
-package org.baeldung.web.controller.status;
+package com.baeldung.web.controller.status;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import org.baeldung.config.WebConfig;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -16,8 +14,10 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
+import com.baeldung.config.MvcConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = WebConfig.class)
+@ContextConfiguration(classes = MvcConfig.class)
 @WebAppConfiguration
 @AutoConfigureWebClient
 public class ExampleControllerIntegrationTest {
diff --git a/spring-rest-simple/src/test/java/org/baeldung/web/test/BazzNewMappingsExampleIntegrationTest.java b/spring-rest-simple/src/test/java/com/baeldung/web/test/BazzNewMappingsExampleIntegrationTest.java
similarity index 96%
rename from spring-rest-simple/src/test/java/org/baeldung/web/test/BazzNewMappingsExampleIntegrationTest.java
rename to spring-rest-simple/src/test/java/com/baeldung/web/test/BazzNewMappingsExampleIntegrationTest.java
index dfb3ff7a38..4f0395e914 100644
--- a/spring-rest-simple/src/test/java/org/baeldung/web/test/BazzNewMappingsExampleIntegrationTest.java
+++ b/spring-rest-simple/src/test/java/com/baeldung/web/test/BazzNewMappingsExampleIntegrationTest.java
@@ -1,5 +1,5 @@
 
-package org.baeldung.web.test;
+package com.baeldung.web.test;
 
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
@@ -9,8 +9,6 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import org.baeldung.config.WebConfig;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,9 +21,11 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
+import com.baeldung.config.MvcConfig;
+
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = WebConfig.class)
+@ContextConfiguration(classes = MvcConfig.class)
 @WebAppConfiguration
 @AutoConfigureWebClient
 public class BazzNewMappingsExampleIntegrationTest {
diff --git a/spring-rest-simple/src/test/java/org/baeldung/web/test/RequestMappingLiveTest.java b/spring-rest-simple/src/test/java/com/baeldung/web/test/RequestMappingLiveTest.java
similarity index 99%
rename from spring-rest-simple/src/test/java/org/baeldung/web/test/RequestMappingLiveTest.java
rename to spring-rest-simple/src/test/java/com/baeldung/web/test/RequestMappingLiveTest.java
index 9dd6b13f18..f26f241beb 100644
--- a/spring-rest-simple/src/test/java/org/baeldung/web/test/RequestMappingLiveTest.java
+++ b/spring-rest-simple/src/test/java/com/baeldung/web/test/RequestMappingLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.test;
+package com.baeldung.web.test;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
diff --git a/spring-rest-simple/src/test/java/org/baeldung/web/test/RestTemplateBasicLiveTest.java b/spring-rest-simple/src/test/java/com/baeldung/web/test/RestTemplateBasicLiveTest.java
similarity index 99%
rename from spring-rest-simple/src/test/java/org/baeldung/web/test/RestTemplateBasicLiveTest.java
rename to spring-rest-simple/src/test/java/com/baeldung/web/test/RestTemplateBasicLiveTest.java
index e213d0255f..51e3fb097e 100644
--- a/spring-rest-simple/src/test/java/org/baeldung/web/test/RestTemplateBasicLiveTest.java
+++ b/spring-rest-simple/src/test/java/com/baeldung/web/test/RestTemplateBasicLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.test;
+package com.baeldung.web.test;
 
 import static org.apache.commons.codec.binary.Base64.encodeBase64;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -13,7 +13,6 @@ import java.net.URI;
 import java.util.Arrays;
 import java.util.Set;
 
-import org.baeldung.web.dto.Foo;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.HttpEntity;
@@ -31,6 +30,7 @@ import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RequestCallback;
 import org.springframework.web.client.RestTemplate;
 
+import com.baeldung.web.dto.Foo;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
diff --git a/spring-rest-simple/src/test/java/org/baeldung/web/test/SpringHttpMessageConvertersLiveTest.java b/spring-rest-simple/src/test/java/com/baeldung/web/test/SpringHttpMessageConvertersLiveTest.java
similarity index 96%
rename from spring-rest-simple/src/test/java/org/baeldung/web/test/SpringHttpMessageConvertersLiveTest.java
rename to spring-rest-simple/src/test/java/com/baeldung/web/test/SpringHttpMessageConvertersLiveTest.java
index 7f250653ab..c6929da818 100644
--- a/spring-rest-simple/src/test/java/org/baeldung/web/test/SpringHttpMessageConvertersLiveTest.java
+++ b/spring-rest-simple/src/test/java/com/baeldung/web/test/SpringHttpMessageConvertersLiveTest.java
@@ -1,13 +1,10 @@
-package org.baeldung.web.test;
+package com.baeldung.web.test;
 
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
 import java.util.Arrays;
 
-import org.baeldung.config.converter.KryoHttpMessageConverter;
-import org.baeldung.web.dto.Foo;
-import org.baeldung.web.dto.FooProtos;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.http.HttpEntity;
@@ -18,6 +15,10 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.protobuf.ProtobufHttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
+import com.baeldung.config.converter.KryoHttpMessageConverter;
+import com.baeldung.web.dto.Foo;
+import com.baeldung.web.dto.FooProtos;
+
 /**
  * Integration Test class. Tests methods hits the server's rest services.
  */
diff --git a/spring-rest-simple/src/test/java/org/baeldung/web/test/TestRestTemplateBasicLiveTest.java b/spring-rest-simple/src/test/java/com/baeldung/web/test/TestRestTemplateBasicLiveTest.java
similarity index 99%
rename from spring-rest-simple/src/test/java/org/baeldung/web/test/TestRestTemplateBasicLiveTest.java
rename to spring-rest-simple/src/test/java/com/baeldung/web/test/TestRestTemplateBasicLiveTest.java
index b920ed38da..49ac651da2 100644
--- a/spring-rest-simple/src/test/java/org/baeldung/web/test/TestRestTemplateBasicLiveTest.java
+++ b/spring-rest-simple/src/test/java/com/baeldung/web/test/TestRestTemplateBasicLiveTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.test;
+package com.baeldung.web.test;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/spring-rest-simple/src/test/java/org/baeldung/web/util/HTTPLinkHeaderUtil.java b/spring-rest-simple/src/test/java/com/baeldung/web/util/HTTPLinkHeaderUtil.java
similarity index 98%
rename from spring-rest-simple/src/test/java/org/baeldung/web/util/HTTPLinkHeaderUtil.java
rename to spring-rest-simple/src/test/java/com/baeldung/web/util/HTTPLinkHeaderUtil.java
index bb3919eacc..86b35d2b4e 100644
--- a/spring-rest-simple/src/test/java/org/baeldung/web/util/HTTPLinkHeaderUtil.java
+++ b/spring-rest-simple/src/test/java/com/baeldung/web/util/HTTPLinkHeaderUtil.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.util;
+package com.baeldung.web.util;
 
 import java.util.List;
 
diff --git a/spring-rest-simple/src/test/java/org/baeldung/SpringContextTest.java b/spring-rest-simple/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..5e68a8e64f
--- /dev/null
+++ b/spring-rest-simple/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-rest/README.md b/spring-rest/README.md
index 5d7894cdf8..54b47604d4 100644
--- a/spring-rest/README.md
+++ b/spring-rest/README.md
@@ -6,7 +6,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 ### Relevant Articles:
 - [Spring @RequestMapping](http://www.baeldung.com/spring-requestmapping)
 - [Returning Custom Status Codes from Spring Controllers](http://www.baeldung.com/spring-mvc-controller-custom-http-status-code)
-- [A Guide to OkHttp](http://www.baeldung.com/guide-to-okhttp)
 - [Binary Data Formats in a Spring REST API](http://www.baeldung.com/spring-rest-api-with-binary-data-formats)
 - [Guide to UriComponentsBuilder in Spring](http://www.baeldung.com/spring-uricomponentsbuilder)
 - [Introduction to FindBugs](http://www.baeldung.com/intro-to-findbugs)
diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml
index 36934af101..670bac9805 100644
--- a/spring-rest/pom.xml
+++ b/spring-rest/pom.xml
@@ -93,13 +93,6 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
 
-        <!-- okhttp -->
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>${com.squareup.okhttp3.version}</version>
-        </dependency>
-
         <!-- test scoped -->
         <dependency>
             <groupId>org.hamcrest</groupId>
@@ -270,7 +263,6 @@
         <kryo.version>4.0.0</kryo.version>
         <protobuf-java-format.version>1.4</protobuf-java-format.version>
         <protobuf-java.version>3.1.0</protobuf-java.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
 
         <!-- util -->
         <guava.version>20.0</guava.version>
@@ -280,8 +272,6 @@
         <findbugs-maven-plugin.version>3.0.4</findbugs-maven-plugin.version>
         <checkstyle-maven-plugin.version>3.0.0</checkstyle-maven-plugin.version>
         <dependency.locations.enabled>false</dependency.locations.enabled>
-        <!-- okhttp -->
-        <com.squareup.okhttp3.version>3.4.1</com.squareup.okhttp3.version>
 
         <json.path.version>2.2.0</json.path.version>
         <pact.version>3.5.11</pact.version>
diff --git a/spring-rest/src/test/java/com/baeldung/SpringContextTest.java b/spring-rest/src/test/java/com/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..4b2024e207
--- /dev/null
+++ b/spring-rest/src/test/java/com/baeldung/SpringContextTest.java
@@ -0,0 +1,24 @@
+package com.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.custom.CustomApplication;
+import com.baeldung.produceimage.ImageApplication;
+import com.baeldung.propertyeditor.PropertyEditorApplication;
+import com.baeldung.responseheaders.ResponseHeadersApplication;
+import com.baeldung.sampleapp.config.MainApplication;
+import com.baeldung.web.log.app.Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = { CustomApplication.class, ImageApplication.class, PropertyEditorApplication.class,
+		ResponseHeadersApplication.class, Application.class, com.baeldung.web.upload.app.UploadApplication.class,
+		MainApplication.class})
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {	
+    }
+}
diff --git a/spring-resttemplate/README.md b/spring-resttemplate/README.md
index c2c4965231..97a89ff7aa 100644
--- a/spring-resttemplate/README.md
+++ b/spring-resttemplate/README.md
@@ -10,3 +10,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Configure a RestTemplate with RestTemplateBuilder](http://www.baeldung.com/spring-rest-template-builder)
 - [Mocking a RestTemplate in Spring](https://www.baeldung.com/spring-mock-rest-template)
 - [RestTemplate Post Request with JSON](https://www.baeldung.com/spring-resttemplate-post-json)
+- [Download a Large File Through a Spring RestTemplate](https://www.baeldung.com/spring-resttemplate-download-large-file)
diff --git a/spring-resttemplate/pom.xml b/spring-resttemplate/pom.xml
index 06d4eed9fc..ae5cfed4c9 100644
--- a/spring-resttemplate/pom.xml
+++ b/spring-resttemplate/pom.xml
@@ -284,7 +284,6 @@
     </profiles>
 
     <properties>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <xstream.version>1.4.9</xstream.version>
 
         <!-- util -->
diff --git a/spring-resttemplate/src/test/java/org/baeldung/SpringContextTest.java b/spring-resttemplate/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..e52d249f0b
--- /dev/null
+++ b/spring-resttemplate/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.resttemplate.RestTemplateConfigurationApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = RestTemplateConfigurationApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-resttemplate/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java b/spring-resttemplate/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
index a54c124d5f..ff3034a50d 100644
--- a/spring-resttemplate/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
+++ b/spring-resttemplate/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
@@ -188,7 +188,7 @@ public class RestTemplateBasicLiveTest {
         final String resourceUrl = fooResourceUrl + '/' + createResponse.getBody()
             .getId();
         final HttpEntity<Foo> requestUpdate = new HttpEntity<>(updatedResource, headers);
-        final ClientHttpRequestFactory requestFactory = getSimpleClientHttpRequestFactory();
+        final ClientHttpRequestFactory requestFactory = getClientHttpRequestFactory();
         final RestTemplate template = new RestTemplate(requestFactory);
         template.setMessageConverters(Arrays.asList(new MappingJackson2HttpMessageConverter()));
         template.patchForObject(resourceUrl, requestUpdate, Void.class);
@@ -262,7 +262,7 @@ public class RestTemplateBasicLiveTest {
 
     // Simply setting restTemplate timeout using ClientHttpRequestFactory
 
-    ClientHttpRequestFactory getSimpleClientHttpRequestFactory() {
+    ClientHttpRequestFactory getClientHttpRequestFactory() {
         final int timeout = 5;
         final HttpComponentsClientHttpRequestFactory clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory();
         clientHttpRequestFactory.setConnectTimeout(timeout * 1000);
diff --git a/spring-security-acl/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-acl/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..74f26e2e5a
--- /dev/null
+++ b/spring-security-acl/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.acl.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-angular/README.md b/spring-security-angular/README.md
index 49cd8dd62d..80312c4bab 100644
--- a/spring-security-angular/README.md
+++ b/spring-security-angular/README.md
@@ -1,3 +1,2 @@
 ### Relevant Articles: 
 - [Spring Security Login Page with Angular](https://www.baeldung.com/spring-security-login-angular)
-- [Fixing 401s with CORS Preflights and Spring Security](https://www.baeldung.com/spring-security-cors-preflight)
diff --git a/spring-security-angular/server/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-angular/server/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..e61d512bca
--- /dev/null
+++ b/spring-security-angular/server/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.springbootsecurityrest.basicauth.SpringBootSecurityApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringBootSecurityApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-cache-control/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-cache-control/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..8fbaa7169b
--- /dev/null
+++ b/spring-security-cache-control/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.cachecontrol.AppRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = AppRunner.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-rest-simple/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-client/spring-security-jsp-authentication/src/test/java/org/baeldung/SpringContextTest.java
similarity index 90%
rename from spring-rest-simple/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-security-client/spring-security-jsp-authentication/src/test/java/org/baeldung/SpringContextTest.java
index 66243ef00d..0afb3899db 100644
--- a/spring-rest-simple/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/spring-security-client/spring-security-jsp-authentication/src/test/java/org/baeldung/SpringContextTest.java
@@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
-public class SpringContextIntegrationTest {
+public class SpringContextTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-security-client/spring-security-jsp-authorize/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-client/spring-security-jsp-authorize/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..0afb3899db
--- /dev/null
+++ b/spring-security-client/spring-security-jsp-authorize/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.config.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-client/spring-security-jsp-config/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-client/spring-security-jsp-config/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..0afb3899db
--- /dev/null
+++ b/spring-security-client/spring-security-jsp-config/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.config.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-client/spring-security-mvc/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-client/spring-security-mvc/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..0afb3899db
--- /dev/null
+++ b/spring-security-client/spring-security-mvc/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.config.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-client/spring-security-thymeleaf-authentication/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-client/spring-security-thymeleaf-authentication/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..0afb3899db
--- /dev/null
+++ b/spring-security-client/spring-security-thymeleaf-authentication/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.config.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-client/spring-security-thymeleaf-authorize/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-client/spring-security-thymeleaf-authorize/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..0afb3899db
--- /dev/null
+++ b/spring-security-client/spring-security-thymeleaf-authorize/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.config.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-client/spring-security-thymeleaf-config/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-client/spring-security-thymeleaf-config/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..0afb3899db
--- /dev/null
+++ b/spring-security-client/spring-security-thymeleaf-config/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.config.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-core/README.md b/spring-security-core/README.md
index b38dc061b4..bc9a8afed7 100644
--- a/spring-security-core/README.md
+++ b/spring-security-core/README.md
@@ -10,3 +10,4 @@ mvn clean install
 - [Spring Security – @PreFilter and @PostFilter](http://www.baeldung.com/spring-security-prefilter-postfilter)
 - [Spring Boot Authentication Auditing Support](http://www.baeldung.com/spring-boot-authentication-audit)
 - [Introduction to Spring Method Security](http://www.baeldung.com/spring-security-method-security)
+- [Overview and Need for DelegatingFilterProxy in Spring](https://www.baeldung.com/spring-delegating-filter-proxy)
\ No newline at end of file
diff --git a/spring-security-core/src/main/java/org/baeldung/app/App.java b/spring-security-core/src/main/java/org/baeldung/app/App.java
index 37d8c34c5a..db0c9135c4 100644
--- a/spring-security-core/src/main/java/org/baeldung/app/App.java
+++ b/spring-security-core/src/main/java/org/baeldung/app/App.java
@@ -1,11 +1,15 @@
 package org.baeldung.app;
 
+import javax.servlet.Filter;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.web.filter.DelegatingFilterProxy;
+import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
 @SpringBootApplication
 @EnableJpaRepositories("org.baeldung.repository")
@@ -15,4 +19,32 @@ public class App extends SpringBootServletInitializer {
     public static void main(String[] args) {
         SpringApplication.run(App.class, args);
     }
+    
+    public static class ApplicationInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
+
+        @Override
+        protected javax.servlet.Filter[] getServletFilters() {
+            DelegatingFilterProxy delegateFilterProxy = new DelegatingFilterProxy();
+            delegateFilterProxy.setTargetBeanName("loggingFilter");
+            return new Filter[] { delegateFilterProxy };
+        }
+
+        @Override
+        protected Class<?>[] getRootConfigClasses() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        protected Class<?>[] getServletConfigClasses() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        protected String[] getServletMappings() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+    }
 }
diff --git a/spring-5-mvc/src/main/java/com/baeldung/spring/filter/CustomFilter.java b/spring-security-core/src/main/java/org/baeldung/filter/CustomFilter.java
similarity index 96%
rename from spring-5-mvc/src/main/java/com/baeldung/spring/filter/CustomFilter.java
rename to spring-security-core/src/main/java/org/baeldung/filter/CustomFilter.java
index 4aa33cd749..35596eae16 100644
--- a/spring-5-mvc/src/main/java/com/baeldung/spring/filter/CustomFilter.java
+++ b/spring-security-core/src/main/java/org/baeldung/filter/CustomFilter.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.filter;
+package org.baeldung.filter;
 
 import java.io.IOException;
 
diff --git a/spring-security-core/src/main/webapp/WEB-INF/web.xml b/spring-security-core/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..e4954338a9
--- /dev/null
+++ b/spring-security-core/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+
+	<filter>
+		<filter-name>loggingFilter</filter-name>
+		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>loggingFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+</web-app>
\ No newline at end of file
diff --git a/spring-security-core/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-core/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..1707c706ae
--- /dev/null
+++ b/spring-security-core/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.app.App;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = App.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-core/src/test/java/org/baeldung/methodsecurity/TestMethodSecurity.java b/spring-security-core/src/test/java/org/baeldung/methodsecurity/TestMethodSecurity.java
index 309ee3076d..009d9af9fc 100644
--- a/spring-security-core/src/test/java/org/baeldung/methodsecurity/TestMethodSecurity.java
+++ b/spring-security-core/src/test/java/org/baeldung/methodsecurity/TestMethodSecurity.java
@@ -80,7 +80,7 @@ public class TestMethodSecurity {
 
     @Test
     @WithMockUser(username = "JOHN", authorities = { "SYS_ADMIN" })
-    public void givenAuthoritySysAdmin_whenCallGetUsernameInLowerCase_thenReturnUsername() {
+    public void givenAuthoritySysAdmin_whenCallGetUsernameLC_thenReturnUsername() {
         String username = userRoleService.getUsernameLC();
         assertEquals("john", username);
     }
diff --git a/spring-security-cors/README.md b/spring-security-cors/README.md
new file mode 100644
index 0000000000..2ab5e33ee3
--- /dev/null
+++ b/spring-security-cors/README.md
@@ -0,0 +1,3 @@
+## Relevant Articles
+
+- [Fixing 401s with CORS Preflights and Spring Security](https://www.baeldung.com/spring-security-cors-preflight)
diff --git a/spring-security-kerberos/pom.xml b/spring-security-kerberos/pom.xml
index 35c4ba4926..d98d0ff508 100644
--- a/spring-security-kerberos/pom.xml
+++ b/spring-security-kerberos/pom.xml
@@ -7,12 +7,14 @@
 	<version>0.1-SNAPSHOT</version>
 	<name>spring-security-kerberos</name>
 	<packaging>war</packaging>
+	
 	<parent>
 		<artifactId>parent-boot-1</artifactId>
 		<groupId>com.baeldung</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 		<relativePath>../parent-boot-1</relativePath>
 	</parent>
+	
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -50,6 +52,7 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	
 	<build>
 		<plugins>
 			<plugin>
diff --git a/spring-security-mvc-boot/pom.xml b/spring-security-mvc-boot/pom.xml
index 4c25dc01e8..906bebf442 100644
--- a/spring-security-mvc-boot/pom.xml
+++ b/spring-security-mvc-boot/pom.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
     <artifactId>spring-security-mvc-boot</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>spring-security-mvc-boot</name>
-    <packaging>war</packaging>
+    <packaging>pom</packaging>
     <description>Spring Security MVC Boot</description>
 
     <parent>
@@ -45,10 +46,6 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-data</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
@@ -198,7 +195,7 @@
                                     <excludes>
                                         <exclude>**/*LiveTest.java</exclude>
                                         <exclude>**/*IntegrationTest.java</exclude>
-                        				<exclude>**/*IntTest.java</exclude>
+                                        <exclude>**/*IntTest.java</exclude>
                                     </excludes>
                                     <includes>
                                         <include>**/*EntryPointsTest.java</include>
@@ -217,22 +214,13 @@
         </profile>
     </profiles>
 
+    <modules>
+        <module>spring-security-mvc-boot-default</module>
+        <module>spring-security-mvc-boot-mysql</module>
+        <module>spring-security-mvc-boot-postgre</module>
+    </modules>
 
     <properties>
-        <start-class>org.baeldung.custom.Application</start-class>
-        <!--If you want to run the example with the voters comment the tag 
-            above and uncomment the one below -->
-        <!--<start-class>org.baeldung.voter.VoterApplication</start-class> -->
-        <!--If you want to run the example with the multiple logins, comment 
-            the tag above and uncomment the one below -->
-        <!--<start-class>org.baeldung.multiplelogin.MultipleLoginApplication</start-class> -->
-        <!--If you want to run the example with the multiple http elements, 
-            comment the tag above and uncomment the one below -->
-        <!--<start-class>org.baeldung.multipleentrypoints.MultipleEntryPointsApplication</start-class>-->
-        <!--If you want to run the example with the Https enabled endpoints,
-            comment the tag above and uncomment the one below -->
-       <!-- <start-class>org.baeldung.ssl.HttpsEnabledApplication</start-class> -->
-
         <taglibs-standard.version>1.1.2</taglibs-standard.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
         <ehcache-core.version>2.6.11</ehcache-core.version>
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-default/pom.xml b/spring-security-mvc-boot/spring-security-mvc-boot-default/pom.xml
new file mode 100644
index 0000000000..8f7f18f093
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-default/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-security-mvc-boot-default</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-security-mvc-boot-default</name>
+    <packaging>jar</packaging>
+    <description>Spring Security MVC Boot</description>
+
+    <parent>
+        <artifactId>spring-security-mvc-boot</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <start-class>org.baeldung.custom.Application</start-class>
+        <!--If you want to run the example with the voters comment the tag 
+            above and uncomment the one below -->
+        <!--<start-class>org.baeldung.voter.VoterApplication</start-class> -->
+        <!--If you want to run the example with the multiple logins, comment 
+            the tag above and uncomment the one below -->
+        <!--<start-class>org.baeldung.multiplelogin.MultipleLoginApplication</start-class> -->
+        <!--If you want to run the example with the multiple http elements, 
+            comment the tag above and uncomment the one below -->
+        <!--<start-class>org.baeldung.multipleentrypoints.MultipleEntryPointsApplication</start-class>-->
+        <!--If you want to run the example with the Https enabled endpoints,
+            comment the tag above and uncomment the one below -->
+       <!-- <start-class>org.baeldung.ssl.HttpsEnabledApplication</start-class> -->
+    </properties>
+
+</project>
diff --git a/spring-security-mvc-boot/src/main/java/com/baeldung/AppConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/AppConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/com/baeldung/AppConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/AppConfig.java
diff --git a/spring-security-mvc-boot/src/main/java/com/baeldung/SpringSecurityConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/SpringSecurityConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/com/baeldung/SpringSecurityConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/SpringSecurityConfig.java
diff --git a/spring-security-mvc-boot/src/main/java/com/baeldung/data/repositories/TweetRepository.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/data/repositories/TweetRepository.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/com/baeldung/data/repositories/TweetRepository.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/data/repositories/TweetRepository.java
diff --git a/spring-security-mvc-boot/src/main/java/com/baeldung/data/repositories/UserRepository.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/data/repositories/UserRepository.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/com/baeldung/data/repositories/UserRepository.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/data/repositories/UserRepository.java
diff --git a/spring-security-mvc-boot/src/main/java/com/baeldung/models/AppUser.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/models/AppUser.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/com/baeldung/models/AppUser.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/models/AppUser.java
diff --git a/spring-security-mvc-boot/src/main/java/com/baeldung/models/Tweet.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/models/Tweet.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/com/baeldung/models/Tweet.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/models/Tweet.java
diff --git a/spring-security-mvc-boot/src/main/java/com/baeldung/security/AppUserPrincipal.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/security/AppUserPrincipal.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/com/baeldung/security/AppUserPrincipal.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/security/AppUserPrincipal.java
diff --git a/spring-security-mvc-boot/src/main/java/com/baeldung/security/AuthenticationSuccessHandlerImpl.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/security/AuthenticationSuccessHandlerImpl.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/com/baeldung/security/AuthenticationSuccessHandlerImpl.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/security/AuthenticationSuccessHandlerImpl.java
diff --git a/spring-security-mvc-boot/src/main/java/com/baeldung/security/CustomUserDetailsService.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/security/CustomUserDetailsService.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/com/baeldung/security/CustomUserDetailsService.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/security/CustomUserDetailsService.java
diff --git a/spring-security-mvc-boot/src/main/java/com/baeldung/util/DummyContentUtil.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/util/DummyContentUtil.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/com/baeldung/util/DummyContentUtil.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/com/baeldung/util/DummyContentUtil.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/Application.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/Application.java
similarity index 61%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/Application.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/Application.java
index f932ac3066..682d429963 100644
--- a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/Application.java
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/Application.java
@@ -1,12 +1,8 @@
 package org.baeldung.custom;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/config/MethodSecurityConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/config/MethodSecurityConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/config/MethodSecurityConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/config/MethodSecurityConfig.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/config/MvcConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/config/MvcConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/config/MvcConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/config/MvcConfig.java
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/config/SecurityConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/config/SecurityConfig.java
new file mode 100644
index 0000000000..739e4d3417
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/config/SecurityConfig.java
@@ -0,0 +1,15 @@
+package org.baeldung.custom.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@Configuration
+public class SecurityConfig {
+
+    @Bean
+    public PasswordEncoder encoder() {
+        return new BCryptPasswordEncoder(11);
+    }
+}
\ No newline at end of file
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/SetupData.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/SetupData.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/SetupData.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/SetupData.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/dao/OrganizationRepository.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/dao/OrganizationRepository.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/dao/OrganizationRepository.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/dao/OrganizationRepository.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/dao/PrivilegeRepository.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/dao/PrivilegeRepository.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/dao/PrivilegeRepository.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/dao/PrivilegeRepository.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/dao/UserRepository.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/dao/UserRepository.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/dao/UserRepository.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/dao/UserRepository.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/model/Foo.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/model/Foo.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/model/Foo.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/model/Foo.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/model/Organization.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/model/Organization.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/model/Organization.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/model/Organization.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/model/Privilege.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/model/Privilege.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/model/Privilege.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/model/Privilege.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/model/User.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/model/User.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/persistence/model/User.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/persistence/model/User.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/security/CustomMethodSecurityExpressionHandler.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/security/CustomMethodSecurityExpressionHandler.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/security/CustomMethodSecurityExpressionHandler.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/security/CustomMethodSecurityExpressionHandler.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/security/CustomMethodSecurityExpressionRoot.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/security/CustomMethodSecurityExpressionRoot.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/security/CustomMethodSecurityExpressionRoot.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/security/CustomMethodSecurityExpressionRoot.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/security/CustomPermissionEvaluator.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/security/CustomPermissionEvaluator.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/security/CustomPermissionEvaluator.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/security/CustomPermissionEvaluator.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/security/MySecurityExpressionRoot.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/security/MySecurityExpressionRoot.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/security/MySecurityExpressionRoot.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/security/MySecurityExpressionRoot.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/security/MyUserDetailsService.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/security/MyUserDetailsService.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/security/MyUserDetailsService.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/security/MyUserDetailsService.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/security/MyUserPrincipal.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/security/MyUserPrincipal.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/security/MyUserPrincipal.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/security/MyUserPrincipal.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/web/MainController.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/web/MainController.java
similarity index 70%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/custom/web/MainController.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/web/MainController.java
index 6572954427..74de45d1a8 100644
--- a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/web/MainController.java
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/custom/web/MainController.java
@@ -3,14 +3,16 @@ package org.baeldung.custom.web;
 import org.baeldung.custom.persistence.dao.OrganizationRepository;
 import org.baeldung.custom.persistence.model.Foo;
 import org.baeldung.custom.persistence.model.Organization;
+import org.baeldung.custom.security.MyUserPrincipal;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
@@ -23,14 +25,14 @@ public class MainController {
 
     // @PostAuthorize("hasPermission(returnObject, 'read')")
     @PreAuthorize("hasPermission(#id, 'Foo', 'read')")
-    @RequestMapping(method = RequestMethod.GET, value = "/foos/{id}")
+    @GetMapping("/foos/{id}")
     @ResponseBody
     public Foo findById(@PathVariable final long id) {
         return new Foo("Sample");
     }
 
     @PreAuthorize("hasPermission(#foo, 'write')")
-    @RequestMapping(method = RequestMethod.POST, value = "/foos")
+    @PostMapping("/foos")
     @ResponseStatus(HttpStatus.CREATED)
     @ResponseBody
     public Foo create(@RequestBody final Foo foo) {
@@ -40,7 +42,7 @@ public class MainController {
     //
 
     @PreAuthorize("hasAuthority('FOO_READ_PRIVILEGE')")
-    @RequestMapping(method = RequestMethod.GET, value = "/foos")
+    @GetMapping("/foos")
     @ResponseBody
     public Foo findFooByName(@RequestParam final String name) {
         return new Foo(name);
@@ -49,10 +51,18 @@ public class MainController {
     //
 
     @PreAuthorize("isMember(#id)")
-    @RequestMapping(method = RequestMethod.GET, value = "/organizations/{id}")
+    @GetMapping("/organizations/{id}")
     @ResponseBody
     public Organization findOrgById(@PathVariable final long id) {
-        return organizationRepository.findById(id).orElse(null);
+        return organizationRepository.findById(id)
+            .orElse(null);
+    }
+
+    @PreAuthorize("hasPermission(#id, 'Foo', 'read')")
+    @GetMapping("/user")
+    @ResponseBody
+    public MyUserPrincipal retrieveUserDetails(@AuthenticationPrincipal MyUserPrincipal principal) {
+        return principal;
     }
 
 }
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/IpApplication.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ip/IpApplication.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/ip/IpApplication.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ip/IpApplication.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/CustomIpAuthenticationProvider.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ip/config/CustomIpAuthenticationProvider.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/CustomIpAuthenticationProvider.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ip/config/CustomIpAuthenticationProvider.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ip/config/SecurityConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ip/config/SecurityConfig.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityXmlConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ip/config/SecurityXmlConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/ip/config/SecurityXmlConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ip/config/SecurityXmlConfig.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ip/web/MainController.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/ip/web/MainController.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ip/web/MainController.java
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/jdbcauthentication/h2/H2JdbcAuthenticationApplication.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/jdbcauthentication/h2/H2JdbcAuthenticationApplication.java
new file mode 100644
index 0000000000..6bd30414ef
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/jdbcauthentication/h2/H2JdbcAuthenticationApplication.java
@@ -0,0 +1,15 @@
+package org.baeldung.jdbcauthentication.h2;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+
+@SpringBootApplication
+@EnableWebSecurity
+public class H2JdbcAuthenticationApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(H2JdbcAuthenticationApplication.class, args);
+    }
+
+}
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/jdbcauthentication/h2/config/SecurityConfiguration.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/jdbcauthentication/h2/config/SecurityConfiguration.java
new file mode 100644
index 0000000000..8b8696f0b2
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/jdbcauthentication/h2/config/SecurityConfiguration.java
@@ -0,0 +1,51 @@
+package org.baeldung.jdbcauthentication.h2.config;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@Configuration
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+    @Override
+    protected void configure(HttpSecurity httpSecurity) throws Exception {
+        httpSecurity.authorizeRequests()
+            .antMatchers("/h2-console/**")
+            .permitAll()
+            .anyRequest()
+            .authenticated()
+            .and()
+            .formLogin()
+            .permitAll();
+        httpSecurity.csrf()
+            .ignoringAntMatchers("/h2-console/**");
+        httpSecurity.headers()
+            .frameOptions()
+            .sameOrigin();
+    }
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Autowired
+    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+        auth.jdbcAuthentication()
+            .dataSource(dataSource)
+            .withDefaultSchema()
+            .withUser(User.withUsername("user")
+                .password(passwordEncoder().encode("pass"))
+                .roles("USER"));
+    }
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+}
\ No newline at end of file
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/jdbcauthentication/h2/web/UserController.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/jdbcauthentication/h2/web/UserController.java
new file mode 100644
index 0000000000..0955061614
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/jdbcauthentication/h2/web/UserController.java
@@ -0,0 +1,17 @@
+package org.baeldung.jdbcauthentication.h2.web;
+
+import java.security.Principal;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/principal")
+public class UserController {
+
+    @GetMapping
+    public Principal retrievePrincipal(Principal principal) {
+        return principal;
+    }
+}
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/multipleauthproviders/CustomAuthenticationProvider.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleauthproviders/CustomAuthenticationProvider.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/multipleauthproviders/CustomAuthenticationProvider.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleauthproviders/CustomAuthenticationProvider.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/multipleauthproviders/MultipleAuthController.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleauthproviders/MultipleAuthController.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/multipleauthproviders/MultipleAuthController.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleauthproviders/MultipleAuthController.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/multipleauthproviders/MultipleAuthProvidersApplication.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleauthproviders/MultipleAuthProvidersApplication.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/multipleauthproviders/MultipleAuthProvidersApplication.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleauthproviders/MultipleAuthProvidersApplication.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/multipleauthproviders/MultipleAuthProvidersSecurityConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleauthproviders/MultipleAuthProvidersSecurityConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/multipleauthproviders/MultipleAuthProvidersSecurityConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleauthproviders/MultipleAuthProvidersSecurityConfig.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/multipleentrypoints/MultipleEntryPointsApplication.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleentrypoints/MultipleEntryPointsApplication.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/multipleentrypoints/MultipleEntryPointsApplication.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleentrypoints/MultipleEntryPointsApplication.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/multipleentrypoints/MultipleEntryPointsSecurityConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleentrypoints/MultipleEntryPointsSecurityConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/multipleentrypoints/MultipleEntryPointsSecurityConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleentrypoints/MultipleEntryPointsSecurityConfig.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/multipleentrypoints/PagesController.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleentrypoints/PagesController.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/multipleentrypoints/PagesController.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multipleentrypoints/PagesController.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/multiplelogin/MultipleLoginApplication.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multiplelogin/MultipleLoginApplication.java
similarity index 69%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/multiplelogin/MultipleLoginApplication.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multiplelogin/MultipleLoginApplication.java
index e9dc541ad3..d25324eb54 100644
--- a/spring-security-mvc-boot/src/main/java/org/baeldung/multiplelogin/MultipleLoginApplication.java
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multiplelogin/MultipleLoginApplication.java
@@ -1,11 +1,8 @@
 package org.baeldung.multiplelogin;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
 @ComponentScan("org.baeldung.multiplelogin")
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/multiplelogin/MultipleLoginMvcConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multiplelogin/MultipleLoginMvcConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/multiplelogin/MultipleLoginMvcConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multiplelogin/MultipleLoginMvcConfig.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/multiplelogin/MultipleLoginSecurityConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multiplelogin/MultipleLoginSecurityConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/multiplelogin/MultipleLoginSecurityConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multiplelogin/MultipleLoginSecurityConfig.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/multiplelogin/UsersController.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multiplelogin/UsersController.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/multiplelogin/UsersController.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/multiplelogin/UsersController.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/CustomAuthenticationProvider.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/CustomAuthenticationProvider.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/CustomAuthenticationProvider.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/CustomAuthenticationProvider.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/MyLogoutSuccessHandler.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/MyLogoutSuccessHandler.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/MyLogoutSuccessHandler.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/MyLogoutSuccessHandler.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/MyUserDetailsService.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/MyUserDetailsService.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/MyUserDetailsService.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/MyUserDetailsService.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/RolesAuthoritiesApplication.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/RolesAuthoritiesApplication.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/RolesAuthoritiesApplication.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/RolesAuthoritiesApplication.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/config/MvcConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/config/MvcConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/config/MvcConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/config/MvcConfig.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/config/SecurityConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/config/SecurityConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/config/SecurityConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/config/SecurityConfig.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/model/Privilege.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/model/Privilege.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/model/Privilege.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/model/Privilege.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/model/Role.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/model/Role.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/model/Role.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/model/Role.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/model/User.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/model/User.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/model/User.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/model/User.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/persistence/IUserService.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/persistence/IUserService.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/persistence/IUserService.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/persistence/IUserService.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/persistence/PrivilegeRepository.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/persistence/PrivilegeRepository.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/persistence/PrivilegeRepository.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/persistence/PrivilegeRepository.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/persistence/RoleRepository.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/persistence/RoleRepository.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/persistence/RoleRepository.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/persistence/RoleRepository.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/persistence/SetupDataLoader.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/persistence/SetupDataLoader.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/persistence/SetupDataLoader.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/persistence/SetupDataLoader.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/persistence/UserRepository.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/persistence/UserRepository.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/persistence/UserRepository.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/persistence/UserRepository.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/persistence/UserService.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/persistence/UserService.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/rolesauthorities/persistence/UserService.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/rolesauthorities/persistence/UserService.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/HttpsEnabledApplication.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ssl/HttpsEnabledApplication.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/ssl/HttpsEnabledApplication.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ssl/HttpsEnabledApplication.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/SecurityConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ssl/SecurityConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/ssl/SecurityConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ssl/SecurityConfig.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/ssl/WelcomeController.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ssl/WelcomeController.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/ssl/WelcomeController.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/ssl/WelcomeController.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/voter/MinuteBasedVoter.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/voter/MinuteBasedVoter.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/voter/MinuteBasedVoter.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/voter/MinuteBasedVoter.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/voter/VoterApplication.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/voter/VoterApplication.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/voter/VoterApplication.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/voter/VoterApplication.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/voter/VoterMvcConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/voter/VoterMvcConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/voter/VoterMvcConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/voter/VoterMvcConfig.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/voter/WebSecurityConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/voter/WebSecurityConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/voter/WebSecurityConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/voter/WebSecurityConfig.java
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/voter/XmlSecurityConfig.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/voter/XmlSecurityConfig.java
similarity index 100%
rename from spring-security-mvc-boot/src/main/java/org/baeldung/voter/XmlSecurityConfig.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/java/org/baeldung/voter/XmlSecurityConfig.java
diff --git a/spring-security-mvc-boot/src/main/resources/application-ssl.properties b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/application-ssl.properties
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/application-ssl.properties
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/application-ssl.properties
diff --git a/spring-security-mvc-boot/src/main/resources/application.properties b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/application.properties
similarity index 74%
rename from spring-security-mvc-boot/src/main/resources/application.properties
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/application.properties
index 25eac743d1..365dedab9e 100644
--- a/spring-security-mvc-boot/src/main/resources/application.properties
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/application.properties
@@ -8,5 +8,7 @@ spring.jpa.database=H2
 spring.jpa.show-sql=false
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect
 
+logging.level.org.springframework.security.web.FilterChainProxy=DEBUG
 
-#logging.level.org.springframework.security.web.FilterChainProxy=DEBUG
\ No newline at end of file
+spring.h2.console.enabled=true
+spring.h2.console.path=/h2-console
\ No newline at end of file
diff --git a/spring-security-mvc-boot/src/main/resources/keystore/baeldung.p12 b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/keystore/baeldung.p12
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/keystore/baeldung.p12
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/keystore/baeldung.p12
diff --git a/xmlunit-2/src/main/resources/logback.xml b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/logback.xml
similarity index 100%
rename from xmlunit-2/src/main/resources/logback.xml
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/logback.xml
diff --git a/spring-security-mvc-boot/src/main/resources/persistence-h2.properties b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/persistence-h2.properties
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/persistence-h2.properties
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/persistence-h2.properties
diff --git a/spring-security-mvc-boot/src/main/resources/spring-security-custom-voter.xml b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/spring-security-custom-voter.xml
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/spring-security-custom-voter.xml
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/spring-security-custom-voter.xml
diff --git a/spring-security-mvc-boot/src/main/resources/spring-security-ip.xml b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/spring-security-ip.xml
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/spring-security-ip.xml
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/spring-security-ip.xml
diff --git a/spring-security-mvc-boot/src/main/resources/spring-security-multiple-auth-providers.xml b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/spring-security-multiple-auth-providers.xml
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/spring-security-multiple-auth-providers.xml
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/spring-security-multiple-auth-providers.xml
diff --git a/spring-security-mvc-boot/src/main/resources/spring-security-multiple-entry.xml b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/spring-security-multiple-entry.xml
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/spring-security-multiple-entry.xml
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/spring-security-multiple-entry.xml
diff --git a/spring-security-mvc-boot/src/main/resources/templates/403.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/403.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/403.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/403.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/adminPage.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/adminPage.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/adminPage.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/adminPage.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/index.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/index.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/index.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/index.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/login.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/login.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/login.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/login.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/loginAdmin.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/loginAdmin.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/loginAdmin.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/loginAdmin.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/loginUser.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/loginUser.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/loginUser.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/loginUser.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/multipleHttpElems/login.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/multipleHttpElems/login.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/multipleHttpElems/login.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/multipleHttpElems/login.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/multipleHttpElems/loginWithWarning.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/multipleHttpElems/loginWithWarning.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/multipleHttpElems/loginWithWarning.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/multipleHttpElems/loginWithWarning.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/multipleHttpElems/multipleHttpLinks.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/multipleHttpElems/multipleHttpLinks.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/multipleHttpElems/multipleHttpLinks.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/multipleHttpElems/multipleHttpLinks.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/multipleHttpElems/myAdminPage.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/multipleHttpElems/myAdminPage.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/multipleHttpElems/myAdminPage.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/multipleHttpElems/myAdminPage.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/multipleHttpElems/myGuestPage.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/multipleHttpElems/myGuestPage.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/multipleHttpElems/myGuestPage.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/multipleHttpElems/myGuestPage.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/multipleHttpElems/myPrivateUserPage.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/multipleHttpElems/myPrivateUserPage.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/multipleHttpElems/myPrivateUserPage.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/multipleHttpElems/myPrivateUserPage.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/multipleHttpElems/myUserPage.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/multipleHttpElems/myUserPage.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/multipleHttpElems/myUserPage.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/multipleHttpElems/myUserPage.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/private.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/private.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/private.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/private.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/protectedLinks.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/protectedLinks.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/protectedLinks.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/protectedLinks.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/rolesauthorities/home.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/rolesauthorities/home.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/rolesauthorities/home.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/rolesauthorities/home.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/rolesauthorities/login.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/rolesauthorities/login.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/rolesauthorities/login.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/rolesauthorities/login.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/rolesauthorities/protectedbyauthority.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/rolesauthorities/protectedbyauthority.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/rolesauthorities/protectedbyauthority.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/rolesauthorities/protectedbyauthority.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/rolesauthorities/protectedbynothing.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/rolesauthorities/protectedbynothing.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/rolesauthorities/protectedbynothing.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/rolesauthorities/protectedbynothing.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/rolesauthorities/protectedbyrole.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/rolesauthorities/protectedbyrole.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/rolesauthorities/protectedbyrole.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/rolesauthorities/protectedbyrole.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/ssl/welcome.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/ssl/welcome.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/ssl/welcome.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/ssl/welcome.html
diff --git a/spring-security-mvc-boot/src/main/resources/templates/userPage.html b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/userPage.html
similarity index 100%
rename from spring-security-mvc-boot/src/main/resources/templates/userPage.html
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/main/resources/templates/userPage.html
diff --git a/spring-security-mvc-boot/src/test/java/com/baeldung/relationships/SpringDataWithSecurityIntegrationTest.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/com/baeldung/relationships/SpringDataWithSecurityIntegrationTest.java
similarity index 100%
rename from spring-security-mvc-boot/src/test/java/com/baeldung/relationships/SpringDataWithSecurityIntegrationTest.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/com/baeldung/relationships/SpringDataWithSecurityIntegrationTest.java
diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/SpringContextIntegrationTest.java
similarity index 100%
rename from spring-security-mvc-boot/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/SpringContextIntegrationTest.java
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/jdbcauthentication/h2/web/UserControllerLiveTest.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/jdbcauthentication/h2/web/UserControllerLiveTest.java
new file mode 100644
index 0000000000..638e9d7919
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/jdbcauthentication/h2/web/UserControllerLiveTest.java
@@ -0,0 +1,35 @@
+package org.baeldung.jdbcauthentication.h2.web;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.http.HttpStatus;
+
+import io.restassured.authentication.FormAuthConfig;
+import io.restassured.filter.session.SessionFilter;
+
+/**
+ * This Live Test requires the H2JdbcAuthenticationApplication application to be up and running
+ */
+public class UserControllerLiveTest {
+
+    private static final String PRINCIPAL_SVC_URL = "http://localhost:8082/principal";
+
+    @Test
+    public void givenExisting_whenRequestPrincipal_thenRetrieveData() throws Exception {
+        SessionFilter filter = new SessionFilter();
+        given().auth()
+            .form("user", "pass", new FormAuthConfig("/login", "username", "password").withCsrfFieldName("_csrf"))
+            .and()
+            .filter(filter)
+            .when()
+            .get(PRINCIPAL_SVC_URL)
+            .then()
+            .statusCode(HttpStatus.OK.value())
+            .and()
+            .body("authorities[0].authority", is("ROLE_USER"))
+            .body("principal.username", is("user"))
+            .body("name", is("user"));
+    }
+}
diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/web/ApplicationLiveTest.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/web/ApplicationLiveTest.java
similarity index 100%
rename from spring-security-mvc-boot/src/test/java/org/baeldung/web/ApplicationLiveTest.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/web/ApplicationLiveTest.java
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/web/CustomUserDetailsServiceIntegrationTest.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/web/CustomUserDetailsServiceIntegrationTest.java
new file mode 100644
index 0000000000..d16acc729a
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/web/CustomUserDetailsServiceIntegrationTest.java
@@ -0,0 +1,89 @@
+package org.baeldung.web;
+
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.apache.http.HttpHeaders;
+import org.baeldung.custom.Application;
+import org.baeldung.custom.persistence.model.Foo;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.security.test.context.support.WithAnonymousUser;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.web.servlet.MockMvc;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@SpringBootTest(classes = { Application.class })
+@AutoConfigureMockMvc
+public class CustomUserDetailsServiceIntegrationTest {
+
+    @Autowired
+    private MockMvc mvc;
+
+    @Test
+    @WithUserDetails("john")
+    public void givenUserWithReadPermissions_whenRequestUserInfo_thenRetrieveUserData() throws Exception {
+        this.mvc.perform(get("/user").with(csrf()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.user.privileges[0].name").value("FOO_READ_PRIVILEGE"))
+            .andExpect(jsonPath("$.user.organization.name").value("FirstOrg"))
+            .andExpect(jsonPath("$.user.username").value("john"));
+    }
+
+    @Test
+    @WithUserDetails("tom")
+    public void givenUserWithWritePermissions_whenRequestUserInfo_thenRetrieveUserData() throws Exception {
+        this.mvc.perform(get("/user").with(csrf()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.user.privileges").isArray())
+            .andExpect(jsonPath("$.user.organization.name").value("SecondOrg"))
+            .andExpect(jsonPath("$.user.username").value("tom"));
+    }
+
+    @Test
+    @WithUserDetails("john")
+    public void givenUserWithReadPermissions_whenRequestFoo_thenRetrieveSampleFoo() throws Exception {
+        this.mvc.perform(get("/foos/1").with(csrf()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.name").value("Sample"));
+    }
+
+    @Test
+    @WithAnonymousUser
+    public void givenAnonymous_whenRequestFoo_thenRetrieveUnauthorized() throws Exception {
+        this.mvc.perform(get("/foos/1").with(csrf()))
+            .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    @WithUserDetails("john")
+    public void givenUserWithReadPermissions_whenCreateNewFoo_thenForbiddenStatusRetrieved() throws Exception {
+        this.mvc.perform(post("/foos").with(csrf())
+            .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+            .content(asJsonString(new Foo())))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    @WithUserDetails("tom")
+    public void givenUserWithWritePermissions_whenCreateNewFoo_thenOkStatusRetrieved() throws Exception {
+        this.mvc.perform(post("/foos").with(csrf())
+            .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+            .content(asJsonString(new Foo())))
+            .andExpect(status().isCreated());
+    }
+
+    private static String asJsonString(final Object obj) throws Exception {
+        final ObjectMapper mapper = new ObjectMapper();
+        final String jsonContent = mapper.writeValueAsString(obj);
+        return jsonContent;
+    }
+
+}
diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/web/HttpsApplicationIntegrationTest.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/web/HttpsApplicationIntegrationTest.java
similarity index 100%
rename from spring-security-mvc-boot/src/test/java/org/baeldung/web/HttpsApplicationIntegrationTest.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/web/HttpsApplicationIntegrationTest.java
diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/web/IpLiveTest.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/web/IpLiveTest.java
similarity index 100%
rename from spring-security-mvc-boot/src/test/java/org/baeldung/web/IpLiveTest.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/web/IpLiveTest.java
diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/web/MultipleAuthProvidersApplicationIntegrationTest.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/web/MultipleAuthProvidersApplicationIntegrationTest.java
similarity index 100%
rename from spring-security-mvc-boot/src/test/java/org/baeldung/web/MultipleAuthProvidersApplicationIntegrationTest.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/web/MultipleAuthProvidersApplicationIntegrationTest.java
diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/web/MultipleEntryPointsIntegrationTest.java b/spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/web/MultipleEntryPointsIntegrationTest.java
similarity index 100%
rename from spring-security-mvc-boot/src/test/java/org/baeldung/web/MultipleEntryPointsIntegrationTest.java
rename to spring-security-mvc-boot/spring-security-mvc-boot-default/src/test/java/org/baeldung/web/MultipleEntryPointsIntegrationTest.java
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-mysql/pom.xml b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/pom.xml
new file mode 100644
index 0000000000..765953c557
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-security-mvc-boot-mysql</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-security-mvc-boot-mysql</name>
+    <packaging>jar</packaging>
+    <description>Spring Security MVC Boot using MySQL</description>
+
+    <parent>
+        <artifactId>spring-security-mvc-boot</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/java/com/baeldung/jdbcauthentication/mysql/MySqlJdbcAuthenticationApplication.java b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/java/com/baeldung/jdbcauthentication/mysql/MySqlJdbcAuthenticationApplication.java
new file mode 100644
index 0000000000..238a48730c
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/java/com/baeldung/jdbcauthentication/mysql/MySqlJdbcAuthenticationApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.jdbcauthentication.mysql;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class MySqlJdbcAuthenticationApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MySqlJdbcAuthenticationApplication.class, args);
+    }
+
+}
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/java/com/baeldung/jdbcauthentication/mysql/config/SecurityConfiguration.java b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/java/com/baeldung/jdbcauthentication/mysql/config/SecurityConfiguration.java
new file mode 100644
index 0000000000..a0584818cd
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/java/com/baeldung/jdbcauthentication/mysql/config/SecurityConfiguration.java
@@ -0,0 +1,35 @@
+package com.baeldung.jdbcauthentication.mysql.config;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@Configuration
+public class SecurityConfiguration {
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Autowired
+    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+        auth.jdbcAuthentication()
+            .dataSource(dataSource)
+            .usersByUsernameQuery("select email,password,enabled "
+                + "from bael_users "
+                + "where email = ?")
+            .authoritiesByUsernameQuery("select email,authority "
+                + "from authorities "
+                + "where email = ?");
+    }
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+}
\ No newline at end of file
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/java/com/baeldung/jdbcauthentication/mysql/web/UserController.java b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/java/com/baeldung/jdbcauthentication/mysql/web/UserController.java
new file mode 100644
index 0000000000..ed15f8bfe6
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/java/com/baeldung/jdbcauthentication/mysql/web/UserController.java
@@ -0,0 +1,17 @@
+package com.baeldung.jdbcauthentication.mysql.web;
+
+import java.security.Principal;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/principal")
+public class UserController {
+
+    @GetMapping
+    public Principal retrievePrincipal(Principal principal) {
+        return principal;
+    }
+}
\ No newline at end of file
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/resources/application.properties b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/resources/application.properties
new file mode 100644
index 0000000000..2962475108
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/resources/application.properties
@@ -0,0 +1,8 @@
+server.port=8082
+
+spring.datasource.url=jdbc:mysql://localhost:3306/jdbc_authentication
+spring.datasource.username=root
+spring.datasource.password=pass
+
+spring.datasource.initialization-mode=always
+spring.jpa.hibernate.ddl-auto=none
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/resources/data.sql b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/resources/data.sql
new file mode 100644
index 0000000000..8214fd8204
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/resources/data.sql
@@ -0,0 +1,4 @@
+-- User user@email.com/pass
+INSERT INTO bael_users (name, email, password, enabled) values ('user', 'user@email.com', '$2a$10$8.UnVuG9HHgffUDAlk8qfOuVGkqRzgVymGe07xd00DMxs.AQubh4a', 1);
+
+INSERT INTO authorities (email, authority) values ('user@email.com', 'ROLE_USER');
\ No newline at end of file
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/resources/schema.sql b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/resources/schema.sql
new file mode 100644
index 0000000000..bb38c74366
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/main/resources/schema.sql
@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS authorities;
+DROP TABLE IF EXISTS bael_users;
+
+CREATE  TABLE bael_users (
+  name VARCHAR(50) NOT NULL,
+  email VARCHAR(50) NOT NULL,
+  password VARCHAR(100) NOT NULL,
+  enabled TINYINT NOT NULL DEFAULT 1,
+  PRIMARY KEY (email)
+);
+  
+CREATE TABLE authorities (
+  email VARCHAR(50) NOT NULL,
+  authority VARCHAR(50) NOT NULL,
+  FOREIGN KEY (email) REFERENCES bael_users(email)
+);
+
+CREATE UNIQUE INDEX ix_auth_email on authorities (email,authority);
\ No newline at end of file
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/test/java/com/baeldung/jdbcauthentication/mysql/SpringContextIntegrationTest.java b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/test/java/com/baeldung/jdbcauthentication/mysql/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..2c19e2c0ca
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/test/java/com/baeldung/jdbcauthentication/mysql/SpringContextIntegrationTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.jdbcauthentication.mysql;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = MySqlJdbcAuthenticationApplication.class)
+public class SpringContextIntegrationTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/test/java/com/baeldung/jdbcauthentication/mysql/web/UserControllerLiveTest.java b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/test/java/com/baeldung/jdbcauthentication/mysql/web/UserControllerLiveTest.java
new file mode 100644
index 0000000000..79bc84ea69
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-mysql/src/test/java/com/baeldung/jdbcauthentication/mysql/web/UserControllerLiveTest.java
@@ -0,0 +1,35 @@
+package com.baeldung.jdbcauthentication.mysql.web;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.http.HttpStatus;
+
+/**
+ * This Live Test requires:
+ * *  a MySql instance running, that allows a 'root' user with password 'pass', and with a database named jdbc_authentication
+ * (e.g. with the following command `docker run -p 3306:3306 --name bael-mysql -e MYSQL_ROOT_PASSWORD=pass -e MYSQL_DATABASE=jdbc_authentication mysql:latest`)
+ * * the service up and running
+ *
+ */
+public class UserControllerLiveTest {
+
+    private static final String PRINCIPAL_SVC_URL = "http://localhost:8082/principal";
+
+    @Test
+    public void givenExisting_whenRequestPrincipal_thenRetrieveData() throws Exception {
+        given().auth()
+            .preemptive()
+            .basic("user@email.com", "pass")
+            .when()
+            .get(PRINCIPAL_SVC_URL)
+            .then()
+            .statusCode(HttpStatus.OK.value())
+            .and()
+            .body("authorities[0].authority", is("ROLE_USER"))
+            .body("principal.username", is("user@email.com"))
+            .body("name", is("user@email.com"));
+    }
+
+}
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-postgre/pom.xml b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/pom.xml
new file mode 100644
index 0000000000..e68e47b596
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-security-mvc-boot-postgre</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-security-mvc-boot-postgre</name>
+    <packaging>jar</packaging>
+    <description>Spring Security MVC Boot using PostgreSQL</description>
+
+    <parent>
+        <artifactId>spring-security-mvc-boot</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/java/com/baeldung/jdbcauthentication/postgre/PostgreJdbcAuthenticationApplication.java b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/java/com/baeldung/jdbcauthentication/postgre/PostgreJdbcAuthenticationApplication.java
new file mode 100644
index 0000000000..d4b555e8c6
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/java/com/baeldung/jdbcauthentication/postgre/PostgreJdbcAuthenticationApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.jdbcauthentication.postgre;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class PostgreJdbcAuthenticationApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(PostgreJdbcAuthenticationApplication.class, args);
+    }
+
+}
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/java/com/baeldung/jdbcauthentication/postgre/config/SecurityConfiguration.java b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/java/com/baeldung/jdbcauthentication/postgre/config/SecurityConfiguration.java
new file mode 100644
index 0000000000..85dc9d364c
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/java/com/baeldung/jdbcauthentication/postgre/config/SecurityConfiguration.java
@@ -0,0 +1,29 @@
+package com.baeldung.jdbcauthentication.postgre.config;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@Configuration
+public class SecurityConfiguration {
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Autowired
+    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+        auth.jdbcAuthentication()
+            .dataSource(dataSource);
+    }
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+}
\ No newline at end of file
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/java/com/baeldung/jdbcauthentication/postgre/web/UserController.java b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/java/com/baeldung/jdbcauthentication/postgre/web/UserController.java
new file mode 100644
index 0000000000..da85a46562
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/java/com/baeldung/jdbcauthentication/postgre/web/UserController.java
@@ -0,0 +1,17 @@
+package com.baeldung.jdbcauthentication.postgre.web;
+
+import java.security.Principal;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/principal")
+public class UserController {
+
+    @GetMapping
+    public Principal retrievePrincipal(Principal principal) {
+        return principal;
+    }
+}
\ No newline at end of file
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/resources/application.properties b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/resources/application.properties
new file mode 100644
index 0000000000..2940c5121e
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/resources/application.properties
@@ -0,0 +1,8 @@
+server.port=8082
+
+spring.datasource.url=jdbc:postgresql://localhost:5432/jdbc_authentication
+spring.datasource.username=postgres
+spring.datasource.password=pass
+
+spring.datasource.initialization-mode=always
+spring.jpa.hibernate.ddl-auto=none
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/resources/data.sql b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/resources/data.sql
new file mode 100644
index 0000000000..fcc6b54949
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/resources/data.sql
@@ -0,0 +1,4 @@
+-- User user/pass
+INSERT INTO users (username, password, enabled) values ('user', '$2a$10$8.UnVuG9HHgffUDAlk8qfOuVGkqRzgVymGe07xd00DMxs.AQubh4a', true);
+
+INSERT INTO authorities (username, authority) values ('user', 'ROLE_USER');
\ No newline at end of file
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/resources/schema.sql b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/resources/schema.sql
new file mode 100644
index 0000000000..d78edfb528
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/main/resources/schema.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS authorities;
+DROP TABLE IF EXISTS users;
+
+CREATE TABLE users (
+  username varchar(50) NOT NULL PRIMARY KEY,
+  password varchar(100) NOT NULL,
+  enabled boolean not null DEFAULT true
+);
+  
+CREATE TABLE authorities (
+  username varchar(50) NOT NULL,
+  authority varchar(50) NOT NULL,
+  CONSTRAINT foreign_authorities_users_1 foreign key(username) references users(username)
+);
+
+CREATE UNIQUE INDEX ix_auth_username on authorities (username,authority);
\ No newline at end of file
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/test/java/com/baeldung/jdbcauthentication/postgre/SpringContextIntegrationTest.java b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/test/java/com/baeldung/jdbcauthentication/postgre/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..f133ef73be
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/test/java/com/baeldung/jdbcauthentication/postgre/SpringContextIntegrationTest.java
@@ -0,0 +1,17 @@
+package com.baeldung.jdbcauthentication.postgre;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.jdbcauthentication.postgre.PostgreJdbcAuthenticationApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = PostgreJdbcAuthenticationApplication.class)
+public class SpringContextIntegrationTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/test/java/com/baeldung/jdbcauthentication/postgre/web/UserControllerLiveTest.java b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/test/java/com/baeldung/jdbcauthentication/postgre/web/UserControllerLiveTest.java
new file mode 100644
index 0000000000..b5f4379c0a
--- /dev/null
+++ b/spring-security-mvc-boot/spring-security-mvc-boot-postgre/src/test/java/com/baeldung/jdbcauthentication/postgre/web/UserControllerLiveTest.java
@@ -0,0 +1,35 @@
+package com.baeldung.jdbcauthentication.postgre.web;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.http.HttpStatus;
+
+/**
+ * This Live Test requires:
+ * *  a PostgreSQL instance running, that allows a 'root' user with password 'pass', and with a database named jdbc_authentication
+ * (e.g. with the following command `docker run -p 5432:5432 --name bael-postgre -e POSTGRES_PASSWORD=pass -e POSTGRES_DB=jdbc_authentication postgres:latest`)
+ * * the service up and running
+ *
+ */
+public class UserControllerLiveTest {
+
+    private static final String PRINCIPAL_SVC_URL = "http://localhost:8082/principal";
+
+    @Test
+    public void givenExisting_whenRequestPrincipal_thenRetrieveData() throws Exception {
+        given().auth()
+            .preemptive()
+            .basic("user", "pass")
+            .when()
+            .get(PRINCIPAL_SVC_URL)
+            .then()
+            .statusCode(HttpStatus.OK.value())
+            .and()
+            .body("authorities[0].authority", is("ROLE_USER"))
+            .body("principal.username", is("user"))
+            .body("name", is("user"));
+    }
+
+}
diff --git a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/config/SecurityConfig.java b/spring-security-mvc-boot/src/main/java/org/baeldung/custom/config/SecurityConfig.java
deleted file mode 100644
index f2da5af92c..0000000000
--- a/spring-security-mvc-boot/src/main/java/org/baeldung/custom/config/SecurityConfig.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.baeldung.custom.config;
-
-import org.baeldung.custom.security.MyUserDetailsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-
-@Configuration
-@EnableWebSecurity
-@ComponentScan("org.baeldung.security")
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Autowired
-    private MyUserDetailsService userDetailsService;
-
-    @Override
-    protected void configure(final AuthenticationManagerBuilder auth) throws Exception {
-        auth.authenticationProvider(authenticationProvider());
-    }
-
-    @Override
-    public void configure(WebSecurity web) throws Exception {
-        web.ignoring().antMatchers("/resources/**");
-    }
-
-    @Override
-    protected void configure(final HttpSecurity http) throws Exception {
-        // @formatter:off
-        http.authorizeRequests()
-            .antMatchers("/login").permitAll()
-            .antMatchers("/admin").hasRole("ADMIN")
-            .anyRequest().authenticated()
-            .and().formLogin().permitAll()
-            .and().csrf().disable();
-            ;
-        // @formatter:on
-    }
-
-    @Bean
-    public DaoAuthenticationProvider authenticationProvider() {
-        final DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-        authProvider.setUserDetailsService(userDetailsService);
-        authProvider.setPasswordEncoder(encoder());
-        return authProvider;
-    }
-
-    @Bean
-    public PasswordEncoder encoder() {
-        return new BCryptPasswordEncoder(11);
-    }
-}
\ No newline at end of file
diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-mvc-boot/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..2041249b71
--- /dev/null
+++ b/spring-security-mvc-boot/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.custom.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/web/CustomUserDetailsServiceIntegrationTest.java b/spring-security-mvc-boot/src/test/java/org/baeldung/web/CustomUserDetailsServiceIntegrationTest.java
deleted file mode 100644
index fb25175902..0000000000
--- a/spring-security-mvc-boot/src/test/java/org/baeldung/web/CustomUserDetailsServiceIntegrationTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.baeldung.web;
-
-import static org.junit.Assert.assertEquals;
-
-import org.baeldung.custom.Application;
-import org.baeldung.custom.config.MvcConfig;
-import org.baeldung.custom.config.SecurityConfig;
-import org.baeldung.custom.persistence.dao.UserRepository;
-import org.baeldung.custom.persistence.model.User;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = {Application.class})
-@WebAppConfiguration
-public class CustomUserDetailsServiceIntegrationTest {
-
-    private static final String USERNAME = "user";
-    private static final String PASSWORD = "pass";
-    private static final String USERNAME2 = "user2";
-
-    @Autowired
-    private UserRepository myUserRepository;
-
-    @Autowired
-    private AuthenticationProvider authenticationProvider;
-
-    @Autowired
-    private PasswordEncoder passwordEncoder;
-
-    //
-
-    @Test
-    public void givenExistingUser_whenAuthenticate_thenRetrieveFromDb() {
-        User user = new User();
-        user.setUsername(USERNAME);
-        user.setPassword(passwordEncoder.encode(PASSWORD));
-
-        myUserRepository.save(user);
-
-        UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(USERNAME, PASSWORD);
-        Authentication authentication = authenticationProvider.authenticate(auth);
-
-        assertEquals(authentication.getName(), USERNAME);
-    }
-
-    @Test(expected = BadCredentialsException.class)
-    public void givenIncorrectUser_whenAuthenticate_thenBadCredentialsException() {
-        User user = new User();
-        user.setUsername(USERNAME);
-        user.setPassword(passwordEncoder.encode(PASSWORD));
-
-        myUserRepository.save(user);
-
-        UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(USERNAME2, PASSWORD);
-        authenticationProvider.authenticate(auth);
-    }
-
-    //
-
-    @After
-    public void tearDown() {
-        myUserRepository.removeUserByUsername(USERNAME);
-    }
-
-}
diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml
index 4e932f3245..3bae514bc1 100644
--- a/spring-security-mvc-custom/pom.xml
+++ b/spring-security-mvc-custom/pom.xml
@@ -194,10 +194,8 @@
     <properties>
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
 
         <!-- Maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
 
     </properties>
diff --git a/spring-security-mvc-session/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-mvc-custom/src/test/java/org/baeldung/SpringContextTest.java
similarity index 93%
rename from spring-security-mvc-session/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-security-mvc-custom/src/test/java/org/baeldung/SpringContextTest.java
index 9e74e83a53..5ee80d856a 100644
--- a/spring-security-mvc-session/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/spring-security-mvc-custom/src/test/java/org/baeldung/SpringContextTest.java
@@ -11,7 +11,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { MvcConfig.class, SecSecurityConfig.class })
 @WebAppConfiguration
-public class SpringContextIntegrationTest {
+public class SpringContextTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-security-mvc-digest-auth/pom.xml b/spring-security-mvc-digest-auth/pom.xml
index cf1de1730d..0baaea15ef 100644
--- a/spring-security-mvc-digest-auth/pom.xml
+++ b/spring-security-mvc-digest-auth/pom.xml
@@ -196,13 +196,11 @@
 
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
 
         <httpcore.version>4.4.5</httpcore.version>
         <httpclient.version>4.5.2</httpclient.version>
 
         <!-- Maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
     </properties>
 
diff --git a/spring-security-mvc-digest-auth/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-mvc-digest-auth/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..cd2b796308
--- /dev/null
+++ b/spring-security-mvc-digest-auth/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,20 @@
+package org.baeldung;
+
+import org.baeldung.spring.ClientConfig;
+import org.baeldung.spring.MvcConfig;
+import org.baeldung.spring.SecSecurityConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { ClientConfig.class, MvcConfig.class, SecSecurityConfig.class })
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-mvc-jsonview/pom.xml b/spring-security-mvc-jsonview/pom.xml
index 8fa7b4ffb5..a7f668ae8b 100644
--- a/spring-security-mvc-jsonview/pom.xml
+++ b/spring-security-mvc-jsonview/pom.xml
@@ -111,7 +111,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -206,12 +206,6 @@
     </build>
 
     <properties>
-        <!-- various -->
-        <javax.servlet.version>3.1.0</javax.servlet.version>
-        <jstl.version>1.2</jstl.version>
-
-        <!-- Maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
         <json-path.version>2.4.0</json-path.version>
 
diff --git a/spring-security-mvc-jsonview/src/test/java/com/baeldung/SpringContextTest.java b/spring-security-mvc-jsonview/src/test/java/com/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..b1a3de714e
--- /dev/null
+++ b/spring-security-mvc-jsonview/src/test/java/com/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package com.baeldung;
+
+import com.baeldung.spring.AppConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = AppConfig.class)
+@WebAppConfiguration
+public class SpringContextTest {
+	@Test
+	public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+	}
+}
diff --git a/spring-security-mvc-ldap/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-mvc-ldap/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..30ba7671d8
--- /dev/null
+++ b/spring-security-mvc-ldap/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,15 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SampleLDAPApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-mvc-login/pom.xml b/spring-security-mvc-login/pom.xml
index 02ed0e36f2..1ca11bc1ab 100644
--- a/spring-security-mvc-login/pom.xml
+++ b/spring-security-mvc-login/pom.xml
@@ -175,7 +175,6 @@
 
     <properties>
         <!-- Maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
     </properties>
 
diff --git a/spring-security-mvc-login/src/test/java/com/baeldung/SpringContextTest.java b/spring-security-mvc-login/src/test/java/com/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..4cf3b736ea
--- /dev/null
+++ b/spring-security-mvc-login/src/test/java/com/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package com.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration({ "/RedirectionWebSecurityConfig.xml", "/mvc-servlet.xml" })
+@WebAppConfiguration
+public class SpringContextTest {
+	@Test
+	public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+	}
+}
diff --git a/spring-security-mvc-persisted-remember-me/pom.xml b/spring-security-mvc-persisted-remember-me/pom.xml
index 5e987dcb77..2f7989d573 100644
--- a/spring-security-mvc-persisted-remember-me/pom.xml
+++ b/spring-security-mvc-persisted-remember-me/pom.xml
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -200,15 +200,10 @@
         <!-- persistence -->
         <postgresql.version>9.4.1212</postgresql.version>
 
-        <!-- various -->
-        <javax.servlet.version>3.1.0</javax.servlet.version>
-        <jstl.version>1.2</jstl.version>
-
         <!-- util -->
         <guava.version>19.0</guava.version>
 
         <!-- Maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
         <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
     </properties>
diff --git a/spring-security-mvc-persisted-remember-me/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-mvc-persisted-remember-me/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..8113ed0fbe
--- /dev/null
+++ b/spring-security-mvc-persisted-remember-me/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,20 @@
+package org.baeldung;
+
+import org.baeldung.spring.MvcConfig;
+import org.baeldung.spring.PersistenceConfig;
+import org.baeldung.spring.SecurityConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { MvcConfig.class, PersistenceConfig.class, SecurityConfig.class })
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-mvc-session/pom.xml b/spring-security-mvc-session/pom.xml
deleted file mode 100644
index c0e1527a24..0000000000
--- a/spring-security-mvc-session/pom.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-security-mvc-session</artifactId>
-    <version>0.1-SNAPSHOT</version>
-    <name>spring-security-mvc-session</name>
-    <packaging>war</packaging>
-
-    <parent>
-		<groupId>com.baeldung</groupId>
-		<artifactId>parent-spring-4</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../parent-spring-4</relativePath>
-	</parent>
-
-    <dependencies>
-
-        <!-- Spring Security -->
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
-            <version>${org.springframework.security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
-            <version>${org.springframework.security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-taglibs</artifactId>
-            <version>${org.springframework.security.version}</version>
-        </dependency>
-
-        <!-- Spring -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-expression</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-
-        <!-- web -->
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>${jstl.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- ops -->
-
-        <dependency>
-            <groupId>com.codahale.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-            <version>${codahale.metrics.version}</version>
-        </dependency>
-        
-        <!-- Test -->
-        <dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<version>1.5.10.RELEASE</version>
-			<scope>test</scope>
-		</dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>spring-security-mvc-session</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>${maven-war-plugin.version}</version>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.cargo</groupId>
-                <artifactId>cargo-maven2-plugin</artifactId>
-                <version>${cargo-maven2-plugin.version}</version>
-                <configuration>
-                    <wait>true</wait>
-                    <container>
-                        <containerId>jetty8x</containerId>
-                        <type>embedded</type>
-                        <systemProperties>
-                            <!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
-                        </systemProperties>
-                    </container>
-                    <configuration>
-                        <properties>
-                            <cargo.servlet.port>8082</cargo.servlet.port>
-                        </properties>
-                    </configuration>
-                </configuration>
-            </plugin>
-
-        </plugins>
-
-    </build>
-
-    <properties>
-        <!-- Spring -->
-        <org.springframework.security.version>4.2.6.RELEASE</org.springframework.security.version>
-
-        <!-- various -->
-        <codahale.metrics.version>3.0.2</codahale.metrics.version>
-
-        <!-- Maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
-        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
-    </properties>
-
-</project>
\ No newline at end of file
diff --git a/spring-security-mvc-session/src/main/java/org/baeldung/spring/MvcConfig.java b/spring-security-mvc-session/src/main/java/org/baeldung/spring/MvcConfig.java
deleted file mode 100644
index 9e9c240181..0000000000
--- a/spring-security-mvc-session/src/main/java/org/baeldung/spring/MvcConfig.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.baeldung.spring;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.ViewResolver;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import org.springframework.web.servlet.view.InternalResourceViewResolver;
-import org.springframework.web.servlet.view.JstlView;
-
-@EnableWebMvc
-@Configuration
-public class MvcConfig extends WebMvcConfigurerAdapter {
-
-    public MvcConfig() {
-        super();
-    }
-
-    // API
-
-    @Override
-    public void addViewControllers(final ViewControllerRegistry registry) {
-        super.addViewControllers(registry);
-
-        registry.addViewController("/anonymous.html");
-
-        registry.addViewController("/login.html");
-        registry.addViewController("/homepage.html");
-        registry.addViewController("/sessionExpired.html");
-        registry.addViewController("/invalidExpired.html");
-        registry.addViewController("/console.html");
-    }
-
-    @Bean
-    public ViewResolver viewResolver() {
-        final InternalResourceViewResolver bean = new InternalResourceViewResolver();
-
-        bean.setViewClass(JstlView.class);
-        bean.setPrefix("/WEB-INF/view/");
-        bean.setSuffix(".jsp");
-
-        return bean;
-    }
-}
\ No newline at end of file
diff --git a/spring-security-mvc-socket/pom.xml b/spring-security-mvc-socket/pom.xml
index f1d28355fd..f799a7fa9f 100644
--- a/spring-security-mvc-socket/pom.xml
+++ b/spring-security-mvc-socket/pom.xml
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2database.version}</version>
+            <version>${h2.version}</version>
         </dependency>
 
         <!-- Websockets -->
@@ -186,7 +186,6 @@
         <hibernate-core.version>5.2.10.Final</hibernate-core.version>
         <spring-security.version>4.2.3.RELEASE</spring-security.version>
         <spring-data-jpa.version>1.11.3.RELEASE</spring-data-jpa.version>
-        <h2database.version>1.4.196</h2database.version>
         <logback-classic.version>1.2.3</logback-classic.version>
     </properties>
 
diff --git a/spring-security-mvc-socket/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-mvc-socket/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..7b9c738904
--- /dev/null
+++ b/spring-security-mvc-socket/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,24 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import com.baeldung.springsecuredsockets.config.AppConfig;
+import com.baeldung.springsecuredsockets.config.DataStoreConfig;
+import com.baeldung.springsecuredsockets.config.SecurityConfig;
+import com.baeldung.springsecuredsockets.config.SocketBrokerConfig;
+import com.baeldung.springsecuredsockets.config.SocketSecurityConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { AppConfig.class, DataStoreConfig.class, SecurityConfig.class,
+		SocketBrokerConfig.class, SocketSecurityConfig.class })
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-mvc/.gitignore b/spring-security-mvc/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/spring-security-mvc/.gitignore
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file
diff --git a/spring-security-mvc-session/README.md b/spring-security-mvc/README.md
similarity index 100%
rename from spring-security-mvc-session/README.md
rename to spring-security-mvc/README.md
diff --git a/spring-security-mvc/pom.xml b/spring-security-mvc/pom.xml
new file mode 100644
index 0000000000..98ad3daa46
--- /dev/null
+++ b/spring-security-mvc/pom.xml
@@ -0,0 +1,84 @@
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-security-mvc</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-security-mvc</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+
+        <!-- Spring Security -->
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-taglibs</artifactId>
+        </dependency>
+
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- ops -->
+        <dependency>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-core</artifactId>
+        </dependency>
+
+        <!-- Test -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.baeldung.SpringSessionApplication</mainClass>
+                    <layout>JAR</layout>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/spring-security-mvc/src/main/java/com/baeldung/SpringSessionApplication.java b/spring-security-mvc/src/main/java/com/baeldung/SpringSessionApplication.java
new file mode 100644
index 0000000000..c2a4b35df0
--- /dev/null
+++ b/spring-security-mvc/src/main/java/com/baeldung/SpringSessionApplication.java
@@ -0,0 +1,12 @@
+package com.baeldung;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringSessionApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringSessionApplication.class, args);
+    }
+}
diff --git a/spring-security-mvc-session/src/main/java/org/baeldung/monitoring/MetricRegistrySingleton.java b/spring-security-mvc/src/main/java/com/baeldung/monitoring/MetricRegistrySingleton.java
similarity index 95%
rename from spring-security-mvc-session/src/main/java/org/baeldung/monitoring/MetricRegistrySingleton.java
rename to spring-security-mvc/src/main/java/com/baeldung/monitoring/MetricRegistrySingleton.java
index ed253305ed..e2224996c2 100644
--- a/spring-security-mvc-session/src/main/java/org/baeldung/monitoring/MetricRegistrySingleton.java
+++ b/spring-security-mvc/src/main/java/com/baeldung/monitoring/MetricRegistrySingleton.java
@@ -1,4 +1,4 @@
-package org.baeldung.monitoring;
+package com.baeldung.monitoring;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/spring-security-mvc-session/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java b/spring-security-mvc/src/main/java/com/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java
similarity index 99%
rename from spring-security-mvc-session/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java
rename to spring-security-mvc/src/main/java/com/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java
index 19f49ea59d..9d4fc19098 100644
--- a/spring-security-mvc-session/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java
+++ b/spring-security-mvc/src/main/java/com/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java
@@ -1,4 +1,4 @@
-package org.baeldung.security;
+package com.baeldung.security;
 
 import java.io.IOException;
 import java.util.Collection;
diff --git a/spring-security-mvc-session/src/main/java/org/baeldung/security/SessionFilter.java b/spring-security-mvc/src/main/java/com/baeldung/security/SessionFilter.java
similarity index 97%
rename from spring-security-mvc-session/src/main/java/org/baeldung/security/SessionFilter.java
rename to spring-security-mvc/src/main/java/com/baeldung/security/SessionFilter.java
index d37d46e478..f4f876af9c 100644
--- a/spring-security-mvc-session/src/main/java/org/baeldung/security/SessionFilter.java
+++ b/spring-security-mvc/src/main/java/com/baeldung/security/SessionFilter.java
@@ -1,4 +1,4 @@
-package org.baeldung.security;
+package com.baeldung.security;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/spring-security-mvc/src/main/java/com/baeldung/spring/MvcConfig.java b/spring-security-mvc/src/main/java/com/baeldung/spring/MvcConfig.java
new file mode 100644
index 0000000000..38a4f3f81b
--- /dev/null
+++ b/spring-security-mvc/src/main/java/com/baeldung/spring/MvcConfig.java
@@ -0,0 +1,33 @@
+package com.baeldung.spring;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addViewControllers(final ViewControllerRegistry registry) {
+        registry.addViewController("/anonymous.html");
+
+        registry.addViewController("/login.html");
+        registry.addViewController("/homepage.html");
+        registry.addViewController("/sessionExpired.html");
+        registry.addViewController("/invalidSession.html");
+        registry.addViewController("/console.html");
+    }
+
+
+    /* 
+     * Spring Boot supports configuring a ViewResolver with properties
+     */
+//    @Bean
+//    public ViewResolver viewResolver() {
+//        final InternalResourceViewResolver bean = new InternalResourceViewResolver();
+//
+//        bean.setViewClass(JstlView.class);
+//        bean.setPrefix("/WEB-INF/view/");
+//        bean.setSuffix(".jsp");
+//    }
+}
diff --git a/spring-security-mvc-session/src/main/java/org/baeldung/spring/SecSecurityConfig.java b/spring-security-mvc/src/main/java/com/baeldung/spring/SecSecurityConfig.java
similarity index 78%
rename from spring-security-mvc-session/src/main/java/org/baeldung/spring/SecSecurityConfig.java
rename to spring-security-mvc/src/main/java/com/baeldung/spring/SecSecurityConfig.java
index deeea78e4e..a922ba6f7f 100644
--- a/spring-security-mvc-session/src/main/java/org/baeldung/spring/SecSecurityConfig.java
+++ b/spring-security-mvc/src/main/java/com/baeldung/spring/SecSecurityConfig.java
@@ -1,19 +1,20 @@
-package org.baeldung.spring;
+package com.baeldung.spring;
 
-import org.baeldung.security.MySimpleUrlAuthenticationSuccessHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.session.HttpSessionEventPublisher;
 
+import com.baeldung.security.MySimpleUrlAuthenticationSuccessHandler;
+
 @Configuration
 // @ImportResource({ "classpath:webSecurityConfig.xml" })
-@EnableWebSecurity
 public class SecSecurityConfig extends WebSecurityConfigurerAdapter {
 
     public SecSecurityConfig() {
@@ -24,9 +25,9 @@ public class SecSecurityConfig extends WebSecurityConfigurerAdapter {
     protected void configure(final AuthenticationManagerBuilder auth) throws Exception {
         // @formatter:off
         auth.inMemoryAuthentication()
-        .withUser("user1").password("user1Pass").roles("USER")
+        .withUser("user1").password(passwordEncoder().encode("user1Pass")).roles("USER")
         .and()
-        .withUser("admin1").password("admin1Pass").roles("ADMIN");
+        .withUser("admin1").password(passwordEncoder().encode("admin1Pass")).roles("ADMIN");
         // @formatter:on
     }
 
@@ -37,7 +38,7 @@ public class SecSecurityConfig extends WebSecurityConfigurerAdapter {
         .csrf().disable()
         .authorizeRequests()
         .antMatchers("/anonymous*").anonymous()
-        .antMatchers("/login*").permitAll()
+        .antMatchers("/login*","/invalidSession*", "/sessionExpired*").permitAll()
         .anyRequest().authenticated()
         .and()
         .formLogin()
@@ -69,4 +70,9 @@ public class SecSecurityConfig extends WebSecurityConfigurerAdapter {
         return new HttpSessionEventPublisher();
     }
 
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
 }
diff --git a/spring-security-mvc-session/src/main/java/org/baeldung/web/SessionListenerWithMetrics.java b/spring-security-mvc/src/main/java/com/baeldung/web/SessionListenerWithMetrics.java
similarity index 92%
rename from spring-security-mvc-session/src/main/java/org/baeldung/web/SessionListenerWithMetrics.java
rename to spring-security-mvc/src/main/java/com/baeldung/web/SessionListenerWithMetrics.java
index 46bf2708f7..fb1a81744e 100644
--- a/spring-security-mvc-session/src/main/java/org/baeldung/web/SessionListenerWithMetrics.java
+++ b/spring-security-mvc/src/main/java/com/baeldung/web/SessionListenerWithMetrics.java
@@ -1,12 +1,11 @@
-package org.baeldung.web;
+package com.baeldung.web;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;
 
-import org.baeldung.monitoring.MetricRegistrySingleton;
-
+import com.baeldung.monitoring.MetricRegistrySingleton;
 import com.codahale.metrics.Counter;
 
 public class SessionListenerWithMetrics implements HttpSessionListener {
diff --git a/spring-security-mvc/src/main/java/com/baeldung/web/SessionRestController.java b/spring-security-mvc/src/main/java/com/baeldung/web/SessionRestController.java
new file mode 100644
index 0000000000..1353ee25d0
--- /dev/null
+++ b/spring-security-mvc/src/main/java/com/baeldung/web/SessionRestController.java
@@ -0,0 +1,17 @@
+package com.baeldung.web;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class SessionRestController {
+
+    @GetMapping("/session-max-interval")
+    @ResponseBody
+    public String retrieveMaxSessionIncativeInterval(HttpSession session) {
+        return "Max Inactive Interval before Session expires: " + session.getMaxInactiveInterval();
+    }
+}
diff --git a/spring-security-mvc/src/main/resources/application.properties b/spring-security-mvc/src/main/resources/application.properties
new file mode 100644
index 0000000000..56b2b7b123
--- /dev/null
+++ b/spring-security-mvc/src/main/resources/application.properties
@@ -0,0 +1,8 @@
+server.servlet.session.timeout=65s
+
+spring.mvc.view.prefix=/WEB-INF/view/
+spring.mvc.view.suffix=.jsp
+
+## Secure Session Cookie configurations
+#server.servlet.session.cookie.http-only=true
+#server.servlet.session.cookie.secure=true
\ No newline at end of file
diff --git a/spring-security-mvc-session/src/main/resources/logback.xml b/spring-security-mvc/src/main/resources/logback.xml
similarity index 100%
rename from spring-security-mvc-session/src/main/resources/logback.xml
rename to spring-security-mvc/src/main/resources/logback.xml
diff --git a/spring-security-mvc-session/src/main/resources/webSecurityConfig.xml b/spring-security-mvc/src/main/resources/webSecurityConfig.xml
similarity index 97%
rename from spring-security-mvc-session/src/main/resources/webSecurityConfig.xml
rename to spring-security-mvc/src/main/resources/webSecurityConfig.xml
index e8aa2f76bc..42ff4c2186 100644
--- a/spring-security-mvc-session/src/main/resources/webSecurityConfig.xml
+++ b/spring-security-mvc/src/main/resources/webSecurityConfig.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
     xsi:schemaLocation="
 		http://www.springframework.org/schema/security 
-        http://www.springframework.org/schema/security/spring-security-4.2.xsd
+        http://www.springframework.org/schema/security/spring-security.xsd
 		http://www.springframework.org/schema/beans 
-        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"
+        http://www.springframework.org/schema/beans/spring-beans.xsd"
 >
 
     <http create-session="always" use-expressions="true">
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-security-mvc/src/main/webapp/WEB-INF/mvc-servlet.xml
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/mvc-servlet.xml
rename to spring-security-mvc/src/main/webapp/WEB-INF/mvc-servlet.xml
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/view/anonymous.jsp b/spring-security-mvc/src/main/webapp/WEB-INF/view/anonymous.jsp
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/view/anonymous.jsp
rename to spring-security-mvc/src/main/webapp/WEB-INF/view/anonymous.jsp
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/view/console.jsp b/spring-security-mvc/src/main/webapp/WEB-INF/view/console.jsp
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/view/console.jsp
rename to spring-security-mvc/src/main/webapp/WEB-INF/view/console.jsp
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/view/homepage.jsp b/spring-security-mvc/src/main/webapp/WEB-INF/view/homepage.jsp
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/view/homepage.jsp
rename to spring-security-mvc/src/main/webapp/WEB-INF/view/homepage.jsp
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/view/invalidSession.jsp b/spring-security-mvc/src/main/webapp/WEB-INF/view/invalidSession.jsp
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/view/invalidSession.jsp
rename to spring-security-mvc/src/main/webapp/WEB-INF/view/invalidSession.jsp
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/view/login.jsp b/spring-security-mvc/src/main/webapp/WEB-INF/view/login.jsp
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/view/login.jsp
rename to spring-security-mvc/src/main/webapp/WEB-INF/view/login.jsp
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/view/sessionExpired.jsp b/spring-security-mvc/src/main/webapp/WEB-INF/view/sessionExpired.jsp
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/view/sessionExpired.jsp
rename to spring-security-mvc/src/main/webapp/WEB-INF/view/sessionExpired.jsp
diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/web.xml b/spring-security-mvc/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from spring-security-mvc-session/src/main/webapp/WEB-INF/web.xml
rename to spring-security-mvc/src/main/webapp/WEB-INF/web.xml
diff --git a/spring-security-mvc/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-security-mvc/src/test/java/com/baeldung/SpringContextIntegrationTest.java
new file mode 100644
index 0000000000..8e53a6371a
--- /dev/null
+++ b/spring-security-mvc/src/test/java/com/baeldung/SpringContextIntegrationTest.java
@@ -0,0 +1,15 @@
+package com.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringContextIntegrationTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-mvc/src/test/java/com/baeldung/session/SessionConfigurationLiveTest.java b/spring-security-mvc/src/test/java/com/baeldung/session/SessionConfigurationLiveTest.java
new file mode 100644
index 0000000000..7d9a03d5f6
--- /dev/null
+++ b/spring-security-mvc/src/test/java/com/baeldung/session/SessionConfigurationLiveTest.java
@@ -0,0 +1,92 @@
+package com.baeldung.session;
+
+import static io.restassured.RestAssured.given;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Optional;
+
+import org.junit.Test;
+import org.springframework.http.HttpStatus;
+
+import io.restassured.filter.session.SessionFilter;
+import io.restassured.response.Response;
+import io.restassured.specification.RequestSpecification;
+
+/**
+ * This Live Test requires the service to be up and running.
+ */
+public class SessionConfigurationLiveTest {
+
+    private static final String USER = "user1";
+    private static final String PASSWORD = "user1Pass";
+    private static final String SESSION_SVC_URL = "http://localhost:8080/session-max-interval";
+
+    @Test
+    public void givenValidUser_whenRequestResourceAfterSessionExpiration_thenRedirectedToInvalidSessionUri() throws Exception {
+        SessionFilter sessionFilter = new SessionFilter();
+        simpleSvcRequestLoggingIn(sessionFilter);
+        Response resp2 = simpleResponseRequestUsingSessionNotFollowingRedirects(sessionFilter);
+        assertThat(resp2.getStatusCode()).isEqualTo(HttpStatus.OK.value());
+        assertThat(resp2.getBody()
+            .asString()).isEqualTo("Max Inactive Interval before Session expires: 60");
+
+        // session will be expired in 60 seconds...
+        Thread.sleep(62000);
+        Response resp3 = simpleResponseRequestUsingSessionNotFollowingRedirects(sessionFilter);
+
+        assertThat(resp3.getStatusCode()).isEqualTo(HttpStatus.FOUND.value());
+        assertThat(resp3.getHeader("Location")).isEqualTo("http://localhost:8080/invalidSession.html");
+    }
+
+    @Test
+    public void givenValidUser_whenLoginMoreThanMaxValidSession_thenRedirectedToExpiredSessionUri() throws Exception {
+        SessionFilter sessionFilter = new SessionFilter();
+        simpleSvcRequestLoggingIn(sessionFilter);
+        simpleSvcRequestLoggingIn();
+
+        // this login will expire the first session
+        simpleSvcRequestLoggingIn();
+
+        // now try to access a resource using expired session
+        Response resp4 = given().filter(sessionFilter)
+            .and()
+            .redirects()
+            .follow(false)
+            .when()
+            .get(SESSION_SVC_URL);
+
+        assertThat(resp4.getStatusCode()).isEqualTo(HttpStatus.FOUND.value());
+        assertThat(resp4.getHeader("Location")).isEqualTo("http://localhost:8080/sessionExpired.html");
+    }
+
+    private static void simpleSvcRequestLoggingIn() {
+        simpleSvcRequestLoggingIn(null);
+    }
+
+    private static void simpleSvcRequestLoggingIn(SessionFilter sessionFilter) {
+        Response response = simpleResponseSvcRequestLoggingIn(Optional.ofNullable(sessionFilter));
+
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK.value());
+        assertThat(response.getBody()
+            .asString()).isEqualTo("Max Inactive Interval before Session expires: 60");
+    }
+
+    private static Response simpleResponseSvcRequestLoggingIn(Optional<SessionFilter> sessionFilter) {
+        RequestSpecification spec = given().auth()
+            .form(USER, PASSWORD);
+        sessionFilter.ifPresent(filter -> spec.and()
+            .filter(filter));
+        return spec.when()
+            .get(SESSION_SVC_URL);
+    }
+
+    private static Response simpleResponseRequestUsingSessionNotFollowingRedirects(SessionFilter sessionFilter) {
+        return given().filter(sessionFilter)
+            .and()
+            .redirects()
+            .follow(false)
+            .when()
+            .get(SESSION_SVC_URL);
+    }
+
+}
diff --git a/spring-security-mvc/src/test/resources/.gitignore b/spring-security-mvc/src/test/resources/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/spring-security-mvc/src/test/resources/.gitignore
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file
diff --git a/spring-security-openid/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-openid/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..fa346b2b31
--- /dev/null
+++ b/spring-security-openid/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.config.SpringOpenidApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringOpenidApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-react/pom.xml b/spring-security-react/pom.xml
index c7b7c85be8..40c284af7f 100644
--- a/spring-security-react/pom.xml
+++ b/spring-security-react/pom.xml
@@ -169,10 +169,8 @@
 
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
 
         <!-- Maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
         <frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
         <jetty.version>9.4.11.v20180605</jetty.version>
diff --git a/spring-security-react/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-react/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..9cc52b4726
--- /dev/null
+++ b/spring-security-react/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.baeldung.spring.MvcConfig;
+import org.baeldung.spring.SecSecurityConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { MvcConfig.class, SecSecurityConfig.class })
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-rest-basic-auth/pom.xml b/spring-security-rest-basic-auth/pom.xml
index 8a90247386..78bab83db5 100644
--- a/spring-security-rest-basic-auth/pom.xml
+++ b/spring-security-rest-basic-auth/pom.xml
@@ -279,7 +279,6 @@
         <guava.version>19.0</guava.version>
 
         <!-- Maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
     </properties>
 
diff --git a/spring-security-rest-basic-auth/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-rest-basic-auth/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..f54cbf3b7b
--- /dev/null
+++ b/spring-security-rest-basic-auth/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,15 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration({ "/webSecurityConfig.xml" })
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-rest-custom/pom.xml b/spring-security-rest-custom/pom.xml
index 2180b917e5..4bab9b9d95 100644
--- a/spring-security-rest-custom/pom.xml
+++ b/spring-security-rest-custom/pom.xml
@@ -206,7 +206,6 @@
     <properties>
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <commons-logging.version>1.2</commons-logging.version>
 
         <!-- Maven plugins -->
diff --git a/spring-security-rest/pom.xml b/spring-security-rest/pom.xml
index af38c1ffef..a66909a68e 100644
--- a/spring-security-rest/pom.xml
+++ b/spring-security-rest/pom.xml
@@ -271,7 +271,6 @@
 
         <!-- util -->
         <guava.version>26.0-jre</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
         <commons-fileupload.version>1.3.2</commons-fileupload.version>
 
         <!-- testing -->
diff --git a/spring-security-rest/src/main/java/org/baeldung/web/controller/CustomController.java b/spring-security-rest/src/main/java/org/baeldung/web/controller/CustomController.java
new file mode 100644
index 0000000000..7d40b9bb8d
--- /dev/null
+++ b/spring-security-rest/src/main/java/org/baeldung/web/controller/CustomController.java
@@ -0,0 +1,14 @@
+package org.baeldung.web.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+@Controller
+public class CustomController {
+    
+    @RequestMapping(value = "/custom", method = RequestMethod.POST)
+    public String custom() {
+        return "custom";
+    }
+}
\ No newline at end of file
diff --git a/spring-security-rest/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-rest/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..d984cf5c35
--- /dev/null
+++ b/spring-security-rest/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,20 @@
+package org.baeldung;
+
+import org.baeldung.spring.ClientWebConfig;
+import org.baeldung.spring.SecurityJavaConfig;
+import org.baeldung.spring.WebConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = { ClientWebConfig.class, SecurityJavaConfig.class, WebConfig.class })
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-sso/spring-security-sso-auth-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-sso/spring-security-sso-auth-server/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..f677f683b2
--- /dev/null
+++ b/spring-security-sso/spring-security-sso-auth-server/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.baeldung.config.AuthorizationServerApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = AuthorizationServerApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
+public class SpringContextTest {
+
+    @Test
+    public void whenLoadApplication_thenSuccess() {
+
+    }
+}
diff --git a/spring-security-sso/spring-security-sso-ui-2/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-sso/spring-security-sso-ui-2/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..61a2a022ed
--- /dev/null
+++ b/spring-security-sso/spring-security-sso-ui-2/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.baeldung.config.UiApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = UiApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
+public class SpringContextTest {
+
+    @Test
+    public void whenLoadApplication_thenSuccess() {
+
+    }
+}
diff --git a/spring-security-sso/spring-security-sso-ui/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-sso/spring-security-sso-ui/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..61a2a022ed
--- /dev/null
+++ b/spring-security-sso/spring-security-sso-ui/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.baeldung.config.UiApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = UiApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
+public class SpringContextTest {
+
+    @Test
+    public void whenLoadApplication_thenSuccess() {
+
+    }
+}
diff --git a/spring-security-x509/spring-security-x509-basic-auth/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-x509/spring-security-x509-basic-auth/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..5c65dd3e8a
--- /dev/null
+++ b/spring-security-x509/spring-security-x509-basic-auth/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.security.x509.X509AuthenticationServer;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = X509AuthenticationServer.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-security-x509/spring-security-x509-client-auth/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-x509/spring-security-x509-client-auth/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..5c65dd3e8a
--- /dev/null
+++ b/spring-security-x509/spring-security-x509-client-auth/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.security.x509.X509AuthenticationServer;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = X509AuthenticationServer.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-session/README.md b/spring-session/README.md
index 505d043e75..c9875beadf 100644
--- a/spring-session/README.md
+++ b/spring-session/README.md
@@ -5,3 +5,4 @@
 ### Relevant Articles: 
 - [Guide to Spring Session](https://www.baeldung.com/spring-session)
 - [Spring Session with JDBC](https://www.baeldung.com/spring-session-jdbc)
+- [Spring Session with MongoDB](https://www.baeldung.com/spring-session-mongodb)
diff --git a/spring-session/spring-session-jdbc/src/test/java/org/baeldung/SpringContextTest.java b/spring-session/spring-session-jdbc/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..b69855ba38
--- /dev/null
+++ b/spring-session/spring-session-jdbc/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.springsessionjdbc.SpringSessionJdbcApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringSessionJdbcApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-session/spring-session-mongodb/pom.xml b/spring-session/spring-session-mongodb/pom.xml
index 16fbaccc84..dc055ff32d 100644
--- a/spring-session/spring-session-mongodb/pom.xml
+++ b/spring-session/spring-session-mongodb/pom.xml
@@ -42,11 +42,6 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <spring-session-data-mongodb.version>2.1.3.RELEASE</spring-session-data-mongodb.version>
-        <spring-boot-starter-data-mongodb.version>2.1.5.RELEASE</spring-boot-starter-data-mongodb.version>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
@@ -56,4 +51,9 @@
         </plugins>
     </build>
 
+    <properties>
+        <spring-session-data-mongodb.version>2.1.3.RELEASE</spring-session-data-mongodb.version>
+        <spring-boot-starter-data-mongodb.version>2.1.5.RELEASE</spring-boot-starter-data-mongodb.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextTest.java b/spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..307d31a809
--- /dev/null
+++ b/spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import com.baeldung.springsessionmongodb.SpringSessionMongoDBApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringSessionMongoDBApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-session/spring-session-redis/src/test/java/org/baeldung/SpringContextTest.java b/spring-session/spring-session-redis/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..994f93c24f
--- /dev/null
+++ b/spring-session/spring-session-redis/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.session.SessionWebApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SessionWebApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-sleuth/src/test/java/org/baeldung/SpringContextTest.java b/spring-sleuth/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..ff22398ca4
--- /dev/null
+++ b/spring-sleuth/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.spring.session.SleuthWebApp;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SleuthWebApp.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-soap/pom.xml b/spring-soap/pom.xml
index ba05eddf5d..e155a0f6b2 100644
--- a/spring-soap/pom.xml
+++ b/spring-soap/pom.xml
@@ -13,11 +13,6 @@
         <relativePath>../parent-boot-2</relativePath>
     </parent>
 
-    <properties>
-        <java.version>1.8</java.version>
-        <spring-boot.version>2.1.2.RELEASE</spring-boot.version>
-    </properties>
-
     <dependencies>
         <!-- tag::springws[] -->
         <dependency>
@@ -66,4 +61,8 @@
         </plugins>
     </build>
 
+    <properties>
+        <spring-boot.version>2.1.2.RELEASE</spring-boot.version>
+    </properties>
+
 </project>
diff --git a/spring-social-login/pom.xml b/spring-social-login/pom.xml
index e948c908d4..655e885568 100644
--- a/spring-social-login/pom.xml
+++ b/spring-social-login/pom.xml
@@ -94,8 +94,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <commons-lang3.version>3.3.2</commons-lang3.version>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/spring-social-login/src/test/java/org/baeldung/SpringContextTest.java b/spring-social-login/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..cfd8759c52
--- /dev/null
+++ b/spring-social-login/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,18 @@
+package org.baeldung;
+
+import org.baeldung.config.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT)
+public class SpringContextTest {
+
+    @Test
+    public void whenLoadApplication_thenSuccess() {
+
+    }
+}
diff --git a/spring-spel/src/test/java/org/baeldung/SpringContextTest.java b/spring-spel/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..e25c1bf8e4
--- /dev/null
+++ b/spring-spel/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,15 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:applicationContext.xml"})
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-state-machine/src/test/java/org/baeldung/SpringContextTest.java b/spring-state-machine/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..1e847c0d65
--- /dev/null
+++ b/spring-state-machine/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,23 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.spring.statemachine.config.ForkJoinStateMachineConfiguration;
+import com.baeldung.spring.statemachine.config.HierarchicalStateMachineConfiguration;
+import com.baeldung.spring.statemachine.config.JunctionStateMachineConfiguration;
+import com.baeldung.spring.statemachine.config.SimpleEnumStateMachineConfiguration;
+import com.baeldung.spring.statemachine.config.SimpleStateMachineConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { SimpleStateMachineConfiguration.class, SimpleEnumStateMachineConfiguration.class,
+		JunctionStateMachineConfiguration.class, HierarchicalStateMachineConfiguration.class,
+		ForkJoinStateMachineConfiguration.class })
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-static-resources/README.md b/spring-static-resources/README.md
index c12e0272d4..64f017b5dd 100644
--- a/spring-static-resources/README.md
+++ b/spring-static-resources/README.md
@@ -2,3 +2,4 @@
 - [Cachable Static Assets with Spring MVC](http://www.baeldung.com/cachable-static-assets-with-spring-mvc)
 - [Minification of JS and CSS Assets with Maven](http://www.baeldung.com/maven-minification-of-js-and-css-assets)
 - [Serve Static Resources with Spring](http://www.baeldung.com/spring-mvc-static-resources)
+- [Load a Resource as a String in Spring](https://www.baeldung.com/spring-load-resource-as-string)
diff --git a/spring-static-resources/pom.xml b/spring-static-resources/pom.xml
index 84519a37c1..b8068814ba 100644
--- a/spring-static-resources/pom.xml
+++ b/spring-static-resources/pom.xml
@@ -145,7 +145,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>${commons.io.version}</version>
+            <version>${commons-io.version}</version>
         </dependency>
         
         <dependency>
@@ -215,9 +215,6 @@
 
         <!-- Maven plugins -->
         <yuicompressor-maven-plugin.version>1.5.1</yuicompressor-maven-plugin.version>
-
-        <!-- commons.io -->
-        <commons.io.version>2.5</commons.io.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-static-resources/src/test/java/com/baeldung/SpringContextTest.java b/spring-static-resources/src/test/java/com/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..0dcbba3221
--- /dev/null
+++ b/spring-static-resources/src/test/java/com/baeldung/SpringContextTest.java
@@ -0,0 +1,20 @@
+package com.baeldung;
+
+import org.baeldung.spring.SecSecurityConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { SecSecurityConfig.class }, loader = AnnotationConfigContextLoader.class)
+@WebAppConfiguration
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+
+    }
+}
diff --git a/spring-swagger-codegen/spring-swagger-codegen-app/src/test/java/org/baeldung/SpringContextTest.java b/spring-swagger-codegen/spring-swagger-codegen-app/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..79b2b7fa88
--- /dev/null
+++ b/spring-swagger-codegen/spring-swagger-codegen-app/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.petstore.app.PetStoreApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = PetStoreApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-thymeleaf-2/pom.xml b/spring-thymeleaf-2/pom.xml
index bc1147cb14..1b95cac43c 100644
--- a/spring-thymeleaf-2/pom.xml
+++ b/spring-thymeleaf-2/pom.xml
@@ -23,11 +23,6 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
@@ -37,4 +32,9 @@
         </plugins>
         <finalName>spring-thymeleaf-2</finalName>
     </build>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
 </project>
diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/ThymeleafConfig.java b/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/ThymeleafConfig.java
new file mode 100644
index 0000000000..2fd11628ad
--- /dev/null
+++ b/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/ThymeleafConfig.java
@@ -0,0 +1,23 @@
+package com.baeldung.thymeleaf;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.thymeleaf.templatemode.TemplateMode;
+import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver;
+
+@Configuration
+public class ThymeleafConfig {
+
+    @Bean
+    public ClassLoaderTemplateResolver secondaryTemplateResolver() {
+        ClassLoaderTemplateResolver secondaryTemplateResolver = new ClassLoaderTemplateResolver();
+        secondaryTemplateResolver.setPrefix("templates-2/");
+        secondaryTemplateResolver.setSuffix(".html");
+        secondaryTemplateResolver.setTemplateMode(TemplateMode.HTML);
+        secondaryTemplateResolver.setCharacterEncoding("UTF-8");
+        secondaryTemplateResolver.setOrder(1);
+        secondaryTemplateResolver.setCheckExistence(true);
+
+        return secondaryTemplateResolver;
+    }
+}
diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/templatedir/HelloController.java b/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/templatedir/HelloController.java
new file mode 100644
index 0000000000..b404418106
--- /dev/null
+++ b/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/templatedir/HelloController.java
@@ -0,0 +1,13 @@
+package com.baeldung.thymeleaf.templatedir;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class HelloController {
+
+    @GetMapping("/hello")
+    public String sayHello() {
+        return "hello";
+    }
+}
diff --git a/spring-thymeleaf-2/src/main/resources/application.properties b/spring-thymeleaf-2/src/main/resources/application.properties
new file mode 100644
index 0000000000..b09232bb1b
--- /dev/null
+++ b/spring-thymeleaf-2/src/main/resources/application.properties
@@ -0,0 +1 @@
+#spring.thymeleaf.prefix=classpath:/templates-2/
\ No newline at end of file
diff --git a/spring-thymeleaf-2/src/main/resources/templates-2/hello.html b/spring-thymeleaf-2/src/main/resources/templates-2/hello.html
new file mode 100644
index 0000000000..035904c8ba
--- /dev/null
+++ b/spring-thymeleaf-2/src/main/resources/templates-2/hello.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="UTF-8">
+<title>Enums in Thymeleaf</title>
+</head>
+<body>
+    <h2>Hello from 'templates/templates-2'</h2>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-thymeleaf-2/src/main/resources/templates/enums/view.html b/spring-thymeleaf-2/src/main/resources/templates/enums/view.html
index 5f473886d6..f766f66277 100644
--- a/spring-thymeleaf-2/src/main/resources/templates/enums/view.html
+++ b/spring-thymeleaf-2/src/main/resources/templates/enums/view.html
@@ -5,26 +5,26 @@
 <title>Enums in Thymeleaf</title>
 </head>
 <body>
-	<h3>View Widget</h3>
-	<div>
-	    <label for="name">Name: </label>
-    	<span th:text="${widget.name}"></span>
-	</div>
-	<div>
-    	<label for="color">Color: </label>
-    	<span th:text="${widget.color.displayValue}"></span>
-	</div>
-	<div th:if="${widget.color == T(com.baeldung.thymeleaf.enums.Color).RED}">
-	    This color screams danger.
-	</div>
-	<div th:if="${widget.color.name() == 'GREEN'}">
-	    Green is for go.
-	</div>
-	<div th:switch="${widget.color}">
-	    <span th:case="${T(com.baeldung.thymeleaf.enums.Color).RED}" style="color: red;">Alert</span>
-	    <span th:case="${T(com.baeldung.thymeleaf.enums.Color).ORANGE}" style="color: orange;">Warning</span>
-	    <span th:case="${T(com.baeldung.thymeleaf.enums.Color).YELLOW}" style="color: yellow;">Caution</span>
-	    <span th:case="${T(com.baeldung.thymeleaf.enums.Color).GREEN}" style="color: green;">All Good</span>
-	</div>
+    <h3>View Widget</h3>
+    <div>
+        <label for="name">Name: </label>
+        <span th:text="${widget.name}"></span>
+    </div>
+    <div>
+        <label for="color">Color: </label>
+        <span th:text="${widget.color.displayValue}"></span>
+    </div>
+    <div th:if="${widget.color == T(com.baeldung.thymeleaf.enums.Color).RED}">
+        This color screams danger.
+    </div>
+    <div th:if="${widget.color.name() == 'GREEN'}">
+        Green is for go.
+    </div>
+    <div th:switch="${widget.color}">
+        <span th:case="${T(com.baeldung.thymeleaf.enums.Color).RED}" style="color: red;">Alert</span>
+        <span th:case="${T(com.baeldung.thymeleaf.enums.Color).ORANGE}" style="color: orange;">Warning</span>
+        <span th:case="${T(com.baeldung.thymeleaf.enums.Color).YELLOW}" style="color: yellow;">Caution</span>
+        <span th:case="${T(com.baeldung.thymeleaf.enums.Color).GREEN}" style="color: green;">All Good</span>
+    </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/ParticipantController.java b/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/ParticipantController.java
new file mode 100644
index 0000000000..eebe37e000
--- /dev/null
+++ b/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/ParticipantController.java
@@ -0,0 +1,28 @@
+package com.example.demo;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+import static java.util.Arrays.asList;
+
+@Controller
+public class ParticipantController {
+
+    @RequestMapping("/")
+    public String index(
+            @RequestParam(value = "participant", required = false) String participant,
+            @RequestParam(value = "country", required = false) String country,
+            @RequestParam(value = "action", required = false) String action,
+            @RequestParam(value = "id", required = false) Integer id,
+            Model model
+    ) {
+        model.addAttribute("id", id);
+        List<Integer> userIds = asList(1,2,3,4);
+        model.addAttribute("userIds", userIds);
+        return "participants";
+    }
+}
diff --git a/spring-thymeleaf/src/main/resources/templates/participants.html b/spring-thymeleaf/src/main/resources/templates/participants.html
new file mode 100644
index 0000000000..8d4e552093
--- /dev/null
+++ b/spring-thymeleaf/src/main/resources/templates/participants.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+</head>
+
+<h2>Enter participant</h2>
+<form th:action="@{/}">
+
+    <input type="text" th:name="participant"/>
+    <select name="country">
+        <option value="de">Germany</option>
+        <option value="nl">Netherlands</option>
+        <option value="pl">Poland</option>
+        <option value="lv">Latvia</option>
+    </select>
+    <button type="submit" th:name="action" th:value="in">check-in</button>
+    <button type="submit" th:name="action" th:value="out">check-out</button>
+</form>
+
+<th:block th:if="${id != null}">
+    <h2 >User Details</h2>
+    <p>Details for user [[${id}]] ...</p>
+</th:block>
+
+<h2>Users</h2>
+<th:block th:each="userId: ${userIds}">
+    <p>
+        <a th:href="@{/(id=${userId})}"> User [[${userId}]]</a>
+    </p>
+</th:block>
+
+</html>
diff --git a/spring-thymeleaf/src/test/java/org/baeldung/SpringContextTest.java b/spring-thymeleaf/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..1ff1c52c68
--- /dev/null
+++ b/spring-thymeleaf/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,22 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import com.baeldung.thymeleaf.config.InitSecurity;
+import com.baeldung.thymeleaf.config.WebApp;
+import com.baeldung.thymeleaf.config.WebMVCConfig;
+import com.baeldung.thymeleaf.config.WebMVCSecurity;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = { WebApp.class, WebMVCConfig.class, WebMVCSecurity.class, InitSecurity.class })
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-userservice/.springBeans b/spring-userservice/.springBeans
deleted file mode 100644
index ff32b84d3b..0000000000
--- a/spring-userservice/.springBeans
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
-	<version>1</version>
-	<pluginVersion><![CDATA[3.7.3.201602250914-RELEASE]]></pluginVersion>
-	<configSuffixes>
-		<configSuffix><![CDATA[xml]]></configSuffix>
-	</configSuffixes>
-	<enableImports><![CDATA[false]]></enableImports>
-	<configs>
-	</configs>
-	<autoconfigs>
-	</autoconfigs>
-	<configSets>
-	</configSets>
-</beansProjectDescription>
diff --git a/spring-userservice/README.md b/spring-userservice/README.md
deleted file mode 100644
index 097afc5fc1..0000000000
--- a/spring-userservice/README.md
+++ /dev/null
@@ -1 +0,0 @@
-spring-userservice is using a in memory derby db. Right click -> run on server to run the project
\ No newline at end of file
diff --git a/spring-userservice/pom.xml b/spring-userservice/pom.xml
deleted file mode 100644
index e6e8553c80..0000000000
--- a/spring-userservice/pom.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>spring-userservice</groupId>
-    <artifactId>spring-userservice</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>war</packaging>
-	<name>spring-userservice</name>
-	
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-4</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-spring-4</relativePath>
-    </parent>
-
-    <dependencies>
-
-        <!-- Spring -->
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-orm</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-
-        <!-- persistence -->
-
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${hibernate.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-ehcache</artifactId>
-            <version>${hibernate.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>${xml-apis.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>${javassist.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql-connector-java.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-            <version>${spring-data-jpa.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
-        </dependency>
-
-        <!-- validation -->
-
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>${hibernate-validator.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>javax.el-api</artifactId>
-            <version>${javax.el-api.version}</version>
-        </dependency>
-
-        <!-- utils -->
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
-
-        <!-- test scoped -->
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-core</artifactId>
-            <version>${org.springframework.security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
-            <version>${org.springframework.security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
-            <version>${org.springframework.security.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>${derby.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbyclient</artifactId>
-            <version>${derby.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbynet</artifactId>
-            <version>${derby.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbytools</artifactId>
-            <version>${derby.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>${taglibs-standard.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-taglibs</artifactId>
-            <version>${org.springframework.security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet.jsp.jstl</groupId>
-            <artifactId>jstl-api</artifactId>
-            <version>${jstl.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-test</artifactId>
-            <version>${spring-boot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot</artifactId>
-            <version>${spring-boot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>spring-userservice</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>${maven-war-plugin.version}</version>
-            </plugin>
-        </plugins>
-
-    </build>
-
-    <properties>
-        <!-- Spring -->
-        <org.springframework.security.version>4.2.6.RELEASE</org.springframework.security.version>
-        <spring-boot.version>1.5.14.RELEASE</spring-boot.version>
-        <javassist.version>3.21.0-GA</javassist.version>
-
-        <!-- persistence -->
-        <hibernate.version>5.2.10.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.40</mysql-connector-java.version>
-        <spring-data-jpa.version>1.10.5.RELEASE</spring-data-jpa.version>
-        <derby.version>10.13.1.1</derby.version>
-
-        <!-- various -->
-        <hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
-        <javax.el-api.version>2.2.5</javax.el-api.version>
-        <taglibs-standard.version>1.1.2</taglibs-standard.version>
-
-        <!-- util -->
-        <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
-        <xml-apis.version>1.4.01</xml-apis.version>
-
-        <!-- maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
-    </properties>
-
-</project>
\ No newline at end of file
diff --git a/spring-userservice/src/main/java/org/baeldung/custom/config/MvcConfig.java b/spring-userservice/src/main/java/org/baeldung/custom/config/MvcConfig.java
deleted file mode 100644
index 4a9e737a92..0000000000
--- a/spring-userservice/src/main/java/org/baeldung/custom/config/MvcConfig.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.baeldung.custom.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.ViewResolver;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import org.springframework.web.servlet.view.InternalResourceViewResolver;
-import org.springframework.web.servlet.view.JstlView;
-
-@EnableWebMvc
-@Configuration
-@ComponentScan(basePackages = { "org.baeldung.security" })
-public class MvcConfig extends WebMvcConfigurerAdapter {
-
-    public MvcConfig() {
-        super();
-    }
-
-    @Override
-    public void addViewControllers(final ViewControllerRegistry registry) {
-        super.addViewControllers(registry);
-
-        registry.addViewController("/");
-        registry.addViewController("/index");
-        registry.addViewController("/login");
-        registry.addViewController("/register");
-    }
-
-    @Bean
-    public ViewResolver viewResolver() {
-        final InternalResourceViewResolver bean = new InternalResourceViewResolver();
-
-        bean.setViewClass(JstlView.class);
-        bean.setPrefix("/WEB-INF/view/");
-        bean.setSuffix(".jsp");
-
-        return bean;
-    }
-}
diff --git a/spring-userservice/src/main/java/org/baeldung/custom/config/PersistenceDerbyJPAConfig.java b/spring-userservice/src/main/java/org/baeldung/custom/config/PersistenceDerbyJPAConfig.java
deleted file mode 100644
index 6be7053b78..0000000000
--- a/spring-userservice/src/main/java/org/baeldung/custom/config/PersistenceDerbyJPAConfig.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.baeldung.custom.config;
-
-import java.util.Properties;
-
-import javax.persistence.EntityManagerFactory;
-import javax.sql.DataSource;
-
-import org.baeldung.user.dao.MyUserDAO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.env.Environment;
-import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import com.google.common.base.Preconditions;
-
-@Configuration
-@EnableTransactionManagement
-@PropertySource({ "classpath:persistence-derby.properties" })
-public class PersistenceDerbyJPAConfig {
-
-    @Autowired
-    private Environment env;
-
-    public PersistenceDerbyJPAConfig() {
-        super();
-    }
-
-    // beans
-
-    @Bean
-    public LocalContainerEntityManagerFactoryBean myEmf() {
-        final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
-        em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
-
-        final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-        em.setJpaVendorAdapter(vendorAdapter);
-        em.setJpaProperties(additionalProperties());
-
-        return em;
-    }
-
-    @Bean
-    public DataSource dataSource() {
-        final DriverManagerDataSource dataSource = new DriverManagerDataSource();
-        dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
-        dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));
-        dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user")));
-        dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass")));
-
-        return dataSource;
-    }
-
-    @Bean
-    public PlatformTransactionManager transactionManager(final EntityManagerFactory emf) {
-        final JpaTransactionManager transactionManager = new JpaTransactionManager();
-        transactionManager.setEntityManagerFactory(emf);
-        return transactionManager;
-    }
-
-    @Bean
-    public PersistenceExceptionTranslationPostProcessor exceptionTranslation() {
-        return new PersistenceExceptionTranslationPostProcessor();
-    }
-
-    final Properties additionalProperties() {
-        final Properties hibernateProperties = new Properties();
-        hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
-        hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
-        hibernateProperties.setProperty("hibernate.cache.use_second_level_cache", env.getProperty("hibernate.cache.use_second_level_cache"));
-        hibernateProperties.setProperty("hibernate.cache.use_query_cache", env.getProperty("hibernate.cache.use_query_cache"));
-        // hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
-        return hibernateProperties;
-    }
-
-    @Bean
-    public MyUserDAO myUserDAO() {
-        final MyUserDAO myUserDAO = new MyUserDAO();
-        return myUserDAO;
-    }
-}
\ No newline at end of file
diff --git a/spring-userservice/src/main/java/org/baeldung/custom/config/SecSecurityConfig.java b/spring-userservice/src/main/java/org/baeldung/custom/config/SecSecurityConfig.java
deleted file mode 100644
index 44df02980f..0000000000
--- a/spring-userservice/src/main/java/org/baeldung/custom/config/SecSecurityConfig.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.baeldung.custom.config;
-
-import org.baeldung.security.MyUserDetailsService;
-import org.baeldung.user.service.MyUserService;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-
-@Configuration
-@EnableWebSecurity
-@Profile("!https")
-public class SecSecurityConfig extends WebSecurityConfigurerAdapter {
-
-    public SecSecurityConfig() {
-        super();
-    }
-
-    @Override
-    protected void configure(final AuthenticationManagerBuilder auth) throws Exception {
-        // @formatter:off
-        auth.authenticationProvider(authenticationProvider());
-        // @formatter:on
-    }
-
-    @Override
-    protected void configure(final HttpSecurity http) throws Exception {
-        // @formatter:off
-        http
-        .csrf().disable()
-        .authorizeRequests()
-        .antMatchers("/*").permitAll()
-        .and()
-        .formLogin()
-        .loginPage("/login")
-        .loginProcessingUrl("/login")
-        .defaultSuccessUrl("/",true)
-        .failureUrl("/login?error=true")
-        .and()
-        .logout()
-        .logoutUrl("/logout")
-        .deleteCookies("JSESSIONID")
-        .logoutSuccessUrl("/");
-        // @formatter:on
-    }
-
-    @Bean
-    public DaoAuthenticationProvider authenticationProvider() {
-        final DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
-        authProvider.setUserDetailsService(myUserDetailsService());
-        authProvider.setPasswordEncoder(encoder());
-        return authProvider;
-    }
-
-    @Bean
-    public PasswordEncoder encoder() {
-        return new BCryptPasswordEncoder(11);
-    }
-
-    @Bean
-    public MyUserDetailsService myUserDetailsService() {
-        return new MyUserDetailsService();
-    }
-
-    @Bean
-    public MyUserService myUserService() {
-        return new MyUserService();
-    }
-}
diff --git a/spring-userservice/src/main/java/org/baeldung/persistence/model/MyUser.java b/spring-userservice/src/main/java/org/baeldung/persistence/model/MyUser.java
deleted file mode 100644
index 804d391641..0000000000
--- a/spring-userservice/src/main/java/org/baeldung/persistence/model/MyUser.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.baeldung.persistence.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;
-
-@Entity
-@Table(schema = "spring_custom_user_service")
-public class MyUser {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-
-    @Column(unique = true, nullable = false)
-    private String username;
-
-    @Column(nullable = false)
-    private String password;
-
-    public MyUser() {
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(final int id) {
-        this.id = id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(final String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(final String password) {
-        this.password = password;
-    }
-}
diff --git a/spring-userservice/src/main/java/org/baeldung/security/MyUserDetailsService.java b/spring-userservice/src/main/java/org/baeldung/security/MyUserDetailsService.java
deleted file mode 100644
index fe97984af8..0000000000
--- a/spring-userservice/src/main/java/org/baeldung/security/MyUserDetailsService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.baeldung.security;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.baeldung.persistence.model.MyUser;
-import org.baeldung.user.dao.MyUserDAO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-
-@Service("userDetailsService")
-public class MyUserDetailsService implements UserDetailsService {
-
-    @Autowired
-    MyUserDAO myUserDAO;
-
-    @Override
-    public UserDetails loadUserByUsername(final String username) throws UsernameNotFoundException {
-        final MyUser user = myUserDAO.findByUsername(username);
-
-        if (user == null) {
-            throw new UsernameNotFoundException("No user found with username: " + username);
-        }
-        return new User(user.getUsername(), user.getPassword(), Arrays.asList(new SimpleGrantedAuthority("ROLE_USER")));
-
-    }
-
-}
diff --git a/spring-userservice/src/main/java/org/baeldung/security/UserController.java b/spring-userservice/src/main/java/org/baeldung/security/UserController.java
deleted file mode 100644
index a4c15f7942..0000000000
--- a/spring-userservice/src/main/java/org/baeldung/security/UserController.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.baeldung.security;
-
-import javax.annotation.Resource;
-
-import org.baeldung.user.service.MyUserService;
-import org.baeldung.web.MyUserDto;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-@Controller
-public class UserController {
-
-    @Resource
-    MyUserService myUserService;
-
-    @RequestMapping(value = "/register", method = RequestMethod.POST)
-    public String registerUserAccount(final MyUserDto accountDto, final Model model) {
-        final Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-        model.addAttribute("name", auth.getName());
-        try {
-            myUserService.registerNewUserAccount(accountDto);
-            model.addAttribute("message", "Registration successful");
-            return "index";
-        } catch (final Exception exc) {
-            model.addAttribute("message", "Registration failed");
-
-            return "index";
-        }
-    }
-
-    @RequestMapping(value = "/", method = RequestMethod.GET)
-    public String getHomepage(final Model model) {
-        final Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-        model.addAttribute("name", auth.getName());
-        return "index";
-    }
-
-    @RequestMapping(value = "/register", method = RequestMethod.GET)
-    public String getRegister() {
-        return "register";
-    }
-
-    @RequestMapping(value = "/login", method = RequestMethod.GET)
-    public String getLogin() {
-        return "login";
-    }
-}
diff --git a/spring-userservice/src/main/java/org/baeldung/user/dao/MyUserDAO.java b/spring-userservice/src/main/java/org/baeldung/user/dao/MyUserDAO.java
deleted file mode 100644
index 834941b68b..0000000000
--- a/spring-userservice/src/main/java/org/baeldung/user/dao/MyUserDAO.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.baeldung.user.dao;
-
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-
-import org.baeldung.persistence.model.MyUser;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class MyUserDAO {
-
-    @PersistenceContext
-    private EntityManager entityManager;
-
-    public MyUser findByUsername(final String username) {
-        final Query query = entityManager.createQuery("from MyUser where username=:username", MyUser.class);
-        query.setParameter("username", username);
-        final List<MyUser> result = query.getResultList();
-        if (result != null && result.size() > 0) {
-            return result.get(0);
-        } else
-            return null;
-    }
-
-    public MyUser save(final MyUser user) {
-        entityManager.persist(user);
-        return user;
-    }
-
-    public void removeUserByUsername(String username) {
-        final Query query = entityManager.createQuery("delete from MyUser where username=:username");
-        query.setParameter("username", username);
-        query.executeUpdate();
-    }
-
-    public EntityManager getEntityManager() {
-        return entityManager;
-    }
-
-    public void setEntityManager(final EntityManager entityManager) {
-        this.entityManager = entityManager;
-    }
-}
diff --git a/spring-userservice/src/main/java/org/baeldung/user/service/MyUserService.java b/spring-userservice/src/main/java/org/baeldung/user/service/MyUserService.java
deleted file mode 100644
index 2ab44752c0..0000000000
--- a/spring-userservice/src/main/java/org/baeldung/user/service/MyUserService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.baeldung.user.service;
-
-import org.baeldung.persistence.model.MyUser;
-import org.baeldung.user.dao.MyUserDAO;
-import org.baeldung.web.MyUserDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Service
-@Transactional
-public class MyUserService {
-
-    @Autowired
-    private PasswordEncoder passwordEncoder;
-
-    @Autowired
-    MyUserDAO myUserDAO;
-
-    public MyUser registerNewUserAccount(final MyUserDto accountDto) throws Exception {
-        if (usernameExists(accountDto.getUsername())) {
-            throw new Exception("There is an account with that username: " + accountDto.getUsername());
-        }
-        final MyUser user = new MyUser();
-
-        user.setUsername(accountDto.getUsername());
-        user.setPassword(passwordEncoder.encode(accountDto.getPassword()));
-        return myUserDAO.save(user);
-    }
-
-    public MyUser getUserByUsername(final String username) {
-        final MyUser user = myUserDAO.findByUsername(username);
-        return user;
-    }
-
-    public void removeUserByUsername(String username) {
-        myUserDAO.removeUserByUsername(username);
-    }
-
-    private boolean usernameExists(final String username) {
-        final MyUser user = myUserDAO.findByUsername(username);
-        if (user != null) {
-            return true;
-        }
-        return false;
-    }
-
-}
diff --git a/spring-userservice/src/main/java/org/baeldung/web/MyUserDto.java b/spring-userservice/src/main/java/org/baeldung/web/MyUserDto.java
deleted file mode 100644
index 60a6848ea4..0000000000
--- a/spring-userservice/src/main/java/org/baeldung/web/MyUserDto.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.baeldung.web;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
-public class MyUserDto {
-    @NotNull
-    @Size(min = 1)
-    private String username;
-
-    private String password;
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(final String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(final String password) {
-        this.password = password;
-    }
-
-}
diff --git a/spring-userservice/src/main/resources/persistence-derby.properties b/spring-userservice/src/main/resources/persistence-derby.properties
deleted file mode 100644
index b76c5de12f..0000000000
--- a/spring-userservice/src/main/resources/persistence-derby.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# jdbc.X
-jdbc.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
-jdbc.url=jdbc:derby:memory:spring_custom_user_service;create=true
-jdbc.user=tutorialuser
-jdbc.pass=tutorialpass
-
-# hibernate.X
-hibernate.dialect=org.hibernate.dialect.DerbyDialect
-hibernate.show_sql=false
-hibernate.hbm2ddl.auto=update
-hibernate.cache.use_second_level_cache=false
-hibernate.cache.use_query_cache=false
\ No newline at end of file
diff --git a/spring-userservice/src/main/webapp/META-INF/MANIFEST.MF b/spring-userservice/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c0..0000000000
--- a/spring-userservice/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/spring-userservice/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml b/spring-userservice/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
deleted file mode 100644
index 48ef8a8c43..0000000000
--- a/spring-userservice/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
-
-<context:annotation-config></context:annotation-config>
-
-<security:http auto-config="true">
-        <security:intercept-url pattern="/" access="permitAll" />
-        <security:intercept-url pattern="/login*" access="permitAll" />
-        <security:intercept-url pattern="/logout*" access="permitAll" />
-        <security:intercept-url pattern="/register*" access="permitAll" />
-        
-        <security:csrf disabled="true"/>
-
-        <security:form-login login-page='/login' login-processing-url="/login" default-target-url="/" authentication-failure-url="/login?error=true"
-            always-use-default-target="true"/>
-
-        <security:logout logout-url="/logout" delete-cookies="JSESSIONID" logout-success-url="/"/>
-    </security:http>
-
-    <security:authentication-manager>
-        <security:authentication-provider user-service-ref="myUserDetailsService" >
-        <security:password-encoder ref="passwordEncoder"></security:password-encoder>
-        </security:authentication-provider>
-    </security:authentication-manager>
-    
-    <bean id="myUserDetailsService" class="org.baeldung.security.MyUserDetailsService" />
-
- <bean id="passwordEncoder" class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder">
-        <constructor-arg value="11"/>
-    </bean>
-    
-   <context:component-scan base-package="org.baeldung.security"></context:component-scan>
-   <context:component-scan base-package="org.baeldung.user"></context:component-scan>
-   
-   <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-        <property name="prefix">
-            <value>/WEB-INF/views/</value>
-        </property>
-        <property name="suffix">
-            <value>.jsp</value>
-        </property>
-    </bean>
-   
-    <context:property-placeholder location="classpath:persistence-derby.properties"/>
-
-    <bean id="myEmf" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-        <property name="dataSource" ref="dataSource"/>
-        <property name="packagesToScan" value="org.baeldung.persistence.model"/>
-        <property name="jpaVendorAdapter">
-            <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"/>
-            <!-- <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" /> <property name="generateDdl" value="${jpa.generateDdl}" /> <property name="databasePlatform" 
-                value="${persistence.dialect}" /> </bean> -->
-        </property>
-        <property name="jpaProperties">
-            <props>
-                <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
-                <prop key="hibernate.dialect">${hibernate.dialect}</prop>
-                <prop key="hibernate.cache.use_second_level_cache">${hibernate.cache.use_second_level_cache}</prop>
-                <prop key="hibernate.cache.use_query_cache">${hibernate.cache.use_query_cache}</prop>
-            </props>
-        </property>
-    </bean>
-
-    <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-        <property name="driverClassName" value="${jdbc.driverClassName}"/>
-        <property name="url" value="${jdbc.url}"/>
-        <property name="username" value="${jdbc.user}"/>
-        <property name="password" value="${jdbc.pass}"/>
-    </bean>
-
-    <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-        <property name="entityManagerFactory" ref="myEmf"/>
-    </bean>
-    <tx:annotation-driven/>
-
-    <bean id="persistenceExceptionTranslationPostProcessor" class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor"/>
-   
-</beans>
diff --git a/spring-userservice/src/main/webapp/WEB-INF/views/index.jsp b/spring-userservice/src/main/webapp/WEB-INF/views/index.jsp
deleted file mode 100644
index 0c89257cd2..0000000000
--- a/spring-userservice/src/main/webapp/WEB-INF/views/index.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="c" 
-           uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Welcome!</title>
-</head>
-<body>
-
-<c:url value="/register" var="registerUrl" />
-<c:url value="/login" var="loginUrl"/>
-<c:url value="/logout" var="logoutUrl"/>
-
-<a href="${registerUrl }">Register</a>
-<br /><br/>
-<sec:authorize access="!isAuthenticated()">
-<a href="${loginUrl }">Login</a>
-</sec:authorize>
-<br><br>
-${message }
-<br><br>
-<sec:authorize access="isAuthenticated()">
-Hello, ${name }!
-<br>
-<br>
-<a href="${logoutUrl }">Logout</a>
-</sec:authorize>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-userservice/src/main/webapp/WEB-INF/views/login.jsp b/spring-userservice/src/main/webapp/WEB-INF/views/login.jsp
deleted file mode 100644
index 29431f426d..0000000000
--- a/spring-userservice/src/main/webapp/WEB-INF/views/login.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ taglib prefix="c" 
-           uri="http://java.sun.com/jsp/jstl/core" %>
-
-<html>
-<head></head>
-
-<body>
-	<h1>Login</h1>
-
-	<form name='f' action="login" method='POST'>
-
-		<table>
-			<tr>
-				<td>User:</td>
-				<td><input type='text' name='username' value=''></td>
-			</tr>
-			<tr>
-				<td>Password:</td>
-				<td><input type='password' name='password' /></td>
-			</tr>
-			<tr>
-				<td><input name="submit" type="submit" value="submit" /></td>
-			</tr>
-		</table>
-
-	</form>
-    <c:if test="${param.error }">Username or password invalid! </c:if>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-userservice/src/main/webapp/WEB-INF/views/register.jsp b/spring-userservice/src/main/webapp/WEB-INF/views/register.jsp
deleted file mode 100644
index e6e9d373a0..0000000000
--- a/spring-userservice/src/main/webapp/WEB-INF/views/register.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="c" 
-           uri="http://java.sun.com/jsp/jstl/core" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Welcome!</title>
-</head>
-<body>
-
-<c:url value="/register" var="registerUrl" />
-
-Register here:<br><br>
-<form action="${registerUrl }" method="POST">
-Username: <input type="text" name="username"/><br>
-Password: <input type="password" name="password"/><br>
-<input type="submit" value="Register"/>
-</form>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-userservice/src/main/webapp/WEB-INF/web.xml b/spring-userservice/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index b526774179..0000000000
--- a/spring-userservice/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-         version="3.1">
-
-    <display-name>Spring MVC Application</display-name>
-
-
-    <!-- 
-    <context-param>
-        <param-name>contextClass</param-name>
-        <param-value>
-            org.springframework.web.context.support.AnnotationConfigWebApplicationContext
-        </param-value>
-    </context-param>
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>org.baeldung.custom.config</param-value>
-    </context-param>
-
-    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
--->
-    <!-- Spring child -->
-    <servlet>
-        <servlet-name>mvc-dispatcher</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>mvc-dispatcher</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping>
-
-    <!-- Spring Security -->
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-    </welcome-file-list>
-
-</web-app>
\ No newline at end of file
diff --git a/spring-userservice/src/test/java/org/baeldung/userservice/CustomUserDetailsServiceIntegrationTest.java b/spring-userservice/src/test/java/org/baeldung/userservice/CustomUserDetailsServiceIntegrationTest.java
deleted file mode 100644
index 1cd38228b8..0000000000
--- a/spring-userservice/src/test/java/org/baeldung/userservice/CustomUserDetailsServiceIntegrationTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.baeldung.userservice;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.baeldung.custom.config.MvcConfig;
-import org.baeldung.custom.config.PersistenceDerbyJPAConfig;
-import org.baeldung.custom.config.SecSecurityConfig;
-import org.baeldung.user.service.MyUserService;
-import org.baeldung.web.MyUserDto;
-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.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = { MvcConfig.class, PersistenceDerbyJPAConfig.class, SecSecurityConfig.class })
-@WebAppConfiguration
-public class CustomUserDetailsServiceIntegrationTest {
-
-    private static final Logger LOG = Logger.getLogger("CustomUserDetailsServiceTest");
-
-    public static final String USERNAME = "user";
-    public static final String PASSWORD = "pass";
-    public static final String USERNAME2 = "user2";
-
-    @Autowired
-    MyUserService myUserService;
-
-    @Autowired
-    AuthenticationProvider authenticationProvider;
-
-    @Test
-    public void givenExistingUser_whenAuthenticate_thenRetrieveFromDb() {
-        try {
-            MyUserDto userDTO = new MyUserDto();
-            userDTO.setUsername(USERNAME);
-            userDTO.setPassword(PASSWORD);
-
-            myUserService.registerNewUserAccount(userDTO);
-
-            UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(USERNAME, PASSWORD);
-            Authentication authentication = authenticationProvider.authenticate(auth);
-
-            assertEquals(authentication.getName(), USERNAME);
-
-        } catch (Exception exc) {
-            LOG.log(Level.SEVERE, "Error creating account");
-        } finally {
-            myUserService.removeUserByUsername(USERNAME);
-        }
-    }
-
-    @Test(expected = BadCredentialsException.class)
-    public void givenIncorrectUser_whenAuthenticate_thenBadCredentialsException() {
-        try {
-            MyUserDto userDTO = new MyUserDto();
-            userDTO.setUsername(USERNAME);
-            userDTO.setPassword(PASSWORD);
-
-            try {
-                myUserService.registerNewUserAccount(userDTO);
-            } catch (Exception exc) {
-                LOG.log(Level.SEVERE, "Error creating account");
-            }
-
-            UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(USERNAME2, PASSWORD);
-            Authentication authentication = authenticationProvider.authenticate(auth);
-        } finally {
-            myUserService.removeUserByUsername(USERNAME);
-        }
-    }
-
-}
diff --git a/spring-vault/src/test/java/org/baeldung/SpringContextTest.java b/spring-vault/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..95abe622fa
--- /dev/null
+++ b/spring-vault/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.springvault.SpringVaultApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringVaultApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-vertx/src/test/java/org/baeldung/SpringContextTest.java b/spring-vertx/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..4ce94ec16a
--- /dev/null
+++ b/spring-vertx/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.vertxspring.VertxSpringApplication;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = VertxSpringApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-webflux-amqp/src/test/java/org/baeldung/SpringContextTest.java b/spring-webflux-amqp/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..88d29d5ac0
--- /dev/null
+++ b/spring-webflux-amqp/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.spring.amqp.SpringWebfluxAmqpApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringWebfluxAmqpApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-zuul/pom.xml b/spring-zuul/pom.xml
index fbbbdddbf7..a613f51c3f 100644
--- a/spring-zuul/pom.xml
+++ b/spring-zuul/pom.xml
@@ -39,10 +39,6 @@
     <properties>
         <!-- Spring -->
         <spring-cloud.version>2.1.0.RELEASE</spring-cloud.version>
-        <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
-        <!-- Maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-zuul/spring-zuul-foos-resource/src/test/java/org/baeldung/SpringContextTest.java b/spring-zuul/spring-zuul-foos-resource/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..2a57d7aa07
--- /dev/null
+++ b/spring-zuul/spring-zuul-foos-resource/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.config.ResourceServerApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ResourceServerApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/SpringContextTest.java b/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..fd35ec0841
--- /dev/null
+++ b/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/SpringContextTest.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import org.baeldung.config.UiApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = UiApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/struts-2/pom.xml b/struts-2/pom.xml
index 7de688ff2c..1f7d6876d5 100644
--- a/struts-2/pom.xml
+++ b/struts-2/pom.xml
@@ -70,7 +70,6 @@
         <struts2.version>2.5.5</struts2.version>
         <struts2-convention-plugin.version>2.5.8</struts2-convention-plugin.version>
         <spring.version>4.3.6.RELEASE</spring.version>
-        <maven-war-plugin.version>3.0.0</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/tensorflow-java/pom.xml b/tensorflow-java/pom.xml
index f9abde737c..84d2f6cf21 100644
--- a/tensorflow-java/pom.xml
+++ b/tensorflow-java/pom.xml
@@ -24,13 +24,13 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>${junit.jupiter.version}</version>
+			<version>${junit-jupiter.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>${junit.jupiter.version}</version>
+			<version>${junit-jupiter.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -46,6 +46,5 @@
 
 	<properties>
 		<tensorflow.version>1.12.0</tensorflow.version>
-		<junit.jupiter.version>5.4.0</junit.jupiter.version>
 	</properties>
 </project>
\ No newline at end of file
diff --git a/testing-modules/README.md b/testing-modules/README.md
index d69f07215e..b269f547ec 100644
--- a/testing-modules/README.md
+++ b/testing-modules/README.md
@@ -13,5 +13,3 @@
 - [Headers, Cookies and Parameters with REST-assured](http://www.baeldung.com/rest-assured-header-cookie-parameter)
 - [JSON Schema Validation with REST-assured](http://www.baeldung.com/rest-assured-json-schema)
 - [Testing Callbacks with Mockito](http://www.baeldung.com/mockito-callbacks)
-- [Running JUnit Tests in Parallel with Maven](https://www.baeldung.com/maven-junit-parallel-tests)
-- [Gatling vs JMeter vs The Grinder: Comparing Load Test Tools](https://www.baeldung.com/gatling-jmeter-grinder-comparison)
diff --git a/testing-modules/easy-random/pom.xml b/testing-modules/easy-random/pom.xml
new file mode 100644
index 0000000000..93c0027f8f
--- /dev/null
+++ b/testing-modules/easy-random/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>easy-random</artifactId>
+    <name>easy-random</name>
+
+    <parent>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jeasy</groupId>
+            <artifactId>easy-random-core</artifactId>
+            <version>4.0.0</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Department.java b/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Department.java
new file mode 100644
index 0000000000..ee4dc82771
--- /dev/null
+++ b/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Department.java
@@ -0,0 +1,17 @@
+package org.baeldung.easy.random.model;
+
+import java.util.StringJoiner;
+
+public class Department {
+    private String depName;
+
+    public Department(String depName) {
+        this.depName = depName;
+    }
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", Department.class.getSimpleName() + "[", "]").add("depName='" + depName + "'")
+            .toString();
+    }
+}
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Employee.java b/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Employee.java
new file mode 100644
index 0000000000..ef63642ca2
--- /dev/null
+++ b/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Employee.java
@@ -0,0 +1,70 @@
+package org.baeldung.easy.random.model;
+
+import java.util.*;
+
+public class Employee {
+
+    private long id;
+    private String firstName;
+    private String lastName;
+    private Department department;
+    private Collection<Employee> coworkers;
+    private Map<YearQuarter, Grade> quarterGrades;
+
+    public Employee(long id, String firstName, String lastName, Department department) {
+        this.id = id;
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.department = department;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        Employee employee = (Employee) o;
+        return id == employee.id;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public Department getDepartment() {
+        return department;
+    }
+
+    public Collection<Employee> getCoworkers() {
+        return Collections.unmodifiableCollection(coworkers);
+    }
+
+    public Map<YearQuarter, Grade> getQuarterGrades() {
+        return Collections.unmodifiableMap(quarterGrades);
+    }
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", Employee.class.getSimpleName() + "[", "]").add("id=" + id)
+            .add("firstName='" + firstName + "'")
+            .add("lastName='" + lastName + "'")
+            .add("department=" + department)
+            .add("coworkers size=" + ((coworkers == null) ? 0 : coworkers.size()))
+            .add("quarterGrades=" + quarterGrades)
+            .toString();
+    }
+}
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Grade.java b/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Grade.java
new file mode 100644
index 0000000000..cb979be3b8
--- /dev/null
+++ b/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Grade.java
@@ -0,0 +1,22 @@
+package org.baeldung.easy.random.model;
+
+import java.util.StringJoiner;
+
+public class Grade {
+
+    private int grade;
+
+    public Grade(int grade) {
+        this.grade = grade;
+    }
+
+    public int getGrade() {
+        return grade;
+    }
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", Grade.class.getSimpleName() + "[", "]").add("grade=" + grade)
+            .toString();
+    }
+}
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Person.java b/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Person.java
new file mode 100644
index 0000000000..c941499993
--- /dev/null
+++ b/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Person.java
@@ -0,0 +1,30 @@
+package org.baeldung.easy.random.model;
+
+import java.util.StringJoiner;
+
+public class Person {
+
+    private String firstName;
+    private String lastName;
+    private Integer age;
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", Person.class.getSimpleName() + "[", "]").add("firstName='" + firstName + "'")
+            .add("lastName='" + lastName + "'")
+            .add("age=" + age)
+            .toString();
+    }
+}
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/YearQuarter.java b/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/YearQuarter.java
new file mode 100644
index 0000000000..c2868f09b8
--- /dev/null
+++ b/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/YearQuarter.java
@@ -0,0 +1,50 @@
+package org.baeldung.easy.random.model;
+
+import java.time.LocalDate;
+import java.util.Objects;
+import java.util.StringJoiner;
+
+public class YearQuarter {
+
+    private LocalDate startDate;
+    private LocalDate endDate;
+
+    public YearQuarter(LocalDate startDate) {
+        this.startDate = startDate;
+        autoAdjustEndDate();
+    }
+
+    private void autoAdjustEndDate() {
+        endDate = startDate.plusMonths(3L);
+    }
+
+    public LocalDate getStartDate() {
+        return startDate;
+    }
+
+    public LocalDate getEndDate() {
+        return endDate;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        YearQuarter quarter = (YearQuarter) o;
+        return Objects.equals(startDate, quarter.startDate) && Objects.equals(endDate, quarter.endDate);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(startDate, endDate);
+    }
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", YearQuarter.class.getSimpleName() + "[", "]").add("startDate=" + startDate)
+            .add("endDate=" + endDate)
+            .toString();
+    }
+}
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/randomizer/YearQuarterRandomizer.java b/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/randomizer/YearQuarterRandomizer.java
new file mode 100644
index 0000000000..05232ffcbc
--- /dev/null
+++ b/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/randomizer/YearQuarterRandomizer.java
@@ -0,0 +1,18 @@
+package org.baeldung.easy.random.randomizer;
+
+import org.baeldung.easy.random.model.YearQuarter;
+import org.jeasy.random.api.Randomizer;
+
+import java.time.LocalDate;
+import java.time.Month;
+
+public class YearQuarterRandomizer implements Randomizer<YearQuarter> {
+
+    private LocalDate date = LocalDate.of(1990, Month.SEPTEMBER, 25);
+
+    @Override
+    public YearQuarter getRandomValue() {
+        date = date.plusMonths(3);
+        return new YearQuarter(date);
+    }
+}
diff --git a/testing-modules/easy-random/src/test/java/org/baeldung/easy/random/EasyRandomUnitTest.java b/testing-modules/easy-random/src/test/java/org/baeldung/easy/random/EasyRandomUnitTest.java
new file mode 100644
index 0000000000..9f7a23db66
--- /dev/null
+++ b/testing-modules/easy-random/src/test/java/org/baeldung/easy/random/EasyRandomUnitTest.java
@@ -0,0 +1,63 @@
+package org.baeldung.easy.random;
+
+import org.baeldung.easy.random.model.Employee;
+import org.baeldung.easy.random.model.Person;
+import org.baeldung.easy.random.model.YearQuarter;
+import org.baeldung.easy.random.randomizer.YearQuarterRandomizer;
+import org.jeasy.random.EasyRandom;
+import org.jeasy.random.EasyRandomParameters;
+import org.jeasy.random.FieldPredicates;
+import org.jeasy.random.TypePredicates;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class EasyRandomUnitTest {
+
+    @Test
+    void givenDefaultConfiguration_thenGenerateSingleObject() {
+        EasyRandom generator = new EasyRandom();
+        Person person = generator.nextObject(Person.class);
+
+        assertNotNull(person.getAge());
+        assertNotNull(person.getFirstName());
+        assertNotNull(person.getLastName());
+    }
+
+    @Test
+    void givenDefaultConfiguration_thenGenerateObjectsList() {
+        EasyRandom generator = new EasyRandom();
+        List<Person> persons = generator.objects(Person.class, 5)
+            .collect(Collectors.toList());
+
+        assertEquals(5, persons.size());
+    }
+
+    @Test
+    void givenCustomConfiguration_thenGenerateSingleEmployee() {
+        EasyRandomParameters parameters = new EasyRandomParameters();
+        parameters.stringLengthRange(3, 3);
+        parameters.collectionSizeRange(5, 5);
+        parameters.excludeField(FieldPredicates.named("lastName").and(FieldPredicates.inClass(Employee.class)));
+        parameters.excludeType(TypePredicates.inPackage("not.existing.pkg"));
+        parameters.randomize(YearQuarter.class, new YearQuarterRandomizer());
+
+        EasyRandom generator = new EasyRandom(parameters);
+        Employee employee = generator.nextObject(Employee.class);
+
+        assertEquals(3, employee.getFirstName().length());
+        assertEquals(5, employee.getCoworkers().size());
+        assertEquals(5, employee.getQuarterGrades().size());
+        assertNotNull(employee.getDepartment());
+
+        assertNull(employee.getLastName());
+
+        for (YearQuarter key : employee.getQuarterGrades().keySet()) {
+            assertEquals(key.getStartDate(), key.getEndDate().minusMonths(3L));
+        }
+    }
+
+}
diff --git a/testing-modules/easymock/pom.xml b/testing-modules/easymock/pom.xml
new file mode 100644
index 0000000000..ed9a077f67
--- /dev/null
+++ b/testing-modules/easymock/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>easymock</artifactId>
+    <name>easymock</name>
+    <url>http://maven.apache.org</url>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>testing-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>${easymock.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <easymock.version>4.0.2</easymock.version>
+    </properties>
+</project>
diff --git a/testing-modules/easymock/src/main/java/com/baeldung/testing/easymock/ForecastProcessor.java b/testing-modules/easymock/src/main/java/com/baeldung/testing/easymock/ForecastProcessor.java
new file mode 100644
index 0000000000..482e985e5b
--- /dev/null
+++ b/testing-modules/easymock/src/main/java/com/baeldung/testing/easymock/ForecastProcessor.java
@@ -0,0 +1,28 @@
+package com.baeldung.testing.easymock;
+
+import java.math.BigDecimal;
+
+public class ForecastProcessor {
+    private WeatherService weatherService;
+    
+    public BigDecimal getMaximumTemperature(String locationName) {
+        
+        Location location = new Location(locationName);
+        
+        try {
+            weatherService.populateTemperature(location);
+        } catch (ServiceUnavailableException e) {
+           return null;
+        }
+        
+        return location.getMaximumTemparature();
+    }
+
+    public WeatherService getWeatherService() {
+        return weatherService;
+    }
+
+    public void setWeatherService(WeatherService weatherService) {
+        this.weatherService = weatherService;
+    }    
+}
diff --git a/testing-modules/easymock/src/main/java/com/baeldung/testing/easymock/Location.java b/testing-modules/easymock/src/main/java/com/baeldung/testing/easymock/Location.java
new file mode 100644
index 0000000000..5f318acd5c
--- /dev/null
+++ b/testing-modules/easymock/src/main/java/com/baeldung/testing/easymock/Location.java
@@ -0,0 +1,33 @@
+package com.baeldung.testing.easymock;
+
+import java.math.BigDecimal;
+
+public class Location {
+    private String name;
+    private BigDecimal minimumTemperature;
+    private BigDecimal maximumTemparature;
+    
+    public Location(String name) {
+        this.name = name;
+    }   
+    
+    public String getName() {
+        return name;
+    }
+    
+    public BigDecimal getMinimumTemperature() {
+        return minimumTemperature;
+    }
+    
+    public void setMinimumTemperature(BigDecimal minimumTemperature) {
+        this.minimumTemperature = minimumTemperature;
+    }
+    
+    public BigDecimal getMaximumTemparature() {
+        return maximumTemparature;
+    }
+    
+    public void setMaximumTemparature(BigDecimal maximumTemparature) {
+        this.maximumTemparature = maximumTemparature;
+    }
+}
diff --git a/testing-modules/easymock/src/main/java/com/baeldung/testing/easymock/ServiceUnavailableException.java b/testing-modules/easymock/src/main/java/com/baeldung/testing/easymock/ServiceUnavailableException.java
new file mode 100644
index 0000000000..abab4bdee8
--- /dev/null
+++ b/testing-modules/easymock/src/main/java/com/baeldung/testing/easymock/ServiceUnavailableException.java
@@ -0,0 +1,7 @@
+package com.baeldung.testing.easymock;
+
+public class ServiceUnavailableException extends Exception {
+
+    private static final long serialVersionUID = 6961151537340723535L;
+
+}
diff --git a/testing-modules/easymock/src/main/java/com/baeldung/testing/easymock/WeatherService.java b/testing-modules/easymock/src/main/java/com/baeldung/testing/easymock/WeatherService.java
new file mode 100644
index 0000000000..1c6b11b17b
--- /dev/null
+++ b/testing-modules/easymock/src/main/java/com/baeldung/testing/easymock/WeatherService.java
@@ -0,0 +1,5 @@
+package com.baeldung.testing.easymock;
+
+public interface WeatherService {
+    void populateTemperature(Location location) throws ServiceUnavailableException;
+}
diff --git a/testing-modules/easymock/src/test/java/com/baeldung/testing/easymock/ForecastProcessorUnitTest.java b/testing-modules/easymock/src/test/java/com/baeldung/testing/easymock/ForecastProcessorUnitTest.java
new file mode 100644
index 0000000000..fa8fa847ae
--- /dev/null
+++ b/testing-modules/easymock/src/test/java/com/baeldung/testing/easymock/ForecastProcessorUnitTest.java
@@ -0,0 +1,49 @@
+package com.baeldung.testing.easymock;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+import java.math.BigDecimal;
+
+import org.easymock.EasyMock;
+import org.easymock.EasyMockRule;
+import org.easymock.Mock;
+import org.easymock.TestSubject;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class ForecastProcessorUnitTest {
+    private static int MAX_TEMP = 90;
+    
+    @Rule
+    public EasyMockRule rule = new EasyMockRule(this);
+
+    @TestSubject
+    private ForecastProcessor forecastProcessor = new ForecastProcessor();
+
+    @Mock
+    private WeatherService mockWeatherService;
+
+    @Before
+    public void setUp() {
+        forecastProcessor.setWeatherService(mockWeatherService);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void givenLocationName_whenWeatherServicePopulatesTemperatures_thenMaxTempReturned() throws ServiceUnavailableException {
+        mockWeatherService.populateTemperature(EasyMock.anyObject(Location.class));
+        EasyMock.expectLastCall()
+            .andAnswer(() -> {
+                Location passedLocation = (Location) EasyMock.getCurrentArguments()[0]; 
+                passedLocation.setMaximumTemparature(new BigDecimal(MAX_TEMP)); 
+                passedLocation.setMinimumTemperature(new BigDecimal(MAX_TEMP - 10));
+                return null;
+            });
+        EasyMock.replay(mockWeatherService);
+        BigDecimal maxTemperature = forecastProcessor.getMaximumTemperature("New York");
+        EasyMock.verify(mockWeatherService);
+        assertThat(maxTemperature, equalTo(new BigDecimal(MAX_TEMP)));
+    }
+}
diff --git a/testing-modules/gatling/pom.xml b/testing-modules/gatling/pom.xml
index 158da176c6..e708d939e4 100644
--- a/testing-modules/gatling/pom.xml
+++ b/testing-modules/gatling/pom.xml
@@ -14,6 +14,31 @@
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>io.gatling</groupId>
+				<artifactId>gatling-app</artifactId>
+				<version>${gatling.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.gatling</groupId>
+				<artifactId>gatling-recorder</artifactId>
+				<version>${gatling.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.gatling.highcharts</groupId>
+				<artifactId>gatling-charts-highcharts</artifactId>
+				<version>${gatling.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.scala-lang</groupId>
+				<artifactId>scala-library</artifactId>
+				<version>${scala.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
     
 	<dependencies>
 		<dependency>
@@ -77,52 +102,27 @@
 			<id>simulation</id>
 			<build>
 				<plugins>
-			<plugin>
-				<groupId>io.gatling</groupId>
-				<artifactId>gatling-maven-plugin</artifactId>
-				<version>${gatling-maven-plugin.version}</version>
-				<executions>
-					<execution>
-						<phase>test</phase>
-						<goals>
-							<goal>execute</goal>
-						</goals>
-						<configuration>
-  							<disableCompiler>true</disableCompiler>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+					<plugin>
+						<groupId>io.gatling</groupId>
+						<artifactId>gatling-maven-plugin</artifactId>
+						<version>${gatling-maven-plugin.version}</version>
+						<executions>
+							<execution>
+								<phase>test</phase>
+								<goals>
+									<goal>execute</goal>
+								</goals>
+								<configuration>
+									<disableCompiler>true</disableCompiler>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
 		</profile>
 	</profiles>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>io.gatling</groupId>
-				<artifactId>gatling-app</artifactId>
-				<version>${gatling.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>io.gatling</groupId>
-				<artifactId>gatling-recorder</artifactId>
-				<version>${gatling.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>io.gatling.highcharts</groupId>
-				<artifactId>gatling-charts-highcharts</artifactId>
-				<version>${gatling.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.scala-lang</groupId>
-				<artifactId>scala-library</artifactId>
-				<version>${scala.version}</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
diff --git a/testing-modules/junit-5-advanced/README.md b/testing-modules/junit-5-advanced/README.md
new file mode 100644
index 0000000000..7282a4efad
--- /dev/null
+++ b/testing-modules/junit-5-advanced/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles
+
+- [JUnit 5 TestWatcher API](https://www.baeldung.com/junit-testwatcher)
diff --git a/testing-modules/junit-5-advanced/src/main/java/com/baeldung/failure_vs_error/SimpleCalculator.java b/testing-modules/junit-5-advanced/src/main/java/com/baeldung/failure_vs_error/SimpleCalculator.java
new file mode 100644
index 0000000000..d018aa939f
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/main/java/com/baeldung/failure_vs_error/SimpleCalculator.java
@@ -0,0 +1,15 @@
+package com.baeldung.failure_vs_error;
+
+/**
+ * @author paullatzelsperger
+ * @since 2019-07-17
+ */
+public class SimpleCalculator {
+
+    public static double divideNumbers(double dividend, double divisor) {
+        if (divisor == 0) {
+            throw new ArithmeticException("Division by zero!");
+        }
+        return dividend / divisor;
+    }
+}
diff --git a/testing-modules/junit-5-advanced/src/main/resources/logback.xml b/testing-modules/junit-5-advanced/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/displayname/ReplaceUnderscoresGeneratorUnitTest.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/displayname/ReplaceUnderscoresGeneratorUnitTest.java
new file mode 100644
index 0000000000..429d6bac2a
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/displayname/ReplaceUnderscoresGeneratorUnitTest.java
@@ -0,0 +1,20 @@
+package com.baeldung.displayname;
+
+import org.junit.jupiter.api.*;
+
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+class ReplaceUnderscoresGeneratorUnitTest {
+
+    @Nested
+    class when_doing_something {
+
+        @Test
+        void then_something_should_happen() {
+        }
+
+        @Test
+        @DisplayName("@DisplayName takes precedence over generation")
+        void override_generator() {
+        }
+    }
+}
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/extensions/testwatcher/TestResultLoggerExtension.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/extensions/testwatcher/TestResultLoggerExtension.java
new file mode 100644
index 0000000000..a92c44a85b
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/extensions/testwatcher/TestResultLoggerExtension.java
@@ -0,0 +1,62 @@
+package com.baeldung.extensions.testwatcher;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestResultLoggerExtension implements TestWatcher, AfterAllCallback {
+
+    private static final Logger LOG = LoggerFactory.getLogger(TestResultLoggerExtension.class);
+
+    private List<TestResultStatus> testResultsStatus = new ArrayList<>();
+
+    private enum TestResultStatus {
+        SUCCESSFUL, ABORTED, FAILED, DISABLED;
+    }
+
+    @Override
+    public void testDisabled(ExtensionContext context, Optional<String> reason) {
+        LOG.info("Test Disabled for test {}: with reason :- {}", context.getDisplayName(), reason.orElse("No reason"));
+
+        testResultsStatus.add(TestResultStatus.DISABLED);
+    }
+
+    @Override
+    public void testSuccessful(ExtensionContext context) {
+        LOG.info("Test Successful for test {}: ", context.getDisplayName());
+
+        testResultsStatus.add(TestResultStatus.SUCCESSFUL);
+    }
+
+    @Override
+    public void testAborted(ExtensionContext context, Throwable cause) {
+        LOG.info("Test Aborted for test {}: ", context.getDisplayName());
+
+        testResultsStatus.add(TestResultStatus.ABORTED);
+    }
+
+    @Override
+    public void testFailed(ExtensionContext context, Throwable cause) {
+        LOG.info("Test Aborted for test {}: ", context.getDisplayName());
+
+        testResultsStatus.add(TestResultStatus.FAILED);
+    }
+
+    @Override
+    public void afterAll(ExtensionContext context) throws Exception {
+        Map<TestResultStatus, Long> summary = testResultsStatus.stream()
+            .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
+
+        LOG.info("Test result summary for {} {}", context.getDisplayName(), summary.toString());
+    }
+
+}
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/extensions/testwatcher/TestWatcherAPIUnitTest.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/extensions/testwatcher/TestWatcherAPIUnitTest.java
new file mode 100644
index 0000000000..89666cf9b8
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/extensions/testwatcher/TestWatcherAPIUnitTest.java
@@ -0,0 +1,36 @@
+package com.baeldung.extensions.testwatcher;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.Assert;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+@ExtendWith(TestResultLoggerExtension.class)
+class TestWatcherAPIUnitTest {
+
+    @Test
+    void givenFalseIsTrue_whenTestAbortedThenCaptureResult() {
+        Assumptions.assumeTrue(false);
+    }
+
+    @Disabled
+    @Test
+    void givenTrueIsTrue_whenTestDisabledThenCaptureResult() {
+        Assert.assertTrue(true);
+    }
+
+    @Test
+    void givenTrueIsTrue_whenTestAbortedThenCaptureResult() {
+        Assumptions.assumeTrue(true);
+    }
+
+    @Disabled("This test is disabled")
+    @Test
+    void givenFailure_whenTestDisabledWithReason_ThenCaptureResult() {
+        fail("Not yet implemented");
+    }
+
+}
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/failure_vs_error/SimpleCalculatorUnitTest.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/failure_vs_error/SimpleCalculatorUnitTest.java
new file mode 100644
index 0000000000..9b1777258c
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/failure_vs_error/SimpleCalculatorUnitTest.java
@@ -0,0 +1,32 @@
+package com.baeldung.failure_vs_error;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author paullatzelsperger
+ * @since 2019-07-17
+ */
+class SimpleCalculatorUnitTest {
+
+    @Test
+    void divideNumbers() {
+        double result = SimpleCalculator.divideNumbers(6, 3);
+        assertEquals(2, result);
+    }
+
+    @Test
+    @Disabled("test is expected to fail, disabled so that CI build still goes through")
+    void divideNumbers_failure() {
+        double result = SimpleCalculator.divideNumbers(6, 3);
+        assertEquals(15, result);
+    }
+
+    @Test
+    @Disabled("test is expected to raise an error, disabled so that CI build still goes through")
+    void divideNumbers_error() {
+        SimpleCalculator.divideNumbers(10, 0);
+    }
+}
diff --git a/testing-modules/junit-5-basics/README.md b/testing-modules/junit-5-basics/README.md
index 6e44a9c071..dbe6803401 100644
--- a/testing-modules/junit-5-basics/README.md
+++ b/testing-modules/junit-5-basics/README.md
@@ -1,4 +1,10 @@
 ### Relevant Articles:
-
+- [A Guide to JUnit 5](http://www.baeldung.com/junit-5)
+- [JUnit5 @RunWith](http://www.baeldung.com/junit-5-runwith)
 - [Get the Path of the /src/test/resources Directory in JUnit](https://www.baeldung.com/junit-src-test-resources-directory-path)
 - [Tagging and Filtering JUnit Tests](https://www.baeldung.com/junit-filtering-tests)
+- [JUnit 5 Temporary Directory Support](https://www.baeldung.com/junit-5-temporary-directory)
+- [@Before vs @BeforeClass vs @BeforeEach vs @BeforeAll](http://www.baeldung.com/junit-before-beforeclass-beforeeach-beforeall)
+- [JUnit 5 @Test Annotation](http://www.baeldung.com/junit-5-test-annotation)
+- [Migrating from JUnit 4 to JUnit 5](http://www.baeldung.com/junit-5-migration)
+- [Assert an Exception is Thrown in JUnit 4 and 5](http://www.baeldung.com/junit-assert-exception)
diff --git a/testing-modules/junit-5-basics/pom.xml b/testing-modules/junit-5-basics/pom.xml
index f72c14ee65..68a0ceeee7 100644
--- a/testing-modules/junit-5-basics/pom.xml
+++ b/testing-modules/junit-5-basics/pom.xml
@@ -153,7 +153,6 @@
         <junit.vintage.version>5.4.2</junit.vintage.version>
         <junit-platform.version>1.2.0</junit-platform.version>
         <junit-jupiter.version>5.4.2</junit-jupiter.version>
-        <h2.version>1.4.196</h2.version>
         <spring.version>5.0.6.RELEASE</spring.version>
         <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
     </properties>
diff --git a/testing-modules/junit-5-basics/src/main/java/com/baeldung/failure_vs_error/SimpleCalculator.java b/testing-modules/junit-5-basics/src/main/java/com/baeldung/failure_vs_error/SimpleCalculator.java
new file mode 100644
index 0000000000..d018aa939f
--- /dev/null
+++ b/testing-modules/junit-5-basics/src/main/java/com/baeldung/failure_vs_error/SimpleCalculator.java
@@ -0,0 +1,15 @@
+package com.baeldung.failure_vs_error;
+
+/**
+ * @author paullatzelsperger
+ * @since 2019-07-17
+ */
+public class SimpleCalculator {
+
+    public static double divideNumbers(double dividend, double divisor) {
+        if (divisor == 0) {
+            throw new ArithmeticException("Division by zero!");
+        }
+        return dividend / divisor;
+    }
+}
diff --git a/testing-modules/junit-5/src/main/java/com/baeldung/junit5/Greetings.java b/testing-modules/junit-5-basics/src/main/java/com/baeldung/junit5/Greetings.java
similarity index 100%
rename from testing-modules/junit-5/src/main/java/com/baeldung/junit5/Greetings.java
rename to testing-modules/junit-5-basics/src/main/java/com/baeldung/junit5/Greetings.java
diff --git a/testing-modules/junit-5/src/main/java/com/baeldung/junit5/bean/NumbersBean.java b/testing-modules/junit-5-basics/src/main/java/com/baeldung/junit5/bean/NumbersBean.java
similarity index 100%
rename from testing-modules/junit-5/src/main/java/com/baeldung/junit5/bean/NumbersBean.java
rename to testing-modules/junit-5-basics/src/main/java/com/baeldung/junit5/bean/NumbersBean.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/ExceptionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/ExceptionUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/ExceptionUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/FirstUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/FirstUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/FirstUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/FirstUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/GreetingsUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/GreetingsUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/GreetingsUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/GreetingsUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/LiveTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/LiveTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/LiveTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/LiveTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/exception/ExceptionAssertionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/exception/ExceptionAssertionUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/exception/ExceptionAssertionUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/exception/ExceptionAssertionUnitTest.java
diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/failure_vs_error/SimpleCalculatorUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/failure_vs_error/SimpleCalculatorUnitTest.java
new file mode 100644
index 0000000000..6833834959
--- /dev/null
+++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/failure_vs_error/SimpleCalculatorUnitTest.java
@@ -0,0 +1,39 @@
+package com.baeldung.failure_vs_error;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * @author paullatzelsperger
+ * @since 2019-07-17
+ */
+class SimpleCalculatorUnitTest {
+
+    @Test
+    void whenDivideByValidNumber_thenAssertCorrectResult() {
+        double result = SimpleCalculator.divideNumbers(6, 3);
+        assertEquals(2, result);
+    }
+
+    @Test
+    @Disabled("test is expected to fail, disabled so that CI build still goes through")
+    void whenDivideNumbers_thenExpectWrongResult() {
+        double result = SimpleCalculator.divideNumbers(6, 3);
+        assertEquals(15, result);
+    }
+
+    @Test
+    @Disabled("test is expected to raise an error, disabled so that CI build still goes through")
+    void whenDivideByZero_thenThrowsException() {
+        SimpleCalculator.divideNumbers(10, 0);
+    }
+
+    @Test
+    void whenDivideByZero_thenAssertException(){
+        assertThrows(ArithmeticException.class, () -> SimpleCalculator.divideNumbers(10, 0));
+    }
+
+}
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/bean/test/NumbersBeanUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/junit5/bean/test/NumbersBeanUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/junit5/bean/test/NumbersBeanUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/junit5/bean/test/NumbersBeanUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/junit5/spring/GreetingsSpringUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/junit5/spring/GreetingsSpringUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/AnnotationTestExampleUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/AnnotationTestExampleUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/AnnotationTestExampleUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/AnnotationTestExampleUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/AssertionsExampleUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/AssertionsExampleUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/AssertionsExampleUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/AssertionsExampleUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/BeforeAndAfterAnnotationsUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/BeforeAndAfterAnnotationsUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/BeforeAndAfterAnnotationsUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/BeforeAndAfterAnnotationsUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/BeforeClassAndAfterClassAnnotationsUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/BeforeClassAndAfterClassAnnotationsUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/BeforeClassAndAfterClassAnnotationsUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/BeforeClassAndAfterClassAnnotationsUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/ExceptionAssertionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/ExceptionAssertionUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/ExceptionAssertionUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/ExceptionAssertionUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/RuleExampleUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/RuleExampleUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/RuleExampleUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/RuleExampleUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/categories/Annotations.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/categories/Annotations.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/categories/Annotations.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/categories/Annotations.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/categories/JUnit4UnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/categories/JUnit4UnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/categories/JUnit4UnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/categories/JUnit4UnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/rules/TraceUnitTestRule.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/rules/TraceUnitTestRule.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit4/rules/TraceUnitTestRule.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/rules/TraceUnitTestRule.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AnnotationTestExampleUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AnnotationTestExampleUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AnnotationTestExampleUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AnnotationTestExampleUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AssertionsExampleUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssertionsExampleUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AssertionsExampleUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssertionsExampleUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/BeforeAllAndAfterAllAnnotationsUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/BeforeAllAndAfterAllAnnotationsUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/BeforeAllAndAfterAllAnnotationsUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/BeforeAllAndAfterAllAnnotationsUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/BeforeEachAndAfterEachAnnotationsUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/BeforeEachAndAfterEachAnnotationsUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/BeforeEachAndAfterEachAnnotationsUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/BeforeEachAndAfterEachAnnotationsUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/RuleExampleUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/RuleExampleUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/RuleExampleUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/RuleExampleUnitTest.java
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/extensions/TraceUnitExtension.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/extensions/TraceUnitExtension.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/extensions/TraceUnitExtension.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit5/extensions/TraceUnitExtension.java
diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
index 20fa372abd..eb8cab2462 100644
--- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
+++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/resourcedirectory/ReadResourceDirectoryUnitTest.java
@@ -17,7 +17,7 @@ public class ReadResourceDirectoryUnitTest {
         String absolutePath = file.getAbsolutePath();
 
         System.out.println(absolutePath);
-        Assert.assertTrue(absolutePath.endsWith("src/test/resources"));
+        Assert.assertTrue(absolutePath.endsWith("src" + File.separator + "test" + File.separator + "resources"));
     }
 
     @Test
@@ -27,7 +27,7 @@ public class ReadResourceDirectoryUnitTest {
         String absolutePath = resourceDirectory.toFile().getAbsolutePath();
 
         System.out.println(absolutePath);
-        Assert.assertTrue(absolutePath.endsWith("src/test/resources"));
+        Assert.assertTrue(absolutePath.endsWith("src" + File.separator + "test" + File.separator + "resources"));
     }
 
     @Test
@@ -39,7 +39,7 @@ public class ReadResourceDirectoryUnitTest {
         String absolutePath = file.getAbsolutePath();
 
         System.out.println(absolutePath);
-        Assert.assertTrue(absolutePath.endsWith("/example_resource.txt"));
+        Assert.assertTrue(absolutePath.endsWith(File.separator + "example_resource.txt"));
     }
 
 }
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/suites/AllUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/suites/AllUnitTest.java
similarity index 100%
rename from testing-modules/junit-5/src/test/java/com/baeldung/suites/AllUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/suites/AllUnitTest.java
diff --git a/testing-modules/junit-5/README.md b/testing-modules/junit-5/README.md
index 47db6587b4..d543b9b09b 100644
--- a/testing-modules/junit-5/README.md
+++ b/testing-modules/junit-5/README.md
@@ -1,16 +1,9 @@
 ### Relevant Articles:
-- [The Basics of JUnit 5 – A Preview](http://www.baeldung.com/junit-5-preview)
-- [A Guide to JUnit 5](http://www.baeldung.com/junit-5)
 - [A Guide to @RepeatedTest in Junit 5](http://www.baeldung.com/junit-5-repeated-test)
 - [Guide to Dynamic Tests in Junit 5](http://www.baeldung.com/junit5-dynamic-tests)
 - [A Guide to JUnit 5 Extensions](http://www.baeldung.com/junit-5-extensions)
 - [Inject Parameters into JUnit Jupiter Unit Tests](http://www.baeldung.com/junit-5-parameters)
 - [Mockito and JUnit 5 – Using ExtendWith](http://www.baeldung.com/mockito-junit-5-extension)
-- [JUnit5 @RunWith](http://www.baeldung.com/junit-5-runwith)
-- [JUnit 5 @Test Annotation](http://www.baeldung.com/junit-5-test-annotation)
-- [Assert an Exception is Thrown in JUnit 4 and 5](http://www.baeldung.com/junit-assert-exception)
-- [@Before vs @BeforeClass vs @BeforeEach vs @BeforeAll](http://www.baeldung.com/junit-before-beforeclass-beforeeach-beforeall)
-- [Migrating from JUnit 4 to JUnit 5](http://www.baeldung.com/junit-5-migration)
 - [JUnit5 Programmatic Extension Registration with @RegisterExtension](http://www.baeldung.com/junit-5-registerextension-annotation)
 - [The Order of Tests in JUnit](http://www.baeldung.com/junit-5-test-order)
 - [Running JUnit Tests Programmatically, from a Java Application](https://www.baeldung.com/junit-tests-run-programmatically-from-java)
diff --git a/testing-modules/junit5-migration/README.md b/testing-modules/junit5-migration/README.md
new file mode 100644
index 0000000000..b97ff8255c
--- /dev/null
+++ b/testing-modules/junit5-migration/README.md
@@ -0,0 +1,2 @@
+
+This is the code for the Junit 4 - Junit 5 Migration E-book.
diff --git a/testing-modules/load-testing-comparison/README.md b/testing-modules/load-testing-comparison/README.md
new file mode 100644
index 0000000000..9823be5369
--- /dev/null
+++ b/testing-modules/load-testing-comparison/README.md
@@ -0,0 +1,3 @@
+## Relevant Articles
+
+- [Gatling vs JMeter vs The Grinder: Comparing Load Test Tools](https://www.baeldung.com/gatling-jmeter-grinder-comparison)
diff --git a/testing-modules/load-testing-comparison/pom.xml b/testing-modules/load-testing-comparison/pom.xml
index 44014e96ab..2c53657481 100644
--- a/testing-modules/load-testing-comparison/pom.xml
+++ b/testing-modules/load-testing-comparison/pom.xml
@@ -145,7 +145,6 @@
         <jmeter.version>5.0</jmeter.version>
         <grinder.version>3.11</grinder.version>
         <spring.boot.version>2.0.5.RELEASE</spring.boot.version>
-        <h2.version>1.4.197</h2.version>
     </properties>
     
 </project>
\ No newline at end of file
diff --git a/testing-modules/mockito/pom.xml b/testing-modules/mockito/pom.xml
index acdd7eb2ac..7b6d6e7735 100644
--- a/testing-modules/mockito/pom.xml
+++ b/testing-modules/mockito/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>javax.persistence</artifactId>
-            <version>2.1.1</version>
+            <version>${javax.persistence.version}</version>
         </dependency>
 
         <!-- utils -->
@@ -94,11 +94,11 @@
     	<spring-data.version>2.0.9.RELEASE</spring-data.version>
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
 
         <!-- testing -->
         <powermock.version>1.7.0</powermock.version>
         <hamcrest.version>2.0.0.0</hamcrest.version>
+        <javax.persistence.version>2.1.1</javax.persistence.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoInjectIntoSpyUnitTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoInjectIntoSpyUnitTest.java
index 4f5ceb04e7..568492ca10 100644
--- a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoInjectIntoSpyUnitTest.java
+++ b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockitoInjectIntoSpyUnitTest.java
@@ -30,7 +30,7 @@ public class MockitoInjectIntoSpyUnitTest {
     private MyDictionary spyDic;
 
     @Test
-    public void whenUseInjectMocksAnnotation_thenCorrect2() {
+    public void whenUseInjectMocksAnnotation_thenCorrect() {
         Mockito.when(wordMap.get("aWord")).thenReturn("aMeaning");
 
         assertEquals("aMeaning", spyDic.getMeaning("aWord"));
diff --git a/testing-modules/mocks/mock-comparisons/pom.xml b/testing-modules/mocks/mock-comparisons/pom.xml
index ae36280300..e454f124ce 100644
--- a/testing-modules/mocks/mock-comparisons/pom.xml
+++ b/testing-modules/mocks/mock-comparisons/pom.xml
@@ -49,7 +49,6 @@
         <mockito.version>2.21.0</mockito.version>
         <easymock.version>3.5.1</easymock.version>
         <jmockit.version>1.41</jmockit.version>
-        
     </properties>
 
 </project>
diff --git a/testing-modules/parallel-tests-junit/README.md b/testing-modules/parallel-tests-junit/README.md
new file mode 100644
index 0000000000..0b7834c5e7
--- /dev/null
+++ b/testing-modules/parallel-tests-junit/README.md
@@ -0,0 +1,3 @@
+## Relevant Articles
+
+- [Running JUnit Tests in Parallel with Maven](https://www.baeldung.com/maven-junit-parallel-tests)
diff --git a/testing-modules/pom.xml b/testing-modules/pom.xml
index 95a19c2557..8d40c668c0 100644
--- a/testing-modules/pom.xml
+++ b/testing-modules/pom.xml
@@ -14,6 +14,7 @@
     </parent>
 
     <modules>
+        <module>easy-random</module>
         <module>gatling</module>
         <module>groovy-spock</module>
         <module>junit-5</module>
@@ -33,6 +34,8 @@
         <module>testing</module>
         <module>testng</module>
         <module>junit-5-basics</module>
+        <module>easymock</module>
         <module>junit-5-advanced</module>
+        <module>xmlunit-2</module>
     </modules>
 </project>
diff --git a/testing-modules/rest-assured/pom.xml b/testing-modules/rest-assured/pom.xml
index 4ed10f0641..eb85c6c8be 100644
--- a/testing-modules/rest-assured/pom.xml
+++ b/testing-modules/rest-assured/pom.xml
@@ -194,14 +194,12 @@
 
     <properties>
         <guava.version>18.0</guava.version>
-        <jackson.version>2.9.7</jackson.version>
         <jackson-coreutils.version>1.8</jackson-coreutils.version>
         <guava.version>19.0</guava.version>
         <servlet-api.version>2.5</servlet-api.version>
         <javax.mail.version>1.4.7</javax.mail.version>
         <jetty.version>9.4.0.v20161208</jetty.version>
 
-        <commons-lang3.version>3.5</commons-lang3.version>
         <commons-collections.version>3.2.2</commons-collections.version>
 
         <httpcore.version>4.4.5</httpcore.version>
diff --git a/testing-modules/rest-testing/pom.xml b/testing-modules/rest-testing/pom.xml
index 6dad3be117..a1995ce9ff 100644
--- a/testing-modules/rest-testing/pom.xml
+++ b/testing-modules/rest-testing/pom.xml
@@ -151,7 +151,6 @@
     <properties>
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
 
         <!-- testing -->
         <rest-assured.version>2.9.0</rest-assured.version>
@@ -163,9 +162,6 @@
         <httpclient.version>4.5.2</httpclient.version>
 
         <jbehave.version>4.1</jbehave.version>
-
-        <!-- maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/testing-modules/spring-testing/README.md b/testing-modules/spring-testing/README.md
index 8eb282643a..0970eabeff 100644
--- a/testing-modules/spring-testing/README.md
+++ b/testing-modules/spring-testing/README.md
@@ -4,3 +4,5 @@
 - [A Quick Guide to @TestPropertySource](https://www.baeldung.com/spring-test-property-source)
 - [Guide to ReflectionTestUtils for Unit Testing](https://www.baeldung.com/spring-reflection-test-utils)
 - [How to Test the @Scheduled Annotation](https://www.baeldung.com/spring-testing-scheduled-annotation)
+- [Using SpringJUnit4ClassRunner with Parameterized](https://www.baeldung.com/springjunit4classrunner-parameterized)
+- [Override properties in Spring]()
diff --git a/testing-modules/spring-testing/pom.xml b/testing-modules/spring-testing/pom.xml
index 10d34f169b..6f2700e2df 100644
--- a/testing-modules/spring-testing/pom.xml
+++ b/testing-modules/spring-testing/pom.xml
@@ -26,7 +26,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
             <version>LATEST</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -52,7 +51,7 @@
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>javax.persistence</artifactId>
-            <version>2.1.1</version>
+            <version>${javax.persistence.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
@@ -74,7 +73,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${servlet.api.version}</version>
+            <version>${javax.servlet-api.version}</version>
         </dependency>
     </dependencies>
 
@@ -95,7 +94,8 @@
         <awaitility.version>3.1.6</awaitility.version>
         <junit.jupiter.version>5.4.0</junit.jupiter.version>
         <spring.version>5.1.4.RELEASE</spring.version>
-        <servlet.api.version>4.0.1</servlet.api.version>
+        <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
+        <javax.persistence.version>2.1.1</javax.persistence.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/testing-modules/spring-testing/src/main/java/com/baeldung/overrideproperties/Application.java b/testing-modules/spring-testing/src/main/java/com/baeldung/overrideproperties/Application.java
new file mode 100644
index 0000000000..ac215bf78e
--- /dev/null
+++ b/testing-modules/spring-testing/src/main/java/com/baeldung/overrideproperties/Application.java
@@ -0,0 +1,11 @@
+package com.baeldung.overrideproperties;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/testing-modules/spring-testing/src/main/java/com/baeldung/overrideproperties/resolver/PropertySourceResolver.java b/testing-modules/spring-testing/src/main/java/com/baeldung/overrideproperties/resolver/PropertySourceResolver.java
new file mode 100644
index 0000000000..074092b7df
--- /dev/null
+++ b/testing-modules/spring-testing/src/main/java/com/baeldung/overrideproperties/resolver/PropertySourceResolver.java
@@ -0,0 +1,24 @@
+package com.baeldung.overrideproperties.resolver;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class PropertySourceResolver {
+
+    private final String firstProperty;
+    private final String secondProperty;
+
+    public PropertySourceResolver(@Value("${example.firstProperty}") String firstProperty, @Value("${example.secondProperty}") String secondProperty) {
+        this.firstProperty = firstProperty;
+        this.secondProperty = secondProperty;
+    }
+
+    public String getFirstProperty() {
+        return firstProperty;
+    }
+
+    public String getSecondProperty() {
+        return secondProperty;
+    }
+}
diff --git a/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/ContextPropertySourceResolverIntegrationTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/ContextPropertySourceResolverIntegrationTest.java
new file mode 100644
index 0000000000..9b692edd7b
--- /dev/null
+++ b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/ContextPropertySourceResolverIntegrationTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.overrideproperties;
+
+import com.baeldung.overrideproperties.resolver.PropertySourceResolver;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration(initializers = PropertyOverrideContextInitializer.class, classes = Application.class)
+public class ContextPropertySourceResolverIntegrationTest {
+
+    @Autowired private PropertySourceResolver propertySourceResolver;
+
+    @Test
+    public void shouldContext_overridePropertyValues() {
+        final String firstProperty = propertySourceResolver.getFirstProperty();
+        final String secondProperty = propertySourceResolver.getSecondProperty();
+
+        assertEquals(PropertyOverrideContextInitializer.PROPERTY_FIRST_VALUE, firstProperty);
+        assertEquals("contextFile", secondProperty);
+    }
+
+}
\ No newline at end of file
diff --git a/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/ProfilePropertySourceResolverIntegrationTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/ProfilePropertySourceResolverIntegrationTest.java
new file mode 100644
index 0000000000..95d83420b7
--- /dev/null
+++ b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/ProfilePropertySourceResolverIntegrationTest.java
@@ -0,0 +1,29 @@
+package com.baeldung.overrideproperties;
+
+import com.baeldung.overrideproperties.resolver.PropertySourceResolver;
+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.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@ActiveProfiles("test")
+public class ProfilePropertySourceResolverIntegrationTest {
+
+    @Autowired private PropertySourceResolver propertySourceResolver;
+
+    @Test
+    public void shouldProfiledProperty_overridePropertyValues() {
+        final String firstProperty = propertySourceResolver.getFirstProperty();
+        final String secondProperty = propertySourceResolver.getSecondProperty();
+
+        assertEquals("profile", firstProperty);
+        assertEquals("file", secondProperty);
+    }
+
+}
\ No newline at end of file
diff --git a/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/PropertyOverrideContextInitializer.java b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/PropertyOverrideContextInitializer.java
new file mode 100644
index 0000000000..a8c4267c5c
--- /dev/null
+++ b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/PropertyOverrideContextInitializer.java
@@ -0,0 +1,17 @@
+package com.baeldung.overrideproperties;
+
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.test.context.support.TestPropertySourceUtils;
+
+public class PropertyOverrideContextInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+    static final String PROPERTY_FIRST_VALUE = "contextClass";
+
+    @Override
+    public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
+        TestPropertySourceUtils.addInlinedPropertiesToEnvironment(configurableApplicationContext, "example.firstProperty=" + PROPERTY_FIRST_VALUE);
+
+        TestPropertySourceUtils.addPropertiesFilesToEnvironment(configurableApplicationContext, "context-override-application.properties");
+    }
+}
diff --git a/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/SpringBootPropertySourceResolverIntegrationTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/SpringBootPropertySourceResolverIntegrationTest.java
new file mode 100644
index 0000000000..573a46dd5f
--- /dev/null
+++ b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/SpringBootPropertySourceResolverIntegrationTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.overrideproperties;
+
+import com.baeldung.overrideproperties.resolver.PropertySourceResolver;
+import org.junit.Assert;
+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.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(properties = { "example.firstProperty=annotation" })
+public class SpringBootPropertySourceResolverIntegrationTest {
+
+    @Autowired private PropertySourceResolver propertySourceResolver;
+
+    @Test
+    public void shouldSpringBootTestAnnotation_overridePropertyValues() {
+        final String firstProperty = propertySourceResolver.getFirstProperty();
+        final String secondProperty = propertySourceResolver.getSecondProperty();
+
+        Assert.assertEquals("annotation", firstProperty);
+        Assert.assertEquals("file", secondProperty);
+    }
+
+}
\ No newline at end of file
diff --git a/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/TestResourcePropertySourceResolverIntegrationTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/TestResourcePropertySourceResolverIntegrationTest.java
new file mode 100644
index 0000000000..c724713854
--- /dev/null
+++ b/testing-modules/spring-testing/src/test/java/com/baeldung/overrideproperties/TestResourcePropertySourceResolverIntegrationTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.overrideproperties;
+
+import com.baeldung.overrideproperties.resolver.PropertySourceResolver;
+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.test.context.junit4.SpringRunner;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class TestResourcePropertySourceResolverIntegrationTest {
+
+    @Autowired private PropertySourceResolver propertySourceResolver;
+
+    @Test
+    public void shouldTestResourceFile_overridePropertyValues() {
+        final String firstProperty = propertySourceResolver.getFirstProperty();
+        final String secondProperty = propertySourceResolver.getSecondProperty();
+
+        assertEquals("file", firstProperty);
+        assertEquals("file", secondProperty);
+    }
+
+}
\ No newline at end of file
diff --git a/testing-modules/spring-testing/src/test/resources/application-test.properties b/testing-modules/spring-testing/src/test/resources/application-test.properties
new file mode 100644
index 0000000000..54c5bda7e8
--- /dev/null
+++ b/testing-modules/spring-testing/src/test/resources/application-test.properties
@@ -0,0 +1,2 @@
+# override properties
+example.firstProperty=profile
\ No newline at end of file
diff --git a/testing-modules/spring-testing/src/test/resources/application.properties b/testing-modules/spring-testing/src/test/resources/application.properties
new file mode 100644
index 0000000000..6c74aa2995
--- /dev/null
+++ b/testing-modules/spring-testing/src/test/resources/application.properties
@@ -0,0 +1,3 @@
+# override properties
+example.firstProperty=file
+example.secondProperty=file
\ No newline at end of file
diff --git a/testing-modules/spring-testing/src/test/resources/context-override-application.properties b/testing-modules/spring-testing/src/test/resources/context-override-application.properties
new file mode 100644
index 0000000000..c39e5d3966
--- /dev/null
+++ b/testing-modules/spring-testing/src/test/resources/context-override-application.properties
@@ -0,0 +1 @@
+example.secondProperty=contextFile
\ No newline at end of file
diff --git a/testing-modules/test-containers/pom.xml b/testing-modules/test-containers/pom.xml
index 7ee002ea8b..bd87cb5b22 100644
--- a/testing-modules/test-containers/pom.xml
+++ b/testing-modules/test-containers/pom.xml
@@ -23,6 +23,12 @@
             <version>${junit.platform.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>${junit.platform.version}</version>
+            <scope>test</scope>
+        </dependency>        
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
@@ -59,6 +65,11 @@
             <artifactId>selenium-remote-driver</artifactId>
             <version>${selenium-remote-driver.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-chrome-driver</artifactId>
+            <version>${selenium-remote-driver.version}</version>
+        </dependency>        
     </dependencies>
 
     <build>
@@ -76,7 +87,7 @@
                     <dependency>
                         <groupId>org.junit.platform</groupId>
                         <artifactId>junit-platform-surefire-provider</artifactId>
-                        <version>${junit.platform.version}</version>
+                        <version>${junit-platform-surefire-provider.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -99,16 +110,14 @@
     </build>
 
     <properties>
-        <junit.jupiter.version>5.1.0</junit.jupiter.version>
-        <junit.platform.version>1.0.1</junit.platform.version>
-        <junit.vintage.version>4.12.1</junit.vintage.version>
-        <log4j2.version>2.8.2</log4j2.version>
-        <mockito.version>2.21.0</mockito.version>
-        <spring.version>5.0.1.RELEASE</spring.version>
-        <testcontainers.version>1.7.2</testcontainers.version>
-        <postgresql.version>42.2.2</postgresql.version>
-        <selenium-remote-driver.version>3.12.0</selenium-remote-driver.version>
-        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+        <junit.platform.version>1.5.0</junit.platform.version>
+        <junit.vintage.version>5.5.0</junit.vintage.version>
+        <log4j2.version>2.12.0</log4j2.version>
+        <testcontainers.version>1.11.4</testcontainers.version>
+        <postgresql.version>42.2.6</postgresql.version>
+        <selenium-remote-driver.version>3.141.59</selenium-remote-driver.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+        <junit-platform-surefire-provider.version>1.3.2</junit-platform-surefire-provider.version>
     </properties>
 
 </project>
diff --git a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/WebDriverContainerLiveTest.java b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/WebDriverContainerLiveTest.java
index 0e52c4e9f7..0fdf0ede79 100644
--- a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/WebDriverContainerLiveTest.java
+++ b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/WebDriverContainerLiveTest.java
@@ -2,29 +2,26 @@ package com.baeldung.testconainers;
 
 import static org.junit.Assert.assertEquals;
 
-import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openqa.selenium.By;
-import org.openqa.selenium.remote.DesiredCapabilities;
+import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
-import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.BrowserWebDriverContainer;
-import org.testcontainers.containers.GenericContainer;
 
 public class WebDriverContainerLiveTest {
     @Rule
     public BrowserWebDriverContainer chrome
       = new BrowserWebDriverContainer()
-        .withDesiredCapabilities(DesiredCapabilities.chrome());
+        .withCapabilities(new ChromeOptions());
 
     @Test
     public void whenNavigatedToPage_thenHeadingIsInThePage() {
         RemoteWebDriver driver = chrome.getWebDriver();
-        driver.get("https://saucelabs.com/test/guinea-pig");
-        String heading = driver.findElement(By.xpath("/html/body/h1"))
+        driver.get("http://example.com");
+        String heading = driver.findElement(By.xpath("/html/body/div/h1"))
             .getText();
-        assertEquals("This page is a Selenium sandbox", heading);
+        assertEquals("Example Domain", heading);
     }
     
 }
diff --git a/xmlunit-2/README.md b/testing-modules/xmlunit-2/README.md
similarity index 100%
rename from xmlunit-2/README.md
rename to testing-modules/xmlunit-2/README.md
diff --git a/xmlunit-2/pom.xml b/testing-modules/xmlunit-2/pom.xml
similarity index 94%
rename from xmlunit-2/pom.xml
rename to testing-modules/xmlunit-2/pom.xml
index faefeca7a1..aa516bfcc5 100644
--- a/xmlunit-2/pom.xml
+++ b/testing-modules/xmlunit-2/pom.xml
@@ -1,15 +1,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">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
     <artifactId>xmlunit-2</artifactId>
-    <version>1.0</version>
 	<name>xmlunit-2</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
     </parent>
 
     <dependencies>
@@ -23,7 +22,6 @@
             <artifactId>xmlunit-core</artifactId>
             <version>${xmlunit.version}</version>
         </dependency>
-
     </dependencies>
 
     <properties>
diff --git a/xmlunit-2/src/main/java/com/baeldung/xmlunit/IgnoreAttributeDifferenceEvaluator.java b/testing-modules/xmlunit-2/src/main/java/com/baeldung/xmlunit/IgnoreAttributeDifferenceEvaluator.java
similarity index 100%
rename from xmlunit-2/src/main/java/com/baeldung/xmlunit/IgnoreAttributeDifferenceEvaluator.java
rename to testing-modules/xmlunit-2/src/main/java/com/baeldung/xmlunit/IgnoreAttributeDifferenceEvaluator.java
diff --git a/testing-modules/xmlunit-2/src/main/resources/logback.xml b/testing-modules/xmlunit-2/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/testing-modules/xmlunit-2/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/xmlunit-2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java b/testing-modules/xmlunit-2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java
similarity index 100%
rename from xmlunit-2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java
rename to testing-modules/xmlunit-2/src/test/java/com/baeldung/xmlunit/XMLUnitTest.java
diff --git a/xmlunit-2/src/test/resources/control.xml b/testing-modules/xmlunit-2/src/test/resources/control.xml
similarity index 100%
rename from xmlunit-2/src/test/resources/control.xml
rename to testing-modules/xmlunit-2/src/test/resources/control.xml
diff --git a/xmlunit-2/src/test/resources/students.xml b/testing-modules/xmlunit-2/src/test/resources/students.xml
similarity index 100%
rename from xmlunit-2/src/test/resources/students.xml
rename to testing-modules/xmlunit-2/src/test/resources/students.xml
diff --git a/xmlunit-2/src/test/resources/students.xsd b/testing-modules/xmlunit-2/src/test/resources/students.xsd
similarity index 100%
rename from xmlunit-2/src/test/resources/students.xsd
rename to testing-modules/xmlunit-2/src/test/resources/students.xsd
diff --git a/xmlunit-2/src/test/resources/students_with_error.xml b/testing-modules/xmlunit-2/src/test/resources/students_with_error.xml
similarity index 100%
rename from xmlunit-2/src/test/resources/students_with_error.xml
rename to testing-modules/xmlunit-2/src/test/resources/students_with_error.xml
diff --git a/xmlunit-2/src/test/resources/teachers.xml b/testing-modules/xmlunit-2/src/test/resources/teachers.xml
similarity index 100%
rename from xmlunit-2/src/test/resources/teachers.xml
rename to testing-modules/xmlunit-2/src/test/resources/teachers.xml
diff --git a/xmlunit-2/src/test/resources/test.xml b/testing-modules/xmlunit-2/src/test/resources/test.xml
similarity index 100%
rename from xmlunit-2/src/test/resources/test.xml
rename to testing-modules/xmlunit-2/src/test/resources/test.xml
diff --git a/Twitter4J/README.md b/twitter4j/README.md
similarity index 100%
rename from Twitter4J/README.md
rename to twitter4j/README.md
diff --git a/Twitter4J/pom.xml b/twitter4j/pom.xml
similarity index 100%
rename from Twitter4J/pom.xml
rename to twitter4j/pom.xml
diff --git a/Twitter4J/src/main/java/com/baeldung/Application.java b/twitter4j/src/main/java/com/baeldung/Application.java
similarity index 100%
rename from Twitter4J/src/main/java/com/baeldung/Application.java
rename to twitter4j/src/main/java/com/baeldung/Application.java
diff --git a/twitter4j/src/main/resources/logback.xml b/twitter4j/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/twitter4j/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/Twitter4J/src/main/resources/twitter4j.properties b/twitter4j/src/main/resources/twitter4j.properties
similarity index 100%
rename from Twitter4J/src/main/resources/twitter4j.properties
rename to twitter4j/src/main/resources/twitter4j.properties
diff --git a/Twitter4J/src/test/java/com/baeldung/ApplicationIntegrationTest.java b/twitter4j/src/test/java/com/baeldung/ApplicationIntegrationTest.java
similarity index 100%
rename from Twitter4J/src/test/java/com/baeldung/ApplicationIntegrationTest.java
rename to twitter4j/src/test/java/com/baeldung/ApplicationIntegrationTest.java
diff --git a/vaadin/pom.xml b/vaadin/pom.xml
index 648343fcd8..e3d882bbda 100644
--- a/vaadin/pom.xml
+++ b/vaadin/pom.xml
@@ -33,7 +33,26 @@
             <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
-
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-server</artifactId>
+            <version>${vaadin-server.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-push</artifactId>
+            <version>${vaadin-push.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-client-compiled</artifactId>
+            <version>${vaadin-client-compiled.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-themes</artifactId>
+            <version>${vaadin-themes.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -155,16 +174,19 @@
     </profiles>
 
     <properties>
-        <vaadin.version>10.0.11</vaadin.version>
-        <vaadin.plugin.version>10.0.11</vaadin.plugin.version>
-        <vaadin-spring-boot-starter.version>10.0.11</vaadin-spring-boot-starter.version>
+        <vaadin.version>13.0.9</vaadin.version>
+        <vaadin.plugin.version>13.0.9</vaadin.plugin.version>
+        <vaadin-spring-boot-starter.version>13.0.9</vaadin-spring-boot-starter.version>
+        <vaadin-server.version>8.8.5</vaadin-server.version>
+        <vaadin-push.version>8.8.5</vaadin-push.version>
+        <vaadin-client-compiled.version>8.8.5</vaadin-client-compiled.version>
+        <vaadin-themes.version>8.8.5</vaadin-themes.version>
         <jetty.plugin.version>9.3.9.v20160517</jetty.plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <vaadin.widgetset.mode>local</vaadin.widgetset.mode>
         <vaadin.theme>mytheme</vaadin.theme>
-        <maven-war-plugin.version>3.0.0</maven-war-plugin.version>
         <maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>
     </properties>
 
diff --git a/vaadin/src/main/java/com/baeldung/introduction/Row.java b/vaadin/src/main/java/com/baeldung/introduction/Row.java
new file mode 100644
index 0000000000..412a286376
--- /dev/null
+++ b/vaadin/src/main/java/com/baeldung/introduction/Row.java
@@ -0,0 +1,45 @@
+package com.baeldung.introduction;
+
+public class Row {
+    
+    private String column1;
+    
+    private String column2;
+
+    private String column3;
+    
+    public Row() {
+       
+    }
+
+    public Row(String column1, String column2, String column3) {
+        super();
+        this.column1 = column1;
+        this.column2 = column2;
+        this.column3 = column3;
+    }
+
+    public String getColumn1() {
+        return column1;
+    }
+
+    public void setColumn1(String column1) {
+        this.column1 = column1;
+    }
+
+    public String getColumn2() {
+        return column2;
+    }
+
+    public void setColumn2(String column2) {
+        this.column2 = column2;
+    }
+
+    public String getColumn3() {
+        return column3;
+    }
+
+    public void setColumn3(String column3) {
+        this.column3 = column3;
+    }    
+}
\ No newline at end of file
diff --git a/vaadin/src/main/java/com/baeldung/introduction/VaadinUI.java b/vaadin/src/main/java/com/baeldung/introduction/VaadinUI.java
new file mode 100644
index 0000000000..22ce19f5e0
--- /dev/null
+++ b/vaadin/src/main/java/com/baeldung/introduction/VaadinUI.java
@@ -0,0 +1,282 @@
+package com.baeldung.introduction;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import javax.servlet.annotation.WebServlet;
+
+import com.vaadin.annotations.Push;
+import com.vaadin.annotations.Theme;
+import com.vaadin.annotations.VaadinServletConfiguration;
+import com.vaadin.data.Binder;
+import com.vaadin.data.validator.StringLengthValidator;
+import com.vaadin.icons.VaadinIcons;
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.server.VaadinServlet;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.FormLayout;
+import com.vaadin.ui.Grid;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.InlineDateField;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.NativeButton;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.PasswordField;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.TextArea;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.TwinColSelect;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalLayout;
+
+@SuppressWarnings("serial")
+@Push
+@Theme("mytheme")
+public class VaadinUI extends UI {
+
+    private Label currentTime;
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @Override
+    protected void init(VaadinRequest vaadinRequest) {
+        final VerticalLayout verticalLayout = new VerticalLayout();
+        verticalLayout.setSpacing(true);
+        verticalLayout.setMargin(true);
+        final GridLayout gridLayout = new GridLayout(3, 2);
+        gridLayout.setSpacing(true);
+        gridLayout.setMargin(true);
+        final HorizontalLayout horizontalLayout = new HorizontalLayout();
+        horizontalLayout.setSpacing(true);
+        horizontalLayout.setMargin(true);
+        final FormLayout formLayout = new FormLayout();
+        formLayout.setSpacing(true);
+        formLayout.setMargin(true);
+        final GridLayout buttonLayout = new GridLayout(3, 5);
+        buttonLayout.setMargin(true);
+        buttonLayout.setSpacing(true);
+
+        final Label label = new Label();
+        label.setId("Label");
+        label.setValue("Label Value");
+        label.setCaption("Label");
+        gridLayout.addComponent(label);
+
+        final Link link = new Link("Baeldung", new ExternalResource("http://www.baeldung.com/"));
+        link.setId("Link");
+        link.setTargetName("_blank");
+        gridLayout.addComponent(link);
+
+        final TextField textField = new TextField();
+        textField.setId("TextField");
+        textField.setCaption("TextField:");
+        textField.setValue("TextField Value");
+        textField.setIcon(VaadinIcons.USER);
+        gridLayout.addComponent(textField);
+
+        final TextArea textArea = new TextArea();
+        textArea.setCaption("TextArea");
+        textArea.setId("TextArea");
+        textArea.setValue("TextArea Value");
+        gridLayout.addComponent(textArea);
+
+        final DateField dateField = new DateField("DateField", LocalDate.ofEpochDay(0));
+        dateField.setId("DateField");
+        gridLayout.addComponent(dateField);
+
+        final PasswordField passwordField = new PasswordField();
+        passwordField.setId("PasswordField");
+        passwordField.setCaption("PasswordField:");
+        passwordField.setValue("password");
+        gridLayout.addComponent(passwordField);
+
+        final RichTextArea richTextArea = new RichTextArea();
+        richTextArea.setCaption("Rich Text Area");
+        richTextArea.setValue("<h1>RichTextArea</h1>");
+        richTextArea.setSizeFull();
+
+        Panel richTextPanel = new Panel();
+        richTextPanel.setContent(richTextArea);
+
+        final InlineDateField inlineDateField = new InlineDateField();
+        inlineDateField.setValue(LocalDate.ofEpochDay(0));
+        inlineDateField.setCaption("Inline Date Field");
+        horizontalLayout.addComponent(inlineDateField);
+
+        Button normalButton = new Button("Normal Button");
+        normalButton.setId("NormalButton");
+        normalButton.addClickListener(e -> {
+            label.setValue("CLICK");
+        });
+        buttonLayout.addComponent(normalButton);
+
+        Button tinyButton = new Button("Tiny Button");
+        tinyButton.addStyleName("tiny");
+        buttonLayout.addComponent(tinyButton);
+
+        Button smallButton = new Button("Small Button");
+        smallButton.addStyleName("small");
+        buttonLayout.addComponent(smallButton);
+
+        Button largeButton = new Button("Large Button");
+        largeButton.addStyleName("large");
+        buttonLayout.addComponent(largeButton);
+
+        Button hugeButton = new Button("Huge Button");
+        hugeButton.addStyleName("huge");
+        buttonLayout.addComponent(hugeButton);
+
+        Button disabledButton = new Button("Disabled Button");
+        disabledButton.setDescription("This button cannot be clicked");
+        disabledButton.setEnabled(false);
+        buttonLayout.addComponent(disabledButton);
+
+        Button dangerButton = new Button("Danger Button");
+        dangerButton.addStyleName("danger");
+        buttonLayout.addComponent(dangerButton);
+
+        Button friendlyButton = new Button("Friendly Button");
+        friendlyButton.addStyleName("friendly");
+        buttonLayout.addComponent(friendlyButton);
+
+        Button primaryButton = new Button("Primary Button");
+        primaryButton.addStyleName("primary");
+        buttonLayout.addComponent(primaryButton);
+
+        NativeButton nativeButton = new NativeButton("Native Button");
+        buttonLayout.addComponent(nativeButton);
+
+        Button iconButton = new Button("Icon Button");
+        iconButton.setIcon(VaadinIcons.ALIGN_LEFT);
+        buttonLayout.addComponent(iconButton);
+
+        Button borderlessButton = new Button("BorderLess Button");
+        borderlessButton.addStyleName("borderless");
+        buttonLayout.addComponent(borderlessButton);
+
+        Button linkButton = new Button("Link Button");
+        linkButton.addStyleName("link");
+        buttonLayout.addComponent(linkButton);
+
+        Button quietButton = new Button("Quiet Button");
+        quietButton.addStyleName("quiet");
+        buttonLayout.addComponent(quietButton);
+
+        horizontalLayout.addComponent(buttonLayout);
+
+        final CheckBox checkbox = new CheckBox("CheckBox");
+        checkbox.setValue(true);
+        checkbox.addValueChangeListener(e -> checkbox.setValue(!checkbox.getValue()));
+        formLayout.addComponent(checkbox);
+
+        List<String> numbers = new ArrayList<String>();
+        numbers.add("One");
+        numbers.add("Ten");
+        numbers.add("Eleven");
+        ComboBox comboBox = new ComboBox("ComboBox");
+        comboBox.setItems(numbers);
+        formLayout.addComponent(comboBox);
+
+        ListSelect listSelect = new ListSelect("ListSelect");
+        listSelect.setItems(numbers);
+        listSelect.setRows(2);
+        formLayout.addComponent(listSelect);
+
+        NativeSelect nativeSelect = new NativeSelect("NativeSelect");
+        nativeSelect.setItems(numbers);
+        formLayout.addComponent(nativeSelect);
+
+        TwinColSelect twinColSelect = new TwinColSelect("TwinColSelect");
+        twinColSelect.setItems(numbers);
+
+        Grid<Row> grid = new Grid(Row.class);
+        grid.setColumns("column1", "column2", "column3");
+        Row row1 = new Row("Item1", "Item2", "Item3");
+        Row row2 = new Row("Item4", "Item5", "Item6");
+        List<Row> rows = new ArrayList();
+        rows.add(row1);
+        rows.add(row2);
+        grid.setItems(rows);
+
+        Panel panel = new Panel("Panel");
+        panel.setContent(grid);
+        panel.setSizeUndefined();
+
+        Panel serverPushPanel = new Panel("Server Push");
+        FormLayout timeLayout = new FormLayout();
+        timeLayout.setSpacing(true);
+        timeLayout.setMargin(true);
+        currentTime = new Label("No TIME...");
+        timeLayout.addComponent(currentTime);
+        serverPushPanel.setContent(timeLayout);
+        serverPushPanel.setSizeUndefined();
+        ScheduledExecutorService scheduleExecutor = Executors.newScheduledThreadPool(1);
+        Runnable task = () -> {
+            currentTime.setValue("Current Time : " + Instant.now());
+        };
+        scheduleExecutor.scheduleWithFixedDelay(task, 0, 1, TimeUnit.SECONDS);
+
+        FormLayout dataBindingLayout = new FormLayout();
+        dataBindingLayout.setSpacing(true);
+        dataBindingLayout.setMargin(true);
+
+        Binder<BindData> binder = new Binder<>();
+        BindData bindData = new BindData("BindData");
+        binder.readBean(bindData);
+        TextField bindedTextField = new TextField();
+        bindedTextField.setWidth("250px");
+        binder.forField(bindedTextField).bind(BindData::getBindName, BindData::setBindName);
+        dataBindingLayout.addComponent(bindedTextField);
+
+        FormLayout validatorLayout = new FormLayout();
+        validatorLayout.setSpacing(true);
+        validatorLayout.setMargin(true);
+
+        HorizontalLayout textValidatorLayout = new HorizontalLayout();
+        textValidatorLayout.setSpacing(true);
+        textValidatorLayout.setMargin(true);
+
+        
+        BindData stringValidatorBindData = new BindData("");
+        TextField stringValidator = new TextField();
+        Binder<BindData> stringValidatorBinder = new Binder<>();
+        stringValidatorBinder.setBean(stringValidatorBindData);
+        stringValidatorBinder.forField(stringValidator)
+        .withValidator(new StringLengthValidator("String must have 2-5 characters lenght", 2, 5))
+        .bind(BindData::getBindName, BindData::setBindName);
+        
+        textValidatorLayout.addComponent(stringValidator);
+        Button buttonStringValidator = new Button("Validate String");
+        buttonStringValidator.addClickListener(e -> stringValidatorBinder.validate());
+        textValidatorLayout.addComponent(buttonStringValidator);
+
+        validatorLayout.addComponent(textValidatorLayout);
+        verticalLayout.addComponent(gridLayout);
+        verticalLayout.addComponent(richTextPanel);
+        verticalLayout.addComponent(horizontalLayout);
+        verticalLayout.addComponent(formLayout);
+        verticalLayout.addComponent(twinColSelect);
+        verticalLayout.addComponent(panel);
+        verticalLayout.addComponent(serverPushPanel);
+        verticalLayout.addComponent(dataBindingLayout);
+        verticalLayout.addComponent(validatorLayout);
+        setContent(verticalLayout);
+    }
+
+    @WebServlet(urlPatterns = "/VAADIN/*", name = "MyUIServlet", asyncSupported = true)
+    @VaadinServletConfiguration(ui = VaadinUI.class, productionMode = false)
+    public static class MyUIServlet extends VaadinServlet {
+    }
+}
\ No newline at end of file
diff --git a/vertx-and-rxjava/.gitignore b/vertx-and-rxjava/.gitignore
new file mode 100644
index 0000000000..3aba11e2fd
--- /dev/null
+++ b/vertx-and-rxjava/.gitignore
@@ -0,0 +1 @@
+/.vertx
\ No newline at end of file
diff --git a/video-tutorials/README.md b/video-tutorials/README.md
index ff12555376..729105e3fd 100644
--- a/video-tutorials/README.md
+++ b/video-tutorials/README.md
@@ -1 +1 @@
-## Relevant articles:
+## Relevant Articles:
diff --git a/video-tutorials/jackson-annotations/pom.xml b/video-tutorials/jackson-annotations/pom.xml
index 2492951d1a..200ca7577f 100644
--- a/video-tutorials/jackson-annotations/pom.xml
+++ b/video-tutorials/jackson-annotations/pom.xml
@@ -141,10 +141,6 @@
         <gson.version>2.8.0</gson.version>
         <commons-collections4.version>4.1</commons-collections4.version>
 
-        <!-- util -->
-        <commons-lang3.version>3.5</commons-lang3.version>
-        <commons-io.version>2.5</commons-io.version>
-
         <!-- testing -->
         <rest-assured.version>3.0.1</rest-assured.version>
         <rest-assured-json-schema-validator.version>3.0.0</rest-assured-json-schema-validator.version>
diff --git a/xml/pom.xml b/xml/pom.xml
index ba6a734dc9..540b1fc03b 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>xml</artifactId>
@@ -14,7 +15,7 @@
     <dependencies>
         <!-- xml libraries -->
         <dependency>
-            <groupId>dom4j</groupId>
+            <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
             <version>${dom4j.version}</version>
         </dependency>
@@ -23,29 +24,52 @@
             <artifactId>jaxen</artifactId>
             <version>${jaxen.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.jooq</groupId>
+            <artifactId>joox-java-6</artifactId>
+            <version>${joox.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.jdom</groupId>
             <artifactId>jdom2</artifactId>
             <version>${jdom2.version}</version>
         </dependency>
-
         <dependency>
-            <groupId>javax.xml</groupId>
+            <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
+            <version>${jaxb-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${jaxb-impl.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>${jaxb-core.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.xml</groupId>
             <artifactId>jaxp-api</artifactId>
-            <version>1.4.2</version>
+            <version>${jaxp-api.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
-            <version>1.0-2</version>
+            <version>${stax-api.version}</version>
+        </dependency>
+        <!-- JMH Libraries -->
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${jmh.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${jmh.version}</version>
         </dependency>
-
         <!-- utils -->
         <dependency>
             <groupId>commons-io</groupId>
@@ -76,6 +100,31 @@
             <artifactId>commons-lang</artifactId>
             <version>${commons-lang.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-assertj</artifactId>
+            <version>${xmlunit-assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -86,6 +135,16 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+            </plugin>
+        </plugins>
     </build>
 
     <profiles>
@@ -213,7 +272,8 @@
                         </configuration>
                     </plugin>
                     <plugin>
-                        <!-- NOTE: We don't need a groupId specification because the group is org.apache.maven.plugins ...which is assumed by default. -->
+                        <!-- NOTE: We don't need a groupId specification 
+                            because the group is org.apache.maven.plugins ...which is assumed by default. -->
                         <artifactId>maven-assembly-plugin</artifactId>
                         <configuration>
                             <archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
@@ -232,8 +292,10 @@
                         </configuration>
                         <executions>
                             <execution>
-                                <id>make-assembly</id><!-- this is used for inheritance merges -->
-                                <phase>package</phase><!-- append to the packaging phase. -->
+                                <id>make-assembly</id><!-- this is used for 
+                                    inheritance merges -->
+                                <phase>package</phase><!-- append to the 
+                                    packaging phase. -->
                                 <goals>
                                     <goal>attached</goal><!-- goals == mojos -->
                                 </goals>
@@ -246,13 +308,22 @@
     </profiles>
 
     <properties>
-        <dom4j.version>1.6.1</dom4j.version>
-        <jaxen.version>1.1.6</jaxen.version>
+        <dom4j.version>2.1.1</dom4j.version>
+        <jaxen.version>1.2.0</jaxen.version>
         <jdom2.version>2.0.6</jdom2.version>
+        <joox.version>1.6.2</joox.version>
         <commons-io.version>2.5</commons-io.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <jibx-version>1.2.4.5</jibx-version>
-
+        <jaxb-api.version>2.3.1</jaxb-api.version>
+        <jaxp-api.version>1.4.2</jaxp-api.version>
+        <jaxb-core.version>2.3.0.1</jaxb-core.version>
+        <jaxb-impl.version>2.3.2</jaxb-impl.version>
+        <stax-api.version>1.0-2</stax-api.version>
+        <assertj-core.version>3.12.2</assertj-core.version>
+        <xmlunit-assertj.version>2.6.3</xmlunit-assertj.version>
+        <junit-jupiter.version>5.5.0</junit-jupiter.version>
+        <jmh.version>1.21</jmh.version>
         <!-- util -->
         <commons-lang3.version>3.5</commons-lang3.version>
         <commons-lang.version>2.4</commons-lang.version>
@@ -260,6 +331,8 @@
 
         <!-- maven plugins -->
         <maven-jibx-plugin.version>1.3.1</maven-jibx-plugin.version>
+        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     </properties>
 
 </project>
diff --git a/xml/src/main/java/com/baeldung/xml/attribute/Dom4jTransformer.java b/xml/src/main/java/com/baeldung/xml/attribute/Dom4jTransformer.java
new file mode 100644
index 0000000000..a1922ad224
--- /dev/null
+++ b/xml/src/main/java/com/baeldung/xml/attribute/Dom4jTransformer.java
@@ -0,0 +1,45 @@
+package com.baeldung.xml.attribute;
+
+import org.dom4j.*;
+import org.dom4j.io.DocumentSource;
+import org.dom4j.io.SAXReader;
+
+import javax.xml.XMLConstants;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.List;
+
+public class Dom4jTransformer {
+    private final Document input;
+
+    public Dom4jTransformer(String resourcePath) throws DocumentException {
+        // 1- Build the doc from the XML file
+        SAXReader xmlReader = new SAXReader();
+        this.input = xmlReader.read(resourcePath);
+    }
+
+    public String modifyAttribute(String attribute, String oldValue, String newValue) throws TransformerException {
+        // 2- Locate the node(s) with xpath, we can use index and iterator too.
+        String expr = String.format("//*[contains(@%s, '%s')]", attribute, oldValue);
+        XPath xpath = DocumentHelper.createXPath(expr);
+        List<Node> nodes = xpath.selectNodes(input);
+        // 3- Make the change on the selected nodes
+        for (int i = 0; i < nodes.size(); i++) {
+            Element element = (Element) nodes.get(i);
+            element.addAttribute(attribute, newValue);
+        }
+        // 4- Save the result to a new XML doc
+        TransformerFactory factory = TransformerFactory.newInstance();
+        factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        Transformer xformer = factory.newTransformer();
+        xformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        Writer output = new StringWriter();
+        xformer.transform(new DocumentSource(input), new StreamResult(output));
+        return output.toString();
+    }
+}
diff --git a/xml/src/main/java/com/baeldung/xml/attribute/JaxpTransformer.java b/xml/src/main/java/com/baeldung/xml/attribute/JaxpTransformer.java
new file mode 100644
index 0000000000..a2266a2b44
--- /dev/null
+++ b/xml/src/main/java/com/baeldung/xml/attribute/JaxpTransformer.java
@@ -0,0 +1,63 @@
+package com.baeldung.xml.attribute;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+public class JaxpTransformer {
+
+    private Document input;
+
+    public JaxpTransformer(String resourcePath) throws SAXException, IOException, ParserConfigurationException {
+        // 1- Build the doc from the XML file
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        input = factory.newDocumentBuilder()
+            .parse(resourcePath);
+    }
+
+    public String modifyAttribute(String attribute, String oldValue, String newValue) throws XPathExpressionException, TransformerFactoryConfigurationError, TransformerException {
+        // 2- Locate the node(s) with xpath
+        XPath xpath = XPathFactory.newInstance()
+            .newXPath();
+        NodeList nodes = (NodeList) xpath.evaluate(String.format("//*[contains(@%s, '%s')]", attribute, oldValue), input, XPathConstants.NODESET);
+        // 3- Make the change on the selected nodes
+        for (int i = 0; i < nodes.getLength(); i++) {
+            Element value = (Element) nodes.item(i);
+            value.setAttribute(attribute, newValue);
+        }
+        //Stream api syntax
+        //        IntStream
+        //          .range(0, nodes.getLength())
+        //          .mapToObj(i -> (Element) nodes.item(i))
+        //          .forEach(value -> value.setAttribute(attribute, newValue));
+        // 4- Save the result to a new XML doc
+        TransformerFactory factory = TransformerFactory.newInstance();
+        factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        Transformer xformer = factory.newTransformer();
+        xformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        Writer output = new StringWriter();
+        xformer.transform(new DOMSource(input), new StreamResult(output));
+        return output.toString();
+    }
+}
diff --git a/xml/src/main/java/com/baeldung/xml/attribute/JooxTransformer.java b/xml/src/main/java/com/baeldung/xml/attribute/JooxTransformer.java
new file mode 100644
index 0000000000..d36d60ec59
--- /dev/null
+++ b/xml/src/main/java/com/baeldung/xml/attribute/JooxTransformer.java
@@ -0,0 +1,38 @@
+package com.baeldung.xml.attribute;
+
+import org.joox.JOOX;
+import org.joox.Match;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import java.io.IOException;
+
+import static org.joox.JOOX.$;
+
+public class JooxTransformer {
+
+    private final Document input;
+
+    public JooxTransformer(String resourcePath) throws SAXException, IOException {
+        // 1- Build the doc from the XML file
+        DocumentBuilder builder = JOOX.builder();
+        input = builder.parse(resourcePath);
+    }
+
+    public String modifyAttribute(String attribute, String oldValue, String newValue) throws TransformerFactoryConfigurationError {
+        // 2- Select the document
+        Match $ = $(input);
+        // 3 - Find node to modify
+        String expr = String.format("//*[contains(@%s, '%s')]", attribute, oldValue);
+        $
+            // .find("to") or with xpath
+            .xpath(expr)
+            .get()
+            .stream()
+            .forEach(e -> e.setAttribute(attribute, newValue));
+        // 4- Return result as String
+        return $.toString();
+    }
+}
diff --git a/xml/src/main/java/com/baeldung/xml/attribute/jmh/AttributeBenchMark.java b/xml/src/main/java/com/baeldung/xml/attribute/jmh/AttributeBenchMark.java
new file mode 100644
index 0000000000..064e181713
--- /dev/null
+++ b/xml/src/main/java/com/baeldung/xml/attribute/jmh/AttributeBenchMark.java
@@ -0,0 +1,72 @@
+package com.baeldung.xml.attribute.jmh;
+
+import org.dom4j.DocumentException;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+import org.xml.sax.SAXException;
+
+import com.baeldung.xml.attribute.Dom4jTransformer;
+import com.baeldung.xml.attribute.JaxpTransformer;
+import com.baeldung.xml.attribute.JooxTransformer;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPathExpressionException;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@State(Scope.Benchmark)
+public class AttributeBenchMark {
+
+    public static void main(String[] args) throws RunnerException {
+        Options opt = new OptionsBuilder()
+          .include(AttributeBenchMark.class.getSimpleName())
+          .forks(1)
+          .build();
+        new Runner(opt).run();
+    }
+
+    @Benchmark
+    public String dom4jBenchmark() throws DocumentException, TransformerException {
+        String path = getClass()
+          .getResource("/xml/attribute.xml")
+          .toString();
+        Dom4jTransformer transformer = new Dom4jTransformer(path);
+        String attribute = "customer";
+        String oldValue = "true";
+        String newValue = "false";
+
+        return transformer.modifyAttribute(attribute, oldValue, newValue);
+    }
+
+    @Benchmark
+    public String jooxBenchmark() throws IOException, SAXException {
+        String path = getClass()
+          .getResource("/xml/attribute.xml")
+          .toString();
+        JooxTransformer transformer = new JooxTransformer(path);
+        String attribute = "customer";
+        String oldValue = "true";
+        String newValue = "false";
+
+        return transformer.modifyAttribute(attribute, oldValue, newValue);
+    }
+
+    @Benchmark
+    public String jaxpBenchmark() throws TransformerException, ParserConfigurationException, SAXException, IOException, XPathExpressionException {
+        String path = getClass()
+          .getResource("/xml/attribute.xml")
+          .toString();
+        JaxpTransformer transformer = new JaxpTransformer(path);
+        String attribute = "customer";
+        String oldValue = "true";
+        String newValue = "false";
+
+        return transformer.modifyAttribute(attribute, oldValue, newValue);
+    }
+}
diff --git a/xml/src/main/resources/xml/attribute.xml b/xml/src/main/resources/xml/attribute.xml
new file mode 100644
index 0000000000..c8fa3f1071
--- /dev/null
+++ b/xml/src/main/resources/xml/attribute.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notification id="5">
+    <to customer="true">john@email.com</to>
+    <from>mary@email.com</from>
+</notification>
\ No newline at end of file
diff --git a/xml/src/main/resources/xml/attribute_expected.xml b/xml/src/main/resources/xml/attribute_expected.xml
new file mode 100644
index 0000000000..1d5d7b0cea
--- /dev/null
+++ b/xml/src/main/resources/xml/attribute_expected.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notification id="5">
+    <to customer="false">john@email.com</to>
+    <from>mary@email.com</from>
+</notification>
\ No newline at end of file
diff --git a/xml/src/test/java/com/baeldung/xml/attribute/Dom4jProcessorUnitTest.java b/xml/src/test/java/com/baeldung/xml/attribute/Dom4jProcessorUnitTest.java
new file mode 100644
index 0000000000..485744f9a5
--- /dev/null
+++ b/xml/src/test/java/com/baeldung/xml/attribute/Dom4jProcessorUnitTest.java
@@ -0,0 +1,55 @@
+package com.baeldung.xml.attribute;
+
+import org.dom4j.DocumentException;
+import org.junit.jupiter.api.Test;
+
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static org.xmlunit.assertj.XmlAssert.assertThat;
+
+/**
+ * Unit test for {@link Dom4jTransformer}.
+ */
+public class Dom4jProcessorUnitTest {
+
+    @Test
+    public void givenXmlWithAttributes_whenModifyAttribute_thenGetXmlUpdated() throws TransformerFactoryConfigurationError, TransformerException, DocumentException {
+        String path = getClass()
+          .getResource("/xml/attribute.xml")
+          .toString();
+        Dom4jTransformer transformer = new Dom4jTransformer(path);
+        String attribute = "customer";
+        String oldValue = "true";
+        String newValue = "false";
+
+        String result = transformer.modifyAttribute(attribute, oldValue, newValue);
+
+        assertThat(result).hasXPath("//*[contains(@customer, 'false')]");
+    }
+
+    @Test
+    public void givenTwoXml_whenModifyAttribute_thenGetSimilarXml() throws IOException, TransformerFactoryConfigurationError, TransformerException, URISyntaxException, DocumentException {
+        String path = getClass()
+          .getResource("/xml/attribute.xml")
+          .toString();
+        Dom4jTransformer transformer = new Dom4jTransformer(path);
+        String attribute = "customer";
+        String oldValue = "true";
+        String newValue = "false";
+        String expectedXml = new String(Files.readAllBytes((Paths.get(getClass()
+          .getResource("/xml/attribute_expected.xml")
+          .toURI()))));
+
+        String result = transformer.modifyAttribute(attribute, oldValue, newValue);
+
+        assertThat(result)
+          .and(expectedXml)
+          .areSimilar();
+    }
+
+}
diff --git a/xml/src/test/java/com/baeldung/xml/attribute/JaxpProcessorUnitTest.java b/xml/src/test/java/com/baeldung/xml/attribute/JaxpProcessorUnitTest.java
new file mode 100644
index 0000000000..8394016dbd
--- /dev/null
+++ b/xml/src/test/java/com/baeldung/xml/attribute/JaxpProcessorUnitTest.java
@@ -0,0 +1,34 @@
+package com.baeldung.xml.attribute;
+
+import static org.xmlunit.assertj.XmlAssert.assertThat;
+
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.xpath.XPathExpressionException;
+
+import org.junit.jupiter.api.Test;
+import org.xml.sax.SAXException;
+
+/**
+ * Unit test for {@link JaxpTransformer}.
+ */
+public class JaxpProcessorUnitTest {
+
+    @Test
+    public void givenXmlWithAttributes_whenModifyAttribute_thenGetXmlUpdated() throws IOException, SAXException, ParserConfigurationException, XPathExpressionException, TransformerFactoryConfigurationError, TransformerException {
+        String path = getClass().getResource("/xml/attribute.xml")
+            .toString();
+        JaxpTransformer transformer = new JaxpTransformer(path);
+        String attribute = "customer";
+        String oldValue = "true";
+        String newValue = "false";
+
+        String result = transformer.modifyAttribute(attribute, oldValue, newValue);
+
+        assertThat(result).hasXPath("//*[contains(@customer, 'false')]");
+    }
+
+}
diff --git a/xml/src/test/java/com/baeldung/xml/attribute/JooxProcessorUnitTest.java b/xml/src/test/java/com/baeldung/xml/attribute/JooxProcessorUnitTest.java
new file mode 100644
index 0000000000..38c7c59789
--- /dev/null
+++ b/xml/src/test/java/com/baeldung/xml/attribute/JooxProcessorUnitTest.java
@@ -0,0 +1,54 @@
+package com.baeldung.xml.attribute;
+
+import org.junit.jupiter.api.Test;
+import org.xml.sax.SAXException;
+
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static org.xmlunit.assertj.XmlAssert.assertThat;
+
+/**
+ * Unit test for {@link JooxTransformer}.
+ */
+public class JooxProcessorUnitTest {
+
+    @Test
+    public void givenXmlWithAttributes_whenModifyAttribute_thenGetXmlUpdated() throws IOException, SAXException, TransformerFactoryConfigurationError {
+        String path = getClass()
+          .getResource("/xml/attribute.xml")
+          .toString();
+        JooxTransformer transformer = new JooxTransformer(path);
+        String attribute = "customer";
+        String oldValue = "true";
+        String newValue = "false";
+
+        String result = transformer.modifyAttribute(attribute, oldValue, newValue);
+
+        assertThat(result).hasXPath("//*[contains(@customer, 'false')]");
+    }
+
+    @Test
+    public void givenTwoXml_whenModifyAttribute_thenGetSimilarXml() throws IOException, TransformerFactoryConfigurationError, URISyntaxException, SAXException {
+        String path = getClass()
+          .getResource("/xml/attribute.xml")
+          .toString();
+        JooxTransformer transformer = new JooxTransformer(path);
+        String attribute = "customer";
+        String oldValue = "true";
+        String newValue = "false";
+        String expectedXml = new String(Files.readAllBytes((Paths.get(getClass()
+          .getResource("/xml/attribute_expected.xml")
+          .toURI()))));
+
+        String result = transformer.modifyAttribute(attribute, oldValue, newValue);
+
+        assertThat(result)
+          .and(expectedXml)
+          .areSimilar();
+    }
+
+}
diff --git a/xml/src/test/resources/xml/attribute.xml b/xml/src/test/resources/xml/attribute.xml
new file mode 100644
index 0000000000..c8fa3f1071
--- /dev/null
+++ b/xml/src/test/resources/xml/attribute.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notification id="5">
+    <to customer="true">john@email.com</to>
+    <from>mary@email.com</from>
+</notification>
\ No newline at end of file
diff --git a/xml/src/test/resources/xml/attribute_expected.xml b/xml/src/test/resources/xml/attribute_expected.xml
new file mode 100644
index 0000000000..1d5d7b0cea
--- /dev/null
+++ b/xml/src/test/resources/xml/attribute_expected.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notification id="5">
+    <to customer="false">john@email.com</to>
+    <from>mary@email.com</from>
+</notification>
\ No newline at end of file
diff --git a/xstream/pom.xml b/xstream/pom.xml
index f75e10fc7d..b98e258599 100644
--- a/xstream/pom.xml
+++ b/xstream/pom.xml
@@ -11,6 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <dependencies>
@@ -28,8 +29,8 @@
     </dependencies>
 
     <properties>
-        <xstream.version>1.4.9</xstream.version>
+        <xstream.version>1.4.10</xstream.version>
         <jettison.version>1.3.8</jettison.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/xstream/src/main/java/com/baeldung/rce/App.java b/xstream/src/main/java/com/baeldung/rce/App.java
new file mode 100644
index 0000000000..3720c7fa93
--- /dev/null
+++ b/xstream/src/main/java/com/baeldung/rce/App.java
@@ -0,0 +1,92 @@
+package com.baeldung.rce;
+
+import com.sun.net.httpserver.HttpServer;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.security.NoTypePermission;
+import com.thoughtworks.xstream.security.NullPermission;
+import com.thoughtworks.xstream.security.PrimitiveTypePermission;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Web application which is intentionally vulnerable to an XStream remote code
+ * exploitation (RCE).
+ *
+ * <p>
+ * This test application is meant to maintain a set of {@link Person} models. It
+ * exposes a "/persons" endpoint which supports the following operations:
+ *
+ * <ol>
+ * <li>{@code POST} XML for adding a new {@link Person} to the set
+ * <li>{@code GET} for retrieving the set of {@link Person} models as XML
+ * </ol>
+ *
+ * The {@code POST} handler is vulnerable to an RCE exploit.
+ */
+public final class App {
+
+    public static App createHardened(int port) {
+        final XStream xstream = new XStream();
+        xstream.addPermission(NoTypePermission.NONE);
+        xstream.addPermission(NullPermission.NULL);
+        xstream.addPermission(PrimitiveTypePermission.PRIMITIVES);
+        xstream.allowTypes(new Class<?>[] { Person.class });
+        return new App(port, xstream);
+    }
+
+    public static App createVulnerable(int port) {
+        return new App(port, new XStream());
+    }
+
+    private final int port;
+    private final Set<Person> persons;
+    private final XStream xstream;
+    private HttpServer server;
+
+    private App(int port, XStream xstream) {
+        this.port = port;
+        persons = new HashSet<>();
+        // this app is vulnerable because XStream security is not configured
+        this.xstream = xstream;
+        this.xstream.alias("person", Person.class);
+    }
+
+    void start() throws IOException {
+        server = HttpServer.create(new InetSocketAddress("localhost", port), 0);
+        server.createContext("/persons", exchange -> {
+            switch (exchange.getRequestMethod()) {
+            case "POST":
+                final Person person = (Person) xstream.fromXML(exchange.getRequestBody());
+                persons.add(person);
+                exchange.sendResponseHeaders(201, 0);
+                exchange.close();
+                break;
+            case "GET":
+                exchange.sendResponseHeaders(200, 0);
+                xstream.toXML(persons, exchange.getResponseBody());
+                exchange.close();
+                break;
+            default:
+                exchange.sendResponseHeaders(405, 0);
+                exchange.close();
+            }
+        });
+        server.start();
+    }
+
+    void stop() {
+        if (server != null) {
+            server.stop(0);
+        }
+    }
+
+    int port() {
+        if (server == null)
+            throw new IllegalStateException("Server not started");
+        return server.getAddress()
+            .getPort();
+    }
+}
diff --git a/xstream/src/main/java/com/baeldung/rce/Person.java b/xstream/src/main/java/com/baeldung/rce/Person.java
new file mode 100644
index 0000000000..336c47798b
--- /dev/null
+++ b/xstream/src/main/java/com/baeldung/rce/Person.java
@@ -0,0 +1,43 @@
+package com.baeldung.rce;
+
+import java.util.Objects;
+
+/** Person model */
+public final class Person {
+
+    private String first;
+    private String last;
+
+    public String getFirst() {
+        return first;
+    }
+
+    public void setFirst(String first) {
+        this.first = first;
+    }
+
+    public String getLast() {
+        return last;
+    }
+
+    public void setLast(String last) {
+        this.last = last;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Person)) {
+            return false;
+        }
+        Person person = (Person) o;
+        return Objects.equals(first, person.first) && Objects.equals(last, person.last);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(first, last);
+    }
+}
diff --git a/xstream/src/test/java/com/baeldung/rce/AppUnitTest.java b/xstream/src/test/java/com/baeldung/rce/AppUnitTest.java
new file mode 100644
index 0000000000..3b541ae099
--- /dev/null
+++ b/xstream/src/test/java/com/baeldung/rce/AppUnitTest.java
@@ -0,0 +1,65 @@
+package com.baeldung.rce;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.SocketException;
+import java.net.URL;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Unit test which demonstrates a remote code exploit against the {@link App}
+ * server. Sends an XML request containing an attack payload to the {@code POST}
+ * endpoint.
+ */
+public final class AppUnitTest {
+
+    private App app;
+
+    /** start a new web server */
+    @Before
+    public void before() throws IOException {
+        app = App.createVulnerable(0);
+        app.start();
+    }
+
+    /** stop the web server */
+    @After
+    public void after() {
+        if (app != null)
+            app.stop();
+    }
+
+    /**
+     * Test passes when an {@link IOException} is thrown because this indicates that
+     * the attacker caused the application to fail in some way. This does not
+     * actually confirm that the exploit took place, because the RCE is a
+     * side-effect that is difficult to observe.
+     */
+    @Test(expected = SocketException.class)
+    public void givenAppIsVulneable_whenExecuteRemoteCodeWhichThrowsException_thenThrowsException() throws IOException {
+        // POST the attack.xml to the application's /persons endpoint
+        final URL url = new URL("http://localhost:" + app.port() + "/persons");
+        final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        connection.setRequestMethod("POST");
+        connection.setDoOutput(true);
+        connection.setUseCaches(false);
+        connection.setRequestProperty("Content-Type", "application/xml");
+        connection.connect();
+        try (OutputStream os = connection.getOutputStream(); InputStream is = AppUnitTest.class.getResourceAsStream("/attack.xml")) {
+            byte[] buffer = new byte[1024];
+            while (is.read(buffer) > 0) {
+                os.write(buffer);
+            }
+        }
+        final int rc = connection.getResponseCode();
+        connection.disconnect();
+        assertTrue(rc >= 400);
+    }
+}
diff --git a/xstream/src/test/java/com/baeldung/rce/AttackExploitedException.java b/xstream/src/test/java/com/baeldung/rce/AttackExploitedException.java
new file mode 100644
index 0000000000..16c906abfc
--- /dev/null
+++ b/xstream/src/test/java/com/baeldung/rce/AttackExploitedException.java
@@ -0,0 +1,7 @@
+package com.baeldung.rce;
+
+/**
+ * Indicates a successful remote code execution attack has taken place.
+ */
+final class AttackExploitedException extends RuntimeException {
+}
diff --git a/xstream/src/test/java/com/baeldung/rce/AttackExploitedExceptionThrower.java b/xstream/src/test/java/com/baeldung/rce/AttackExploitedExceptionThrower.java
new file mode 100644
index 0000000000..16ed143f7a
--- /dev/null
+++ b/xstream/src/test/java/com/baeldung/rce/AttackExploitedExceptionThrower.java
@@ -0,0 +1,13 @@
+package com.baeldung.rce;
+
+/**
+ * Class which contains an action to throw {@link AttackExploitedException}.
+ * This helper is used by {@link AppTest} to determine when the remote code
+ * exploit has taken place.
+ */
+final class AttackExploitedExceptionThrower {
+
+    public void throwAttackExploitedException() {
+        throw new AttackExploitedException();
+    }
+}
diff --git a/xstream/src/test/java/com/baeldung/rce/XStreamBasicsUnitTest.java b/xstream/src/test/java/com/baeldung/rce/XStreamBasicsUnitTest.java
new file mode 100644
index 0000000000..d762813b22
--- /dev/null
+++ b/xstream/src/test/java/com/baeldung/rce/XStreamBasicsUnitTest.java
@@ -0,0 +1,82 @@
+package com.baeldung.rce;
+
+import com.thoughtworks.xstream.XStream;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Demonstrates XStream basics
+ */
+public final class XStreamBasicsUnitTest {
+
+    private XStream xstream;
+
+    @Before
+    public void before() {
+        xstream = new XStream();
+        xstream.alias("person", Person.class);
+    }
+
+    @Test
+    public void whenWritePerson_thenWritesExpectedXml() {
+        Person person = new Person();
+        person.setFirst("John");
+        person.setLast("Smith");
+
+        String xml = xstream.toXML(person);
+
+        // @formatter:off
+        String expected = ""
+            + "<person>\n"
+            + "  <first>John</first>\n"
+            + "  <last>Smith</last>\n"
+            + "</person>";
+        // @formatter:on
+        assertEquals(expected, xml);
+
+    }
+
+    @Test
+    public void whenReadXmlAsPerson_thenReturnsNewPerson() {
+        // @formatter:off
+        String xml = ""
+            + "<person>"
+            + "  <first>John</first>"
+            + "  <last>Smith</last>"
+            + "</person>";
+        // @formatter:on
+
+        Person person = (Person) xstream.fromXML(xml);
+
+        Person expected = new Person();
+        expected.setFirst("John");
+        expected.setLast("Smith");
+        assertEquals(person, expected);
+    }
+
+    @Test
+    public void givenXmlRepresentationOfMap_whenDeserialize_thenBuildsMap() {
+        // @formatter:off
+        String xml = ""
+            + "<map>"
+            + "  <element>"
+            + "    <string>foo</string>"
+            + "    <int>10</int>"
+            + "  </element>"
+            + "</map>";
+        // @formatter:on
+        @SuppressWarnings("unchecked")
+        Map<String, Integer> actual = (Map<String, Integer>) xstream.fromXML(xml);
+
+        final Map<String, Integer> expected = Collections.singletonMap("foo", 10);
+
+        assertEquals(expected, actual);
+    }
+
+}
diff --git a/xstream/src/test/resources/attack.xml b/xstream/src/test/resources/attack.xml
new file mode 100644
index 0000000000..8a5713648c
--- /dev/null
+++ b/xstream/src/test/resources/attack.xml
@@ -0,0 +1,12 @@
+<sorted-set>
+    <string>foo</string>
+    <dynamic-proxy>
+        <interface>java.lang.Comparable</interface>
+        <handler class="java.beans.EventHandler">
+            <target
+                class='com.baeldung.rce.AttackExploitedExceptionThrower'>
+            </target>
+            <action>throwAttackExploitedException</action>
+        </handler>
+    </dynamic-proxy>
+</sorted-set>
diff --git a/xstream/src/test/resources/calculator-attack.xml b/xstream/src/test/resources/calculator-attack.xml
new file mode 100644
index 0000000000..ae24843dc6
--- /dev/null
+++ b/xstream/src/test/resources/calculator-attack.xml
@@ -0,0 +1,16 @@
+    <sorted-set>
+        <string>foo</string>
+        <dynamic-proxy>
+            <interface>java.lang.Comparable</interface>
+            <handler class="java.beans.EventHandler">
+                <target
+                    class="java.lang.ProcessBuilder">
+                    <command>
+                        <string>open</string>
+                        <string>/Applications/Calculator.app</string>
+                    </command>
+                </target>
+                <action>start</action>
+            </handler>
+        </dynamic-proxy>
+    </sorted-set>