diff --git a/core-java-11/README.md b/core-java-11/README.md
new file mode 100644
index 0000000000..181ada3f45
--- /dev/null
+++ b/core-java-11/README.md
@@ -0,0 +1,5 @@
+### Relevant articles
+
+- [Java 11 Single File Source Code](https://www.baeldung.com/java-single-file-source-code)
+- [Java 11 Local Variable Syntax for Lambda Parameters](https://www.baeldung.com/java-var-lambda-params)
+
diff --git a/core-java-11/src/test/java/com/baeldung/NewStringAPIUnitTest.java b/core-java-11/src/test/java/com/baeldung/NewStringAPIUnitTest.java
new file mode 100644
index 0000000000..43e9022a64
--- /dev/null
+++ b/core-java-11/src/test/java/com/baeldung/NewStringAPIUnitTest.java
@@ -0,0 +1,43 @@
+package com.baeldung;
+
+import static org.hamcrest.CoreMatchers.is;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class NewStringAPIUnitTest {
+
+    @Test
+    public void whenRepeatStringTwice_thenGetStringTwice() {
+        String output = "La ".repeat(2) + "Land";
+
+        is(output).equals("La La Land");
+    }
+
+    @Test
+    public void whenStripString_thenReturnStringWithoutWhitespaces() {
+        is("\n\t  hello   \u2005".strip()).equals("hello");
+    }
+
+    @Test
+    public void whenTrimAdvanceString_thenReturnStringWithWhitespaces() {
+        is("\n\t  hello   \u2005".trim()).equals("hello   \u2005");
+    }
+
+    @Test
+    public void whenBlankString_thenReturnTrue() {
+        assertTrue("\n\t\u2005  ".isBlank());
+    }
+
+    @Test
+    public void whenMultilineString_thenReturnNonEmptyLineCount() {
+        String multilineStr = "This is\n \n a multiline\n string.";
+
+        long lineCount = multilineStr.lines()
+          .filter(String::isBlank)
+          .count();
+
+        is(lineCount).equals(3L);
+    }
+}
\ No newline at end of file
diff --git a/core-java-8/README.md b/core-java-8/README.md
index 6786b29120..e5fa953cc7 100644
--- a/core-java-8/README.md
+++ b/core-java-8/README.md
@@ -15,7 +15,6 @@
 - [Guide to Java 8 Comparator.comparing()](http://www.baeldung.com/java-8-comparator-comparing)
 - [Guide To Java 8 Optional](http://www.baeldung.com/java-optional)
 - [Guide to the Java 8 forEach](http://www.baeldung.com/foreach-java)
-- [Java Base64 Encoding and Decoding](http://www.baeldung.com/java-base64-encode-and-decode)
 - [The Difference Between map() and flatMap()](http://www.baeldung.com/java-difference-map-and-flatmap)
 - [Static and Default Methods in Interfaces in Java](http://www.baeldung.com/java-static-default-methods)
 - [Efficient Word Frequency Calculator in Java](http://www.baeldung.com/java-word-frequency)
diff --git a/core-java-8/src/test/java/com/baeldung/java8/Java8PredicateChainUnitTest.java b/core-java-8/src/test/java/com/baeldung/java8/Java8PredicateChainUnitTest.java
new file mode 100644
index 0000000000..fa579f9a00
--- /dev/null
+++ b/core-java-8/src/test/java/com/baeldung/java8/Java8PredicateChainUnitTest.java
@@ -0,0 +1,131 @@
+package com.baeldung.java8;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import org.junit.Test;
+
+public class Java8PredicateChainUnitTest {
+    
+    private List<String> names = Arrays.asList("Adam", "Alexander", "John", "Tom");
+
+    @Test
+    public void whenFilterList_thenSuccess() {
+        List<String> result = names.stream()
+            .filter(name -> name.startsWith("A"))
+            .collect(Collectors.toList());
+
+        assertEquals(2, result.size());
+        assertThat(result, contains("Adam", "Alexander"));
+    }
+
+    @Test
+    public void whenFilterListWithMultipleFilters_thenSuccess() {
+        List<String> result = names.stream()
+            .filter(name -> name.startsWith("A"))
+            .filter(name -> name.length() < 5)
+            .collect(Collectors.toList());
+        
+        assertEquals(1, result.size());
+        assertThat(result, contains("Adam"));
+    }
+
+    @Test
+    public void whenFilterListWithComplexPredicate_thenSuccess() {
+        List<String> result = names.stream()
+            .filter(name -> name.startsWith("A") && name.length() < 5)
+            .collect(Collectors.toList());
+        
+        assertEquals(1, result.size());
+        assertThat(result, contains("Adam"));
+    }
+
+    @Test
+    public void whenFilterListWithCombinedPredicatesInline_thenSuccess() {
+        List<String> result = names.stream()
+            .filter(((Predicate<String>) name -> name.startsWith("A")).and(name -> name.length() < 5))
+            .collect(Collectors.toList());
+        
+        assertEquals(1, result.size());
+        assertThat(result, contains("Adam"));
+    }
+
+    @Test
+    public void whenFilterListWithCombinedPredicatesUsingAnd_thenSuccess() {
+        Predicate<String> predicate1 = str -> str.startsWith("A");
+        Predicate<String> predicate2 = str -> str.length() < 5;
+
+        List<String> result = names.stream()
+            .filter(predicate1.and(predicate2))
+            .collect(Collectors.toList());
+
+        assertEquals(1, result.size());
+        assertThat(result, contains("Adam"));
+    }
+
+    @Test
+    public void whenFilterListWithCombinedPredicatesUsingOr_thenSuccess() {
+        Predicate<String> predicate1 = str -> str.startsWith("J");
+        Predicate<String> predicate2 = str -> str.length() < 4;
+
+        List<String> result = names.stream()
+            .filter(predicate1.or(predicate2))
+            .collect(Collectors.toList());
+
+        assertEquals(2, result.size());
+        assertThat(result, contains("John", "Tom"));
+    }
+
+    @Test
+    public void whenFilterListWithCombinedPredicatesUsingOrAndNegate_thenSuccess() {
+        Predicate<String> predicate1 = str -> str.startsWith("J");
+        Predicate<String> predicate2 = str -> str.length() < 4;
+
+        List<String> result = names.stream()
+            .filter(predicate1.or(predicate2.negate()))
+            .collect(Collectors.toList());
+
+        assertEquals(3, result.size());
+        assertThat(result, contains("Adam", "Alexander", "John"));
+    }
+
+    @Test
+    public void whenFilterListWithCollectionOfPredicatesUsingAnd_thenSuccess() {
+        List<Predicate<String>> allPredicates = new ArrayList<Predicate<String>>();
+        allPredicates.add(str -> str.startsWith("A"));
+        allPredicates.add(str -> str.contains("d"));
+        allPredicates.add(str -> str.length() > 4);
+
+        List<String> result = names.stream()
+            .filter(allPredicates.stream()
+                .reduce(x -> true, Predicate::and))
+            .collect(Collectors.toList());
+
+        assertEquals(1, result.size());
+        assertThat(result, contains("Alexander"));
+    }
+
+    @Test
+    public void whenFilterListWithCollectionOfPredicatesUsingOr_thenSuccess() {
+        List<Predicate<String>> allPredicates = new ArrayList<Predicate<String>>();
+        allPredicates.add(str -> str.startsWith("A"));
+        allPredicates.add(str -> str.contains("d"));
+        allPredicates.add(str -> str.length() > 4);
+
+        List<String> result = names.stream()
+            .filter(allPredicates.stream()
+                .reduce(x -> false, Predicate::or))
+            .collect(Collectors.toList());
+
+        assertEquals(2, result.size());
+        assertThat(result, contains("Adam", "Alexander"));
+    }
+
+}
diff --git a/core-java-9/README.md b/core-java-9/README.md
index 38816471aa..c96267dc95 100644
--- a/core-java-9/README.md
+++ b/core-java-9/README.md
@@ -9,7 +9,6 @@
 - [Java 9 Convenience Factory Methods for Collections](http://www.baeldung.com/java-9-collections-factory-methods) 
 - [New Stream Collectors in Java 9](http://www.baeldung.com/java9-stream-collectors)
 - [Java 9 CompletableFuture API Improvements](http://www.baeldung.com/java-9-completablefuture)
-- [Spring Security – Redirect to the Previous URL After Login](http://www.baeldung.com/spring-security-redirect-login)
 - [Java 9 Process API Improvements](http://www.baeldung.com/java-9-process-api)
 - [Introduction to Java 9 StackWalking API](http://www.baeldung.com/java-9-stackwalking-api)
 - [Introduction to Project Jigsaw](http://www.baeldung.com/project-jigsaw-java-modularity)
diff --git a/core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Employee.java b/core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Employee.java
index 757a8f8ec1..a7592574d9 100644
--- a/core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Employee.java
+++ b/core-java-arrays/src/main/java/com/baeldung/arraycopy/model/Employee.java
@@ -7,6 +7,14 @@ public class Employee implements Serializable {
     private int id;
     private String name;
 
+    public Employee() {
+    }
+
+    public Employee(int id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
     public int getId() {
         return id;
     }
diff --git a/core-java-arrays/src/test/java/com/baeldung/sort/ArraySortUnitTest.java b/core-java-arrays/src/test/java/com/baeldung/sort/ArraySortUnitTest.java
new file mode 100644
index 0000000000..59035738fe
--- /dev/null
+++ b/core-java-arrays/src/test/java/com/baeldung/sort/ArraySortUnitTest.java
@@ -0,0 +1,90 @@
+package com.baeldung.sort;
+
+import com.baeldung.arraycopy.model.Employee;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.stream.IntStream;
+
+import static org.junit.Assert.assertArrayEquals;
+
+public class ArraySortUnitTest {
+    private Employee[] employees;
+    private int[] numbers;
+    private String[] strings;
+
+    private Employee john = new Employee(6, "John");
+    private Employee mary = new Employee(3, "Mary");
+    private Employee david = new Employee(4, "David");
+
+    @Before
+    public void setup() {
+        createEmployeesArray();
+        createNumbersArray();
+        createStringArray();
+    }
+
+    private void createEmployeesArray() {
+        employees = new Employee[]{john, mary, david};
+    }
+
+    private void createNumbersArray() {
+        numbers = new int[]{-8, 7, 5, 9, 10, -2, 3};
+    }
+
+    private void createStringArray() {
+        strings = new String[]{"learning", "java", "with", "baeldung"};
+    }
+
+    @Test
+    public void givenIntArray_whenSortingAscending_thenCorrectlySorted() {
+        Arrays.sort(numbers);
+
+        assertArrayEquals(new int[]{-8, -2, 3, 5, 7, 9, 10}, numbers);
+    }
+
+    @Test
+    public void givenIntArray_whenSortingDescending_thenCorrectlySorted() {
+        numbers = IntStream.of(numbers).boxed().sorted(Comparator.reverseOrder()).mapToInt(i -> i).toArray();
+
+        assertArrayEquals(new int[]{10, 9, 7, 5, 3, -2, -8}, numbers);
+    }
+
+    @Test
+    public void givenStringArray_whenSortingAscending_thenCorrectlySorted() {
+        Arrays.sort(strings);
+
+        assertArrayEquals(new String[]{"baeldung", "java", "learning", "with"}, strings);
+    }
+
+    @Test
+    public void givenStringArray_whenSortingDescending_thenCorrectlySorted() {
+        Arrays.sort(strings, Comparator.reverseOrder());
+
+        assertArrayEquals(new String[]{"with", "learning", "java", "baeldung"}, strings);
+    }
+
+    @Test
+    public void givenObjectArray_whenSortingAscending_thenCorrectlySorted() {
+        Arrays.sort(employees, Comparator.comparing(Employee::getName));
+
+        assertArrayEquals(new Employee[]{david, john, mary}, employees);
+    }
+
+    @Test
+    public void givenObjectArray_whenSortingDescending_thenCorrectlySorted() {
+        Arrays.sort(employees, Comparator.comparing(Employee::getName).reversed());
+
+        assertArrayEquals(new Employee[]{mary, john, david}, employees);
+    }
+
+    @Test
+    public void givenObjectArray_whenSortingMultipleAttributesAscending_thenCorrectlySorted() {
+        Arrays.sort(employees, Comparator.comparing(Employee::getName).thenComparing(Employee::getId));
+
+        assertArrayEquals(new Employee[]{david, john, mary}, employees);
+    }
+
+}
diff --git a/core-java-collections/src/test/java/org/baeldung/java/lists/ListJUnitTest.java b/core-java-collections/src/test/java/org/baeldung/java/lists/ListJUnitTest.java
index 7dddf6c2ce..f9c9d3fda8 100644
--- a/core-java-collections/src/test/java/org/baeldung/java/lists/ListJUnitTest.java
+++ b/core-java-collections/src/test/java/org/baeldung/java/lists/ListJUnitTest.java
@@ -5,6 +5,10 @@ import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
+
+import java.util.stream.Collectors;
 
 public class ListJUnitTest {
 
@@ -18,4 +22,26 @@ public class ListJUnitTest {
         Assert.assertNotSame(list1, list2);
         Assert.assertNotEquals(list1, list3);
     }
+
+    @Test
+    public void whenIntersection_ShouldReturnCommonElements() throws Exception {
+        List<String> list = Arrays.asList("red", "blue", "blue", "green", "red");
+        List<String> otherList = Arrays.asList("red", "green", "green", "yellow");
+
+        Set<String> commonElements = new HashSet(Arrays.asList("red", "green"));
+
+        Set<String> result = list.stream()
+          .distinct()
+          .filter(otherList::contains)
+          .collect(Collectors.toSet());
+
+        Assert.assertEquals(commonElements, result);
+
+        Set<String> inverseResult = otherList.stream()
+          .distinct()
+          .filter(list::contains)
+          .collect(Collectors.toSet());
+
+        Assert.assertEquals(commonElements, inverseResult);
+    }
 }
diff --git a/core-java-lang/src/main/java/com/baeldung/controlstructures/ConditionalBranches.java b/core-java-lang/src/main/java/com/baeldung/controlstructures/ConditionalBranches.java
new file mode 100644
index 0000000000..bace609699
--- /dev/null
+++ b/core-java-lang/src/main/java/com/baeldung/controlstructures/ConditionalBranches.java
@@ -0,0 +1,68 @@
+package com.baeldung.controlstructures;
+
+public class ConditionalBranches {
+
+    /**
+     * Multiple if/else/else if statements examples. Shows different syntax usage.
+     */
+    public static void ifElseStatementsExamples() {
+        int count = 2; // Initial count value.
+
+        // Basic syntax. Only one statement follows. No brace usage.
+        if (count > 1)
+            System.out.println("Count is higher than 1");
+
+        // Basic syntax. More than one statement can be included. Braces are used (recommended syntax).
+        if (count > 1) {
+            System.out.println("Count is higher than 1");
+            System.out.println("Count is equal to: " + count);
+        }
+
+        // If/Else syntax. Two different courses of action can be included.
+        if (count > 2) {
+            System.out.println("Count is higher than 2");
+        } else {
+            System.out.println("Count is lower or equal than 2");
+        }
+
+        // If/Else/Else If syntax. Three or more courses of action can be included.
+        if (count > 2) {
+            System.out.println("Count is higher than 2");
+        } else if (count <= 0) {
+            System.out.println("Count is less or equal than zero");
+        } else {
+            System.out.println("Count is either equal to one, or two");
+        }
+    }
+
+    /**
+     * Ternary Operator example.
+     * @see ConditionalBranches#ifElseStatementsExamples()
+     */
+    public static void ternaryExample() {
+        int count = 2;
+        System.out.println(count > 2 ? "Count is higher than 2" : "Count is lower or equal than 2");
+    }
+
+    /**
+     * Switch structure example. Shows how to replace multiple if/else statements with one structure.
+     */
+    public static void switchExample() {
+        int count = 3;
+        switch (count) {
+        case 0:
+            System.out.println("Count is equal to 0");
+            break;
+        case 1:
+            System.out.println("Count is equal to 1");
+            break;
+        case 2:
+            System.out.println("Count is equal to 2");
+            break;
+        default:
+            System.out.println("Count is either negative, or higher than 2");
+            break;
+        }
+    }
+
+}
diff --git a/core-java-lang/src/main/java/com/baeldung/controlstructures/Loops.java b/core-java-lang/src/main/java/com/baeldung/controlstructures/Loops.java
new file mode 100644
index 0000000000..bb858ffe22
--- /dev/null
+++ b/core-java-lang/src/main/java/com/baeldung/controlstructures/Loops.java
@@ -0,0 +1,123 @@
+package com.baeldung.controlstructures;
+
+public class Loops {
+
+    /**
+     * Dummy method. Only prints a generic message.
+     */
+    private static void methodToRepeat() {
+        System.out.println("Dummy method.");
+    }
+
+    /**
+     * Shows how to iterate 50 times with 3 different method/control structures.
+     */
+    public static void repetitionTo50Examples() {
+        for (int i = 1; i <= 50; i++) {
+            methodToRepeat();
+        }
+
+        int whileCounter = 1;
+        while (whileCounter <= 50) {
+            methodToRepeat();
+            whileCounter++;
+        }
+
+        int count = 1;
+        do {
+            methodToRepeat();
+            count++;
+        } while (count < 50);
+    }
+
+    /**
+     * Splits a sentence in words, and prints each word in a new line.
+     * @param sentence Sentence to print as independent words.
+     */
+    public static void printWordByWord(String sentence) {
+        for (String word : sentence.split(" ")) {
+            System.out.println(word);
+        }
+    }
+
+    /**
+     * Prints text an N amount of times. Shows usage of the {@code break} branching statement.
+     * @param textToPrint Text to repeatedly print.
+     * @param times Amount to times to print received text.
+     */
+    public static void printTextNTimes(String textToPrint, int times) {
+        int counter = 1;
+        while (true) {
+            System.out.println(textToPrint);
+            if (counter == times) {
+                break;
+            }
+        }
+    }
+
+    /**
+     * Prints text an N amount of times, up to 50. Shows usage of the {@code break} branching statement.
+     * @param textToPrint Text to repeatedly print.
+     * @param times Amount to times to print received text. If times is higher than 50, textToPrint will only be printed 50 times.
+     */
+    public static void printTextNTimesUpTo50(String textToPrint, int times) {
+        int counter = 1;
+        while (counter < 50) {
+            System.out.println(textToPrint);
+            if (counter == times) {
+                break;
+            }
+        }
+    }
+
+    /**
+     * Prints an specified amount of even numbers. Shows usage of both {@code break} and {@code continue} branching statements.
+     * @param amountToPrint Amount of even numbers to print.
+     */
+    public static void printEvenNumbers(int amountToPrint) {
+        if (amountToPrint <= 0) { // Invalid input
+            return;
+        }
+        int iterator = 0;
+        int amountPrinted = 0;
+        while (true) {
+            if (iterator % 2 == 0) { // Is an even number
+                System.out.println(iterator);
+                amountPrinted++;
+                iterator++;
+            } else {
+                iterator++;
+                continue; // Won't print
+            }
+            if (amountPrinted == amountToPrint) {
+                break;
+            }
+        }
+    }
+
+    /**
+     * Prints an specified amount of even numbers, up to 100. Shows usage of both {@code break} and {@code continue} branching statements.
+     * @param amountToPrint Amount of even numbers to print.
+     */
+    public static void printEvenNumbersToAMaxOf100(int amountToPrint) {
+        if (amountToPrint <= 0) { // Invalid input
+            return;
+        }
+        int iterator = 0;
+        int amountPrinted = 0;
+        while (amountPrinted < 100) {
+            if (iterator % 2 == 0) { // Is an even number
+                System.out.println(iterator);
+                amountPrinted++;
+                iterator++;
+            } else {
+                iterator++;
+                continue; // Won't print
+            }
+            if (amountPrinted == amountToPrint) {
+                break;
+            }
+        }
+    }
+
+}
diff --git a/core-java-sun/src/main/java/com/baeldung/README.md b/core-java-sun/src/main/java/com/baeldung/README.md
index 51809b2882..7d843af9ea 100644
--- a/core-java-sun/src/main/java/com/baeldung/README.md
+++ b/core-java-sun/src/main/java/com/baeldung/README.md
@@ -1,2 +1 @@
 ### Relevant Articles:
-- [SHA-256 Hashing in Java](http://www.baeldung.com/sha-256-hashing-java)
diff --git a/core-java/README.md b/core-java/README.md
index 20f6ef5ea7..4fbc8bbc6e 100644
--- a/core-java/README.md
+++ b/core-java/README.md
@@ -14,25 +14,20 @@
 - [Pattern Search with Grep in Java](http://www.baeldung.com/grep-in-java)
 - [URL Encoding and Decoding in Java](http://www.baeldung.com/java-url-encoding-decoding)
 - [How to Create an Executable JAR with Maven](http://www.baeldung.com/executable-jar-with-maven)
-- [How to Design a Genetic Algorithm in Java](http://www.baeldung.com/java-genetic-algorithm)
 - [Basic Introduction to JMX](http://www.baeldung.com/java-management-extensions)
-- [AWS Lambda With Java](http://www.baeldung.com/java-aws-lambda)
 - [Introduction to Nashorn](http://www.baeldung.com/java-nashorn)
 - [Java Money and the Currency API](http://www.baeldung.com/java-money-and-currency)
 - [JVM Log Forging](http://www.baeldung.com/jvm-log-forging)
 - [Guide to sun.misc.Unsafe](http://www.baeldung.com/java-unsafe)
 - [How to Perform a Simple HTTP Request in Java](http://www.baeldung.com/java-http-request)
 - [How to Add a Single Element to a Stream](http://www.baeldung.com/java-stream-append-prepend)
-- [Kotlin Java Interoperability](http://www.baeldung.com/kotlin-java-interoperability)
 - [How to Find all Getters Returning Null](http://www.baeldung.com/java-getters-returning-null)
 - [How to Get a Name of a Method Being Executed?](http://www.baeldung.com/java-name-of-executing-method)
-- [Converting a Stack Trace to a String in Java](http://www.baeldung.com/java-stacktrace-to-string)
 - [Introduction to Java Serialization](http://www.baeldung.com/java-serialization)
 - [Guide to UUID in Java](http://www.baeldung.com/java-uuid)
 - [Guide to Escaping Characters in Java RegExps](http://www.baeldung.com/java-regexp-escape-char)
 - [Difference between URL and URI](http://www.baeldung.com/java-url-vs-uri)
 - [Broadcasting and Multicasting in Java](http://www.baeldung.com/java-broadcast-multicast)
-- [Period and Duration in Java](http://www.baeldung.com/java-period-duration)
 - [OutOfMemoryError: GC Overhead Limit Exceeded](http://www.baeldung.com/java-gc-overhead-limit-exceeded)
 - [Creating a Java Compiler Plugin](http://www.baeldung.com/java-build-compiler-plugin)
 - [Quick Guide to Java Stack](http://www.baeldung.com/java-stack)
@@ -41,9 +36,8 @@
 - [A Guide to ThreadLocalRandom in Java](http://www.baeldung.com/java-thread-local-random)
 - [Compiling Java *.class Files with javac](http://www.baeldung.com/javac)
 - [A Guide to Iterator in Java](http://www.baeldung.com/java-iterator)
-- [The Trie Data Structure in Java](http://www.baeldung.com/trie-java)
 - [Introduction to Javadoc](http://www.baeldung.com/javadoc)
-- [Guide to Externalizable Interface in Java](http://www.baeldung.com/java-externalizable)
+- [Guide to the Externalizable Interface in Java](http://www.baeldung.com/java-externalizable)
 - [A Practical Guide to DecimalFormat](http://www.baeldung.com/java-decimalformat)
 - [How to Detect the OS Using Java](http://www.baeldung.com/java-detect-os)
 - [ASCII Art in Java](http://www.baeldung.com/ascii-art-in-java)
@@ -84,7 +78,6 @@
 - [Understanding Memory Leaks in Java](https://www.baeldung.com/java-memory-leaks)
 - [A Guide to SimpleDateFormat](https://www.baeldung.com/java-simple-date-format)
 - [SSL Handshake Failures](https://www.baeldung.com/java-ssl-handshake-failures)
-- [Implementing a Binary Tree in Java](https://www.baeldung.com/java-binary-tree)
 - [Changing the Order in a Sum Operation Can Produce Different Results?](https://www.baeldung.com/java-floating-point-sum-order)
 - [Java – Try with Resources](https://www.baeldung.com/java-try-with-resources)
 - [Abstract Classes in Java](https://www.baeldung.com/java-abstract-class)
diff --git a/core-java/native/nativedatetimeutils.dll b/core-java/native/nativedatetimeutils.dll
new file mode 100644
index 0000000000..ecdd388380
Binary files /dev/null and b/core-java/native/nativedatetimeutils.dll differ
diff --git a/core-java/src/main/java/com/baeldung/README.md b/core-java/src/main/java/com/baeldung/README.md
index 51809b2882..7d843af9ea 100644
--- a/core-java/src/main/java/com/baeldung/README.md
+++ b/core-java/src/main/java/com/baeldung/README.md
@@ -1,2 +1 @@
 ### Relevant Articles:
-- [SHA-256 Hashing in Java](http://www.baeldung.com/sha-256-hashing-java)
diff --git a/core-java/src/main/java/com/baeldung/gc/VerboseGarbageCollectorRunner.java b/core-java/src/main/java/com/baeldung/gc/VerboseGarbageCollectorRunner.java
new file mode 100644
index 0000000000..f57580bbb5
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/gc/VerboseGarbageCollectorRunner.java
@@ -0,0 +1,63 @@
+package com.baeldung.gc;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A simple Java program to demonstrate how to enable verbose Garbage Collection (GC) logging.
+ * <p>
+ * This simple program loads 3 million {@link java.lang.String} instances into a {@link java.util.HashMap} 
+ * object before making an explicit call to the garbage collector using <code>System.gc()</code>.
+ * <p>
+ * Finally, it removes 2 million of the {@link java.lang.String} instances from the {@link java.util.HashMap}. 
+ * We also explicitly use <code>System.out.println</code> to make interpreting the output easier.
+ * <p>
+ * Run this program with the following arguments to see verbose GC logging in its complete form:
+ * <pre>
+ * -XX:+UseSerialGC -Xms1024m -Xmx1024m -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -Xloggc:/path/to/file/gc.log
+ * </pre>
+ * Where:
+ * <ul>
+ *   <li><code>-XX:+UseSerialGC</code> - specify the serial garbage collector.</li>
+ *   <li><code>-Xms1024m</code> - specify the minimal heap size.</li>
+ *   <li><code>-Xmx1024m</code> - specify the maximal heap size.</li>
+ *   <li><code>-verbose:gc</code> - activate the logging of garbage collection information in its simplest form.</li>
+ *   <li><code>-XX:+PrintGCDetails</code> - activate detailed information about garbage collection.</li>
+ *   <li><code>-XX:+PrintGCTimeStamps</code> - include a timestamp in the output reflecting the real-time passed in seconds since the JVM started.</li>
+ *   <li><code>-XX:+PrintGCDateStamps</code> - include the absolute date and time at the start of each line.</li>
+ *   <li><code>-Xloggc</code> - by default the GC log is written to stdout. Specify an output file via this argument.</li>
+ * </ul>
+ * <p>
+ * It should be noted that the first three arguments are not strictly necessary but for the purposes or the example
+ * help really simplify things.
+ *
+ */
+public class VerboseGarbageCollectorRunner {
+
+    private static Map<String, String> stringContainer = new HashMap<>();
+
+    public static void main(String[] args) {
+        System.out.println("Start of program!");
+        String stringWithPrefix = "stringWithPrefix";
+
+        // Load Java Heap with 3 M java.lang.String instances
+        for (int i = 0; i < 3000000; i++) {
+            String newString = stringWithPrefix + i;
+            stringContainer.put(newString, newString);
+        }
+        System.out.println("MAP size: " + stringContainer.size());
+
+        // Explicit GC!
+        System.gc();
+
+        // Remove 2 M out of 3 M
+        for (int i = 0; i < 2000000; i++) {
+            String newString = stringWithPrefix + i;
+            stringContainer.remove(newString);
+        }
+
+        System.out.println("MAP size: " + stringContainer.size());
+        System.out.println("End of program!");
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/nativekeyword/DateTimeUtils.java b/core-java/src/main/java/com/baeldung/nativekeyword/DateTimeUtils.java
new file mode 100644
index 0000000000..0762b0eb8a
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/nativekeyword/DateTimeUtils.java
@@ -0,0 +1,10 @@
+package com.baeldung.nativekeyword;
+
+public class DateTimeUtils {
+
+    public native String getSystemTime();
+
+    static {
+        System.loadLibrary("nativedatetimeutils");
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/nativekeyword/NativeMainApp.java b/core-java/src/main/java/com/baeldung/nativekeyword/NativeMainApp.java
new file mode 100644
index 0000000000..76fe548ed3
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/nativekeyword/NativeMainApp.java
@@ -0,0 +1,11 @@
+package com.baeldung.nativekeyword;
+
+import com.baeldung.nativekeyword.DateTimeUtils;
+
+public class NativeMainApp {
+    public static void main(String[] args) {
+        DateTimeUtils dateTimeUtils = new DateTimeUtils();
+        String input = dateTimeUtils.getSystemTime();
+        System.out.println("System time is : " + input);
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/nativekeyword/DateTimeUtilsManualTest.java b/core-java/src/test/java/com/baeldung/nativekeyword/DateTimeUtilsManualTest.java
new file mode 100644
index 0000000000..d5003dfc1f
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/nativekeyword/DateTimeUtilsManualTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.nativekeyword;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+
+public class DateTimeUtilsManualTest {
+
+    private static final Logger LOG = org.slf4j.LoggerFactory.getLogger(DateTimeUtilsManualTest.class);
+
+    @BeforeClass
+    public static void setUpClass() {
+        System.loadLibrary("msvcr100");
+        System.loadLibrary("libgcc_s_sjlj-1");
+        System.loadLibrary("libstdc++-6");
+        System.loadLibrary("nativedatetimeutils");
+    }
+
+    @Test
+    public void givenNativeLibsLoaded_thenNativeMethodIsAccessible() {
+        DateTimeUtils dateTimeUtils = new DateTimeUtils();
+        LOG.info("System time is : " + dateTimeUtils.getSystemTime());
+        assertNotNull(dateTimeUtils.getSystemTime());
+    }
+}
diff --git a/core-kotlin/README.md b/core-kotlin/README.md
index 828293ec90..05f07e7e7e 100644
--- a/core-kotlin/README.md
+++ b/core-kotlin/README.md
@@ -34,7 +34,6 @@
 - [Kotlin Constructors](https://www.baeldung.com/kotlin-constructors)
 - [Creational Design Patterns in Kotlin: Builder](https://www.baeldung.com/kotlin-builder-pattern)
 - [Kotlin Nested and Inner Classes](https://www.baeldung.com/kotlin-inner-classes)
-- [Kotlin with Ktor](https://www.baeldung.com/kotlin-ktor)
 - [Fuel HTTP Library with Kotlin](https://www.baeldung.com/kotlin-fuel)
 - [Introduction to Kovenant Library for Kotlin](https://www.baeldung.com/kotlin-kovenant)
 - [Converting Kotlin Data Class from JSON using GSON](https://www.baeldung.com/kotlin-json-convert-data-class)
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/contract/CallsInPlaceEffect.kt b/core-kotlin/src/main/kotlin/com/baeldung/contract/CallsInPlaceEffect.kt
new file mode 100644
index 0000000000..ca0b13cdc7
--- /dev/null
+++ b/core-kotlin/src/main/kotlin/com/baeldung/contract/CallsInPlaceEffect.kt
@@ -0,0 +1,23 @@
+package com.baeldung.contract
+
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+
+@ExperimentalContracts
+inline fun <R> myRun(block: () -> R): R {
+    contract {
+        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+    }
+    return block()
+}
+
+@ExperimentalContracts
+fun callsInPlace() {
+    val i: Int
+    myRun {
+        i = 1 // Without contract initialization is forbidden due to possible re-assignment
+    }
+    println(i) // Without contract variable might be uninitialized
+}
+
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/contract/ReturnsEffect.kt b/core-kotlin/src/main/kotlin/com/baeldung/contract/ReturnsEffect.kt
new file mode 100644
index 0000000000..56f667af82
--- /dev/null
+++ b/core-kotlin/src/main/kotlin/com/baeldung/contract/ReturnsEffect.kt
@@ -0,0 +1,43 @@
+package com.baeldung.contract
+
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.contract
+
+data class Request(val arg: String)
+
+class Service {
+
+    @ExperimentalContracts
+    fun process(request: Request?) {
+        validate(request)
+        println(request.arg)
+    }
+
+}
+
+@ExperimentalContracts
+private fun validate(request: Request?) {
+    contract {
+        returns() implies (request != null)
+    }
+    if (request == null) {
+        throw IllegalArgumentException("Undefined request")
+    }
+}
+
+data class MyEvent(val message: String)
+
+@ExperimentalContracts
+fun processEvent(event: Any?) {
+    if (isInterested(event)) {
+        println(event.message) // Compiler makes smart cast here with the help of contract
+    }
+}
+
+@ExperimentalContracts
+fun isInterested(event: Any?): Boolean {
+    contract {
+        returns(true) implies (event is MyEvent)
+    }
+    return event is MyEvent
+}
\ No newline at end of file
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/ConstantUnitTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/ConstantUnitTest.kt
new file mode 100644
index 0000000000..51d45b8df0
--- /dev/null
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/ConstantUnitTest.kt
@@ -0,0 +1,17 @@
+import com.baeldung.kotlin.constant.TestKotlinConstantClass
+import com.baeldung.kotlin.constant.TestKotlinConstantObject
+import org.junit.jupiter.api.Test
+import kotlin.test.assertEquals
+
+class ConstantUnitTest {
+
+    @Test
+    fun givenConstant_whenCompareWithActualValue_thenReturnTrue() {
+        assertEquals(10, TestKotlinConstantObject.COMPILE_TIME_CONST)
+        assertEquals(30, TestKotlinConstantObject.RUN_TIME_CONST)
+        assertEquals(20, TestKotlinConstantObject.JAVA_STATIC_FINAL_FIELD)
+
+        assertEquals(40, TestKotlinConstantClass.COMPANION_OBJECT_NUMBER)
+    }
+}
+
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/TestKotlinConstantClass.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/TestKotlinConstantClass.kt
new file mode 100644
index 0000000000..8bcc327999
--- /dev/null
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/TestKotlinConstantClass.kt
@@ -0,0 +1,8 @@
+package com.baeldung.kotlin.constant
+
+
+class TestKotlinConstantClass {
+    companion object {
+        const val COMPANION_OBJECT_NUMBER = 40
+    }
+}
\ No newline at end of file
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/TestKotlinConstantObject.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/TestKotlinConstantObject.kt
new file mode 100644
index 0000000000..815fdeaf14
--- /dev/null
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/constant/TestKotlinConstantObject.kt
@@ -0,0 +1,15 @@
+package com.baeldung.kotlin.constant
+
+
+object TestKotlinConstantObject {
+    const val COMPILE_TIME_CONST = 10
+
+    val RUN_TIME_CONST: Int
+
+    @JvmField
+    val JAVA_STATIC_FINAL_FIELD = 20
+
+    init {
+        RUN_TIME_CONST = TestKotlinConstantObject.COMPILE_TIME_CONST + 20;
+    }
+}
\ No newline at end of file
diff --git a/data-structures/README.md b/data-structures/README.md
index b3b1196ce0..2d92068390 100644
--- a/data-structures/README.md
+++ b/data-structures/README.md
@@ -1,4 +1,4 @@
 ## Relevant articles:
 
-- [The Trie Data Structure in Java](http://www.baeldung.com/trie-java)
-- [Implementing a Binary Tree in Java](http://www.baeldung.com/java-binary-tree)
+[The Trie Data Structure in Java](https://www.baeldung.com/trie-java)
+[Implementing a Binary Tree in Java](https://www.baeldung.com/java-binary-tree)
diff --git a/gson/src/main/java/org/baeldung/gson/primitives/models/BooleanExample.java b/gson/src/main/java/org/baeldung/gson/primitives/models/BooleanExample.java
new file mode 100644
index 0000000000..1fe87650de
--- /dev/null
+++ b/gson/src/main/java/org/baeldung/gson/primitives/models/BooleanExample.java
@@ -0,0 +1,9 @@
+package org.baeldung.gson.primitives.models;
+
+public class BooleanExample {
+    public boolean value;
+
+    public String toString() {
+        return "{boolean: " + value + "}";
+    }
+}
diff --git a/gson/src/main/java/org/baeldung/gson/primitives/models/ByteExample.java b/gson/src/main/java/org/baeldung/gson/primitives/models/ByteExample.java
new file mode 100644
index 0000000000..2e1c68ee51
--- /dev/null
+++ b/gson/src/main/java/org/baeldung/gson/primitives/models/ByteExample.java
@@ -0,0 +1,9 @@
+package org.baeldung.gson.primitives.models;
+
+public class ByteExample {
+    public byte value = (byte) 1;
+
+    public String toString() {
+        return "{byte: " + value + "}";
+    }
+}
diff --git a/gson/src/main/java/org/baeldung/gson/primitives/models/CharExample.java b/gson/src/main/java/org/baeldung/gson/primitives/models/CharExample.java
new file mode 100644
index 0000000000..ccac913f23
--- /dev/null
+++ b/gson/src/main/java/org/baeldung/gson/primitives/models/CharExample.java
@@ -0,0 +1,9 @@
+package org.baeldung.gson.primitives.models;
+
+public class CharExample {
+    public char value;
+
+    public String toString() {
+        return "{char: " + value + "}";
+    }
+}
diff --git a/gson/src/main/java/org/baeldung/gson/primitives/models/DoubleExample.java b/gson/src/main/java/org/baeldung/gson/primitives/models/DoubleExample.java
new file mode 100644
index 0000000000..5022b6a11e
--- /dev/null
+++ b/gson/src/main/java/org/baeldung/gson/primitives/models/DoubleExample.java
@@ -0,0 +1,9 @@
+package org.baeldung.gson.primitives.models;
+
+public class DoubleExample {
+    public double value;
+
+    public String toString() {
+        return "{float: " + value + "}";
+    }
+}
diff --git a/gson/src/main/java/org/baeldung/gson/primitives/models/FloatExample.java b/gson/src/main/java/org/baeldung/gson/primitives/models/FloatExample.java
new file mode 100644
index 0000000000..00a97f68fc
--- /dev/null
+++ b/gson/src/main/java/org/baeldung/gson/primitives/models/FloatExample.java
@@ -0,0 +1,9 @@
+package org.baeldung.gson.primitives.models;
+
+public class FloatExample {
+    public float value;
+
+    public String toString() {
+        return "{float: " + value + "}";
+    }
+}
diff --git a/gson/src/main/java/org/baeldung/gson/primitives/models/InfinityValuesExample.java b/gson/src/main/java/org/baeldung/gson/primitives/models/InfinityValuesExample.java
new file mode 100644
index 0000000000..163b0a3d95
--- /dev/null
+++ b/gson/src/main/java/org/baeldung/gson/primitives/models/InfinityValuesExample.java
@@ -0,0 +1,6 @@
+package org.baeldung.gson.primitives.models;
+
+public class InfinityValuesExample {
+    public float negativeInfinity;
+    public float positiveInfinity;
+}
diff --git a/gson/src/main/java/org/baeldung/gson/primitives/models/LongExample.java b/gson/src/main/java/org/baeldung/gson/primitives/models/LongExample.java
new file mode 100644
index 0000000000..e709650789
--- /dev/null
+++ b/gson/src/main/java/org/baeldung/gson/primitives/models/LongExample.java
@@ -0,0 +1,9 @@
+package org.baeldung.gson.primitives.models;
+
+public class LongExample {
+    public long value = 1;
+
+    public String toString() {
+        return "{byte: " + value + "}";
+    }
+}
diff --git a/gson/src/main/java/org/baeldung/gson/primitives/models/PrimitiveBundle.java b/gson/src/main/java/org/baeldung/gson/primitives/models/PrimitiveBundle.java
new file mode 100644
index 0000000000..ad7309a2f7
--- /dev/null
+++ b/gson/src/main/java/org/baeldung/gson/primitives/models/PrimitiveBundle.java
@@ -0,0 +1,19 @@
+package org.baeldung.gson.primitives.models;
+
+public class PrimitiveBundle {
+    public byte byteValue;
+    public short shortValue;
+    public int intValue;
+    public long longValue;
+    public float floatValue;
+    public double doubleValue;
+    public boolean booleanValue;
+    public char charValue;
+
+    public String toString() {
+        return "{" + "byte: " + byteValue + ", " + "short: " + shortValue + ", "
+            + "int: " + intValue + ", " + "long: " + longValue + ", "
+            + "float: " + floatValue + ", " + "double: " + doubleValue + ", "
+            + "boolean: " + booleanValue + ", " + "char: " + charValue + "}";
+    }
+}
diff --git a/gson/src/main/java/org/baeldung/gson/primitives/models/PrimitiveBundleInitialized.java b/gson/src/main/java/org/baeldung/gson/primitives/models/PrimitiveBundleInitialized.java
new file mode 100644
index 0000000000..2780f7fd18
--- /dev/null
+++ b/gson/src/main/java/org/baeldung/gson/primitives/models/PrimitiveBundleInitialized.java
@@ -0,0 +1,18 @@
+package org.baeldung.gson.primitives.models;
+
+public class PrimitiveBundleInitialized {
+    // @formatter:off
+    public byte byteValue       = (byte) 1;
+    public short shortValue     = (short) 1;
+    public int intValue         = 1;
+    public long longValue       = 1L;
+    public float floatValue     = 1.0f;
+    public double doubleValue   = 1;
+    // @formatter:on
+
+    public String toString() {
+        return "{" + "byte: " + byteValue + ", " + "short: " + shortValue + ", "
+            + "int: " + intValue + ", " + "long: " + longValue + ", "
+            + "float: " + floatValue + ", " + "double: " + doubleValue + "}";
+    }
+}
diff --git a/gson/src/test/java/org/baeldung/gson/primitives/PrimitiveValuesUnitTest.java b/gson/src/test/java/org/baeldung/gson/primitives/PrimitiveValuesUnitTest.java
new file mode 100644
index 0000000000..7d249bc55c
--- /dev/null
+++ b/gson/src/test/java/org/baeldung/gson/primitives/PrimitiveValuesUnitTest.java
@@ -0,0 +1,248 @@
+package org.baeldung.gson.primitives;
+
+import com.google.gson.*;
+import org.baeldung.gson.primitives.models.*;
+import org.junit.Test;
+
+import java.lang.reflect.Type;
+
+import static junit.framework.TestCase.*;
+
+public class PrimitiveValuesUnitTest {
+    @Test public void whenSerializingToJSON_thenShouldCreateJSON() {
+        PrimitiveBundle primitiveBundle = new PrimitiveBundle();
+
+        // @formatter:off
+        primitiveBundle.byteValue    = (byte) 0x00001111;
+        primitiveBundle.shortValue   = (short) 3;
+        primitiveBundle.intValue     = 3;
+        primitiveBundle.longValue    = 3;
+        primitiveBundle.floatValue   = 3.5f;
+        primitiveBundle.doubleValue  = 3.5;
+        primitiveBundle.booleanValue = true;
+        primitiveBundle.charValue    = 'a';
+        // @formatter:on
+
+        Gson gson = new Gson();
+
+        String expected = "{\"byteValue\":17,\"shortValue\":3,\"intValue\":3,"
+            + "\"longValue\":3,\"floatValue\":3.5" + ",\"doubleValue\":3.5"
+            + ",\"booleanValue\":true,\"charValue\":\"a\"}";
+
+        assertEquals(expected, gson.toJson(primitiveBundle));
+    }
+
+    @Test(expected = IllegalArgumentException.class) public void
+    whenSerializingInfinity_thenShouldRaiseAnException() {
+        InfinityValuesExample model = new InfinityValuesExample();
+        model.negativeInfinity = Float.NEGATIVE_INFINITY;
+        model.positiveInfinity = Float.POSITIVE_INFINITY;
+
+        Gson gson = new Gson();
+
+        gson.toJson(model);
+    }
+
+    @Test(expected = IllegalArgumentException.class) public void
+        whenSerializingNaN_thenShouldRaiseAnException() {
+        FloatExample model = new FloatExample();
+        model.value = Float.NaN;
+
+        Gson gson = new Gson();
+        gson.toJson(model);
+    }
+
+    @Test public void whenDeserializingFromJSON_thenShouldParseTheValueInTheString() {
+        String json = "{\"byteValue\": 17, \"shortValue\": 3, \"intValue\": 3, "
+            + "\"longValue\": 3, \"floatValue\": 3.5" + ", \"doubleValue\": 3.5"
+            + ", \"booleanValue\": true, \"charValue\": \"a\"}";
+
+        Gson gson = new Gson();
+        PrimitiveBundle model = gson.fromJson(json, PrimitiveBundle.class);
+
+        // @formatter:off
+        assertEquals(17,  model.byteValue);
+        assertEquals(3,   model.shortValue);
+        assertEquals(3,   model.intValue);
+        assertEquals(3,   model.longValue);
+        assertEquals(3.5, model.floatValue, 0.0001);
+        assertEquals(3.5, model.doubleValue, 0.0001);
+        assertTrue(       model.booleanValue);
+        assertEquals('a', model.charValue);
+        // @formatter:on
+    }
+
+    @Test public void whenDeserializingHighPrecissionNumberIntoFloat_thenShouldPerformRounding() {
+        String json = "{\"value\": 12.123425589123456}";
+        Gson gson = new Gson();
+        FloatExample model = gson.fromJson(json, FloatExample.class);
+        assertEquals(12.123426f, model.value, 0.000001);
+    }
+
+    @Test public void whenDeserializingHighPrecissiongNumberIntoDouble_thenShouldPerformRounding() {
+        String json = "{\"value\": 12.123425589123556}";
+        Gson gson = new Gson();
+        DoubleExample model = gson.fromJson(json, DoubleExample.class);
+        assertEquals(12.123425589124f, model.value, 0.000001);
+    }
+
+
+    @Test public void whenDeserializingValueThatOverflows_thenShouldOverflowSilently() {
+        Gson gson = new Gson();
+        String json = "{\"value\": \"300\"}";
+        ByteExample model = gson.fromJson(json, ByteExample.class);
+
+        assertEquals(44, model.value);
+    }
+
+    @Test public void whenDeserializingRealIntoByte_thenShouldRaiseAnException() {
+        Gson gson = new Gson();
+        String json = "{\"value\": 2.3}";
+        try {
+            gson.fromJson(json, ByteExample.class);
+        } catch (Exception ex) {
+            assertTrue(ex instanceof JsonSyntaxException);
+            assertTrue(ex.getCause() instanceof NumberFormatException);
+            return;
+        }
+
+        fail();
+    }
+
+    @Test public void whenDeserializingRealIntoLong_thenShouldRaiseAnException() {
+        Gson gson = new Gson();
+        String json = "{\"value\": 2.3}";
+        try {
+            gson.fromJson(json, LongExample.class);
+        } catch (Exception ex) {
+            assertTrue(ex instanceof JsonSyntaxException);
+            assertTrue(ex.getCause() instanceof NumberFormatException);
+            return;
+        }
+
+        fail();
+    }
+
+    @Test public void whenDeserializingRealWhoseDecimalPartIs0_thenShouldParseItCorrectly() {
+        Gson gson = new Gson();
+        String json = "{\"value\": 2.0}";
+        LongExample model = gson.fromJson(json, LongExample.class);
+        assertEquals(2, model.value);
+    }
+
+    @Test public void whenDeserializingUnicodeChar_thenShouldParseItCorrectly() {
+        Gson gson = new Gson();
+        String json = "{\"value\": \"\\u00AE\"}";
+        CharExample model = gson.fromJson(json, CharExample.class);
+
+        assertEquals('\u00AE', model.value);
+    }
+
+    @Test public void whenDeserializingNullValues_thenShouldIgnoreThoseFields() {
+        Gson gson = new Gson();
+        // @formatter:off
+        String json = "{\"byteValue\": null, \"shortValue\": null, "
+            + "\"intValue\": null, " + "\"longValue\": null, \"floatValue\": null"
+            + ", \"doubleValue\": null}";
+        // @formatter:on
+        PrimitiveBundleInitialized model = gson.fromJson(json,
+            PrimitiveBundleInitialized.class);
+
+        assertEquals(1, model.byteValue);
+        assertEquals(1, model.shortValue);
+        assertEquals(1, model.intValue);
+        assertEquals(1, model.longValue);
+        assertEquals(1, model.floatValue, 0.0001);
+        assertEquals(1, model.doubleValue, 0.0001);
+    }
+
+    @Test(expected = JsonSyntaxException.class) public void
+    whenDeserializingTheEmptyString_thenShouldRaiseAnException() {
+        Gson gson = new Gson();
+        // @formatter:off
+        String json = "{\"byteValue\": \"\", \"shortValue\": \"\", "
+            + "\"intValue\": \"\", " + "\"longValue\": \"\", \"floatValue\": \"\""
+            + ", \"doubleValue\": \"\"" + ", \"booleanValue\": \"\"}";
+        // @formatter:on
+        gson.fromJson(json, PrimitiveBundleInitialized.class);
+    }
+
+    @Test public void whenDeserializingTheEmptyStringIntoChar_thenShouldHaveTheEmtpyChar() {
+        Gson gson = new Gson();
+        // @formatter:off
+        String json = "{\"charValue\": \"\"}";
+        // @formatter:on
+        CharExample model = gson.fromJson(json, CharExample.class);
+
+        assertEquals(Character.MIN_VALUE, model.value);
+    }
+
+    @Test public void whenDeserializingValidValueAppearingInAString_thenShouldParseTheValue() {
+        Gson gson = new Gson();
+        // @formatter:off
+        String json = "{\"byteValue\": \"15\", \"shortValue\": \"15\", "
+            + "\"intValue\": \"15\", " + "\"longValue\": \"15\", \"floatValue\": \"15.0\""
+            + ", \"doubleValue\": \"15.0\"}";
+        // @formatter:on
+        PrimitiveBundleInitialized model = gson.fromJson(json,
+            PrimitiveBundleInitialized.class);
+
+        assertEquals(15, model.byteValue);
+        assertEquals(15, model.shortValue);
+        assertEquals(15, model.intValue);
+        assertEquals(15, model.longValue);
+        assertEquals(15, model.floatValue, 0.0001);
+        assertEquals(15, model.doubleValue, 0.0001);
+    }
+
+    @Test public void whenDeserializingABooleanFrom0Or1Integer_thenShouldRaiseAnException() {
+        String json = "{\"value\": 1}";
+        Gson gson = new Gson();
+
+        try {
+            gson.fromJson(json, BooleanExample.class);
+        } catch (Exception ex) {
+            assertTrue(ex instanceof JsonSyntaxException);
+            assertTrue(ex.getCause() instanceof IllegalStateException);
+            return;
+        }
+
+        fail();
+    }
+
+    @Test public void whenDeserializingWithCustomDeserializerABooleanFrom0Or1Integer_thenShouldWork() {
+        String json = "{\"value\": 1}";
+        GsonBuilder builder = new GsonBuilder();
+        builder.registerTypeAdapter(BooleanExample.class,
+            new BooleanAs2ValueIntegerDeserializer());
+
+        Gson gson = builder.create();
+
+        BooleanExample model = gson.fromJson(json, BooleanExample.class);
+
+        assertTrue(model.value);
+    }
+
+    // @formatter:off
+    static class BooleanAs2ValueIntegerDeserializer implements JsonDeserializer<BooleanExample> {
+        @Override public BooleanExample deserialize(
+            JsonElement jsonElement,
+            Type type,
+            JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
+
+            BooleanExample model = new BooleanExample();
+            int value = jsonElement.getAsJsonObject().getAsJsonPrimitive("value").getAsInt();
+            if (value == 0) {
+                model.value = false;
+            } else if (value == 1) {
+                model.value = true;
+            } else {
+                throw new JsonParseException("Unexpected value. Trying to deserialize "
+                    + "a boolean from an integer different than 0 and 1.");
+            }
+
+            return model;
+        }
+    }
+    // @formatter:on
+}
diff --git a/guava/README.md b/guava/README.md
index 56e6aff50c..0346d34903 100644
--- a/guava/README.md
+++ b/guava/README.md
@@ -17,3 +17,5 @@
 - [Using Guava CountingOutputStream](http://www.baeldung.com/guava-counting-outputstream)
 - [Hamcrest Text Matchers](http://www.baeldung.com/hamcrest-text-matchers)
 - [Quick Guide to the Guava RateLimiter](http://www.baeldung.com/guava-rate-limiter)
+- [Hamcrest File Matchers](https://www.baeldung.com/hamcrest-file-matchers)
+- [SHA-256 Hashing in Java](https://www.baeldung.com/sha-256-hashing-java)
diff --git a/guava/src/test/java/org/baeldung/hamcrest/README.md b/guava/src/test/java/org/baeldung/hamcrest/README.md
index 456108d78a..7266ecda3a 100644
--- a/guava/src/test/java/org/baeldung/hamcrest/README.md
+++ b/guava/src/test/java/org/baeldung/hamcrest/README.md
@@ -1,3 +1,2 @@
 ### Relevant Articles:
 - [Testing with Hamcrest](http://www.baeldung.com/java-junit-hamcrest-guide)
-- [Hamcrest File Matchers](http://www.baeldung.com/hamcrest-file-matchers)
diff --git a/java-dates/src/main/java/com/baeldung/datetime/README.md b/java-dates/src/main/java/com/baeldung/datetime/README.md
index 1e4adbb612..7d843af9ea 100644
--- a/java-dates/src/main/java/com/baeldung/datetime/README.md
+++ b/java-dates/src/main/java/com/baeldung/datetime/README.md
@@ -1,2 +1 @@
 ### Relevant Articles:
-- [Introduction to the Java 8 Date/Time API](http://www.baeldung.com/java-8-date-time-intro)
diff --git a/java-strings/README.md b/java-strings/README.md
index 2713f69d58..cbc32d0015 100644
--- a/java-strings/README.md
+++ b/java-strings/README.md
@@ -2,7 +2,7 @@
 
 ## Java Strings Cookbooks and Examples
 
-### Relevant Articles: 
+### Relevant Articles:
 - [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)
@@ -10,7 +10,7 @@
 - [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)
-- [How to Convert String to different data types in Java](http://www.baeldung.com/java-string-conversions)
+- [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)
@@ -27,7 +27,6 @@
 - [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)
-- [String Not Empty Test Assertions in Java](https://www.baeldung.com/java-assert-string-not-empty)
 - [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)
@@ -43,4 +42,4 @@
 - [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)
\ No newline at end of file
+- [Remove or Replace part of a String in Java](https://www.baeldung.com/java-remove-replace-string-part)
diff --git a/java-strings/src/main/java/com/baeldung/string/ReplaceCharacterInString.java b/java-strings/src/main/java/com/baeldung/string/ReplaceCharacterInString.java
new file mode 100644
index 0000000000..e8d1ce2d8b
--- /dev/null
+++ b/java-strings/src/main/java/com/baeldung/string/ReplaceCharacterInString.java
@@ -0,0 +1,21 @@
+package com.baeldung.string;
+
+public class ReplaceCharacterInString {
+    public  String replaceCharSubstring(String str, char ch, int index) {
+        String myString = str.substring(0, index) + ch + str.substring(index+1);
+        return myString;
+    }
+
+    public  String replaceCharStringBuilder(String str, char ch, int index) {
+        StringBuilder myString = new StringBuilder(str);
+        myString.setCharAt(index, ch);
+        return myString.toString();
+    }
+
+    public String replaceCharStringBuffer(String str, char ch, int index) {
+        StringBuffer myString = new StringBuffer(str);
+        myString.setCharAt(index, ch);
+        return myString.toString();
+    }
+
+}
diff --git a/java-strings/src/test/java/com/baeldung/string/ReplaceCharInStringUnitTest.java b/java-strings/src/test/java/com/baeldung/string/ReplaceCharInStringUnitTest.java
new file mode 100644
index 0000000000..07e86bb69b
--- /dev/null
+++ b/java-strings/src/test/java/com/baeldung/string/ReplaceCharInStringUnitTest.java
@@ -0,0 +1,23 @@
+package com.baeldung.string;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class ReplaceCharInStringUnitTest {
+    private ReplaceCharacterInString characterInString = new ReplaceCharacterInString();
+
+    @Test
+    public void whenReplaceCharAtIndexUsingSubstring_thenSuccess(){
+        assertEquals("abcme",characterInString.replaceCharSubstring("abcde",'m',3));
+    }
+
+    @Test
+    public void whenReplaceCharAtIndexUsingStringBuilder_thenSuccess(){
+        assertEquals("abcme",characterInString.replaceCharStringBuilder("abcde",'m',3));
+    }
+
+    @Test
+    public void whenReplaceCharAtIndexUsingStringBuffer_thenSuccess(){
+        assertEquals("abcme",characterInString.replaceCharStringBuffer("abcde",'m',3));
+    }
+}
diff --git a/jee-7/src/main/java/com/baeldung/batch/understanding/CustomCheckPoint.java b/jee-7/src/main/java/com/baeldung/batch/understanding/CustomCheckPoint.java
index fe6759b365..ba4eeb9da8 100644
--- a/jee-7/src/main/java/com/baeldung/batch/understanding/CustomCheckPoint.java
+++ b/jee-7/src/main/java/com/baeldung/batch/understanding/CustomCheckPoint.java
@@ -1,12 +1,22 @@
 package com.baeldung.batch.understanding;
 
 import javax.batch.api.chunk.AbstractCheckpointAlgorithm;
+import javax.batch.runtime.context.JobContext;
+import javax.inject.Inject;
 import javax.inject.Named;
 
 @Named
 public class CustomCheckPoint extends AbstractCheckpointAlgorithm {
+    
+    @Inject
+    JobContext jobContext;
+    
+    private Integer counterRead = 0;
+    
     @Override
     public boolean isReadyToCheckpoint() throws Exception {
-        return SimpleChunkItemReader.COUNT % 5 == 0;
+        counterRead = (Integer)jobContext.getTransientUserData();
+        System.out.println("counterRead : " + counterRead);
+        return counterRead % 5 == 0;
     }
 }
diff --git a/jee-7/src/main/java/com/baeldung/batch/understanding/InjectSimpleBatchLet.java b/jee-7/src/main/java/com/baeldung/batch/understanding/InjectSimpleBatchLet.java
index 93eb20708d..ccc052b44b 100644
--- a/jee-7/src/main/java/com/baeldung/batch/understanding/InjectSimpleBatchLet.java
+++ b/jee-7/src/main/java/com/baeldung/batch/understanding/InjectSimpleBatchLet.java
@@ -1,20 +1,38 @@
 package com.baeldung.batch.understanding;
 
+import java.util.Properties;
+import java.util.logging.Logger;
+
 import javax.batch.api.AbstractBatchlet;
 import javax.batch.api.BatchProperty;
 import javax.batch.runtime.BatchStatus;
+import javax.batch.runtime.context.JobContext;
+import javax.batch.runtime.context.StepContext;
 import javax.inject.Inject;
 import javax.inject.Named;
 
 @Named
 public class InjectSimpleBatchLet extends AbstractBatchlet {
+    Logger logger = Logger.getLogger(InjectSimpleBatchLet.class.getName());
+
     @Inject
     @BatchProperty(name = "name")
     private String nameString;
 
+    @Inject
+    StepContext stepContext;
+    private Properties stepProperties;    
+    @Inject
+    JobContext jobContext;
+    private Properties jobProperties;
+
     @Override
     public String process() throws Exception {
-        System.out.println("Value passed in = " + nameString);
+        logger.info("BatchProperty : " + nameString);
+        stepProperties = stepContext.getProperties();
+        jobProperties = jobContext.getProperties();
+        logger.info("Step property : "+ stepProperties.getProperty("stepProp1"));
+        logger.info("job property : "+jobProperties.getProperty("jobProp1"));
         return BatchStatus.COMPLETED.toString();
     }
 }
diff --git a/jee-7/src/main/java/com/baeldung/batch/understanding/SimpleChunkItemReader.java b/jee-7/src/main/java/com/baeldung/batch/understanding/SimpleChunkItemReader.java
index 10f81d95d0..7d66edc74c 100644
--- a/jee-7/src/main/java/com/baeldung/batch/understanding/SimpleChunkItemReader.java
+++ b/jee-7/src/main/java/com/baeldung/batch/understanding/SimpleChunkItemReader.java
@@ -1,20 +1,28 @@
 package com.baeldung.batch.understanding;
 
 import java.io.Serializable;
+import java.util.Properties;
 import java.util.StringTokenizer;
 import javax.batch.api.chunk.AbstractItemReader;
+import javax.batch.runtime.BatchStatus;
+import javax.batch.runtime.context.JobContext;
+import javax.inject.Inject;
 import javax.inject.Named;
 
 @Named
 public class SimpleChunkItemReader extends AbstractItemReader {
     private StringTokenizer tokens;
-    public static int COUNT = 0;
+    private Integer count=0;
+    
+    @Inject
+    JobContext jobContext;
 
     @Override
     public Integer readItem() throws Exception {
         if (tokens.hasMoreTokens()) {
-            COUNT++;
+            this.count++;
             String tempTokenize = tokens.nextToken();
+            jobContext.setTransientUserData(count);
             return Integer.valueOf(tempTokenize);
         }
         return null;
@@ -24,4 +32,5 @@ public class SimpleChunkItemReader extends AbstractItemReader {
     public void open(Serializable checkpoint) throws Exception {
         tokens = new StringTokenizer("1,2,3,4,5,6,7,8,9,10", ",");
     }
+
 }
diff --git a/jee-7/src/main/java/com/baeldung/batch/understanding/SimpleChunkItemReaderError.java b/jee-7/src/main/java/com/baeldung/batch/understanding/SimpleChunkItemReaderError.java
index 92096d0571..f51426339f 100644
--- a/jee-7/src/main/java/com/baeldung/batch/understanding/SimpleChunkItemReaderError.java
+++ b/jee-7/src/main/java/com/baeldung/batch/understanding/SimpleChunkItemReaderError.java
@@ -4,17 +4,22 @@ import java.io.Serializable;
 import java.util.StringTokenizer;
 
 import javax.batch.api.chunk.AbstractItemReader;
+import javax.batch.runtime.context.JobContext;
+import javax.inject.Inject;
 import javax.inject.Named;
 
 @Named
 public class SimpleChunkItemReaderError extends AbstractItemReader {
+    @Inject 
+    JobContext jobContext;
     private StringTokenizer tokens;
-    public static int COUNT = 0;
+    private Integer count = 0;
 
     @Override
     public Integer readItem() throws Exception {
         if (tokens.hasMoreTokens()) {
-            COUNT++;
+            count++;
+            jobContext.setTransientUserData(count);
             int token = Integer.valueOf(tokens.nextToken());
             if (token == 3) {
                 throw new RuntimeException("Something happened");
diff --git a/jee-7/src/main/java/com/baeldung/batch/understanding/SimpleChunkWriter.java b/jee-7/src/main/java/com/baeldung/batch/understanding/SimpleChunkWriter.java
index 909596766d..f21dd77b85 100644
--- a/jee-7/src/main/java/com/baeldung/batch/understanding/SimpleChunkWriter.java
+++ b/jee-7/src/main/java/com/baeldung/batch/understanding/SimpleChunkWriter.java
@@ -1,5 +1,6 @@
 package com.baeldung.batch.understanding;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.batch.api.chunk.AbstractItemWriter;
@@ -7,7 +8,9 @@ import javax.inject.Named;
 
 @Named
 public class SimpleChunkWriter extends AbstractItemWriter {
+    List<Integer> processed = new ArrayList<>();
     @Override
     public void writeItems(List<Object> items) throws Exception {
+        items.stream().map(Integer.class::cast).forEach(this.processed::add);
     }
 }
diff --git a/jee-7/src/main/resources/META-INF/batch-jobs/injectionSimpleBatchLet.xml b/jee-7/src/main/resources/META-INF/batch-jobs/injectionSimpleBatchLet.xml
index d152f063f6..39cb043dcf 100644
--- a/jee-7/src/main/resources/META-INF/batch-jobs/injectionSimpleBatchLet.xml
+++ b/jee-7/src/main/resources/META-INF/batch-jobs/injectionSimpleBatchLet.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<job id="injectSimpleBatchLet" 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/jobXML_1_0.xsd"
-    version="1.0">
-    <step id="firstStep" >
-        <batchlet ref="injectSimpleBatchLet">
-        	<properties>
-                <property name="name" value="helloThere"  />
-            </properties>
-        </batchlet>
-    </step>
+<job id="injectSimpleBatchLet"
+	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/jobXML_1_0.xsd"
+	version="1.0">
+	<step id="firstStep">
+		<properties>
+			<property name="stepProp1" value="value1" />
+		</properties>
+		<batchlet ref="injectSimpleBatchLet">
+			<properties>
+				<property name="name" value="helloThere" />
+			</properties>
+		</batchlet>
+	</step>
 </job>	
\ No newline at end of file
diff --git a/jee-7/src/main/resources/META-INF/batch-jobs/partitionSimpleBatchLet.xml b/jee-7/src/main/resources/META-INF/batch-jobs/partitionSimpleBatchLet.xml
index 76c64ee899..49495072ea 100644
--- a/jee-7/src/main/resources/META-INF/batch-jobs/partitionSimpleBatchLet.xml
+++ b/jee-7/src/main/resources/META-INF/batch-jobs/partitionSimpleBatchLet.xml
@@ -4,7 +4,13 @@
 	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/jobXML_1_0.xsd"
 	version="1.0">
+	<properties> 
+        <property name="jobProp1" value="job-value1"/>
+    </properties>
 	<step id="firstStep">
+		<properties>
+			<property name="stepProp1" value="step-value1" />
+		</properties>
 		<batchlet ref="injectSimpleBatchLet">
 			<properties>
 				<property name="name" value="#{partitionPlan['name']}" />
diff --git a/jee-7/src/test/java/com/baeldung/batch/understanding/BatchTestHelper.java b/jee-7/src/test/java/com/baeldung/batch/understanding/BatchTestHelper.java
index 5060bd9b91..56269809f3 100644
--- a/jee-7/src/test/java/com/baeldung/batch/understanding/BatchTestHelper.java
+++ b/jee-7/src/test/java/com/baeldung/batch/understanding/BatchTestHelper.java
@@ -7,6 +7,7 @@ import javax.batch.runtime.BatchRuntime;
 import javax.batch.runtime.BatchStatus;
 import javax.batch.runtime.JobExecution;
 import javax.batch.runtime.Metric;
+import javax.batch.runtime.StepExecution;
 
 public class BatchTestHelper {
     private static final int MAX_TRIES = 40;
@@ -68,6 +69,16 @@ public class BatchTestHelper {
         return jobExecution;
     }
 
+    public static long getCommitCount(StepExecution stepExecution) {
+        Map<Metric.MetricType, Long> metricsMap = getMetricsMap(stepExecution.getMetrics());
+        return metricsMap.get(Metric.MetricType.COMMIT_COUNT);
+    }
+    
+    public static long getProcessSkipCount(StepExecution stepExecution) {
+        Map<Metric.MetricType, Long> metricsMap = getMetricsMap(stepExecution.getMetrics());
+        return metricsMap.get(Metric.MetricType.PROCESS_SKIP_COUNT);
+    }
+    
     public static Map<Metric.MetricType, Long> getMetricsMap(Metric[] metrics) {
         Map<Metric.MetricType, Long> metricsMap = new HashMap<>();
         for (Metric metric : metrics) {
diff --git a/jee-7/src/test/java/com/baeldung/batch/understanding/CustomCheckPointUnitTest.java b/jee-7/src/test/java/com/baeldung/batch/understanding/CustomCheckPointUnitTest.java
index a9488c5c03..dfea878a75 100644
--- a/jee-7/src/test/java/com/baeldung/batch/understanding/CustomCheckPointUnitTest.java
+++ b/jee-7/src/test/java/com/baeldung/batch/understanding/CustomCheckPointUnitTest.java
@@ -15,7 +15,7 @@ import org.junit.jupiter.api.Test;
 
 class CustomCheckPointUnitTest {
     @Test
-    public void givenChunk_whenCustomCheckPoint_thenCommitCount_3() throws Exception {
+    public void givenChunk_whenCustomCheckPoint_thenCommitCountIsThree() throws Exception {
         JobOperator jobOperator = BatchRuntime.getJobOperator();
         Long executionId = jobOperator.start("customCheckPoint", new Properties());
         JobExecution jobExecution = jobOperator.getJobExecution(executionId);
@@ -23,9 +23,10 @@ class CustomCheckPointUnitTest {
         for (StepExecution stepExecution : jobOperator.getStepExecutions(executionId)) {
             if (stepExecution.getStepName()
                 .equals("firstChunkStep")) {
-                Map<Metric.MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());
-                assertEquals(3L, metricsMap.get(Metric.MetricType.COMMIT_COUNT)
-                    .longValue());
+                jobOperator.getStepExecutions(executionId)
+                    .stream()
+                    .map(BatchTestHelper::getCommitCount)
+                    .forEach(count -> assertEquals(3L, count.longValue()));
             }
         }
         assertEquals(jobExecution.getBatchStatus(), BatchStatus.COMPLETED);
diff --git a/jee-7/src/test/java/com/baeldung/batch/understanding/SimpleBatchLetUnitTest.java b/jee-7/src/test/java/com/baeldung/batch/understanding/SimpleBatchLetUnitTest.java
index 485c997cc6..ade492b1b9 100644
--- a/jee-7/src/test/java/com/baeldung/batch/understanding/SimpleBatchLetUnitTest.java
+++ b/jee-7/src/test/java/com/baeldung/batch/understanding/SimpleBatchLetUnitTest.java
@@ -1,18 +1,11 @@
 package com.baeldung.batch.understanding;
 
 import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.List;
-import java.util.Map;
 import java.util.Properties;
-
 import javax.batch.operations.JobOperator;
 import javax.batch.runtime.BatchRuntime;
 import javax.batch.runtime.BatchStatus;
 import javax.batch.runtime.JobExecution;
-import javax.batch.runtime.Metric;
-import javax.batch.runtime.StepExecution;
-
 import org.junit.jupiter.api.Test;
 
 class SimpleBatchLetUnitTest {
diff --git a/jee-7/src/test/java/com/baeldung/batch/understanding/SimpleErrorChunkUnitTest.java b/jee-7/src/test/java/com/baeldung/batch/understanding/SimpleErrorChunkUnitTest.java
index 0f6d068888..ded31b6345 100644
--- a/jee-7/src/test/java/com/baeldung/batch/understanding/SimpleErrorChunkUnitTest.java
+++ b/jee-7/src/test/java/com/baeldung/batch/understanding/SimpleErrorChunkUnitTest.java
@@ -1,5 +1,6 @@
 package com.baeldung.batch.understanding;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -23,7 +24,6 @@ class SimpleErrorChunkUnitTest {
         Long executionId = jobOperator.start("simpleErrorChunk", new Properties());
         JobExecution jobExecution = jobOperator.getJobExecution(executionId);
         jobExecution = BatchTestHelper.keepTestFailed(jobExecution);
-        System.out.println(jobExecution.getBatchStatus());
         assertEquals(jobExecution.getBatchStatus(), BatchStatus.FAILED);
     }
 
@@ -37,10 +37,10 @@ class SimpleErrorChunkUnitTest {
         for (StepExecution stepExecution : stepExecutions) {
             if (stepExecution.getStepName()
                 .equals("errorStep")) {
-                Map<MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());
-                long skipCount = metricsMap.get(MetricType.PROCESS_SKIP_COUNT)
-                    .longValue();
-                assertTrue("Skip count=" + skipCount, skipCount == 1l || skipCount == 2l);
+                jobOperator.getStepExecutions(executionId)
+                .stream()
+                .map(BatchTestHelper::getProcessSkipCount)
+                .forEach(skipCount -> assertEquals(1L, skipCount.longValue()));
             }
         }
         assertEquals(jobExecution.getBatchStatus(), BatchStatus.COMPLETED);
diff --git a/jhipster/jhipster-uaa/pom.xml b/jhipster/jhipster-uaa/pom.xml
new file mode 100644
index 0000000000..e8ccaabfb0
--- /dev/null
+++ b/jhipster/jhipster-uaa/pom.xml
@@ -0,0 +1,22 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.jhipster</groupId>
+    <artifactId>jhipster-microservice-uaa</artifactId>
+    <packaging>pom</packaging>
+    <name>JHipster Microservice with UAA</name>
+
+	<parent>
+        <artifactId>jhipster</artifactId>
+        <groupId>com.baeldung.jhipster</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>uaa</module>
+        <module>gateway</module>
+		<module>quotes</module>
+	</modules>
+	
+</project>
diff --git a/jhipster/pom.xml b/jhipster/pom.xml
index 2bf7bcb233..5132c6dc95 100644
--- a/jhipster/pom.xml
+++ b/jhipster/pom.xml
@@ -18,6 +18,7 @@
     <modules>
         <module>jhipster-monolithic</module>
         <module>jhipster-microservice</module>
+		<module>jhipster-uaa</module>
 	</modules>
 	
 </project>
diff --git a/jib/pom.xml b/jib/pom.xml
index e71250f157..ad4011c3c4 100644
--- a/jib/pom.xml
+++ b/jib/pom.xml
@@ -1,5 +1,5 @@
 <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>jib</artifactId>
     <version>0.1-SNAPSHOT</version>
@@ -42,16 +42,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>spring-releases</id>
-            <url>https://repo.spring.io/libs-release</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-releases</id>
-            <url>https://repo.spring.io/libs-release</url>
-        </pluginRepository>
-    </pluginRepositories>
 </project>
diff --git a/kotlin-libraries/README.md b/kotlin-libraries/README.md
index d1ef77aa46..4110bfe12e 100644
--- a/kotlin-libraries/README.md
+++ b/kotlin-libraries/README.md
@@ -5,7 +5,7 @@
 - [Kotlin Dependency Injection with Kodein](http://www.baeldung.com/kotlin-kodein-dependency-injection)
 - [Writing Specifications with Kotlin and Spek](http://www.baeldung.com/kotlin-spek)
 - [Processing JSON with Kotlin and Klaxson](http://www.baeldung.com/kotlin-json-klaxson)
-- [Kotlin with Ktor](http://www.baeldung.com/kotlin-ktor)
 - [Guide to the Kotlin Exposed Framework](https://www.baeldung.com/kotlin-exposed-persistence)
 - [Working with Dates in Kotlin](https://www.baeldung.com/kotlin-dates)
 - [Introduction to Arrow in Kotlin](https://www.baeldung.com/kotlin-arrow)
+- [Kotlin with Ktor](https://www.baeldung.com/kotlin-ktor)
diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index 1a7833a0da..daf6c8b500 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -429,13 +429,6 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>Apache Staging</id>
-            <url>https://repository.apache.org/content/groups/staging</url>
-        </repository>
-    </repositories>
-
     <properties>
         <storm.version>1.2.2</storm.version>
         <kryo.version>4.0.1</kryo.version>
diff --git a/libraries-data/src/main/resources/logback.xml b/libraries-data/src/main/resources/logback.xml
index a57d22fcb2..3d2ec51566 100644
--- a/libraries-data/src/main/resources/logback.xml
+++ b/libraries-data/src/main/resources/logback.xml
@@ -9,7 +9,7 @@
     <logger name="io.ebean.DDL" level="TRACE"/>
     <logger name="io.ebean.SQL" level="TRACE"/>
     <logger name="io.ebean.TXN" level="TRACE"/>
-    <root level="INFO">
+    <root level="WARN">
         <appender-ref ref="STDOUT" />
     </root>
 </configuration>
\ No newline at end of file
diff --git a/libraries-data/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java b/libraries-data/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java
index 96ed090482..9db7bdb4ac 100644
--- a/libraries-data/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java
+++ b/libraries-data/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java
@@ -15,100 +15,88 @@ import com.googlecode.jmapper.api.JMapperAPI;
 
 public class JMapperIntegrationTest {
 
-    
     @Test
-    public void givenUser_whenUseAnnotation_thenConverted(){
+    public void givenUser_whenUseAnnotation_thenConverted() {
         JMapper<UserDto, User> userMapper = new JMapper<>(UserDto.class, User.class);
-        
-        User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20));
+
+        User user = new User(1L, "john@test.com", LocalDate.of(1980, 8, 20));
         UserDto result = userMapper.getDestination(user);
 
-        System.out.println(result);
-        assertEquals(user.getId(), result.getId());
-        assertEquals(user.getEmail(), result.getUsername());        
-    }
-    
-    @Test
-    public void givenUser_whenUseGlobalMapAnnotation_thenConverted(){
-        JMapper<UserDto1, User> userMapper= new JMapper<>(UserDto1.class, User.class);
-        
-        User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20));
-        UserDto1 result = userMapper.getDestination(user);
-
-        System.out.println(result);
-        assertEquals(user.getId(), result.getId());
-        assertEquals(user.getEmail(), result.getEmail());        
-    }  
-    
-    @Test
-    public void givenUser_whenUseAnnotationExplicitConversion_thenConverted(){
-        JMapper<UserDto, User> userMapper = new JMapper<>(UserDto.class, User.class);
-        
-        User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20));
-        UserDto result = userMapper.getDestination(user);
-
-        System.out.println(result);
-        assertEquals(user.getId(), result.getId());
-        assertEquals(user.getEmail(), result.getUsername());     
-        assertTrue(result.getAge() > 0);
-    }      
-
-    //======================= XML
-    
-    @Test
-    public void givenUser_whenUseXml_thenConverted(){
-        JMapper<UserDto, User> userMapper = new JMapper<>(UserDto.class, User.class,"user_jmapper.xml");
-        
-        User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20));
-        UserDto result = userMapper.getDestination(user);
-
-        System.out.println(result);
-        assertEquals(user.getId(), result.getId());
-        assertEquals(user.getEmail(), result.getUsername());            
-    }
-    
-    @Test
-    public void givenUser_whenUseXmlGlobal_thenConverted(){
-        JMapper<UserDto1, User> userMapper = new JMapper<>(UserDto1.class, User.class,"user_jmapper1.xml");
-        
-        User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20));
-        UserDto1 result = userMapper.getDestination(user);
-
-        System.out.println(result);
-        assertEquals(user.getId(), result.getId());
-        assertEquals(user.getEmail(), result.getEmail());            
-    }    
-    
-    // ===== API
-    
-    @Test
-    public void givenUser_whenUseApi_thenConverted(){
-        JMapperAPI jmapperApi = new JMapperAPI() .add(mappedClass(UserDto.class)
-                 .add(attribute("id").value("id"))
-                 .add(attribute("username").value("email"))
-            ) ;
-        JMapper<UserDto, User> userMapper = new JMapper<>(UserDto.class, User.class, jmapperApi);
-        
-        User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20));
-        UserDto result = userMapper.getDestination(user);
-
-        System.out.println(result);
         assertEquals(user.getId(), result.getId());
         assertEquals(user.getEmail(), result.getUsername());
     }
-    
-    @Test
-    public void givenUser_whenUseApiGlobal_thenConverted(){
-        JMapperAPI jmapperApi = new JMapperAPI() .add(mappedClass(UserDto.class)
-                .add(global())
-            ) ;
-        JMapper<UserDto1, User> userMapper1 = new JMapper<>(UserDto1.class, User.class,jmapperApi);
-        
-        User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20));
-        UserDto1 result = userMapper1.getDestination(user);
 
-        System.out.println(result);
+    @Test
+    public void givenUser_whenUseGlobalMapAnnotation_thenConverted() {
+        JMapper<UserDto1, User> userMapper = new JMapper<>(UserDto1.class, User.class);
+
+        User user = new User(1L, "john@test.com", LocalDate.of(1980, 8, 20));
+        UserDto1 result = userMapper.getDestination(user);
+
         assertEquals(user.getId(), result.getId());
         assertEquals(user.getEmail(), result.getEmail());
     }
+
+    @Test
+    public void givenUser_whenUseAnnotationExplicitConversion_thenConverted() {
+        JMapper<UserDto, User> userMapper = new JMapper<>(UserDto.class, User.class);
+
+        User user = new User(1L, "john@test.com", LocalDate.of(1980, 8, 20));
+        UserDto result = userMapper.getDestination(user);
+
+        assertEquals(user.getId(), result.getId());
+        assertEquals(user.getEmail(), result.getUsername());
+        assertTrue(result.getAge() > 0);
+    }
+
+    // ======================= XML
+
+    @Test
+    public void givenUser_whenUseXml_thenConverted() {
+        JMapper<UserDto, User> userMapper = new JMapper<>(UserDto.class, User.class, "user_jmapper.xml");
+
+        User user = new User(1L, "john@test.com", LocalDate.of(1980, 8, 20));
+        UserDto result = userMapper.getDestination(user);
+
+        assertEquals(user.getId(), result.getId());
+        assertEquals(user.getEmail(), result.getUsername());
+    }
+
+    @Test
+    public void givenUser_whenUseXmlGlobal_thenConverted() {
+        JMapper<UserDto1, User> userMapper = new JMapper<>(UserDto1.class, User.class, "user_jmapper1.xml");
+
+        User user = new User(1L, "john@test.com", LocalDate.of(1980, 8, 20));
+        UserDto1 result = userMapper.getDestination(user);
+
+        assertEquals(user.getId(), result.getId());
+        assertEquals(user.getEmail(), result.getEmail());
+    }
+
+    // ===== API
+
+    @Test
+    public void givenUser_whenUseApi_thenConverted() {
+        JMapperAPI jmapperApi = new JMapperAPI().add(mappedClass(UserDto.class).add(attribute("id").value("id")).add(attribute("username").value("email")));
+        JMapper<UserDto, User> userMapper = new JMapper<>(UserDto.class, User.class, jmapperApi);
+
+        User user = new User(1L, "john@test.com", LocalDate.of(1980, 8, 20));
+        UserDto result = userMapper.getDestination(user);
+
+        assertEquals(user.getId(), result.getId());
+        assertEquals(user.getEmail(), result.getUsername());
+    }
+
+    @Test
+    public void givenUser_whenUseApiGlobal_thenConverted() {
+        JMapperAPI jmapperApi = new JMapperAPI().add(mappedClass(UserDto.class).add(global()));
+        JMapper<UserDto1, User> userMapper1 = new JMapper<>(UserDto1.class, User.class, jmapperApi);
+
+        User user = new User(1L, "john@test.com", LocalDate.of(1980, 8, 20));
+        UserDto1 result = userMapper1.getDestination(user);
+
+        assertEquals(user.getId(), result.getId());
+        assertEquals(user.getEmail(), result.getEmail());
+    }
+
 }
diff --git a/libraries/README.md b/libraries/README.md
index ce2445f3e0..b247caedda 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -18,7 +18,6 @@
 - [Guide to the HyperLogLog Algorithm](http://www.baeldung.com/java-hyperloglog)
 - [Introduction to Neuroph](http://www.baeldung.com/neuroph)
 - [Quick Guide to RSS with Rome](http://www.baeldung.com/rome-rss)
-- [Introduction to NoException](http://www.baeldung.com/introduction-to-noexception)
 - [Introduction to PCollections](http://www.baeldung.com/java-pcollections)
 - [Introduction to Hoverfly in Java](http://www.baeldung.com/hoverfly)
 - [Introduction to Eclipse Collections](http://www.baeldung.com/eclipse-collections)
@@ -34,7 +33,6 @@
 - [Introduction to Retrofit](http://www.baeldung.com/retrofit)
 - [Using Pairs in Java](http://www.baeldung.com/java-pairs)
 - [Introduction to Caffeine](http://www.baeldung.com/java-caching-caffeine)
-- [Introduction to Chronicle Queue](http://www.baeldung.com/java-chronicle-queue)
 - [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)
@@ -66,6 +64,7 @@
 - [Exactly Once Processing in Kafka](https://www.baeldung.com/kafka-exactly-once)
 - [An Introduction to SuanShu](https://www.baeldung.com/suanshu)
 - [Implementing a FTP-Client in Java](http://www.baeldung.com/java-ftp-client)
+- [Introduction to Functional Java](https://www.baeldung.com/java-functional-library
 
 The libraries module contains examples related to small libraries that are relatively easy to use and does not require any separate module of its own.
 
diff --git a/libraries/pom.xml b/libraries/pom.xml
index b2e6552644..c7ef64bc59 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -130,10 +130,10 @@
             <version>${serenity.version}</version>
             <scope>test</scope>
             <exclusions>
-            	<exclusion>
-            		<groupId>org.asciidoctor</groupId>
-					<artifactId>asciidoctorj</artifactId>
-            	</exclusion>
+                <exclusion>
+                    <groupId>org.asciidoctor</groupId>
+                    <artifactId>asciidoctorj</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -577,7 +577,7 @@
             <classifier>test</classifier>
             <scope>test</scope>
         </dependency>
-		
+
         <dependency>
             <groupId>org.milyn</groupId>
             <artifactId>milyn-smooks-all</artifactId>
@@ -654,8 +654,8 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>${snakeyaml.version}</version>            
-        </dependency>       
+            <version>${snakeyaml.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>com.numericalmethod</groupId>
@@ -678,11 +678,6 @@
     </dependencies>
 
     <repositories>
-        <!-- <repository>
-            <id>maven2-repository.dev.java.net</id>
-            <name>Java.net repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository> -->
         <repository>
             <snapshots>
                 <enabled>false</enabled>
diff --git a/lombok-custom/pom.xml b/lombok-custom/pom.xml
new file mode 100644
index 0000000000..41bd042a5e
--- /dev/null
+++ b/lombok-custom/pom.xml
@@ -0,0 +1,58 @@
+<?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>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>lombok-custom</artifactId>
+    <version>0.1-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.14.8</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+            <version>1.8</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>core</artifactId>
+            <version>3.3.0-v_771</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>default-tools.jar</id>
+            <activation>
+                <property>
+                    <name>java.vendor</name>
+                    <value>Oracle Corporation</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.sun</groupId>
+                    <artifactId>tools</artifactId>
+                    <version>${java.version}</version>
+                    <scope>system</scope>
+                    <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+
+</project>
\ No newline at end of file
diff --git a/lombok-custom/src/main/java/com/baeldung/singleton/Singleton.java b/lombok-custom/src/main/java/com/baeldung/singleton/Singleton.java
new file mode 100644
index 0000000000..2d2fd0ffb9
--- /dev/null
+++ b/lombok-custom/src/main/java/com/baeldung/singleton/Singleton.java
@@ -0,0 +1,10 @@
+package com.baeldung.singleton;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+public @interface Singleton {
+
+
+}
diff --git a/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonEclipseHandler.java b/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonEclipseHandler.java
new file mode 100644
index 0000000000..03cdd707a4
--- /dev/null
+++ b/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonEclipseHandler.java
@@ -0,0 +1,124 @@
+package com.baeldung.singleton.handlers;
+
+import com.baeldung.singleton.Singleton;
+import lombok.core.AnnotationValues;
+import lombok.eclipse.EclipseAnnotationHandler;
+import lombok.eclipse.EclipseNode;
+import lombok.eclipse.handlers.EclipseHandlerUtil;
+import org.eclipse.jdt.internal.compiler.ast.AllocationExpression;
+import org.eclipse.jdt.internal.compiler.ast.Annotation;
+import org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.FieldReference;
+import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.ReturnStatement;
+import org.eclipse.jdt.internal.compiler.ast.SingleNameReference;
+import org.eclipse.jdt.internal.compiler.ast.Statement;
+import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.TypeReference;
+import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
+import org.kohsuke.MetaInfServices;
+
+import static lombok.eclipse.Eclipse.ECLIPSE_DO_NOT_TOUCH_FLAG;
+import static org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants.AccFinal;
+import static org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants.AccPrivate;
+import static org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants.AccStatic;
+
+@MetaInfServices(EclipseAnnotationHandler.class)
+public class SingletonEclipseHandler extends EclipseAnnotationHandler<Singleton> {
+
+
+    @Override
+    public void handle(AnnotationValues<Singleton> annotation, Annotation ast, EclipseNode annotationNode) {
+
+        //remove annotation
+        EclipseHandlerUtil.unboxAndRemoveAnnotationParameter(ast, "onType", "@Singleton(onType=", annotationNode);
+
+        //add private constructor
+        EclipseNode singletonClass = annotationNode.up();
+
+        TypeDeclaration singletonClassType = (TypeDeclaration) singletonClass.get();
+        ConstructorDeclaration constructor = addConstructor(singletonClass, singletonClassType);
+
+        TypeReference singletonTypeRef = EclipseHandlerUtil.cloneSelfType(singletonClass, singletonClassType);
+
+        //add inner class
+
+        //add instance field
+        StringBuilder sb = new StringBuilder();
+        sb.append(singletonClass.getName());
+        sb.append("Holder");
+        String innerClassName = sb.toString();
+        TypeDeclaration innerClass = new TypeDeclaration(singletonClassType.compilationResult);
+        innerClass.modifiers = AccPrivate | AccStatic;
+        innerClass.name = innerClassName.toCharArray();
+
+        FieldDeclaration instanceVar = addInstanceVar(constructor, singletonTypeRef, innerClass);
+
+        FieldDeclaration[] declarations = new FieldDeclaration[]{instanceVar};
+        innerClass.fields = declarations;
+
+        EclipseHandlerUtil.injectType(singletonClass, innerClass);
+
+        addFactoryMethod(singletonClass, singletonClassType, singletonTypeRef, innerClass, instanceVar);
+
+
+    }
+
+    private void addFactoryMethod(EclipseNode singletonClass, TypeDeclaration astNode, TypeReference typeReference, TypeDeclaration innerClass, FieldDeclaration field) {
+        MethodDeclaration factoryMethod = new MethodDeclaration(astNode.compilationResult);
+        factoryMethod.modifiers = AccStatic | ClassFileConstants.AccPublic;
+        factoryMethod.returnType = typeReference;
+        factoryMethod.sourceStart = astNode.sourceStart;
+        factoryMethod.sourceEnd = astNode.sourceEnd;
+        factoryMethod.selector = "getInstance".toCharArray();
+        factoryMethod.bits = ECLIPSE_DO_NOT_TOUCH_FLAG;
+
+        long pS = factoryMethod.sourceStart;
+        long pE = factoryMethod.sourceEnd;
+        long p = (long) pS << 32 | pE;
+
+        FieldReference ref = new FieldReference(field.name, p);
+        ref.receiver = new SingleNameReference(innerClass.name, p);
+
+        ReturnStatement statement = new ReturnStatement(ref, astNode.sourceStart, astNode.sourceEnd);
+
+        factoryMethod.statements = new Statement[]{statement};
+
+        EclipseHandlerUtil.injectMethod(singletonClass, factoryMethod);
+    }
+
+    private FieldDeclaration addInstanceVar(ConstructorDeclaration constructor, TypeReference typeReference, TypeDeclaration innerClass) {
+        FieldDeclaration field = new FieldDeclaration();
+        field.modifiers = AccPrivate | AccStatic | AccFinal;
+        field.name = "INSTANCE".toCharArray();
+
+        field.type = typeReference;
+
+        AllocationExpression exp = new AllocationExpression();
+        exp.type = typeReference;
+        exp.binding = constructor.binding;
+        exp.sourceStart = innerClass.sourceStart;
+        exp.sourceEnd = innerClass.sourceEnd;
+
+        field.initialization = exp;
+        return field;
+    }
+
+    private ConstructorDeclaration addConstructor(EclipseNode singletonClass, TypeDeclaration astNode) {
+        ConstructorDeclaration constructor = new ConstructorDeclaration(astNode.compilationResult);
+        constructor.modifiers = AccPrivate;
+        constructor.selector = astNode.name;
+        constructor.sourceStart = astNode.sourceStart;
+        constructor.sourceEnd = astNode.sourceEnd;
+        constructor.thrownExceptions = null;
+        constructor.typeParameters = null;
+        constructor.bits |= ECLIPSE_DO_NOT_TOUCH_FLAG;
+        constructor.bodyStart = constructor.declarationSourceStart = constructor.sourceStart = astNode.sourceStart;
+        constructor.bodyEnd = constructor.declarationSourceEnd = constructor.sourceEnd = astNode.sourceEnd;
+        constructor.arguments = null;
+
+        EclipseHandlerUtil.injectMethod(singletonClass, constructor);
+        return constructor;
+    }
+}
diff --git a/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonJavacHandler.java b/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonJavacHandler.java
new file mode 100644
index 0000000000..1f4cf0ea58
--- /dev/null
+++ b/lombok-custom/src/main/java/com/baeldung/singleton/handlers/SingletonJavacHandler.java
@@ -0,0 +1,108 @@
+package com.baeldung.singleton.handlers;
+
+import com.baeldung.singleton.Singleton;
+import com.sun.tools.javac.code.Flags;
+import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.List;
+import com.sun.tools.javac.util.ListBuffer;
+import lombok.core.AnnotationValues;
+import lombok.javac.Javac8BasedLombokOptions;
+import lombok.javac.JavacAnnotationHandler;
+import lombok.javac.JavacNode;
+import lombok.javac.JavacTreeMaker;
+import lombok.javac.handlers.JavacHandlerUtil;
+import org.kohsuke.MetaInfServices;
+
+import static lombok.javac.handlers.JavacHandlerUtil.deleteAnnotationIfNeccessary;
+import static lombok.javac.handlers.JavacHandlerUtil.deleteImportFromCompilationUnit;
+
+@MetaInfServices(JavacAnnotationHandler.class)
+public class SingletonJavacHandler extends JavacAnnotationHandler<Singleton> {
+
+    @Override
+    public void handle(AnnotationValues<Singleton> annotation, JCTree.JCAnnotation ast, JavacNode annotationNode) {
+
+        Context context = annotationNode.getContext();
+
+        Javac8BasedLombokOptions options = Javac8BasedLombokOptions.replaceWithDelombokOptions(context);
+        options.deleteLombokAnnotations();
+
+        //remove annotation
+        deleteAnnotationIfNeccessary(annotationNode, Singleton.class);
+        //remove import
+        deleteImportFromCompilationUnit(annotationNode, "lombok.AccessLevel");
+
+        //private constructor
+        JavacNode singletonClass = annotationNode.up();
+        JavacTreeMaker singletonClassTreeMaker = singletonClass.getTreeMaker();
+
+        addPrivateConstructor(singletonClass, singletonClassTreeMaker);
+
+        //singleton holder
+        JavacNode holderInnerClass = addInnerClass(singletonClass, singletonClassTreeMaker);
+
+        //inject static field to this
+        addInstanceVar(singletonClass, singletonClassTreeMaker, holderInnerClass);
+
+        //add factory method
+        addFactoryMethod(singletonClass, singletonClassTreeMaker, holderInnerClass);
+    }
+
+    private void addFactoryMethod(JavacNode singletonClass, JavacTreeMaker singletonClassTreeMaker, JavacNode holderInnerClass) {
+        JCTree.JCModifiers modifiers = singletonClassTreeMaker.Modifiers(Flags.PUBLIC | Flags.STATIC);
+
+        JCTree.JCClassDecl singletonClassDecl = (JCTree.JCClassDecl) singletonClass.get();
+        JCTree.JCIdent singletonClassType = singletonClassTreeMaker.Ident(singletonClassDecl.name);
+
+        JCTree.JCBlock block = addReturnBlock(singletonClassTreeMaker, holderInnerClass);
+
+        JCTree.JCMethodDecl factoryMethod = singletonClassTreeMaker.MethodDef(modifiers, singletonClass.toName("getInstance"), singletonClassType, List.nil(), List.nil(), List.nil(), block, null);
+        JavacHandlerUtil.injectMethod(singletonClass, factoryMethod);
+    }
+
+    private JCTree.JCBlock addReturnBlock(JavacTreeMaker singletonClassTreeMaker, JavacNode holderInnerClass) {
+
+        JCTree.JCClassDecl holderInnerClassDecl = (JCTree.JCClassDecl) holderInnerClass.get();
+        JavacTreeMaker holderInnerClassTreeMaker = holderInnerClass.getTreeMaker();
+        JCTree.JCIdent holderInnerClassType = holderInnerClassTreeMaker.Ident(holderInnerClassDecl.name);
+
+        JCTree.JCFieldAccess instanceVarAccess = holderInnerClassTreeMaker.Select(holderInnerClassType, holderInnerClass.toName("INSTANCE"));
+        JCTree.JCReturn returnValue = singletonClassTreeMaker.Return(instanceVarAccess);
+
+        ListBuffer<JCTree.JCStatement> statements = new ListBuffer<>();
+        statements.append(returnValue);
+
+        return singletonClassTreeMaker.Block(0L, statements.toList());
+    }
+
+
+    private void addInstanceVar(JavacNode singletonClass, JavacTreeMaker singletonClassTM, JavacNode holderClass) {
+        JCTree.JCModifiers fieldMod = singletonClassTM.Modifiers(Flags.PRIVATE | Flags.STATIC | Flags.FINAL);
+
+        JCTree.JCClassDecl singletonClassDecl = (JCTree.JCClassDecl) singletonClass.get();
+        JCTree.JCIdent singletonClassType = singletonClassTM.Ident(singletonClassDecl.name);
+
+        JCTree.JCNewClass newKeyword = singletonClassTM.NewClass(null, List.nil(), singletonClassType, List.nil(), null);
+
+        JCTree.JCVariableDecl instanceVar = singletonClassTM.VarDef(fieldMod, singletonClass.toName("INSTANCE"), singletonClassType, newKeyword);
+        JavacHandlerUtil.injectField(holderClass, instanceVar);
+    }
+
+    private JavacNode addInnerClass(JavacNode singletonClass, JavacTreeMaker singletonTM) {
+        JCTree.JCModifiers modifiers = singletonTM.Modifiers(Flags.PRIVATE | Flags.STATIC);
+        String innerClassName = singletonClass.getName() + "Holder";
+        JCTree.JCClassDecl innerClassDecl = singletonTM.ClassDef(modifiers, singletonClass.toName(innerClassName), List.nil(), null, List.nil(), List.nil());
+        return JavacHandlerUtil.injectType(singletonClass, innerClassDecl);
+    }
+
+    private void addPrivateConstructor(JavacNode singletonClass, JavacTreeMaker singletonTM) {
+        JCTree.JCModifiers modifiers = singletonTM.Modifiers(Flags.PRIVATE);
+        JCTree.JCBlock block = singletonTM.Block(0L, List.nil());
+        JCTree.JCMethodDecl constructor = singletonTM.MethodDef(modifiers, singletonClass.toName("<init>"), null, List.nil(), List.nil(), List.nil(), block, null);
+
+        JavacHandlerUtil.injectMethod(singletonClass, constructor);
+    }
+
+
+}
diff --git a/metrics/pom.xml b/metrics/pom.xml
index 79d340aa49..d7d7a8a911 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -3,8 +3,8 @@
     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>metrics</artifactId>
-	<name>metrics</name>
-	
+    <name>metrics</name>
+
     <parent>
         <artifactId>parent-modules</artifactId>
         <groupId>com.baeldung</groupId>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring.boot.ver}</version>
+            <version>2.0.7.RELEASE</version>
         </dependency>
 
         <dependency>
@@ -85,44 +85,21 @@
             <artifactId>spectator-api</artifactId>
             <version>${spectator-api.version}</version>
         </dependency>
-        
-		<dependency>
-		    <groupId>org.assertj</groupId>
-		    <artifactId>assertj-core</artifactId>
-		    <scope>test</scope>
-		</dependency>
-        
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.11.1</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <type>pom</type>
-                <scope>import</scope>
-                <version>${spring.boot.ver}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/libs-milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <properties>
         <dep.ver.metrics>3.1.2</dep.ver.metrics>
         <dep.ver.servlet>3.1.0</dep.ver.servlet>
         <netflix.servo.ver>0.12.17</netflix.servo.ver>
         <micrometer.ver>0.12.0.RELEASE</micrometer.ver>
-        <spring.boot.ver>2.0.0.M5</spring.boot.ver>
         <fasterxml.jackson.version>2.9.1</fasterxml.jackson.version>
         <spectator-api.version>0.57.1</spectator-api.version>
     </properties>
diff --git a/metrics/src/main/java/com/baeldung/metrics/micrometer/MicrometerApp.java b/metrics/src/main/java/com/baeldung/metrics/micrometer/MicrometerApp.java
index cf818f6600..1d738085ce 100644
--- a/metrics/src/main/java/com/baeldung/metrics/micrometer/MicrometerApp.java
+++ b/metrics/src/main/java/com/baeldung/metrics/micrometer/MicrometerApp.java
@@ -1,10 +1,11 @@
 package com.baeldung.metrics.micrometer;
 
-import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 
+import io.micrometer.core.instrument.binder.JvmThreadMetrics;
+
 @SpringBootApplication
 public class MicrometerApp {
 
diff --git a/mvn-wrapper/.gitignore b/mvn-wrapper/.gitignore
deleted file mode 100644
index 2af7cefb0a..0000000000
--- a/mvn-wrapper/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-nbproject/private/
-build/
-nbbuild/
-dist/
-nbdist/
-.nb-gradle/
\ No newline at end of file
diff --git a/mvn-wrapper/README.md b/mvn-wrapper/README.md
deleted file mode 100644
index bd299d41ed..0000000000
--- a/mvn-wrapper/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Setting up the Maven Wrapper on an Application
-==============================================
-
-This is the code that shows the configurations of maven wrapper on a SpringBoot project.
-
-### Requirements
-
-- Maven
-- JDK 7
-
-### Running
-
-To build and start the server simply type
-
-```bash
-$ ./mvn clean install
-$ ./mvn spring-boot:run
-```
-
-Now with default configurations it will be available at: [http://localhost:8080](http://localhost:8080)
-
-Enjoy it :)
\ No newline at end of file
diff --git a/mvn-wrapper/pom.xml b/mvn-wrapper/pom.xml
deleted file mode 100644
index 7f45fe218d..0000000000
--- a/mvn-wrapper/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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>mvn-wrapper</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>mvn-wrapper</name>
-    <description>Setting up the Maven Wrapper</description>
-
-    <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>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-        <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>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/mvn-wrapper/src/main/java/com/baeldung/MvnWrapperApplication.java b/mvn-wrapper/src/main/java/com/baeldung/MvnWrapperApplication.java
deleted file mode 100644
index 3007d24ed0..0000000000
--- a/mvn-wrapper/src/main/java/com/baeldung/MvnWrapperApplication.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.baeldung;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class MvnWrapperApplication {
-	public static void main(String[] args) {
-		SpringApplication.run(MvnWrapperApplication.class, args);
-	}
-}
diff --git a/mvn-wrapper/src/main/resources/logback.xml b/mvn-wrapper/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/mvn-wrapper/src/main/resources/logback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/parent-boot-1/README.md b/parent-boot-1/README.md
new file mode 100644
index 0000000000..8b312c348a
--- /dev/null
+++ b/parent-boot-1/README.md
@@ -0,0 +1,2 @@
+
+This is a parent module for all projects using Spring Boot 1.
diff --git a/parent-boot-2/README.md b/parent-boot-2/README.md
index ff12555376..3f18bdf38e 100644
--- a/parent-boot-2/README.md
+++ b/parent-boot-2/README.md
@@ -1 +1,2 @@
-## Relevant articles:
+
+This is a parent module for all projects using Spring Boot 2.
diff --git a/parent-kotlin/README.md b/parent-kotlin/README.md
new file mode 100644
index 0000000000..6c17a6ac29
--- /dev/null
+++ b/parent-kotlin/README.md
@@ -0,0 +1,2 @@
+
+Parent module for Kotlin projects.
diff --git a/parent-kotlin/pom.xml b/parent-kotlin/pom.xml
index f8283bd920..73c98e1a80 100644
--- a/parent-kotlin/pom.xml
+++ b/parent-kotlin/pom.xml
@@ -202,7 +202,7 @@
 	</build>
 
 	<properties>
-		<kotlin.version>1.3.0</kotlin.version>
+		<kotlin.version>1.3.10</kotlin.version>
 		<kotlinx.version>1.0.0</kotlinx.version>
 		<ktor.io.version>0.9.5</ktor.io.version>
 		<assertj.version>3.11.0</assertj.version>
diff --git a/persistence-modules/hibernate5/pom.xml b/persistence-modules/hibernate5/pom.xml
index d7b3cb85c6..9bfea14d30 100644
--- a/persistence-modules/hibernate5/pom.xml
+++ b/persistence-modules/hibernate5/pom.xml
@@ -1,11 +1,12 @@
 <?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">
+<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>hibernate5</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-	<name>hibernate5</name>
+    <name>hibernate5</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -66,6 +67,13 @@
             <artifactId>byte-buddy</artifactId>
             <version>1.9.5</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-jpamodelgen</artifactId>
+            <version>${hibernate.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -79,7 +87,7 @@
     </build>
 
     <properties>
-        <hibernate.version>5.3.6.Final</hibernate.version>
+        <hibernate.version>5.3.7.Final</hibernate.version>
         <mysql.version>6.0.6</mysql.version>
         <mariaDB4j.version>2.2.3</mariaDB4j.version>
         <h2database.version>1.4.196</h2database.version>
diff --git a/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/criteriaquery/HibernateUtil.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/criteriaquery/HibernateUtil.java
new file mode 100644
index 0000000000..0d11ea1567
--- /dev/null
+++ b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/criteriaquery/HibernateUtil.java
@@ -0,0 +1,61 @@
+package com.baeldung.hibernate.criteriaquery;
+
+import com.baeldung.hibernate.customtypes.LocalDateStringType;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+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;
+
+    private HibernateUtil() {
+    }
+
+    public static SessionFactory getSessionFactory() {
+        if (sessionFactory == null) {
+            sessionFactory = buildSessionFactory();
+        }
+        return sessionFactory;
+    }
+
+    private static SessionFactory buildSessionFactory() {
+        try {
+            ServiceRegistry serviceRegistry = configureServiceRegistry();
+
+            MetadataSources metadataSources = new MetadataSources(serviceRegistry);
+
+            metadataSources.addAnnotatedClass(Student.class);
+            Metadata metadata = metadataSources.getMetadataBuilder()
+                    .applyBasicType(LocalDateStringType.INSTANCE)
+                    .build();
+
+            return metadata.getSessionFactoryBuilder().build();
+        } catch (IOException ex) {
+            throw new ExceptionInInitializerError(ex);
+        }
+    }
+
+
+    private static ServiceRegistry configureServiceRegistry() throws IOException {
+        Properties properties = getProperties();
+        return new StandardServiceRegistryBuilder().applySettings(properties).build();
+    }
+
+    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/hibernate5/src/main/java/com/baeldung/hibernate/criteriaquery/Student.java b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/criteriaquery/Student.java
new file mode 100644
index 0000000000..314e7ca557
--- /dev/null
+++ b/persistence-modules/hibernate5/src/main/java/com/baeldung/hibernate/criteriaquery/Student.java
@@ -0,0 +1,58 @@
+package com.baeldung.hibernate.criteriaquery;
+
+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(name = "students")
+public class Student {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    @Column(name = "first_name")
+    private String firstName;
+
+    @Column(name = "last_name")
+    private String lastName;
+
+    @Column(name = "grad_year")
+    private int gradYear;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public int getGradYear() {
+        return gradYear;
+    }
+
+    public void setGradYear(int gradYear) {
+        this.gradYear = gradYear;
+    }
+}
diff --git a/persistence-modules/hibernate5/src/test/java/com/baeldung/hibernate/criteriaquery/TypeSafeCriteriaIntegrationTest.java b/persistence-modules/hibernate5/src/test/java/com/baeldung/hibernate/criteriaquery/TypeSafeCriteriaIntegrationTest.java
new file mode 100644
index 0000000000..9d368fa27e
--- /dev/null
+++ b/persistence-modules/hibernate5/src/test/java/com/baeldung/hibernate/criteriaquery/TypeSafeCriteriaIntegrationTest.java
@@ -0,0 +1,89 @@
+package com.baeldung.hibernate.criteriaquery;
+
+import com.baeldung.hibernate.criteriaquery.HibernateUtil;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.query.Query;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+import java.io.IOException;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+
+public class TypeSafeCriteriaIntegrationTest {
+
+    private static SessionFactory sessionFactory;
+
+    private Session session;
+
+    @BeforeClass
+    public static void beforeTests() throws IOException {
+        sessionFactory = HibernateUtil.getSessionFactory();
+    }
+
+    @Before
+    public void setUp() {
+        session = sessionFactory.openSession();
+        session.beginTransaction();
+    }
+
+    @Test
+    public void givenStudentData_whenUsingTypeSafeCriteriaQuery_thenSearchAllStudentsOfAGradYear() {
+
+        prepareData();
+        CriteriaBuilder cb = session.getCriteriaBuilder();
+        CriteriaQuery<Student> criteriaQuery = cb.createQuery(Student.class);
+
+        Root<Student> root = criteriaQuery.from(Student.class);
+        criteriaQuery.select(root).where(cb.equal(root.get(Student_.gradYear), 1965));
+
+        Query<Student> query = session.createQuery(criteriaQuery);
+        List<Student> results = query.getResultList();
+
+        assertNotNull(results);
+        assertEquals(1, results.size());
+
+        Student student = results.get(0);
+
+        assertEquals("Ken", student.getFirstName());
+        assertEquals("Thompson", student.getLastName());
+        assertEquals(1965, student.getGradYear());
+    }
+
+    private void prepareData() {
+        Student student1 = new Student();
+        student1.setFirstName("Ken");
+        student1.setLastName("Thompson");
+        student1.setGradYear(1965);
+
+        session.save(student1);
+
+        Student student2 = new Student();
+        student2.setFirstName("Dennis");
+        student2.setLastName("Ritchie");
+        student2.setGradYear(1963);
+
+        session.save(student2);
+        session.getTransaction().commit();
+    }
+
+    @After
+    public void tearDown() {
+        session.close();
+    }
+
+    @AfterClass
+    public static void afterTests() {
+        sessionFactory.close();
+    }
+}
diff --git a/persistence-modules/java-cockroachdb/pom.xml b/persistence-modules/java-cockroachdb/pom.xml
index 2a92934a6e..2738ef85ff 100644
--- a/persistence-modules/java-cockroachdb/pom.xml
+++ b/persistence-modules/java-cockroachdb/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.baeldung</groupId>
     <artifactId>java-cockroachdb</artifactId>
     <version>1.0-SNAPSHOT</version>
-	<name>java-cockroachdb</name>
+    <name>java-cockroachdb</name>
 
     <parent>
         <artifactId>parent-modules</artifactId>
@@ -22,15 +22,6 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>Central</id>
-            <name>Central</name>
-            <url>http://repo1.maven.org/maven2/</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>
-
     <properties>
         <postgresql.version>42.1.4</postgresql.version>
     </properties>
diff --git a/persistence-modules/java-jdbi/pom.xml b/persistence-modules/java-jdbi/pom.xml
index 9281f4fd9d..dfb31b26e8 100644
--- a/persistence-modules/java-jdbi/pom.xml
+++ b/persistence-modules/java-jdbi/pom.xml
@@ -27,15 +27,6 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>Central</id>
-            <name>Central</name>
-            <url>http://repo1.maven.org/maven2/</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>
-
     <properties>
         <jdbi3-core.version>3.1.0</jdbi3-core.version>
         <hsqldb.version>2.4.0</hsqldb.version>
diff --git a/persistence-modules/spring-boot-persistence-mongodb/README.md b/persistence-modules/spring-boot-persistence-mongodb/README.md
new file mode 100644
index 0000000000..f093d4baf0
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb/README.md
@@ -0,0 +1,3 @@
+# Relevant Articles
+
+- [Auto-Generated Field for MongoDB using Spring Boot](https://www.baeldung.com/spring-boot-mongodb-auto-generated-field)
diff --git a/persistence-modules/spring-boot-persistence/pom.xml b/persistence-modules/spring-boot-persistence/pom.xml
index 0ea42b1cb7..d9d3a9f9b7 100644
--- a/persistence-modules/spring-boot-persistence/pom.xml
+++ b/persistence-modules/spring-boot-persistence/pom.xml
@@ -1,20 +1,18 @@
 <?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>    
-    <groupId>com.baeldung</groupId>
+<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-persistence</artifactId>
     <version>0.1.0</version>
-	<name>spring-boot-persistence</name>
-    
+    <name>spring-boot-persistence</name>
+
     <parent>
         <artifactId>parent-boot-2</artifactId>
-	    <groupId>com.baeldung</groupId>
-	    <version>0.0.1-SNAPSHOT</version>
-	    <relativePath>../../parent-boot-2</relativePath>
+        <groupId>com.baeldung</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -35,42 +33,30 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2database.version}</version>
             <scope>runtime</scope>
         </dependency>
-	<dependency>
+        <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-jdbc</artifactId>
-            <version>${tomcat-jdbc.version}</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql-connector-java.version}</version>
         </dependency>
     </dependencies>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
-        <mysql-connector-java.version>8.0.12</mysql-connector-java.version>
-        <tomcat-jdbc.version>9.0.10</tomcat-jdbc.version>
-        <h2database.version>1.4.197</h2database.version>
-	<mockito.version>2.23.0</mockito.version>    
-    </properties>
-    
+
     <build>
         <finalName>spring-boot-persistence</finalName>
         <resources>
-	    <resource>
-	        <directory>src/main/resources</directory>
-		<filtering>true</filtering>
-	    </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
         </resources>
         <plugins>
             <plugin>
@@ -79,4 +65,14 @@
             </plugin>
         </plugins>
     </build>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.8</java.version>
+        <mysql-connector-java.version>8.0.12</mysql-connector-java.version>
+        <tomcat-jdbc.version>9.0.10</tomcat-jdbc.version>
+        <h2database.version>1.4.197</h2database.version>
+        <mockito.version>2.23.0</mockito.version>
+    </properties>
+
 </project>
diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/config/H2JpaConfig.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/config/H2JpaConfig.java
index ef90714347..547a905d91 100644
--- a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/config/H2JpaConfig.java
+++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/config/H2JpaConfig.java
@@ -18,7 +18,7 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
-@EnableJpaRepositories(basePackages = { "org.baeldung.boot.repository", "org.baeldung.repository" })
+@EnableJpaRepositories(basePackages = { "com.baeldung.boot.repository", "com.baeldung.repository" })
 @PropertySource("classpath:persistence-generic-entity.properties")
 @EnableTransactionManagement
 public class H2JpaConfig {
@@ -41,7 +41,7 @@ public class H2JpaConfig {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "org.baeldung.boot.domain" });
+        em.setPackagesToScan(new String[] { "com.baeldung.boot.domain" });
         em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
         em.setJpaProperties(additionalProperties());
         return em;
diff --git a/persistence-modules/spring-boot-persistence/src/main/java/org/baeldung/boot/domain/GenericEntity.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/domain/GenericEntity.java
similarity index 95%
rename from persistence-modules/spring-boot-persistence/src/main/java/org/baeldung/boot/domain/GenericEntity.java
rename to persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/domain/GenericEntity.java
index f1c936e432..a2a676200a 100644
--- a/persistence-modules/spring-boot-persistence/src/main/java/org/baeldung/boot/domain/GenericEntity.java
+++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/domain/GenericEntity.java
@@ -1,4 +1,4 @@
-package org.baeldung.boot.domain;
+package com.baeldung.boot.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/persistence-modules/spring-boot-persistence/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/repository/GenericEntityRepository.java
similarity index 63%
rename from persistence-modules/spring-boot-persistence/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java
rename to persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/repository/GenericEntityRepository.java
index d897e17afe..bbc2865856 100644
--- a/persistence-modules/spring-boot-persistence/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java
+++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/repository/GenericEntityRepository.java
@@ -1,7 +1,8 @@
-package org.baeldung.boot.repository;
+package com.baeldung.boot.repository;
 
-import org.baeldung.boot.domain.GenericEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import com.baeldung.boot.domain.GenericEntity;
+
 public interface GenericEntityRepository extends JpaRepository<GenericEntity, Long> {
 }
diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springboothsqldb/application/Application.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springboothsqldb/application/Application.java
new file mode 100644
index 0000000000..c5a5c291c6
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springboothsqldb/application/Application.java
@@ -0,0 +1,12 @@
+package com.baeldung.springboothsqldb.application;
+
+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/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springboothsqldb/application/controllers/CustomerController.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springboothsqldb/application/controllers/CustomerController.java
new file mode 100644
index 0000000000..8229a1d1c0
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springboothsqldb/application/controllers/CustomerController.java
@@ -0,0 +1,33 @@
+package com.baeldung.springboothsqldb.application.controllers;
+
+import com.baeldung.springboothsqldb.application.entities.Customer;
+import com.baeldung.springboothsqldb.application.repositories.CustomerRepository;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class CustomerController {
+    
+    private final CustomerRepository customerRepository;
+    
+    @Autowired
+    public CustomerController(CustomerRepository customerRepository) {
+        this.customerRepository = customerRepository;
+    }
+    
+    @PostMapping("/customers")
+    public Customer addCustomer(@RequestBody Customer customer) {
+        customerRepository.save(customer);
+        return customer;
+    }
+    
+    @GetMapping("/customers")
+    public List<Customer> getCustomers() {
+        return (List<Customer>) customerRepository.findAll();
+    }
+}
diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springboothsqldb/application/entities/Customer.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springboothsqldb/application/entities/Customer.java
new file mode 100644
index 0000000000..636a80e272
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springboothsqldb/application/entities/Customer.java
@@ -0,0 +1,55 @@
+package com.baeldung.springboothsqldb.application.entities;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "customers")
+public class Customer {
+    
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
+    
+    private String name;
+    private String email;
+    
+    public Customer() {}
+    
+    public Customer(String name, String email) {
+        this.name = name;
+        this.email = email;
+    }
+    
+    public void setId(long id) {
+        this.id = id;
+    }
+    
+    public long getId() {
+        return id;
+    }
+    
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+    public String getName() {
+        return name;
+    }
+    
+    public void setEmail(String email) {
+        this.email = email;
+    }
+    
+    public String getEmail() {
+        return email;
+    }
+
+    @Override
+    public String toString() {
+        return "Customer{" + "id=" + id + ", name=" + name + ", email=" + email + '}';
+    }
+}
diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springboothsqldb/application/repositories/CustomerRepository.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springboothsqldb/application/repositories/CustomerRepository.java
new file mode 100644
index 0000000000..a81aa62c43
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/springboothsqldb/application/repositories/CustomerRepository.java
@@ -0,0 +1,8 @@
+package com.baeldung.springboothsqldb.application.repositories;
+
+import com.baeldung.springboothsqldb.application.entities.Customer;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CustomerRepository extends CrudRepository<Customer, Long> {}
diff --git a/persistence-modules/spring-boot-persistence/src/main/resources/application.properties b/persistence-modules/spring-boot-persistence/src/main/resources/application.properties
index 303ce33c25..b0caf4a809 100644
--- a/persistence-modules/spring-boot-persistence/src/main/resources/application.properties
+++ b/persistence-modules/spring-boot-persistence/src/main/resources/application.properties
@@ -1,16 +1,5 @@
-spring.datasource.tomcat.initial-size=15
-spring.datasource.tomcat.max-wait=20000
-spring.datasource.tomcat.max-active=50
-spring.datasource.tomcat.max-idle=15
-spring.datasource.tomcat.min-idle=8
-spring.datasource.tomcat.default-auto-commit=true   
-spring.datasource.url=jdbc:h2:mem:test
-spring.datasource.username=root
-spring.datasource.password=
-spring.datasource.driver-class-name=org.h2.Driver
-
-spring.jpa.show-sql=false
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect
-spring.jpa.properties.hibernate.id.new_generator_mappings=false
+spring.datasource.driver-class-name = org.hsqldb.jdbc.JDBCDriver
+spring.datasource.url = jdbc:hsqldb:mem:test;DB_CLOSE_DELAY=-1
+spring.datasource.username = sa
+spring.datasource.password =
+spring.jpa.hibernate.ddl-auto = create
diff --git a/persistence-modules/spring-boot-persistence/src/main/resources/templates/index.html b/persistence-modules/spring-boot-persistence/src/main/resources/templates/index.html
index 2634e10380..344d4e59f5 100644
--- a/persistence-modules/spring-boot-persistence/src/main/resources/templates/index.html
+++ b/persistence-modules/spring-boot-persistence/src/main/resources/templates/index.html
@@ -40,4 +40,4 @@
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/SpringBootH2IntegrationTest.java b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/SpringBootH2IntegrationTest.java
index 6479e90113..ecacf62285 100644
--- a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/SpringBootH2IntegrationTest.java
+++ b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/SpringBootH2IntegrationTest.java
@@ -3,8 +3,6 @@ package com.baeldung;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import org.baeldung.boot.domain.GenericEntity;
-import org.baeldung.boot.repository.GenericEntityRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,10 +10,13 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.baeldung.boot.config.H2JpaConfig;
+import com.baeldung.boot.domain.GenericEntity;
+import com.baeldung.boot.repository.GenericEntityRepository;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = { Application.class, H2JpaConfig.class })
 public class SpringBootH2IntegrationTest {
+
     @Autowired
     private GenericEntityRepository genericEntityRepository;
 
@@ -23,7 +24,9 @@ public class SpringBootH2IntegrationTest {
     public void givenGenericEntityRepository_whenSaveAndRetreiveEntity_thenOK() {
         GenericEntity genericEntity = genericEntityRepository.save(new GenericEntity("test"));
         GenericEntity foundEntity = genericEntityRepository.findById(genericEntity.getId()).orElse(null);
+
         assertNotNull(foundEntity);
         assertEquals(genericEntity.getValue(), foundEntity.getValue());
     }
+
 }
\ No newline at end of file
diff --git a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java
index eef9ebe953..01fae2fb4d 100644
--- a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java
+++ b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java
@@ -3,14 +3,15 @@ package com.baeldung;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import org.baeldung.boot.domain.GenericEntity;
-import org.baeldung.boot.repository.GenericEntityRepository;
 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 com.baeldung.boot.domain.GenericEntity;
+import com.baeldung.boot.repository.GenericEntityRepository;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
 public class SpringBootJPAIntegrationTest {
diff --git a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/SpringBootProfileIntegrationTest.java b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/SpringBootProfileIntegrationTest.java
index 4c68f1d4a0..65a75d7bfe 100644
--- a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/SpringBootProfileIntegrationTest.java
+++ b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/SpringBootProfileIntegrationTest.java
@@ -3,9 +3,6 @@ package com.baeldung;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import org.baeldung.boot.domain.GenericEntity;
-import org.baeldung.boot.repository.GenericEntityRepository;
-import org.baeldung.config.H2TestProfileJPAConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +10,10 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.baeldung.boot.domain.GenericEntity;
+import com.baeldung.boot.repository.GenericEntityRepository;
+import com.baeldung.config.H2TestProfileJPAConfig;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { Application.class, H2TestProfileJPAConfig.class })
 @ActiveProfiles("test")
diff --git a/persistence-modules/spring-boot-persistence/src/test/java/org/baeldung/config/H2TestProfileJPAConfig.java b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/config/H2TestProfileJPAConfig.java
similarity index 91%
rename from persistence-modules/spring-boot-persistence/src/test/java/org/baeldung/config/H2TestProfileJPAConfig.java
rename to persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/config/H2TestProfileJPAConfig.java
index 7f962e1417..bcbded95fb 100644
--- a/persistence-modules/spring-boot-persistence/src/test/java/org/baeldung/config/H2TestProfileJPAConfig.java
+++ b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/config/H2TestProfileJPAConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.config;
+package com.baeldung.config;
 
 import java.util.Properties;
 
@@ -18,7 +18,7 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
-@EnableJpaRepositories(basePackages = { "org.baeldung.repository", "org.baeldung.boot.repository" })
+@EnableJpaRepositories(basePackages = { "com.baeldung.repository", "com.baeldung.boot.repository" })
 @EnableTransactionManagement
 public class H2TestProfileJPAConfig {
 
@@ -41,7 +41,7 @@ public class H2TestProfileJPAConfig {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "org.baeldung.domain", "org.baeldung.boot.domain" });
+        em.setPackagesToScan(new String[] { "com.baeldung.domain", "com.baeldung.boot.domain" });
         em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
         em.setJpaProperties(additionalProperties());
         return em;
diff --git a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/springboothsqldb/application/tests/CustomerControllerUnitTest.java b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/springboothsqldb/application/tests/CustomerControllerUnitTest.java
new file mode 100644
index 0000000000..33891e3d43
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/springboothsqldb/application/tests/CustomerControllerUnitTest.java
@@ -0,0 +1,61 @@
+package com.baeldung.springboothsqldb.application.tests;
+
+import com.baeldung.springboothsqldb.application.entities.Customer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import java.nio.charset.Charset;
+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.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 org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@AutoConfigureMockMvc
+public class CustomerControllerUnitTest {
+
+    private static MediaType MEDIA_TYPE_JSON;
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Before
+    public void setUpJsonMediaType() {
+        MEDIA_TYPE_JSON = new MediaType(MediaType.APPLICATION_JSON.getType(), MediaType.APPLICATION_JSON.getSubtype(), Charset.forName("utf8"));
+
+    }
+
+    @Test
+    public void whenPostHttpRequesttoCustomers_thenStatusOK() throws Exception {
+        Customer customer = new Customer("John", "john@domain.com");
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false);
+        ObjectWriter objectWriter = mapper.writer().withDefaultPrettyPrinter();
+        String requestJson = objectWriter.writeValueAsString(customer);
+        
+        this.mockMvc
+                .perform(MockMvcRequestBuilders.post("/customers")
+                        .contentType(MEDIA_TYPE_JSON)
+                        .content(requestJson)
+                )
+                
+                .andExpect(MockMvcResultMatchers.status().isOk());
+    }
+    
+    @Test
+    public void whenGetHttpRequesttoCustomers_thenStatusOK() throws Exception {
+        this.mockMvc
+                .perform(MockMvcRequestBuilders.get("/customers"))
+                
+                .andExpect(MockMvcResultMatchers.content().contentType(MEDIA_TYPE_JSON))
+                .andExpect(MockMvcResultMatchers.status().isOk());
+    }
+}
diff --git a/persistence-modules/spring-data-cassandra-reactive/README.md b/persistence-modules/spring-data-cassandra-reactive/README.md
new file mode 100644
index 0000000000..87a61d46b3
--- /dev/null
+++ b/persistence-modules/spring-data-cassandra-reactive/README.md
@@ -0,0 +1,3 @@
+#Relevant Articles
+
+- [Spring Data with Reactive Cassandra](https://www.baeldung.com/spring-data-cassandra-reactive)
diff --git a/persistence-modules/spring-data-cassandra-reactive/pom.xml b/persistence-modules/spring-data-cassandra-reactive/pom.xml
index 037b1fd3c1..5303f9a53a 100644
--- a/persistence-modules/spring-data-cassandra-reactive/pom.xml
+++ b/persistence-modules/spring-data-cassandra-reactive/pom.xml
@@ -13,10 +13,10 @@
     <description>Spring Data Cassandra reactive</description>
 
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.0.RELEASE</version>
-        <relativePath/>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <properties>
@@ -57,14 +57,5 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 
 </project>
diff --git a/persistence-modules/spring-data-gemfire/pom.xml b/persistence-modules/spring-data-gemfire/pom.xml
index 292b7387ac..dbb869acf0 100644
--- a/persistence-modules/spring-data-gemfire/pom.xml
+++ b/persistence-modules/spring-data-gemfire/pom.xml
@@ -2,10 +2,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-data-gemfire</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-	<name>spring-data-gemfire</name>
+    <name>spring-data-gemfire</name>
     <packaging>jar</packaging>
 
     <parent>
@@ -54,14 +52,6 @@
     </dependencies>
 
     <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>http://repo.spring.io/libs-snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
         <repository>
             <id>gemstone</id>
             <url>http://dist.gemstone.com.s3.amazonaws.com/maven/release/</url>
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/InsertRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/InsertRepository.java
new file mode 100644
index 0000000000..6a74e067fe
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/InsertRepository.java
@@ -0,0 +1,5 @@
+package com.baeldung.dao.repositories;
+
+public interface InsertRepository<T> {
+    <S extends T> void insert(S entity);
+}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/PersonEntityManagerInsertRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/PersonEntityManagerInsertRepository.java
new file mode 100644
index 0000000000..6d3cbb07df
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/PersonEntityManagerInsertRepository.java
@@ -0,0 +1,7 @@
+package com.baeldung.dao.repositories;
+
+import com.baeldung.domain.Person;
+
+public interface PersonEntityManagerInsertRepository {
+    void insert(Person person);
+}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/PersonEntityManagerRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/PersonEntityManagerRepository.java
new file mode 100644
index 0000000000..cbf3d59620
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/PersonEntityManagerRepository.java
@@ -0,0 +1,10 @@
+package com.baeldung.dao.repositories;
+
+import com.baeldung.domain.Person;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PersonEntityManagerRepository extends JpaRepository<Person, Long>, PersonEntityManagerInsertRepository {
+
+}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/PersonQueryInsertRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/PersonQueryInsertRepository.java
new file mode 100644
index 0000000000..be01e9883a
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/PersonQueryInsertRepository.java
@@ -0,0 +1,7 @@
+package com.baeldung.dao.repositories;
+
+import com.baeldung.domain.Person;
+
+public interface PersonQueryInsertRepository {
+    void insert(Person person);
+}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/PersonQueryRepository.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/PersonQueryRepository.java
new file mode 100644
index 0000000000..1516c38443
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/PersonQueryRepository.java
@@ -0,0 +1,16 @@
+package com.baeldung.dao.repositories;
+
+import com.baeldung.domain.Person;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PersonQueryRepository extends JpaRepository<Person, Long>, PersonQueryInsertRepository {
+
+    @Modifying
+    @Query(value = "INSERT INTO person (id, first_name, last_name) VALUES (:id,:firstName,:lastName)", nativeQuery = true)
+    void insertWithAnnotation(@Param("id") Long id, @Param("firstName") String firstName, @Param("lastName") String lastName);
+}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/PersonEntityManagerInsertRepositoryImpl.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/PersonEntityManagerInsertRepositoryImpl.java
new file mode 100644
index 0000000000..c14cc44125
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/PersonEntityManagerInsertRepositoryImpl.java
@@ -0,0 +1,21 @@
+package com.baeldung.dao.repositories.impl;
+
+import com.baeldung.dao.repositories.PersonEntityManagerInsertRepository;
+import com.baeldung.domain.Person;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+@Transactional
+public class PersonEntityManagerInsertRepositoryImpl implements PersonEntityManagerInsertRepository {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Override
+    public void insert(Person person) {
+        this.entityManager.persist(person);
+    }
+}
+
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/PersonQueryInsertRepositoryImpl.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/PersonQueryInsertRepositoryImpl.java
new file mode 100644
index 0000000000..341db1615d
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/PersonQueryInsertRepositoryImpl.java
@@ -0,0 +1,24 @@
+package com.baeldung.dao.repositories.impl;
+
+import com.baeldung.dao.repositories.PersonQueryInsertRepository;
+import com.baeldung.domain.Person;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.transaction.Transactional;
+
+@Transactional
+public class PersonQueryInsertRepositoryImpl implements PersonQueryInsertRepository {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Override
+    public void insert(Person person) {
+        entityManager.createNativeQuery("INSERT INTO person (id,first_name, last_name) VALUES (?,?,?)")
+          .setParameter(1, person.getId())
+          .setParameter(2, person.getFirstName())
+          .setParameter(3, person.getLastName())
+          .executeUpdate();
+    }
+}
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Person.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Person.java
new file mode 100644
index 0000000000..30d7370982
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/domain/Person.java
@@ -0,0 +1,47 @@
+package com.baeldung.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class Person {
+
+    @Id
+    private Long id;
+    private String firstName;
+    private String lastName;
+
+    public Person() {
+    }
+
+    public Person(Long id, String firstName, String lastName) {
+        this.id = id;
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+}
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/PersonInsertRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/PersonInsertRepositoryIntegrationTest.java
new file mode 100644
index 0000000000..476554f6d6
--- /dev/null
+++ b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/dao/repositories/PersonInsertRepositoryIntegrationTest.java
@@ -0,0 +1,102 @@
+package com.baeldung.dao.repositories;
+
+import com.baeldung.domain.Person;
+import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+@RunWith(SpringRunner.class)
+@DataJpaTest
+public class PersonInsertRepositoryIntegrationTest {
+
+    private static final Long ID = 1L;
+    private static final String FIRST_NAME = "firstname";
+    private static final String LAST_NAME = "lastname";
+    private static final Person PERSON = new Person(ID, FIRST_NAME, LAST_NAME);
+
+    @Autowired
+    private PersonQueryRepository personQueryRepository;
+
+    @Autowired
+    private PersonEntityManagerRepository personEntityManagerRepository;
+
+    @BeforeEach
+    public void clearDB() {
+        personQueryRepository.deleteAll();
+    }
+
+    @Test
+    public void givenPersonEntity_whenInsertWithNativeQuery_ThenPersonIsPersisted() {
+        insertPerson();
+
+        assertPersonPersisted();
+    }
+
+    @Test
+    public void givenPersonEntity_whenInsertedTwiceWithNativeQuery_thenDataIntegrityViolationExceptionIsThrown() {
+        assertThatExceptionOfType(DataIntegrityViolationException.class).isThrownBy(() -> {
+            insertPerson();
+            insertPerson();
+        });
+    }
+
+    @Test
+    public void givenPersonEntity_whenInsertWithQueryAnnotation_thenPersonIsPersisted() {
+        insertPersonWithQueryAnnotation();
+
+        assertPersonPersisted();
+    }
+
+    @Test
+    public void givenPersonEntity_whenInsertedTwiceWithQueryAnnotation_thenDataIntegrityViolationExceptionIsThrown() {
+        assertThatExceptionOfType(DataIntegrityViolationException.class).isThrownBy(() -> {
+            insertPersonWithQueryAnnotation();
+            insertPersonWithQueryAnnotation();
+        });
+    }
+
+    @Test
+    public void givenPersonEntity_whenInsertWithEntityManager_thenPersonIsPersisted() {
+        insertPersonWithEntityManager();
+
+        assertPersonPersisted();
+    }
+
+    @Test
+    public void givenPersonEntity_whenInsertedTwiceWithEntityManager_thenDataIntegrityViolationExceptionIsThrown() {
+        assertThatExceptionOfType(DataIntegrityViolationException.class).isThrownBy(() -> {
+            insertPersonWithEntityManager();
+            insertPersonWithEntityManager();
+        });
+    }
+
+    private void insertPerson() {
+        personQueryRepository.insert(PERSON);
+    }
+
+    private void insertPersonWithQueryAnnotation() {
+        personQueryRepository.insertWithAnnotation(ID, FIRST_NAME, LAST_NAME);
+    }
+
+    private void insertPersonWithEntityManager() {
+        personEntityManagerRepository.insert(new Person(ID, FIRST_NAME, LAST_NAME));
+    }
+
+    private void assertPersonPersisted() {
+        Optional<Person> personOptional = personQueryRepository.findById(PERSON.getId());
+
+        assertThat(personOptional.isPresent()).isTrue();
+        assertThat(personOptional.get().getId()).isEqualTo(PERSON.getId());
+        assertThat(personOptional.get().getFirstName()).isEqualTo(PERSON.getFirstName());
+        assertThat(personOptional.get().getLastName()).isEqualTo(PERSON.getLastName());
+    }
+}
diff --git a/persistence-modules/spring-data-mongodb/pom.xml b/persistence-modules/spring-data-mongodb/pom.xml
index 76ec5a96a6..63b9c3c1b0 100644
--- a/persistence-modules/spring-data-mongodb/pom.xml
+++ b/persistence-modules/spring-data-mongodb/pom.xml
@@ -1,9 +1,7 @@
 <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-data-mongodb</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>spring-data-mongodb</name>
 
     <parent>
@@ -23,7 +21,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-releasetrain</artifactId>
-            <version>Lovelace-M3</version>
+            <version>Lovelace-SR3</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
@@ -76,17 +74,6 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <build>
         <plugins>
             <plugin>
diff --git a/persistence-modules/spring-data-mongodb/src/main/resources/mongoConfig.xml b/persistence-modules/spring-data-mongodb/src/main/resources/mongoConfig.xml
index 324f7f60c2..d59ebcef6e 100644
--- a/persistence-modules/spring-data-mongodb/src/main/resources/mongoConfig.xml
+++ b/persistence-modules/spring-data-mongodb/src/main/resources/mongoConfig.xml
@@ -7,33 +7,32 @@
        http://www.springframework.org/schema/data/mongo
        http://www.springframework.org/schema/data/mongo/spring-mongo.xsd
        http://www.springframework.org/schema/context 
-       http://www.springframework.org/schema/context/spring-context.xsd"
->
-    <context:annotation-config/>
-    
+       http://www.springframework.org/schema/context/spring-context.xsd">
+    <context:annotation-config />
+
     <mongo:mongo-client id="mongoClient" host="localhost" />
-    
+
     <mongo:db-factory id="mongoDbFactory" dbname="test" mongo-ref="mongoClient" />
-    
+
     <bean id="gridFsTemplate" class="org.springframework.data.mongodb.gridfs.GridFsTemplate">
         <constructor-arg ref="mongoDbFactory" />
         <constructor-arg ref="mongoConverter" />
     </bean>
 
     <bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
-        <constructor-arg ref="mongoDbFactory"/>
+        <constructor-arg ref="mongoDbFactory" />
         <constructor-arg ref="mongoConverter" />
     </bean>
 
-    <bean class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor"/>
+    <bean class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor" />
 
-    <mongo:repositories base-package="com.baeldung.repository" mongo-template-ref="mongoTemplate"/>
+    <mongo:repositories base-package="com.baeldung.repository" mongo-template-ref="mongoTemplate" />
 
     <bean class="com.baeldung.event.CascadeSaveMongoEventListener">
     </bean>
 
     <mongo:mapping-converter id="mongoConverter" base-package="com.baeldung.converter">
-        <mongo:custom-converters base-package="org.baeldung.converter"/>
+        <mongo:custom-converters base-package="com.baeldung.converter" />
     </mongo:mapping-converter>
 
 </beans>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionReactiveIntegrationTest.java b/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionReactiveLiveTest.java
similarity index 96%
rename from persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionReactiveIntegrationTest.java
rename to persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionReactiveLiveTest.java
index 43aa865e91..70908552fe 100644
--- a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionReactiveIntegrationTest.java
+++ b/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionReactiveLiveTest.java
@@ -14,7 +14,7 @@ import com.baeldung.model.User;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoReactiveConfig.class)
-public class MongoTransactionReactiveIntegrationTest {
+public class MongoTransactionReactiveLiveTest {
 
     @Autowired
     private ReactiveMongoOperations reactiveOps;
diff --git a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionTemplateIntegrationTest.java b/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionTemplateLiveTest.java
similarity index 97%
rename from persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionTemplateIntegrationTest.java
rename to persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionTemplateLiveTest.java
index 1dbe724d87..20ac6974bc 100644
--- a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionTemplateIntegrationTest.java
+++ b/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionTemplateLiveTest.java
@@ -26,7 +26,7 @@ import com.baeldung.model.User;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
-public class MongoTransactionTemplateIntegrationTest {
+public class MongoTransactionTemplateLiveTest {
 
     @Autowired
     private MongoTemplate mongoTemplate;
diff --git a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionalIntegrationTest.java b/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionalLiveTest.java
similarity index 98%
rename from persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionalIntegrationTest.java
rename to persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionalLiveTest.java
index 4d747789a0..0cf86aa43e 100644
--- a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionalIntegrationTest.java
+++ b/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionalLiveTest.java
@@ -27,7 +27,7 @@ import com.mongodb.MongoCommandException;
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class MongoTransactionalIntegrationTest {
+public class MongoTransactionalLiveTest {
 
     @Autowired
     private MongoTemplate mongoTemplate;
diff --git a/persistence-modules/spring-data-mongodb/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-mongodb/src/test/java/org/baeldung/SpringContextIntegrationTest.java
deleted file mode 100644
index 04d549a288..0000000000
--- a/persistence-modules/spring-data-mongodb/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-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.config.MongoConfig;
-import com.baeldung.config.SimpleMongoConfig;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { MongoConfig.class, SimpleMongoConfig.class })
-public class SpringContextIntegrationTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/persistence-modules/spring-hibernate-5/README.md b/persistence-modules/spring-hibernate-5/README.md
index 75d23f7532..5e287919f1 100644
--- a/persistence-modules/spring-hibernate-5/README.md
+++ b/persistence-modules/spring-hibernate-5/README.md
@@ -1,6 +1,5 @@
 ### Relevant articles
 
-- [@Immutable in Hibernate](http://www.baeldung.com/hibernate-immutable)
 - [Hibernate Many to Many Annotation Tutorial](http://www.baeldung.com/hibernate-many-to-many)
 - [Programmatic Transactions in the Spring TestContext Framework](http://www.baeldung.com/spring-test-programmatic-transactions)
 - [Hibernate Criteria Queries](http://www.baeldung.com/hibernate-criteria-queries)
diff --git a/persistence-modules/spring-hibernate4/README.md b/persistence-modules/spring-hibernate4/README.md
index b15b7278f4..57a341ed45 100644
--- a/persistence-modules/spring-hibernate4/README.md
+++ b/persistence-modules/spring-hibernate4/README.md
@@ -7,12 +7,10 @@
 - [The DAO with Spring 3 and Hibernate](http://www.baeldung.com/persistence-layer-with-spring-and-hibernate)
 - [Hibernate Pagination](http://www.baeldung.com/hibernate-pagination)
 - [Sorting with Hibernate](http://www.baeldung.com/hibernate-sort)
-- [Auditing with JPA, Hibernate, and Spring Data JPA](http://www.baeldung.com/database-auditing-jpa)
 - [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)
-- [Guide to @Immutable Annotation in Hibernate](http://www.baeldung.com/hibernate-immutable)
 - [The DAO with Spring and Hibernate](http://www.baeldung.com/persistence-layer-with-spring-and-hibernate)
 
 ### Quick Start
diff --git a/pom.xml b/pom.xml
index d07d1728b4..514392713c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,10 @@
 	<groupId>com.baeldung</groupId>
 	<artifactId>parent-modules</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
-	<name>parent-modules</name>
+    <modules>
+        <module>lombok-custom</module>
+    </modules>
+    <name>parent-modules</name>
 	<packaging>pom</packaging>
 
 	<dependencies>
@@ -487,7 +490,6 @@
                 <module>msf4j</module>
                 <!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
                 <module>mustache</module>
-                <module>mvn-wrapper</module>
                 <module>mybatis</module>
                 
                 <module>noexception</module>
@@ -638,7 +640,9 @@
                 <module>spring-boot-ops</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>
@@ -675,7 +679,6 @@
                 
                 <module>spring-mobile</module>
                 <module>spring-mockito</module>
-                <module>spring-mustache</module>
                 <module>spring-mvc-forms-jsp</module>
                 <module>spring-mvc-forms-thymeleaf</module>
                 <module>spring-mvc-java</module>
@@ -684,7 +687,6 @@
                 <module>spring-mvc-velocity</module>
                 <module>spring-mvc-webflow</module>
                 <module>spring-mvc-xml</module>
-                <module>spring-mybatis</module>
                 
                 <module>spring-protobuf</module>
                 
@@ -695,7 +697,6 @@
                 <module>spring-remoting</module>
                 <module>spring-rest</module>
                 <module>spring-rest-angular</module>
-                <module>spring-rest-embedded-tomcat</module>
                 <module>spring-rest-full</module>
                 <module>spring-rest-hal-browser</module>
                 <module>spring-rest-query-language</module>
@@ -753,7 +754,6 @@
                 
                 <module>spring-zuul</module>
                 
-                <module>sse-jaxrs</module>
                 <module>static-analysis</module>
                 <module>stripe</module>
                 <module>structurizr</module>
@@ -904,7 +904,6 @@
 				<module>spring-remoting/remoting-rmi/remoting-rmi-server</module>
 				<module>spring-rest</module>
 				<module>spring-rest-angular</module>
-				<module>spring-rest-embedded-tomcat</module>
 				<module>spring-rest-full</module>
 				<module>spring-rest-simple</module>
 				<module>spring-resttemplate</module>
@@ -1198,7 +1197,6 @@
                 <module>msf4j</module>
                 <!-- <module>muleesb</module> --> <!-- Fixing in BAEL-10878 -->
                 <module>mustache</module>
-                <module>mvn-wrapper</module>
                 <module>mybatis</module>
                 
                 <module>noexception</module>
@@ -1382,7 +1380,6 @@
                 
                 <module>spring-mobile</module>
                 <module>spring-mockito</module>
-                <module>spring-mustache</module>
                 <module>spring-mvc-forms-jsp</module>
                 <module>spring-mvc-forms-thymeleaf</module>
                 <module>spring-mvc-java</module>
@@ -1391,7 +1388,6 @@
                 <module>spring-mvc-velocity</module>
                 <module>spring-mvc-webflow</module>
                 <module>spring-mvc-xml</module>
-                <module>spring-mybatis</module>
                 
                 <module>spring-protobuf</module>
                 
@@ -1402,7 +1398,6 @@
                 <module>spring-remoting</module>
                 <module>spring-rest</module>
                 <module>spring-rest-angular</module>
-                <module>spring-rest-embedded-tomcat</module>
                 <module>spring-rest-full</module>
                 <module>spring-rest-hal-browser</module>
                 <module>spring-rest-query-language</module>
@@ -1460,7 +1455,6 @@
                 
                 <module>spring-zuul</module>
                 
-                <module>sse-jaxrs</module>
                 <module>static-analysis</module>
                 <module>stripe</module>
                 <module>structurizr</module>
diff --git a/resteasy/bin/README.md b/resteasy/bin/README.md
index 722f1dfe93..f4dba1493a 100644
--- a/resteasy/bin/README.md
+++ b/resteasy/bin/README.md
@@ -4,5 +4,3 @@
 
 
 ### Relevant Articles:
-- [A Guide to RESTEasy](http://www.baeldung.com/resteasy-tutorial)
-- [RESTEasy Client API](http://www.baeldung.com/resteasy-client-tutorial)
diff --git a/spring-boot-libraries/.gitignore b/spring-boot-libraries/.gitignore
new file mode 100644
index 0000000000..da7c2c5c0a
--- /dev/null
+++ b/spring-boot-libraries/.gitignore
@@ -0,0 +1,5 @@
+/target/
+.settings/
+.classpath
+.project
+
diff --git a/spring-boot-libraries/.mvn/wrapper/maven-wrapper.jar b/spring-boot-libraries/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000000..5fd4d5023f
Binary files /dev/null and b/spring-boot-libraries/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/spring-boot-libraries/README.MD b/spring-boot-libraries/README.MD
new file mode 100644
index 0000000000..cc32ce8355
--- /dev/null
+++ b/spring-boot-libraries/README.MD
@@ -0,0 +1,6 @@
+### The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
+### Relevant Articles:
+
+- [Guide to ShedLock with Spring](https://www.baeldung.com/shedlock-spring)
diff --git a/mvn-wrapper/mvnw b/spring-boot-libraries/mvnw
old mode 100755
new mode 100644
similarity index 100%
rename from mvn-wrapper/mvnw
rename to spring-boot-libraries/mvnw
diff --git a/mvn-wrapper/mvnw.cmd b/spring-boot-libraries/mvnw.cmd
old mode 100755
new mode 100644
similarity index 97%
rename from mvn-wrapper/mvnw.cmd
rename to spring-boot-libraries/mvnw.cmd
index 4f0b068a03..6a6eec39ba
--- a/mvn-wrapper/mvnw.cmd
+++ b/spring-boot-libraries/mvnw.cmd
@@ -1,145 +1,145 @@
-@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    http://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
-
-%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%
+@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    http://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
+
+%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/spring-boot-libraries/pom.xml b/spring-boot-libraries/pom.xml
new file mode 100644
index 0000000000..c28128c5f0
--- /dev/null
+++ b/spring-boot-libraries/pom.xml
@@ -0,0 +1,144 @@
+<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-libraries</artifactId>
+    <packaging>war</packaging>
+    <name>spring-boot-libraries</name>
+    <description>This is simple boot application for Spring boot actuator test</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>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- ShedLock -->
+        <dependency>
+            <groupId>net.javacrumbs.shedlock</groupId>
+            <artifactId>shedlock-spring</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>net.javacrumbs.shedlock</groupId>
+            <artifactId>shedlock-provider-jdbc-template</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>spring-boot</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>
+            </plugin>
+
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>${git-commit-id-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                    </execution>
+                    <execution>
+                        <id>validate-the-git-infos</id>
+                        <goals>
+                            <goal>validateRevision</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                    <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+                </configuration>
+            </plugin>
+
+        </plugins>
+
+    </build>
+
+    <profiles>
+        <profile>
+            <id>autoconfiguration</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>
+                                    <includes>
+                                        <include>**/AutoconfigurationTest.java</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <test.mime>json</test.mime>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <properties>
+        <!-- The main class to start by executing java -jar -->
+        <start-class>com.baeldung.intro.App</start-class>
+        <tomee-servlet-api.version>8.5.11</tomee-servlet-api.version>
+        <togglz.version>2.4.1.Final</togglz.version>
+        <rome.version>1.9.0</rome.version>
+        <chaos.monkey.version>2.0.0</chaos.monkey.version>
+        <graphql-spring-boot-starter.version>5.0.2</graphql-spring-boot-starter.version>
+        <graphiql-spring-boot-starter.version>5.0.2</graphiql-spring-boot-starter.version>
+        <graphql-java-tools.version>5.2.4</graphql-java-tools.version>
+        <guava.version>18.0</guava.version>
+        <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
+        <modelmapper.version>2.3.2</modelmapper.version>
+    </properties>
+
+</project>
diff --git a/spring-boot-libraries/src/main/java/com/baeldung/Application.java b/spring-boot-libraries/src/main/java/com/baeldung/Application.java
new file mode 100644
index 0000000000..c1b6558b26
--- /dev/null
+++ b/spring-boot-libraries/src/main/java/com/baeldung/Application.java
@@ -0,0 +1,14 @@
+package org.baeldung.boot;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+
+@SpringBootApplication
+public class Application {
+    private static ApplicationContext applicationContext;
+
+    public static void main(String[] args) {
+        applicationContext = SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/spring-all/src/main/java/org/baeldung/scheduling/shedlock/SchedulerConfiguration.java b/spring-boot-libraries/src/main/java/com/baeldung/scheduling/shedlock/SchedulerConfiguration.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/scheduling/shedlock/SchedulerConfiguration.java
rename to spring-boot-libraries/src/main/java/com/baeldung/scheduling/shedlock/SchedulerConfiguration.java
diff --git a/spring-all/src/main/java/org/baeldung/scheduling/shedlock/TaskScheduler.java b/spring-boot-libraries/src/main/java/com/baeldung/scheduling/shedlock/TaskScheduler.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/scheduling/shedlock/TaskScheduler.java
rename to spring-boot-libraries/src/main/java/com/baeldung/scheduling/shedlock/TaskScheduler.java
diff --git a/spring-boot-testing/.gitignore b/spring-boot-testing/.gitignore
new file mode 100644
index 0000000000..da7c2c5c0a
--- /dev/null
+++ b/spring-boot-testing/.gitignore
@@ -0,0 +1,5 @@
+/target/
+.settings/
+.classpath
+.project
+
diff --git a/mvn-wrapper/.mvn/wrapper/maven-wrapper.jar b/spring-boot-testing/.mvn/wrapper/maven-wrapper.jar
old mode 100755
new mode 100644
similarity index 72%
rename from mvn-wrapper/.mvn/wrapper/maven-wrapper.jar
rename to spring-boot-testing/.mvn/wrapper/maven-wrapper.jar
index f775b1c04c..9cc84ea9b4
Binary files a/mvn-wrapper/.mvn/wrapper/maven-wrapper.jar and b/spring-boot-testing/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/mvn-wrapper/.mvn/wrapper/maven-wrapper.properties b/spring-boot-testing/.mvn/wrapper/maven-wrapper.properties
old mode 100755
new mode 100644
similarity index 100%
rename from mvn-wrapper/.mvn/wrapper/maven-wrapper.properties
rename to spring-boot-testing/.mvn/wrapper/maven-wrapper.properties
diff --git a/spring-boot-testing/README.MD b/spring-boot-testing/README.MD
new file mode 100644
index 0000000000..a609b5bf09
--- /dev/null
+++ b/spring-boot-testing/README.MD
@@ -0,0 +1,6 @@
+### The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
+### Relevant Articles:
+
+- [Testing with Spring and Spock](https://www.baeldung.com/spring-spock-testing)
diff --git a/spring-boot-testing/mvnw b/spring-boot-testing/mvnw
new file mode 100644
index 0000000000..e96ccd5fbb
--- /dev/null
+++ b/spring-boot-testing/mvnw
@@ -0,0 +1,227 @@
+#!/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
+#
+#    http://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
+
+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/spring-boot-testing/mvnw.cmd b/spring-boot-testing/mvnw.cmd
new file mode 100644
index 0000000000..6a6eec39ba
--- /dev/null
+++ b/spring-boot-testing/mvnw.cmd
@@ -0,0 +1,145 @@
+@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    http://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
+
+%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/spring-boot-testing/pom.xml b/spring-boot-testing/pom.xml
new file mode 100644
index 0000000000..2a498e54c5
--- /dev/null
+++ b/spring-boot-testing/pom.xml
@@ -0,0 +1,150 @@
+<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-testing</artifactId>
+    <packaging>war</packaging>
+    <name>spring-boot-testing</name>
+    <description>This is simple boot application for demonstrating testing features.</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>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Spock & Spring -->
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-core</artifactId>
+            <version>${spock.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-spring</artifactId>
+            <version>${spock.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>spring-boot</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>
+            </plugin>
+
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>${git-commit-id-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                    </execution>
+                    <execution>
+                        <id>validate-the-git-infos</id>
+                        <goals>
+                            <goal>validateRevision</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                    <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compileTests</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+    </build>
+
+    <profiles>
+        <profile>
+            <id>autoconfiguration</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>
+                                    <includes>
+                                        <include>**/AutoconfigurationTest.java</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <test.mime>json</test.mime>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <properties>
+        <!-- The main class to start by executing java -jar -->
+        <start-class>org.baeldung.boot.Application</start-class>
+        <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
+        <spock.version>1.2-groovy-2.4</spock.version>
+    </properties>
+
+</project>
diff --git a/spring-boot-testing/src/main/java/com/baeldung/boot/Application.java b/spring-boot-testing/src/main/java/com/baeldung/boot/Application.java
new file mode 100644
index 0000000000..c1b6558b26
--- /dev/null
+++ b/spring-boot-testing/src/main/java/com/baeldung/boot/Application.java
@@ -0,0 +1,14 @@
+package org.baeldung.boot;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+
+@SpringBootApplication
+public class Application {
+    private static ApplicationContext applicationContext;
+
+    public static void main(String[] args) {
+        applicationContext = SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/spring-boot-testing/src/main/java/com/baeldung/boot/controller/rest/WebController.java b/spring-boot-testing/src/main/java/com/baeldung/boot/controller/rest/WebController.java
new file mode 100644
index 0000000000..5b65599e00
--- /dev/null
+++ b/spring-boot-testing/src/main/java/com/baeldung/boot/controller/rest/WebController.java
@@ -0,0 +1,36 @@
+package org.baeldung.boot.controller.rest;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Optional;
+
+@RestController
+@RequestMapping("/hello")
+public class WebController {
+
+    private String name;
+
+    @GetMapping
+    public String salutation() {
+        return "Hello " + Optional.ofNullable(name).orElse("world") + '!';
+    }
+
+    @PutMapping
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void setName(@RequestBody final String name) {
+        this.name = name;
+    }
+
+    @DeleteMapping
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void resetToDefault() {
+        this.name = null;
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-testing/src/test/groovy/org/baeldung/boot/LoadContextTest.groovy b/spring-boot-testing/src/test/groovy/org/baeldung/boot/LoadContextTest.groovy
new file mode 100644
index 0000000000..2d4a7ca2cf
--- /dev/null
+++ b/spring-boot-testing/src/test/groovy/org/baeldung/boot/LoadContextTest.groovy
@@ -0,0 +1,23 @@
+package org.baeldung.boot
+
+import org.baeldung.boot.controller.rest.WebController
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+import spock.lang.Narrative
+import spock.lang.Specification
+import spock.lang.Title
+
+@Title("Application Specification")
+@Narrative("Specification which beans are expected")
+@SpringBootTest
+class LoadContextTest extends Specification {
+
+    @Autowired(required = false)
+    private WebController webController
+
+
+    def "when context is loaded then all expected beans are created"() {
+        expect: "the WebController is created"
+        webController
+    }
+}
diff --git a/spring-boot-testing/src/test/groovy/org/baeldung/boot/WebControllerTest.groovy b/spring-boot-testing/src/test/groovy/org/baeldung/boot/WebControllerTest.groovy
new file mode 100644
index 0000000000..fe1b34ab8c
--- /dev/null
+++ b/spring-boot-testing/src/test/groovy/org/baeldung/boot/WebControllerTest.groovy
@@ -0,0 +1,43 @@
+package org.baeldung.boot
+
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers
+import spock.lang.Narrative
+import spock.lang.Specification
+import spock.lang.Title
+
+@Title("WebController Specification")
+@Narrative("The Specification of the behaviour of the WebController. It can greet a person, change the name and reset it to 'world'")
+@AutoConfigureMockMvc
+@WebMvcTest
+class WebControllerTest extends Specification {
+
+    @Autowired
+    private MockMvc mvc
+
+    def "when get is performed then the response has status 200 and content is 'Hello world!'"() {
+        expect: "Status is 200 and the response is 'Hello world!'"
+        mvc.perform(MockMvcRequestBuilders.get("/hello")).andExpect(MockMvcResultMatchers.status().isOk()).andReturn().response.contentAsString == "Hello world!"
+    }
+
+    def "when set and delete are performed then the response has status 204 and content changes as expected"() {
+        given: "a new name"
+        def NAME = "Emmy"
+
+        when: "the name is set"
+        mvc.perform(MockMvcRequestBuilders.put("/hello").content(NAME)).andExpect(MockMvcResultMatchers.status().isNoContent())
+
+        then: "the salutation uses the new name"
+        mvc.perform(MockMvcRequestBuilders.get("/hello")).andExpect(MockMvcResultMatchers.status().isOk()).andReturn().response.contentAsString == "Hello $NAME!"
+
+        when: "the name is deleted"
+        mvc.perform(MockMvcRequestBuilders.delete("/hello")).andExpect(MockMvcResultMatchers.status().isNoContent())
+
+        then: "the salutation uses the default name"
+        mvc.perform(MockMvcRequestBuilders.get("/hello")).andExpect(MockMvcResultMatchers.status().isOk()).andReturn().response.contentAsString == "Hello world!"
+    }
+}
diff --git a/spring-boot/README.MD b/spring-boot/README.MD
index 016d2841d7..2a6a935cc1 100644
--- a/spring-boot/README.MD
+++ b/spring-boot/README.MD
@@ -25,7 +25,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Spring Boot: Configuring a Main Class](http://www.baeldung.com/spring-boot-main-class)
 - [A Quick Intro to the SpringBootServletInitializer](http://www.baeldung.com/spring-boot-servlet-initializer)
 - [How to Define a Spring Boot Filter?](http://www.baeldung.com/spring-boot-add-filter)
-- [How to Change the Default Port in Spring Boot](http://www.baeldung.com/spring-boot-change-port)
 - [Spring Boot Exit Codes](http://www.baeldung.com/spring-boot-exit-codes)
 - [Guide to the Favicon in Spring Boot](http://www.baeldung.com/spring-boot-favicon)
 - [Spring Shutdown Callbacks](http://www.baeldung.com/spring-shutdown-callbacks)
diff --git a/spring-cloud-data-flow/etl/customer-mongodb-sink/pom.xml b/spring-cloud-data-flow/etl/customer-mongodb-sink/pom.xml
index 392244dc84..1f16a02a98 100644
--- a/spring-cloud-data-flow/etl/customer-mongodb-sink/pom.xml
+++ b/spring-cloud-data-flow/etl/customer-mongodb-sink/pom.xml
@@ -1,6 +1,5 @@
 <?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>
 
@@ -17,13 +16,6 @@
         <relativePath>../../../parent-boot-2</relativePath>
     </parent>
 
-    <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>Greenwich.M3</spring-cloud.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -81,5 +73,11 @@
         </repository>
     </repositories>
 
+    <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>Greenwich.M3</spring-cloud.version>
+    </properties>
 
 </project>
diff --git a/spring-cloud-data-flow/etl/customer-transform/pom.xml b/spring-cloud-data-flow/etl/customer-transform/pom.xml
index 0e429cb593..ed281b420a 100644
--- a/spring-cloud-data-flow/etl/customer-transform/pom.xml
+++ b/spring-cloud-data-flow/etl/customer-transform/pom.xml
@@ -1,11 +1,9 @@
 <?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>
 
     <artifactId>customer-transform</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>customer-transform</name>
@@ -18,13 +16,6 @@
         <relativePath>../../../parent-boot-2</relativePath>
     </parent>
 
-    <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>Greenwich.M3</spring-cloud.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -74,4 +65,11 @@
         </repository>
     </repositories>
 
+    <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>Greenwich.M3</spring-cloud.version>
+    </properties>
+
 </project>
diff --git a/spring-cloud/README.md b/spring-cloud/README.md
index dc43bd1a66..eb2e46c3d0 100644
--- a/spring-cloud/README.md
+++ b/spring-cloud/README.md
@@ -15,19 +15,8 @@
 ### Relevant Articles:
 - [Intro to Spring Cloud Netflix - Hystrix](http://www.baeldung.com/spring-cloud-netflix-hystrix)
 - [Dockerizing a Spring Boot Application](http://www.baeldung.com/dockerizing-spring-boot-application)
-- [Introduction to Spring Cloud Rest Client with Netflix Ribbon](http://www.baeldung.com/spring-cloud-rest-client-with-netflix-ribbon)
-- [A Quick Guide to Spring Cloud Consul](http://www.baeldung.com/spring-cloud-consul)
-- [An Introduction to Spring Cloud Zookeeper](http://www.baeldung.com/spring-cloud-zookeeper)
 - [Using a Spring Cloud App Starter](http://www.baeldung.com/using-a-spring-cloud-app-starter)
-- [Spring Cloud Connectors and Heroku](http://www.baeldung.com/spring-cloud-heroku)
-- [An Example of Load Balancing with Zuul and Eureka](http://www.baeldung.com/zuul-load-balancing)
-- [An Intro to Spring Cloud Contract](http://www.baeldung.com/spring-cloud-contract)
 - [Using a Spring Cloud App Starter](http://www.baeldung.com/spring-cloud-app-starter)
 - [Instance Profile Credentials using Spring Cloud](http://www.baeldung.com/spring-cloud-instance-profiles)
-- [An Intro to Spring Cloud Security](http://www.baeldung.com/spring-cloud-security)
-- [An Intro to Spring Cloud Task](http://www.baeldung.com/spring-cloud-task) 
 - [Running Spring Boot Applications With Minikube](http://www.baeldung.com/spring-boot-minikube)
-- [Introduction to Netflix Archaius with Spring Cloud](https://www.baeldung.com/netflix-archaius-spring-cloud-integration)
-- [An Intro to Spring Cloud Vault](https://www.baeldung.com/spring-cloud-vault)
-- [Netflix Archaius with Various Database Configurations](https://www.baeldung.com/netflix-archaius-database-configurations)
-- [Rate Limiting in Spring Cloud Netflix Zuul](https://www.baeldung.com/spring-cloud-zuul-rate-limit)
+
diff --git a/spring-cloud/spring-cloud-archaius/README.md b/spring-cloud/spring-cloud-archaius/README.md
index 9de26352e1..ae853c6ef0 100644
--- a/spring-cloud/spring-cloud-archaius/README.md
+++ b/spring-cloud/spring-cloud-archaius/README.md
@@ -1,3 +1,8 @@
+# Relevant Articles
+
+- [Introduction to Netflix Archaius with Spring Cloud](https://www.baeldung.com/netflix-archaius-spring-cloud-integration)
+- [Netflix Archaius with Various Database Configurations](https://www.baeldung.com/netflix-archaius-database-configurations)
+
 # Spring Cloud Archaius
 
 #### Basic Config
@@ -11,4 +16,4 @@ These properties are set up on the main method, since Archaius uses System prope
 #### Additional Sources
 In this service we create a new AbstractConfiguration bean, setting up a new Configuration Properties source.
 
-These properties have precedence over all the other properties in the Archaius Composite Configuration.
\ No newline at end of file
+These properties have precedence over all the other properties in the Archaius Composite Configuration.
diff --git a/mvn-wrapper/src/main/resources/application.properties b/spring-cloud/spring-cloud-aws/.attach_pid23938
similarity index 100%
rename from mvn-wrapper/src/main/resources/application.properties
rename to spring-cloud/spring-cloud-aws/.attach_pid23938
diff --git a/spring-cloud/spring-cloud-aws/README.md b/spring-cloud/spring-cloud-aws/README.md
index 1340712c7a..36d0c7080e 100644
--- a/spring-cloud/spring-cloud-aws/README.md
+++ b/spring-cloud/spring-cloud-aws/README.md
@@ -1,5 +1,11 @@
 # Spring Cloud AWS
 
+# Relevant Articles
+- [Spring Cloud AWS – S3](https://www.baeldung.com/spring-cloud-aws-s3)
+- [Spring Cloud AWS – EC2](https://www.baeldung.com/spring-cloud-aws-ec2)
+- [Spring Cloud AWS – RDS](https://www.baeldung.com/spring-cloud-aws-rds)
+- [Spring Cloud AWS – Messaging Support](https://www.baeldung.com/spring-cloud-aws-messaging)
+
 #### Running the Integration Tests
 
 To run the Integration Tests, we need to have an AWS account and have API keys generated for programmatic access. Edit 
@@ -23,4 +29,4 @@ Multiple application classes are available under this project. To launch Instan
 
 ```
 <start-class>com.baeldung.spring.cloud.aws.InstanceProfileAwsApplication</start-class>
-```
\ No newline at end of file
+```
diff --git a/spring-cloud/spring-cloud-aws/src/test/resources/test-file-upload.txt b/spring-cloud/spring-cloud-aws/src/test/resources/test-file-upload.txt
new file mode 100644
index 0000000000..7c4a013e52
--- /dev/null
+++ b/spring-cloud/spring-cloud-aws/src/test/resources/test-file-upload.txt
@@ -0,0 +1 @@
+aaa
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-connectors-heroku/README.md b/spring-cloud/spring-cloud-connectors-heroku/README.md
new file mode 100644
index 0000000000..7c58d2526f
--- /dev/null
+++ b/spring-cloud/spring-cloud-connectors-heroku/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Spring Cloud Connectors and Heroku](http://www.baeldung.com/spring-cloud-heroku)
diff --git a/spring-cloud/spring-cloud-consul/README.md b/spring-cloud/spring-cloud-consul/README.md
new file mode 100644
index 0000000000..47dc39f0d5
--- /dev/null
+++ b/spring-cloud/spring-cloud-consul/README.md
@@ -0,0 +1,3 @@
+
+### Relevant Articles:
+- [A Quick Guide to Spring Cloud Consul](http://www.baeldung.com/spring-cloud-consul)
diff --git a/spring-cloud/spring-cloud-contract/README.md b/spring-cloud/spring-cloud-contract/README.md
new file mode 100644
index 0000000000..70e056757b
--- /dev/null
+++ b/spring-cloud/spring-cloud-contract/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [An Intro to Spring Cloud Contract](http://www.baeldung.com/spring-cloud-contract)
diff --git a/spring-cloud/spring-cloud-kubernetes/README.md b/spring-cloud/spring-cloud-kubernetes/README.md
new file mode 100644
index 0000000000..295ead1c2f
--- /dev/null
+++ b/spring-cloud/spring-cloud-kubernetes/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles:
+
+- [Running Spring Boot Applications With Minikube](https://www.baeldung.com/spring-boot-minikube)
diff --git a/spring-cloud/spring-cloud-rest/README.md b/spring-cloud/spring-cloud-rest/README.md
new file mode 100644
index 0000000000..a650004708
--- /dev/null
+++ b/spring-cloud/spring-cloud-rest/README.md
@@ -0,0 +1,2 @@
+
+Code for an ebook - "A REST API with Spring Boot and Spring Cloud"
diff --git a/spring-cloud/spring-cloud-ribbon-client/README.md b/spring-cloud/spring-cloud-ribbon-client/README.md
new file mode 100644
index 0000000000..596b3226c8
--- /dev/null
+++ b/spring-cloud/spring-cloud-ribbon-client/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Introduction to Spring Cloud Rest Client with Netflix Ribbon](http://www.baeldung.com/spring-cloud-rest-client-with-netflix-ribbon)
diff --git a/spring-cloud/spring-cloud-security/README.md b/spring-cloud/spring-cloud-security/README.md
new file mode 100644
index 0000000000..7099406614
--- /dev/null
+++ b/spring-cloud/spring-cloud-security/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [An Intro to Spring Cloud Security](http://www.baeldung.com/spring-cloud-security)
diff --git a/spring-cloud/spring-cloud-task/README.md b/spring-cloud/spring-cloud-task/README.md
new file mode 100644
index 0000000000..cabc1ac854
--- /dev/null
+++ b/spring-cloud/spring-cloud-task/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [An Intro to Spring Cloud Task](http://www.baeldung.com/spring-cloud-task) 
diff --git a/spring-cloud/spring-cloud-vault/README.md b/spring-cloud/spring-cloud-vault/README.md
new file mode 100644
index 0000000000..b7529b4a5c
--- /dev/null
+++ b/spring-cloud/spring-cloud-vault/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles:
+- [An Intro to Spring Cloud Vault](https://www.baeldung.com/spring-cloud-vault)
+
diff --git a/spring-cloud/spring-cloud-vault/pom.xml b/spring-cloud/spring-cloud-vault/pom.xml
index 3a7198ecc3..363de6e107 100644
--- a/spring-cloud/spring-cloud-vault/pom.xml
+++ b/spring-cloud/spring-cloud-vault/pom.xml
@@ -1,88 +1,72 @@
 <?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>
+    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>org.baeldung.spring.cloud</groupId>
-	<artifactId>spring-cloud-vault</artifactId>
-	<packaging>jar</packaging>
+    <groupId>org.baeldung.spring.cloud</groupId>
+    <artifactId>spring-cloud-vault</artifactId>
+    <packaging>jar</packaging>
 
-	<name>spring-cloud-vault</name>
-	<description>Demo project for Spring Boot</description>
+    <name>spring-cloud-vault</name>
+    <description>Demo project for Spring Boot</description>
 
-	<parent>
-		<groupId>com.baeldung</groupId>
-		<artifactId>parent-boot-2</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../../parent-boot-2</relativePath>
-	</parent>
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-2</relativePath>
+    </parent>
 
-	<!-- <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> 
-		<version>2.0.4.RELEASE</version> <relativePath/> </parent> -->
+    <dependencies>
 
-	<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>Greenwich.M3</spring-cloud.version>
-	</properties>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-vault-config</artifactId>
+        </dependency>
 
-	<dependencies>
-	
-		
-		
-		
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-vault-config</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-vault-config-databases</artifactId>
+        </dependency>
 
-		<dependency>
-		  <groupId>org.springframework.cloud</groupId>
-		  <artifactId>spring-cloud-vault-config-databases</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </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>
 
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-		</dependency>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-jdbc</artifactId>
-		</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>
-		</plugins>
-	</build>
-    
     <repositories>
         <repository>
             <id>spring-milestones</id>
@@ -94,5 +78,11 @@
         </repository>
     </repositories>
 
+    <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>Greenwich.M3</spring-cloud.version>
+    </properties>
 
 </project>
diff --git a/spring-cloud/spring-cloud-zookeeper/README.md b/spring-cloud/spring-cloud-zookeeper/README.md
new file mode 100644
index 0000000000..a639833452
--- /dev/null
+++ b/spring-cloud/spring-cloud-zookeeper/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [An Introduction to Spring Cloud Zookeeper](http://www.baeldung.com/spring-cloud-zookeeper)
diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/README.md b/spring-cloud/spring-cloud-zuul-eureka-integration/README.md
new file mode 100644
index 0000000000..32074f3699
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul-eureka-integration/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [An Example of Load Balancing with Zuul and Eureka](http://www.baeldung.com/zuul-load-balancing)
diff --git a/spring-cloud/spring-cloud-zuul/README.md b/spring-cloud/spring-cloud-zuul/README.md
new file mode 100644
index 0000000000..834917f159
--- /dev/null
+++ b/spring-cloud/spring-cloud-zuul/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Rate Limiting in Spring Cloud Netflix Zuul](https://www.baeldung.com/spring-cloud-zuul-rate-limit)
diff --git a/spring-integration/pom.xml b/spring-integration/pom.xml
index 457645a144..8a5399ae0b 100644
--- a/spring-integration/pom.xml
+++ b/spring-integration/pom.xml
@@ -104,14 +104,6 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>repo.springsource.org.milestone</id>
-            <name>Spring Framework Maven Milestone Repository</name>
-            <url>https://repo.springsource.org/milestone</url>
-        </repository>
-    </repositories>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring.version>5.0.3.RELEASE</spring.version>
diff --git a/spring-ldap/README.md b/spring-ldap/README.md
index e2517b9d4b..b8163ab44d 100644
--- a/spring-ldap/README.md
+++ b/spring-ldap/README.md
@@ -3,8 +3,4 @@
 ### Relevant articles
 
 - [Spring LDAP Overview](http://www.baeldung.com/spring-ldap)
-- [Spring LDAP Example Project](http://www.baeldung.com/spring-ldap-overview/)
 - [Guide to Spring Data LDAP](http://www.baeldung.com/spring-data-ldap)
-
-
-
diff --git a/spring-mobile/pom.xml b/spring-mobile/pom.xml
index d65820594f..4b04c3b8d5 100644
--- a/spring-mobile/pom.xml
+++ b/spring-mobile/pom.xml
@@ -32,20 +32,4 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>spring-releases</id>
-            <name>Spring Milestone Repository</name>
-            <url>https://repo.spring.io/libs-release</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-releases</id>
-            <name>Spring Milestone Repository</name>
-            <url>https://repo.spring.io/libs-release</url>
-        </pluginRepository>
-    </pluginRepositories>
-
 </project>
diff --git a/spring-mustache/.gitignore b/spring-mustache/.gitignore
deleted file mode 100644
index 2af7cefb0a..0000000000
--- a/spring-mustache/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-
-### 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-mustache/README.md b/spring-mustache/README.md
deleted file mode 100644
index ff12555376..0000000000
--- a/spring-mustache/README.md
+++ /dev/null
@@ -1 +0,0 @@
-## Relevant articles:
diff --git a/spring-mustache/pom.xml b/spring-mustache/pom.xml
deleted file mode 100644
index 9e4c528ee0..0000000000
--- a/spring-mustache/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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-mustache</artifactId>
-    <packaging>jar</packaging>
-    <name>spring-mustache</name>
-    <description>Demo project for Spring Boot</description>
-
-    <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>
-            <artifactId>spring-boot-starter-mustache</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.webjars</groupId>
-            <artifactId>bootstrap</artifactId>
-            <version>${bootstrap.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.fluttercode.datafactory</groupId>
-            <artifactId>datafactory</artifactId>
-            <version>${datafactory.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-    <properties>
-        <bootstrap.version>3.3.7</bootstrap.version>
-        <datafactory.version>0.8</datafactory.version>
-    </properties>
-    
-</project>
diff --git a/spring-mustache/src/main/java/com/baeldung/springmustache/SpringMustacheApplication.java b/spring-mustache/src/main/java/com/baeldung/springmustache/SpringMustacheApplication.java
deleted file mode 100644
index 8cdf89d08a..0000000000
--- a/spring-mustache/src/main/java/com/baeldung/springmustache/SpringMustacheApplication.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.baeldung.springmustache;
-
-import com.samskivert.mustache.Mustache;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.mustache.MustacheEnvironmentCollector;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.core.env.Environment;
-
-@SpringBootApplication
-@ComponentScan(basePackages = {"com.baeldung"})
-public class SpringMustacheApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(SpringMustacheApplication.class, args);
-    }
-
-    @Bean
-    public Mustache.Compiler mustacheCompiler(Mustache.TemplateLoader templateLoader, Environment environment) {
-
-        MustacheEnvironmentCollector collector = new MustacheEnvironmentCollector();
-        collector.setEnvironment(environment);
-
-        return Mustache.compiler()
-          .defaultValue("Some Default Value")
-          .withLoader(templateLoader)
-          .withCollector(collector);
-
-    }
-}
-
diff --git a/spring-mustache/src/main/java/com/baeldung/springmustache/controller/ArticleController.java b/spring-mustache/src/main/java/com/baeldung/springmustache/controller/ArticleController.java
deleted file mode 100644
index 5fc34c9f07..0000000000
--- a/spring-mustache/src/main/java/com/baeldung/springmustache/controller/ArticleController.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.baeldung.springmustache.controller;
-
-import com.baeldung.springmustache.model.Article;
-import org.fluttercode.datafactory.impl.DataFactory;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-@Controller
-public class ArticleController {
-
-    @GetMapping("/article")
-    public ModelAndView displayArticle(Map<String, Object> model) {
-
-        List<Article> articles = IntStream.range(0, 10)
-          .mapToObj(i -> generateArticle("Article Title " + i))
-          .collect(Collectors.toList());
-
-        Map<String, Object> modelMap = new HashMap<>();
-        modelMap.put("articles", articles);
-
-        return new ModelAndView("index", modelMap);
-    }
-
-    private Article generateArticle(String title) {
-        Article article = new Article();
-        DataFactory factory = new DataFactory();
-        article.setTitle(title);
-        article.setBody(
-          "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur faucibus tempor diam. In molestie arcu eget ante facilisis sodales. Maecenas porta tellus sapien, eget rutrum nisi blandit in. Mauris tempor auctor ante, ut blandit velit venenatis id. Ut varius, augue aliquet feugiat congue, arcu ipsum finibus purus, dapibus semper velit sapien venenatis magna. Nunc quam ex, aliquet at rutrum sed, vestibulum quis libero. In laoreet libero cursus maximus vulputate. Nullam in fermentum sem. Duis aliquam ullamcorper dui, et dictum justo placerat id. Aliquam pretium orci quis sapien convallis, non blandit est tempus.");
-        article.setPublishDate(factory.getBirthDate().toString());
-        article.setAuthor(factory.getName());
-        return article;
-    }
-}
-
-
diff --git a/spring-mustache/src/main/java/com/baeldung/springmustache/model/Article.java b/spring-mustache/src/main/java/com/baeldung/springmustache/model/Article.java
deleted file mode 100644
index 78b08f877f..0000000000
--- a/spring-mustache/src/main/java/com/baeldung/springmustache/model/Article.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.baeldung.springmustache.model;
-
-public class Article {
-    private String title;
-    private String body;
-    private String author;
-    private String publishDate;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getBody() {
-        return body;
-    }
-
-    public void setBody(String body) {
-        this.body = body;
-    }
-
-    public String getAuthor() {
-        return author;
-    }
-
-    public void setAuthor(String author) {
-        this.author = author;
-    }
-
-    public String getPublishDate() {
-        return publishDate;
-    }
-
-    public void setPublishDate(String publishDate) {
-        this.publishDate = publishDate;
-    }
-
-}
diff --git a/spring-mustache/src/main/resources/application.properties b/spring-mustache/src/main/resources/application.properties
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/spring-mustache/src/main/resources/logback.xml b/spring-mustache/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/spring-mustache/src/main/resources/logback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/spring-mustache/src/main/resources/templates/error/error.html b/spring-mustache/src/main/resources/templates/error/error.html
deleted file mode 100644
index fa29db41c4..0000000000
--- a/spring-mustache/src/main/resources/templates/error/error.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="en">
-
-<body>
-	Something went wrong: {{status}} {{error}}
-</body>
-
-</html>
\ No newline at end of file
diff --git a/spring-mustache/src/main/resources/templates/index.html b/spring-mustache/src/main/resources/templates/index.html
deleted file mode 100644
index bda60f9d8f..0000000000
--- a/spring-mustache/src/main/resources/templates/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{{>layout/header}}
-<body>
-	<div class="container">{{>layout/article}}</div>
-
-	<script type="text/javascript"
-		src="webjars/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-
-</body>
-{{>layout/footer}}
diff --git a/spring-mustache/src/main/resources/templates/layout/article.html b/spring-mustache/src/main/resources/templates/layout/article.html
deleted file mode 100644
index 9d573580d3..0000000000
--- a/spring-mustache/src/main/resources/templates/layout/article.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="starter-template">
-	{{#articles}}
-	<h1>{{title}}</h1>
-	<h3>{{publishDate}}</h3>
-	<h3>{{author}}</h3>
-	<p>{{body}}</p>
-	{{/articles}}
-</div>
\ No newline at end of file
diff --git a/spring-mustache/src/main/resources/templates/layout/footer.html b/spring-mustache/src/main/resources/templates/layout/footer.html
deleted file mode 100644
index 04f34cac54..0000000000
--- a/spring-mustache/src/main/resources/templates/layout/footer.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<!--  this is footer -->
-</html>
\ No newline at end of file
diff --git a/spring-mustache/src/main/resources/templates/layout/header.html b/spring-mustache/src/main/resources/templates/layout/header.html
deleted file mode 100644
index d203ef800b..0000000000
--- a/spring-mustache/src/main/resources/templates/layout/header.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML>
-<head>
-
-<title></title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-<link rel="stylesheet" type="text/css" href="webjars/bootstrap/3.3.7/css/bootstrap.min.css" />
-<link rel="stylesheet" href="css/main.css" />
-
-</head>
-<!--  this is header -->
\ No newline at end of file
diff --git a/spring-mustache/src/test/java/com/baeldung/springmustache/SpringMustacheApplicationIntegrationTest.java b/spring-mustache/src/test/java/com/baeldung/springmustache/SpringMustacheApplicationIntegrationTest.java
deleted file mode 100644
index 1eecf58986..0000000000
--- a/spring-mustache/src/test/java/com/baeldung/springmustache/SpringMustacheApplicationIntegrationTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.baeldung.springmustache;
-
-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.boot.test.web.client.TestRestTemplate;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-public class SpringMustacheApplicationIntegrationTest {
-
-    @Autowired
-    private TestRestTemplate restTemplate;
-
-    @Test
-    public void givenIndexPageWhenContainsArticleThenTrue() {
-
-        ResponseEntity<String> entity = this.restTemplate.getForEntity("/article", String.class);
-
-        Assert.assertTrue(entity.getStatusCode().equals(HttpStatus.OK));
-        Assert.assertTrue(entity.getBody().contains("Article Title 0"));
-    }
-
-}
diff --git a/spring-mvc-xml/pom.xml b/spring-mvc-xml/pom.xml
index 7187b5c270..8e4a56c148 100644
--- a/spring-mvc-xml/pom.xml
+++ b/spring-mvc-xml/pom.xml
@@ -1,7 +1,6 @@
 <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>
     <version>0.1-SNAPSHOT</version>
     <artifactId>spring-mvc-xml</artifactId>
 
@@ -86,13 +85,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        
+
         <dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<version>1.5.10.RELEASE</version>
-			<scope>test</scope>
-		</dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>1.5.10.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -116,14 +115,6 @@
 
     </build>
 
-    <repositories>
-        <repository>
-            <id>1</id>
-            <name>jstl</name>
-            <url>https://mvnrepository.com/artifact/javax.servlet/jstl</url>
-        </repository>
-    </repositories>
-
     <properties>
 
         <!-- Spring -->
diff --git a/spring-mybatis/README.md b/spring-mybatis/README.md
deleted file mode 100644
index ff12555376..0000000000
--- a/spring-mybatis/README.md
+++ /dev/null
@@ -1 +0,0 @@
-## Relevant articles:
diff --git a/spring-mybatis/pom.xml b/spring-mybatis/pom.xml
deleted file mode 100644
index af70cb6377..0000000000
--- a/spring-mybatis/pom.xml
+++ /dev/null
@@ -1,73 +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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-mybatis</artifactId>
-    <packaging>jar</packaging>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-mybatis</name>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis</artifactId>
-            <version>${mybatis.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis-spring</artifactId>
-            <version>${mybatis-spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql-connector.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>${jstl.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${spring-webmvc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>${servlet.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>spring-mybatis</finalName>
-    </build>
-
-    <properties>
-        <mybatis.version>3.1.1</mybatis.version>
-        <mybatis-spring.version>1.1.1</mybatis-spring.version>
-        <spring.version>3.1.1.RELEASE</spring.version>
-        <spring-webmvc.version>3.2.4.RELEASE</spring-webmvc.version>
-        <mysql-connector.version>5.1.40</mysql-connector.version>
-        <jstl.version>1.2</jstl.version>
-        <servlet.version>2.5</servlet.version>
-    </properties>
-</project>
diff --git a/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/application/SpringMyBatisApplication.java b/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/application/SpringMyBatisApplication.java
deleted file mode 100644
index acfaff2669..0000000000
--- a/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/application/SpringMyBatisApplication.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.baeldung.spring.mybatis.application;
-
-import java.util.Date;
-
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import com.baeldung.spring.mybatis.model.Student;
-import com.baeldung.spring.mybatis.service.StudentService;
-
-public class SpringMyBatisApplication {
-	
-	public static void main(String[] args){
-		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("mybatis-spring.xml");
-		
-		StudentService studentService = (StudentService) ctx.getBean("studentService");
-		Student student = new Student();
-		student.setFirstName("Santosh");
-		student.setLastName("B S");
-		student.setEmailAddress("santosh.bse@gmail.com");
-		student.setPassword("Test123");
-		student.setDateOfBirth(new Date());
-		student.setUserName("santoshbs1");
-		
-		boolean result = studentService.insertStudent(student);
-		if(result){
-			System.out.println("Student record saved successfully");
-		}
-		else{
-			System.out.println("Encountered an error while saving student data");
-		}
-		
-		final String userName = "santosh";
-		Student matchingStudent = studentService.getStudentByUserName(userName);
-		if(matchingStudent == null){
-			System.out.println("No matching student found for User Name - " + userName);
-		}
-		else{
-			System.out.println("Student Details are as follows : ");
-			System.out.println("First Name : " + matchingStudent.getFirstName());
-			System.out.println("Last Name : " + matchingStudent.getLastName());
-			System.out.println("EMail : " + matchingStudent.getEmailAddress());
-			System.out.println("DOB : " + matchingStudent.getDateOfBirth());
-			System.out.println("User Name : " + matchingStudent.getUserName());
-		}
-		
-	}
-
-}
diff --git a/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/controller/StudentController.java b/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/controller/StudentController.java
deleted file mode 100644
index c1e5579103..0000000000
--- a/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/controller/StudentController.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.baeldung.spring.mybatis.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.SessionAttributes;
-
-import com.baeldung.spring.mybatis.model.Student;
-import com.baeldung.spring.mybatis.model.StudentLogin;
-import com.baeldung.spring.mybatis.service.StudentService;
-
-@Controller
-@SessionAttributes("student")
-public class StudentController {
-
-	@Autowired
-	private StudentService studentService;
-
-	@RequestMapping(value = "/signup", method = RequestMethod.GET)
-	public String signup(Model model) {
-		Student student = new Student();
-		model.addAttribute("student", student);
-		return "signup";
-	}
-
-	@RequestMapping(value = "/signup", method = RequestMethod.POST)
-	public String signup(@Validated @ModelAttribute("student") Student student, BindingResult result, ModelMap model) {
-		if (studentService.getStudentByUserName(student.getUserName()) != null) {
-			model.addAttribute("message", "User Name exists. Try another user name");
-			return "signup";
-		} else {
-			studentService.insertStudent(student);
-			model.addAttribute("message", "Saved student details");
-			return "redirect:login.html";
-		}
-	}
-
-	@RequestMapping(value = "/login", method = RequestMethod.GET)
-	public String login(Model model) {
-		StudentLogin studentLogin = new StudentLogin();
-		model.addAttribute("studentLogin", studentLogin);
-		return "login";
-	}
-
-	@RequestMapping(value = "/login", method = RequestMethod.POST)
-	public String login(@ModelAttribute("studentLogin") StudentLogin studentLogin, BindingResult result, ModelMap model) {
-		boolean found = studentService.getStudentByLogin(studentLogin.getUserName(), studentLogin.getPassword()) != null;
-		if (found) {
-			return "success";
-		} else {
-			return "failure";
-		}
-	}
-}
\ No newline at end of file
diff --git a/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/mappers/StudentMapper.java b/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/mappers/StudentMapper.java
deleted file mode 100644
index cf3584f7b1..0000000000
--- a/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/mappers/StudentMapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.baeldung.spring.mybatis.mappers;
-
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Options;
-import org.apache.ibatis.annotations.Select;
-
-import com.baeldung.spring.mybatis.model.Student;
-
-public interface StudentMapper {
-	@Insert("INSERT INTO student(userName, password, firstName,lastName, dateOfBirth, emailAddress) VALUES"
-			+ "(#{userName},#{password}, #{firstName},  #{lastName}, #{dateOfBirth}, #{emailAddress})")
-	@Options(useGeneratedKeys = true, keyProperty = "id", flushCache = true, keyColumn = "id")
-	public void insertStudent(Student student);
-
-	@Select("SELECT USERNAME as userName, PASSWORD as password, FIRSTNAME as firstName, LASTNAME as lastName, "
-			+ "DATEOFBIRTH as dateOfBirth, EMAILADDRESS as emailAddress " + "FROM student WHERE userName = #{userName}")
-	public Student getStudentByUserName(String userName);
-
-}
\ No newline at end of file
diff --git a/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/model/Student.java b/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/model/Student.java
deleted file mode 100644
index f33dd44f72..0000000000
--- a/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/model/Student.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.baeldung.spring.mybatis.model;
-
-import java.util.Date;
-
-public class Student {
-	private Long id;
-	private String userName;
-	private String firstName;
-	private String lastName;
-	private String password;
-	private String emailAddress;
-	private Date dateOfBirth;
-	public Long getId() {
-		return id;
-	}
-	public void setId(Long id) {
-		this.id = id;
-	}
-	public String getUserName() {
-		return userName;
-	}
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-	public String getFirstName() {
-		return firstName;
-	}
-	public void setFirstName(String firstName) {
-		this.firstName = firstName;
-	}
-	public String getLastName() {
-		return lastName;
-	}
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-	public String getPassword() {
-		return password;
-	}
-	public void setPassword(String password) {
-		this.password = password;
-	}
-	public String getEmailAddress() {
-		return emailAddress;
-	}
-	public void setEmailAddress(String emailAddress) {
-		this.emailAddress = emailAddress;
-	}
-	public Date getDateOfBirth() {
-		return dateOfBirth;
-	}
-	public void setDateOfBirth(Date dateOfBirth) {
-		this.dateOfBirth = dateOfBirth;
-	}
-}
diff --git a/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/model/StudentLogin.java b/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/model/StudentLogin.java
deleted file mode 100644
index 867857b510..0000000000
--- a/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/model/StudentLogin.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.baeldung.spring.mybatis.model;
-
-public class StudentLogin {
-	private String userName;
-	private String password;
-	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;
-	}
-}
diff --git a/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/service/StudentService.java b/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/service/StudentService.java
deleted file mode 100644
index d26115beee..0000000000
--- a/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/service/StudentService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.baeldung.spring.mybatis.service;
-
-import com.baeldung.spring.mybatis.model.Student;
-
-public interface StudentService {
-	public boolean insertStudent(Student student);
-	public Student getStudentByLogin(String userName, String password);
-	public Student getStudentByUserName(String userName);
-}
\ No newline at end of file
diff --git a/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/service/StudentServiceImpl.java b/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/service/StudentServiceImpl.java
deleted file mode 100644
index 538e650482..0000000000
--- a/spring-mybatis/src/main/java/com/baeldung/spring/mybatis/service/StudentServiceImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.baeldung.spring.mybatis.service;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.baeldung.spring.mybatis.mappers.StudentMapper;
-import com.baeldung.spring.mybatis.model.Student;
-
-@Service("studentService")
-public class StudentServiceImpl implements StudentService {
-
-	@Autowired
-	private StudentMapper studentMapper;
-
-	@Transactional
-	public boolean insertStudent(Student student) {
-		boolean result=false;
-		try{
-			studentMapper.insertStudent(student);
-			result = true;
-		}
-		catch(Exception ex){
-			ex.printStackTrace();
-			result = false;
-		}
-		return result;
-	}
-
-	public Student getStudentByLogin(String userName, String password) {
-		Student student = studentMapper.getStudentByUserName(userName);
-		return student;
-	}
-
-	public Student getStudentByUserName(String userName) {
-		Student student = studentMapper.getStudentByUserName(userName);
-		return student;
-	}
-
-}
diff --git a/spring-mybatis/src/main/resources/logback.xml b/spring-mybatis/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/spring-mybatis/src/main/resources/logback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/spring-mybatis/src/main/resources/mybatis-spring.xml b/spring-mybatis/src/main/resources/mybatis-spring.xml
deleted file mode 100644
index 9f5bab3247..0000000000
--- a/spring-mybatis/src/main/resources/mybatis-spring.xml
+++ /dev/null
@@ -1,54 +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:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
-      http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-      http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
-
-	<mvc:annotation-driven />
-	<context:component-scan base-package="com.baeldung.spring.mybatis" />
-	<bean
-		class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/WEB-INF/jsp/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
-	<!-- <bean id="dataSource"
-		class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-		<property name="driverClassName" value="com.mysql.jdbc.Driver" />
-		<property name="url" value="jdbc:mysql//localhost:3306/baeldung;" />
-		<property name="username" value="root" />
-		<property name="password" value="admin" />
-	</bean> -->
-	
-	
-	<bean id="dataSource"
-		class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-
-		<property name="driverClassName" value="com.mysql.jdbc.Driver" />
-		<property name="url" value="jdbc:mysql://localhost:3306/baeldung" />
-		<property name="username" value="root" />
-		<property name="password" value="admin" />
-	</bean>
-	
-	<tx:annotation-driven transaction-manager="transactionManager" />
-	<bean id="transactionManager"
-		class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-		<property name="dataSource" ref="dataSource" />
-	</bean>
-	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-		<property name="dataSource" ref="dataSource" />
-		<property name="typeAliasesPackage" value="com.baeldung.spring.mybatis.model" />
-		<property name="mapperLocations" value="classpath*:com/baeldung/spring/mappers/*.xml" />
-	</bean>
-	<bean id="sqlSession" class="org.mybatis.spring.SqlSessionTemplate">
-		<constructor-arg index="0" ref="sqlSessionFactory" />
-	</bean>
-	<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-		<property name="basePackage" value="com.baeldung.spring.mybatis.mappers" />
-	</bean>
-	
-	<bean id="studentService" class="com.baeldung.spring.mybatis.service.StudentServiceImpl"></bean>
-	
-</beans>
\ No newline at end of file
diff --git a/spring-mybatis/src/main/webapp/WEB-INF/conf/mybatis-spring.xml b/spring-mybatis/src/main/webapp/WEB-INF/conf/mybatis-spring.xml
deleted file mode 100644
index c8b686358c..0000000000
--- a/spring-mybatis/src/main/webapp/WEB-INF/conf/mybatis-spring.xml
+++ /dev/null
@@ -1,51 +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:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
-      http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-      http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
-
-	<mvc:annotation-driven />
-	<context:component-scan base-package="com.baeldung.spring.mybatis" />
-	<bean
-		class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/WEB-INF/jsp/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
-	<!-- <bean id="dataSource"
-		class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-		<property name="driverClassName" value="com.mysql.jdbc.Driver" />
-		<property name="url" value="jdbc:mysql//localhost:3306/baeldung;" />
-		<property name="username" value="root" />
-		<property name="password" value="admin" />
-	</bean> -->
-	
-	
-	<bean id="dataSource"
-		class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-
-		<property name="driverClassName" value="com.mysql.jdbc.Driver" />
-		<property name="url" value="jdbc:mysql://localhost:3306/baeldung" />
-		<property name="username" value="root" />
-		<property name="password" value="admin" />
-	</bean>
-	
-	<tx:annotation-driven transaction-manager="transactionManager" />
-	<bean id="transactionManager"
-		class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-		<property name="dataSource" ref="dataSource" />
-	</bean>
-	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-		<property name="dataSource" ref="dataSource" />
-		<property name="typeAliasesPackage" value="com.baeldung.spring.mybatis.model" />
-		<property name="mapperLocations" value="classpath*:com/baeldung/spring/mappers/*.xml" />
-	</bean>
-	<bean id="sqlSession" class="org.mybatis.spring.SqlSessionTemplate">
-		<constructor-arg index="0" ref="sqlSessionFactory" />
-	</bean>
-	<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-		<property name="basePackage" value="com.baeldung.spring.mybatis.mappers" />
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/spring-mybatis/src/main/webapp/WEB-INF/jsp/failure.jsp b/spring-mybatis/src/main/webapp/WEB-INF/jsp/failure.jsp
deleted file mode 100644
index 66f16d4e09..0000000000
--- a/spring-mybatis/src/main/webapp/WEB-INF/jsp/failure.jsp
+++ /dev/null
@@ -1,36 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/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>Login Failure</title>
-<link href="assets/css/bootstrap-united.css" rel="stylesheet" />
-
-</head>
-<body>
-	<div style="width: 100%">
-		<a href="login.html">Login</a> &nbsp;&nbsp;&nbsp; <a
-			href="signup.html">Signup</a>
-	</div>
-	<div class="panel panel-danger">
-		<div class="panel-heading">
-			<h3 class="panel-title">Student Enrollment Login failure</h3>
-		</div>
-		<div class="panel-body">
-			<div class="alert alert-dismissable alert-danger">
-				<button type="button" class="close" data-dismiss="alert">×</button>
-				<strong>Oh snap!</strong> Something is wrong. Change a few things up
-				and try submitting again.
-			</div>
-		</div>
-	</div>
-	<div></div>
-	<div></div>
-
-	<a class="btn btn-primary" href="<spring:url value="login.html"/>">Try
-		again?</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-mybatis/src/main/webapp/WEB-INF/jsp/login.jsp b/spring-mybatis/src/main/webapp/WEB-INF/jsp/login.jsp
deleted file mode 100644
index 5a895bb348..0000000000
--- a/spring-mybatis/src/main/webapp/WEB-INF/jsp/login.jsp
+++ /dev/null
@@ -1,81 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
-
-<!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">
-
-<style>
-.error {
-	color: #ff0000;
-	font-size: 0.9em;
-	font-weight: bold;
-}
-
-.errorblock {
-	color: #000;
-	background-color: #ffEEEE;
-	border: 3px solid #ff0000;
-	padding: 8px;
-	margin: 16px;
-}
-</style>
-<title>Student Login</title>
-</head>
-<body>
-	<div style="width: 100%">
-		<a href="login.html">Login</a> &nbsp;&nbsp;&nbsp; <a
-			href="signup.html">Signup</a>
-	</div>
-
-	<div>
-		<div>
-			<div>
-				<h1>Welcome to Online Student Enrollment Application</h1>
-				<p>Login to explore the complete features!</p>
-			</div>
-		</div>
-
-		<div></div>
-	</div>
-
-	<div>
-		<fieldset>
-			<legend>Student Enrollment Login Form</legend>
-			<form:form id="myForm" method="post"
-				class="bs-example form-horizontal" modelAttribute="studentLogin" action="login.html">
-				<table>
-					<tr>
-						<td><label for="userNameInput" class="col-lg-3 control-label">User
-								Name : </label></td>
-						<td><form:input type="text" class="form-control"
-								path="userName" id="userNameInput" placeholder="User Name" /> <form:errors
-								path="userName" cssClass="error" /></td>
-					</tr>
-					<tr>
-						<td><label for="passwordInput" class="col-lg-3 control-label">Password</label>
-						</td>
-						<td><form:input type="password" class="form-control"
-								path="password" id="passwordInput" placeholder="Password" /> <form:errors
-								path="password" cssClass="error" /></td>
-
-					</tr>
-					<tr>
-						<td colspan="2">
-							<button class="btn btn-default">Cancel</button>
-							&nbsp;&nbsp;&nbsp;&nbsp;
-							<button class="btn btn-primary">Login</button>
-						</td>
-					</tr>
-
-				</table>
-
-			</form:form>
-		</fieldset>
-	</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-mybatis/src/main/webapp/WEB-INF/jsp/signup.jsp b/spring-mybatis/src/main/webapp/WEB-INF/jsp/signup.jsp
deleted file mode 100644
index bc628862f3..0000000000
--- a/spring-mybatis/src/main/webapp/WEB-INF/jsp/signup.jsp
+++ /dev/null
@@ -1,130 +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="form" uri="http://www.springframework.org/tags/form"%>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/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>Student Signup</title>
-
-<style>
-.green {
-	font-weight: bold;
-	color: green;
-}
-
-.message {
-	margin-bottom: 10px;
-}
-
-.error {
-	color: #ff0000;
-	font-size: 0.9em;
-	font-weight: bold;
-}
-
-.errorblock {
-	color: #000;
-	background-color: #ffEEEE;
-	border: 3px solid #ff0000;
-	padding: 8px;
-	margin: 16px;
-}
-</style>
-</head>
-<body>
-
-	<div style="width: 100%">
-		<a href="login.html">Login</a> &nbsp;&nbsp;&nbsp; <a
-			href="signup.html">Signup</a>
-	</div>
-
-	<div>
-		<div>
-			<div>
-				<h1>Welcome to Online Student Enrollment Application</h1>
-				<p>Login to explore the complete features!</p>
-			</div>
-		</div>
-
-		<div></div>
-	</div>
-
-	<div>
-		<c:if test="${not empty message}">
-			<div class="message green">${message}</div>
-		</c:if>
-	</div>
-
-	<div style="width: 100%;">
-		<form:form id="myForm" method="post"
-			class="bs-example form-horizontal" action="signup.html" modelAttribute="student">
-			<fieldset>
-				<legend>Student Enrollment Signup Form</legend>
-
-				<table>
-					<tr>
-						<td><label for="userNameInput" class="col-lg-3 control-label">User
-								Name</label></td>
-						<td><form:input type="text" class="form-control"
-								path="userName" id="userNameInput" placeholder="User Name" /> <form:errors
-								path="userName" cssClass="error" /></td>
-					</tr>
-					<tr>
-						<td><label for="passwordInput" class="col-lg-3 control-label">Password</label>
-						</td>
-						<td><form:input type="password" class="form-control"
-								path="password" id="passwordInput" placeholder="Password" /> <form:errors
-								path="password" cssClass="error" /></td>
-					</tr>
-
-					<tr>
-						<td><label for="firstNameInput"
-							class="col-lg-3 control-label">First Name</label></td>
-						<td><form:input type="text" class="form-control"
-								path="firstName" id="firstNameInput" placeholder="First Name" />
-							<form:errors path="firstName" cssClass="error" /></td>
-					</tr>
-					<tr>
-						<td><label for="lastNameInput" class="col-lg-3 control-label">Last
-								Name</label></td>
-						<td><form:input type="text" class="form-control"
-								path="lastName" id="lastNameInput" placeholder="Last Name" /> <form:errors
-								path="lastName" cssClass="error" /></td>
-					</tr>
-
-					<tr>
-						<td><label for="dateOfBirthInput"
-							class="col-lg-3 control-label">Date of Birth</label></td>
-						<td><form:input type="text" class="form-control"
-								path="dateOfBirth" id="dateOfBirthInput"
-								placeholder="Date of Birth" /> <form:errors path="dateOfBirth"
-								cssClass="error" /></td>
-					</tr>
-					<tr>
-						<td><label for="emailAddressInput"
-							class="col-lg-3 control-label">Email Address</label></td>
-						<td><form:input type="text" class="form-control"
-								path="emailAddress" id="emailAddressInput"
-								placeholder="Email Address" /> <form:errors path="emailAddress"
-								cssClass="error" /></td>
-					</tr>
-					<tr>
-						<td colspan="2">
-							<button class="btn btn-default">Cancel</button>
-&nbsp;&nbsp;&nbsp;&nbsp;
-							<button class="btn btn-primary" data-toggle="modal"
-								data-target="#themodal">Submit</button>
-						</td>
-
-					</tr>
-				</table>
-			</fieldset>
-		</form:form>
-	</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-mybatis/src/main/webapp/WEB-INF/jsp/success.jsp b/spring-mybatis/src/main/webapp/WEB-INF/jsp/success.jsp
deleted file mode 100644
index 7ae37bc241..0000000000
--- a/spring-mybatis/src/main/webapp/WEB-INF/jsp/success.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/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>Login Success</title>
-<link href="assets/css/bootstrap-united.css" rel="stylesheet" />
-
-</head>
-<body>
-	<div style="width: 100%">
-		<a href="login.html">Login</a> &nbsp;&nbsp;&nbsp; <a
-			href="signup.html">Signup</a>
-	</div>
-
-	<div class="panel panel-success">
-		<div class="panel-heading">
-			<h3 class="panel-title">Student Enrollment Login success</h3>
-		</div>
-		<div class="panel-body">
-			<div class="alert alert-dismissable alert-success">
-				<button type="button" class="close" data-dismiss="alert">×</button>
-				<strong>Well done!</strong> You successfully logged-into the system.
-				Now you can explore the complete features!
-			</div>
-		</div>
-	</div>
-	<div></div>
-	<div></div>
-	<a class="btn btn-primary" href="<spring:url value="login.html"/>">Login
-		as different user?</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-mybatis/src/main/webapp/WEB-INF/lib/mysql-connector-java-5.1.40-bin.jar b/spring-mybatis/src/main/webapp/WEB-INF/lib/mysql-connector-java-5.1.40-bin.jar
deleted file mode 100644
index 60bef5cfbf..0000000000
Binary files a/spring-mybatis/src/main/webapp/WEB-INF/lib/mysql-connector-java-5.1.40-bin.jar and /dev/null differ
diff --git a/spring-mybatis/src/main/webapp/WEB-INF/web.xml b/spring-mybatis/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 569b5ef9b1..0000000000
--- a/spring-mybatis/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
-	<servlet>
-		<servlet-name>myBatisSpringServlet</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<init-param>
-			<param-name>contextConfigLocation</param-name>
-			<param-value>/WEB-INF/conf/mybatis-spring.xml</param-value>
-		</init-param>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>myBatisSpringServlet</servlet-name>
-		<url-pattern>*.html</url-pattern>
-	</servlet-mapping>
-
-	<display-name>MyBatis-Spring Integration</display-name>
-</web-app>
\ No newline at end of file
diff --git a/spring-mybatis/src/main/webapp/index.jsp b/spring-mybatis/src/main/webapp/index.jsp
deleted file mode 100644
index b60222e7de..0000000000
--- a/spring-mybatis/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,34 +0,0 @@
-<html>
-<head>
-<link href="assets/css/bootstrap-united.css" rel="stylesheet" />
-<link href="bootstrap/css/bootstrap-responsive.css" rel="stylesheet" />
-<style>
-body {
-	height: 100%;
-	margin: 0;
-	background: url(assets/img/books.jpg);
-	background-size: 1440px 800px;
-	background-repeat: no-repeat;
-	display: compact;
-}
-</style>
-</head>
-<body>
-	<div style="width: 100%">
-		<a href="login.html">Login</a> &nbsp;&nbsp;&nbsp; <a
-			href="signup.html">Signup</a>
-	</div>
-
-	<div>
-		<div>
-			<div>
-				<h1>Welcome to Online Student Enrollment Application</h1>
-				<p>Login to explore the complete features!</p>
-			</div>
-		</div>
-
-		<div></div>
-	</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-reactor/pom.xml b/spring-reactor/pom.xml
index f6db404656..e828c44f74 100644
--- a/spring-reactor/pom.xml
+++ b/spring-reactor/pom.xml
@@ -30,23 +30,4 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/libs-snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-releases</id>
-            <name>Spring Releases</name>
-            <url>https://repo.spring.io/libs-release</url>
-        </pluginRepository>
-    </pluginRepositories>
-
 </project>
diff --git a/spring-rest-embedded-tomcat/pom.xml b/spring-rest-embedded-tomcat/pom.xml
deleted file mode 100644
index a4e2c739a1..0000000000
--- a/spring-rest-embedded-tomcat/pom.xml
+++ /dev/null
@@ -1,79 +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>org.baeldung.embedded</groupId>
-    <artifactId>spring-rest-embedded-tomcat</artifactId>
-    <name>spring-rest-embedded-tomcat</name>
-    <packaging>war</packaging>
-
-    <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-webmvc</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${servlet.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.library}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-core</artifactId>
-            <version>${tomcat.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-jasper</artifactId>
-            <version>${tomcat.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>${httpcore.version}</version>
-        </dependency>
-        
-        <dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<version>1.5.10.RELEASE</version>
-			<scope>test</scope>
-		</dependency>
-
-    </dependencies>
-
-    <properties>
-        <jackson.library>2.9.7</jackson.library>
-        <servlet.version>4.0.0</servlet.version>
-        <tomcat.version>9.0.1</tomcat.version>
-        <httpclient.version>4.5.3</httpclient.version>
-        <httpcore.version>4.4.8</httpcore.version>
-        <failOnMissingWebXml>false</failOnMissingWebXml>
-    </properties>
-
-</project>
\ No newline at end of file
diff --git a/spring-rest-embedded-tomcat/src/main/java/org/baeldung/embedded/configuration/AppInitializer.java b/spring-rest-embedded-tomcat/src/main/java/org/baeldung/embedded/configuration/AppInitializer.java
deleted file mode 100644
index 24bd28166b..0000000000
--- a/spring-rest-embedded-tomcat/src/main/java/org/baeldung/embedded/configuration/AppInitializer.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.baeldung.embedded.configuration;
-
-import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
-
-public class AppInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
-
-    @Override
-    protected Class<?>[] getRootConfigClasses() {
-        return new Class[] { UserConfiguration.class };
-    }
-
-    @Override
-    protected Class<?>[] getServletConfigClasses() {
-        return null;
-    }
-
-    @Override
-    protected String[] getServletMappings() {
-        return new String[] { "/" };
-    }
-
-}
diff --git a/spring-rest-embedded-tomcat/src/main/java/org/baeldung/embedded/configuration/UserConfiguration.java b/spring-rest-embedded-tomcat/src/main/java/org/baeldung/embedded/configuration/UserConfiguration.java
deleted file mode 100644
index 4c102a74cb..0000000000
--- a/spring-rest-embedded-tomcat/src/main/java/org/baeldung/embedded/configuration/UserConfiguration.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.baeldung.embedded.configuration;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-
-@Configuration
-@EnableWebMvc
-@ComponentScan(basePackages = "org.baeldung.embedded")
-public class UserConfiguration {
-
-}
diff --git a/spring-rest-embedded-tomcat/src/main/java/org/baeldung/embedded/controller/UserController.java b/spring-rest-embedded-tomcat/src/main/java/org/baeldung/embedded/controller/UserController.java
deleted file mode 100644
index a9a5faa0c6..0000000000
--- a/spring-rest-embedded-tomcat/src/main/java/org/baeldung/embedded/controller/UserController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.baeldung.embedded.controller;
-
-import org.baeldung.embedded.domain.User;
-import org.baeldung.embedded.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
-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.RestController;
-
-@RestController
-public class UserController {
-
-    @Autowired
-    UserService userService;
-
-    @RequestMapping("/")
-    public String welcome() {
-        return "Hello World!";
-    }
-
-    @RequestMapping(method = RequestMethod.GET, value = "/user/{userName}")
-    @ResponseBody
-    public User user(@PathVariable String userName) {
-        return this.userService.getUser(userName);
-    }
-}
diff --git a/spring-rest-embedded-tomcat/src/main/java/org/baeldung/embedded/domain/User.java b/spring-rest-embedded-tomcat/src/main/java/org/baeldung/embedded/domain/User.java
deleted file mode 100644
index 2f9443daea..0000000000
--- a/spring-rest-embedded-tomcat/src/main/java/org/baeldung/embedded/domain/User.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.baeldung.embedded.domain;
-
-public class User {
-
-    private String name;
-    private String hobby;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getHobby() {
-        return hobby;
-    }
-
-    public void setHobby(String hobby) {
-        this.hobby = hobby;
-    }
-}
diff --git a/spring-rest-embedded-tomcat/src/main/java/org/baeldung/embedded/service/UserService.java b/spring-rest-embedded-tomcat/src/main/java/org/baeldung/embedded/service/UserService.java
deleted file mode 100644
index 76696e12c2..0000000000
--- a/spring-rest-embedded-tomcat/src/main/java/org/baeldung/embedded/service/UserService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.baeldung.embedded.service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.baeldung.embedded.domain.User;
-import org.springframework.stereotype.Service;
-
-@Service
-public class UserService {
-    private List<User> users = new ArrayList<>();
-
-    public void addUser(String name) {
-        User user = new User();
-        user.setName(name);
-        if (name == "HarryPotter") {
-            user.setHobby("Quidditch");
-        } else {
-            user.setHobby("MuggleActivity");
-        }
-        users.add(user);
-    }
-
-    public User getUser(String name) {
-        for (User user : users) {
-            if (user.getName()
-                .equalsIgnoreCase(name)) {
-                return user;
-            }
-        }
-
-        User user = new User();
-        user.setName(name);
-        user.setHobby("None");
-
-        return user;
-    }
-}
diff --git a/spring-rest-embedded-tomcat/src/main/resources/logback.xml b/spring-rest-embedded-tomcat/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/spring-rest-embedded-tomcat/src/main/resources/logback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/spring-rest-embedded-tomcat/src/main/webapp/emptyFile b/spring-rest-embedded-tomcat/src/main/webapp/emptyFile
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/spring-rest-embedded-tomcat/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-rest-embedded-tomcat/src/test/java/org/baeldung/SpringContextIntegrationTest.java
deleted file mode 100644
index 8b8ff1a322..0000000000
--- a/spring-rest-embedded-tomcat/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.embedded.configuration.UserConfiguration;
-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 = { UserConfiguration.class })
-@WebAppConfiguration
-public class SpringContextIntegrationTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-rest-embedded-tomcat/src/test/java/org/baeldung/embedded/EmbeddedTomcatApp.java b/spring-rest-embedded-tomcat/src/test/java/org/baeldung/embedded/EmbeddedTomcatApp.java
deleted file mode 100644
index f340f6c837..0000000000
--- a/spring-rest-embedded-tomcat/src/test/java/org/baeldung/embedded/EmbeddedTomcatApp.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.baeldung.embedded;
-
-import java.io.File;
-import java.util.concurrent.CountDownLatch;
-import org.apache.catalina.Context;
-import org.apache.catalina.startup.Tomcat;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
-public class EmbeddedTomcatApp {
-
-    private Tomcat tomcatInstance;
-    private WebApplicationContext webApplicationContext;
-    private CountDownLatch started = new CountDownLatch(1);
-
-    public void start() throws Exception {
-        tomcatInstance = new Tomcat();
-        tomcatInstance.setBaseDir(new File(getClass().getResource(".")
-            .toURI()).getAbsolutePath()); // Tomcat's temporary directory
-        tomcatInstance.setPort(0);
-
-        Context webapp = tomcatInstance.addWebapp("", new File("src/main/webapp/").getAbsolutePath());
-
-        webapp.addLifecycleListener(event -> {
-            if (event.getType()
-                .equals("after_stop")) {
-                started.countDown();
-            } else if (event.getType()
-                .equals("after_start")) {
-                webApplicationContext = WebApplicationContextUtils
-                    .findWebApplicationContext(webapp.getServletContext());
-
-                ((ConfigurableListableBeanFactory) webApplicationContext
-                    .getAutowireCapableBeanFactory()).registerSingleton("baseUrl", getBaseUrl());
-
-                started.countDown();
-            }
-        });
-
-        tomcatInstance.start();
-        started.await();
-    }
-
-    public Tomcat getTomcatInstance() {
-        return this.tomcatInstance;
-    }
-
-    public String getBaseUrl() {
-        return String.format("http://localhost:%d%s", getLocalPort(), getWebApplicationContext().getServletContext()
-            .getContextPath());
-    }
-
-    public int getLocalPort() {
-        return tomcatInstance.getConnector()
-            .getLocalPort();
-    }
-
-    public WebApplicationContext getWebApplicationContext() {
-        return webApplicationContext;
-    }
-
-    public boolean isStarted() {
-        return started.getCount() == 0;
-    }
-
-    public boolean isStartedSucessfully() {
-        return webApplicationContext != null;
-    }
-}
diff --git a/spring-rest-embedded-tomcat/src/test/java/org/baeldung/embedded/EmbeddedTomcatRunner.java b/spring-rest-embedded-tomcat/src/test/java/org/baeldung/embedded/EmbeddedTomcatRunner.java
deleted file mode 100644
index 1bf15556e8..0000000000
--- a/spring-rest-embedded-tomcat/src/test/java/org/baeldung/embedded/EmbeddedTomcatRunner.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.baeldung.embedded;
-
-import org.junit.runner.notification.RunNotifier;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.InitializationError;
-import org.junit.runners.model.Statement;
-
-public class EmbeddedTomcatRunner extends BlockJUnit4ClassRunner {
-
-    public EmbeddedTomcatRunner(Class<?> klass) throws InitializationError {
-        super(klass);
-    }
-
-    // use one static Tomcat instance shared across all tests
-    private static EmbeddedTomcatApp embeddedTomcatApp = new EmbeddedTomcatApp();
-
-    @Override
-    protected Statement classBlock(RunNotifier notifier) {
-        ensureSharedTomcatStarted();
-        Statement result = super.classBlock(notifier);
-        return result;
-    }
-
-    private void ensureSharedTomcatStarted() {
-        if (!embeddedTomcatApp.isStarted()) {
-            try {
-                embeddedTomcatApp.start();
-            } catch (Exception e) {
-                throw new RuntimeException("Error while starting embedded Tomcat server", e);
-            }
-        }
-    }
-
-    @Override
-    protected Object createTest() throws Exception {
-        if (!embeddedTomcatApp.isStartedSucessfully()) {
-            throw new RuntimeException("Tomcat server not started successfully. Skipping test");
-        }
-        Object testInstance = super.createTest();
-        embeddedTomcatApp.getWebApplicationContext()
-            .getAutowireCapableBeanFactory()
-            .autowireBean(testInstance);
-        return testInstance;
-    }
-}
\ No newline at end of file
diff --git a/spring-rest-embedded-tomcat/src/test/java/org/baeldung/embedded/UserIntegrationTest.java b/spring-rest-embedded-tomcat/src/test/java/org/baeldung/embedded/UserIntegrationTest.java
deleted file mode 100644
index 1c5d482171..0000000000
--- a/spring-rest-embedded-tomcat/src/test/java/org/baeldung/embedded/UserIntegrationTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.baeldung.embedded;
-
-import java.io.IOException;
-import java.util.Map;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
-import org.baeldung.embedded.service.UserService;
-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 com.fasterxml.jackson.databind.ObjectMapper;
-
-@RunWith(EmbeddedTomcatRunner.class)
-public class UserIntegrationTest {
-
-    @Autowired
-    protected String baseUrl;
-
-    @Autowired
-    private UserService userService;
-
-    private String userName = "HarryPotter";
-
-    @Before
-    public void setUp() {
-        userService.addUser(userName);
-    }
-
-    @Test
-    public void givenUserName_whenSendGetForHarryPotter_thenHobbyQuidditch() throws IOException {
-        String url = baseUrl + "/user/" + userName;
-
-        HttpClient httpClient = HttpClientBuilder.create()
-            .build();
-        HttpGet getUserRequest = new HttpGet(url);
-        getUserRequest.addHeader("Content-type", "application/json");
-        HttpResponse response = httpClient.execute(getUserRequest);
-
-        Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine()
-            .getStatusCode());
-
-        HttpEntity responseEntity = response.getEntity();
-
-        Assert.assertNotNull(responseEntity);
-
-        ObjectMapper mapper = new ObjectMapper();
-        String retSrc = EntityUtils.toString(responseEntity);
-        Map<String, Object> result = mapper.readValue(retSrc, Map.class);
-
-        Assert.assertEquals("Quidditch", result.get("hobby"));
-    }
-}
diff --git a/spring-rest/README.md b/spring-rest/README.md
index efa0dbab60..4921ab012c 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)
 - [Http Message Converters with the Spring Framework](http://www.baeldung.com/spring-httpmessageconverter-rest)
-- [Redirect in Spring](http://www.baeldung.com/spring-redirect-and-forward)
 - [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)
@@ -15,7 +14,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [A Custom Media Type for a Spring REST API](http://www.baeldung.com/spring-rest-custom-media-type)
 - [HTTP PUT vs HTTP PATCH in a REST API](http://www.baeldung.com/http-put-patch-difference-spring)
 - [Spring – Log Incoming Requests](http://www.baeldung.com/spring-http-logging)
-- [RequestBody and ResponseBody Annotations](http://www.baeldung.com/requestbody-and-responsebody-annotations)
 - [Introduction to CheckStyle](http://www.baeldung.com/checkstyle-java)
 - [How to Change the Default Port in Spring Boot](http://www.baeldung.com/spring-boot-change-port)
 - [Guide to DeferredResult in Spring](http://www.baeldung.com/spring-deferred-result)
diff --git a/spring-security-mvc-persisted-remember-me/README.md b/spring-security-mvc-persisted-remember-me/README.md
index f910c3f62b..e505537be1 100644
--- a/spring-security-mvc-persisted-remember-me/README.md
+++ b/spring-security-mvc-persisted-remember-me/README.md
@@ -7,9 +7,6 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
 
 ### Relevant Articles: 
 - [Spring Security Persisted Remember Me](http://www.baeldung.com/spring-security-persistent-remember-me)
-- [Spring Security Remember Me](http://www.baeldung.com/spring-security-remember-me)
-- [Redirect to different pages after Login with Spring Security](http://www.baeldung.com/spring_redirect_after_login)
-
 
 ### Build the Project
 ```
diff --git a/spring-security-rest/README.md b/spring-security-rest/README.md
index c396948a59..f71eead9ae 100644
--- a/spring-security-rest/README.md
+++ b/spring-security-rest/README.md
@@ -15,5 +15,4 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
 - [Spring Security Context Propagation with @Async](http://www.baeldung.com/spring-security-async-principal-propagation)
 - [Servlet 3 Async Support with Spring MVC and Spring Security](http://www.baeldung.com/spring-mvc-async-security)
 - [Intro to Spring Security Expressions](http://www.baeldung.com/spring-security-expressions)
-- [Error Handling for REST with Spring](https://www.baeldung.com/exception-handling-for-rest-with-spring)
 - [Spring Security for a REST API](http://www.baeldung.com/securing-a-restful-web-service-with-spring-security)
diff --git a/spring-security-stormpath/pom.xml b/spring-security-stormpath/pom.xml
index 5c5783eec5..4f19921fbd 100644
--- a/spring-security-stormpath/pom.xml
+++ b/spring-security-stormpath/pom.xml
@@ -35,14 +35,6 @@
         </dependency>
     </dependencies>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-releases</id>
-            <name>Spring Releases</name>
-            <url>https://repo.spring.io/libs-release</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <finalName>spring-security-stormpath</finalName>
         <resources>
diff --git a/spring-security-thymeleaf/README.MD b/spring-security-thymeleaf/README.MD
index c5deeb9946..36007bce62 100644
--- a/spring-security-thymeleaf/README.MD
+++ b/spring-security-thymeleaf/README.MD
@@ -4,4 +4,3 @@ Jira BAEL-1556
 ### Relevant Articles: 
 
 - [Spring Security with Thymeleaf](http://www.baeldung.com/spring-security-thymeleaf)
-- [Working with Select and Option in Thymeleaf](http://www.baeldung.com/thymeleaf-select-option)
diff --git a/spring-session/spring-session-redis/README.md b/spring-session/spring-session-redis/README.md
index 0d802a4715..5e9304d778 100644
--- a/spring-session/spring-session-redis/README.md
+++ b/spring-session/spring-session-redis/README.md
@@ -3,4 +3,4 @@
 ## Spring Session Examples
 
 ### Relevant Articles: 
-- [Introduction to Spring Session](http://www.baeldung.com/spring-session)
+- [Guide to Spring Session](http://www.baeldung.com/spring-session)
diff --git a/spring-sleuth/pom.xml b/spring-sleuth/pom.xml
index 5ce9e07858..dd4477c551 100644
--- a/spring-sleuth/pom.xml
+++ b/spring-sleuth/pom.xml
@@ -6,8 +6,8 @@
     <artifactId>spring-sleuth</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
-	<name>spring-sleuth</name>
-	
+    <name>spring-sleuth</name>
+
     <parent>
         <artifactId>parent-boot-1</artifactId>
         <groupId>com.baeldung</groupId>
@@ -38,19 +38,8 @@
         </dependencies>
     </dependencyManagement>
 
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/libs-milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <properties>
-        <spring-cloud-sleuth.version>2.0.0.M7</spring-cloud-sleuth.version>
+        <spring-cloud-sleuth.version>2.0.2.RELEASE</spring-cloud-sleuth.version>
     </properties>
 
 </project>
diff --git a/spring-webflux-amqp/pom.xml b/spring-webflux-amqp/pom.xml
index 4faa165c50..0868e14717 100755
--- a/spring-webflux-amqp/pom.xml
+++ b/spring-webflux-amqp/pom.xml
@@ -60,23 +60,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/libs-snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-releases</id>
-            <name>Spring Releases</name>
-            <url>https://repo.spring.io/libs-release</url>
-        </pluginRepository>
-    </pluginRepositories>
-
 </project>
diff --git a/sse-jaxrs/pom.xml b/sse-jaxrs/pom.xml
deleted file mode 100644
index 68d1b1bc2b..0000000000
--- a/sse-jaxrs/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.sse</groupId>
-    <artifactId>sse-jaxrs</artifactId>
-    <version>1.0-SNAPSHOT</version>
-	<name>sse-jaxrs</name>
-    <packaging>pom</packaging>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
-    <modules>
-        <module>sse-jaxrs-server</module>
-        <module>sse-jaxrs-client</module>
-   </modules>
-
-</project>
diff --git a/sse-jaxrs/sse-jaxrs-client/pom.xml b/sse-jaxrs/sse-jaxrs-client/pom.xml
deleted file mode 100644
index 15a991bfc0..0000000000
--- a/sse-jaxrs/sse-jaxrs-client/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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>sse-jaxrs-client</artifactId>
-	<name>sse-jaxrs-client</name>
-
-    <parent>
-        <groupId>com.baeldung.sse</groupId>
-        <artifactId>sse-jaxrs</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <cxf-version>3.2.0</cxf-version>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
-                <executions>
-                    <execution>
-                        <id>singleEvent</id>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                        <configuration>
-                            <mainClass>com.baeldung.sse.jaxrs.client.SseClientApp</mainClass>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>broadcast</id>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                        <configuration>
-                            <mainClass>com.baeldung.sse.jaxrs.client.SseClientBroadcastApp</mainClass>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-rs-client</artifactId>
-            <version>${cxf-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-rs-sse</artifactId>
-            <version>${cxf-version}</version>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientApp.java b/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientApp.java
deleted file mode 100644
index 5d42b3a243..0000000000
--- a/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientApp.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.baeldung.sse.jaxrs.client;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.sse.InboundSseEvent;
-import javax.ws.rs.sse.SseEventSource;
-import java.util.function.Consumer;
-
-public class SseClientApp {
-
-    private static final String url = "http://127.0.0.1:9080/sse-jaxrs-server/sse/stock/prices";
-
-    public static void main(String... args) throws Exception {
-
-        Client client = ClientBuilder.newClient();
-        WebTarget target = client.target(url);
-        try (SseEventSource eventSource = SseEventSource.target(target).build()) {
-
-            eventSource.register(onEvent, onError, onComplete);
-            eventSource.open();
-
-            //Consuming events for one hour
-            Thread.sleep(60 * 60 * 1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        client.close();
-        System.out.println("End");
-    }
-
-    // A new event is received
-    private static Consumer<InboundSseEvent> onEvent = (inboundSseEvent) -> {
-        String data = inboundSseEvent.readData();
-        System.out.println(data);
-    };
-
-    //Error
-    private static Consumer<Throwable> onError = (throwable) -> {
-        throwable.printStackTrace();
-    };
-
-    //Connection close and there is nothing to receive
-    private static Runnable onComplete = () -> {
-        System.out.println("Done!");
-    };
-
-}
diff --git a/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientBroadcastApp.java b/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientBroadcastApp.java
deleted file mode 100644
index 9afc187a6d..0000000000
--- a/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientBroadcastApp.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.baeldung.sse.jaxrs.client;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.sse.InboundSseEvent;
-import javax.ws.rs.sse.SseEventSource;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-
-public class SseClientBroadcastApp {
-
-    private static final String subscribeUrl = "http://localhost:9080/sse-jaxrs-server/sse/stock/subscribe";
-
-
-    public static void main(String... args) throws Exception {
-
-        Client client = ClientBuilder.newClient();
-        WebTarget target = client.target(subscribeUrl);
-        try (final SseEventSource eventSource = SseEventSource.target(target)
-                .reconnectingEvery(5, TimeUnit.SECONDS)
-                .build()) {
-            eventSource.register(onEvent, onError, onComplete);
-            eventSource.open();
-            System.out.println("Wainting for incoming event ...");
-
-            //Consuming events for one hour
-            Thread.sleep(60 * 60 * 1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        client.close();
-        System.out.println("End");
-    }
-
-    // A new event is received
-    private static Consumer<InboundSseEvent> onEvent = (inboundSseEvent) -> {
-        String data = inboundSseEvent.readData();
-        System.out.println(data);
-    };
-
-    //Error
-    private static Consumer<Throwable> onError = (throwable) -> {
-        throwable.printStackTrace();
-    };
-
-    //Connection close and there is nothing to receive
-    private static Runnable onComplete = () -> {
-        System.out.println("Done!");
-    };
-
-}
diff --git a/sse-jaxrs/sse-jaxrs-client/src/main/resources/logback.xml b/sse-jaxrs/sse-jaxrs-client/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/sse-jaxrs/sse-jaxrs-client/src/main/resources/logback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/sse-jaxrs/sse-jaxrs-server/pom.xml b/sse-jaxrs/sse-jaxrs-server/pom.xml
deleted file mode 100644
index 825dcddbdf..0000000000
--- a/sse-jaxrs/sse-jaxrs-server/pom.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?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>sse-jaxrs-server</artifactId>
-    <packaging>war</packaging>
-	<name>sse-jaxrs-server</name>
-	
-    <parent>
-        <groupId>com.baeldung.sse</groupId>
-        <artifactId>sse-jaxrs</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <liberty-maven-plugin.version>2.4.2</liberty-maven-plugin.version>
-        <failOnMissingWebXml>false</failOnMissingWebXml>
-        <openliberty-version>18.0.0.2</openliberty-version>
-    </properties>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>net.wasdev.wlp.maven.plugins</groupId>
-                <artifactId>liberty-maven-plugin</artifactId>
-                <version>${liberty-maven-plugin.version}</version>
-                <configuration>
-                    <assemblyArtifact>
-                        <groupId>io.openliberty</groupId>
-                        <artifactId>openliberty-webProfile8</artifactId>
-                        <version>${openliberty-version}</version>
-                        <type>zip</type>
-                    </assemblyArtifact>
-                    <installAppPackages>project</installAppPackages>
-                    <looseApplication>true</looseApplication>
-                    <configFile>src/main/liberty/config/server.xml</configFile>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>install-server</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>install-server</goal>
-                            <goal>create-server</goal>
-                            <goal>install-feature</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>install-apps</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>install-apps</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-            <version>2.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>2.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.json.bind</groupId>
-            <artifactId>javax.json.bind-api</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/AppConfig.java b/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/AppConfig.java
deleted file mode 100644
index 058d19f045..0000000000
--- a/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/AppConfig.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.baeldung.sse.jaxrs;
-
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
-
-@ApplicationPath("sse")
-public class AppConfig extends Application {
-}
diff --git a/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/SseResource.java b/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/SseResource.java
deleted file mode 100644
index 1f60168a1b..0000000000
--- a/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/SseResource.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.baeldung.sse.jaxrs;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.sse.OutboundSseEvent;
-import javax.ws.rs.sse.Sse;
-import javax.ws.rs.sse.SseBroadcaster;
-import javax.ws.rs.sse.SseEventSink;
-
-@ApplicationScoped
-@Path("stock")
-public class SseResource {
-
-    @Inject
-    private StockService stockService;
-
-    private Sse sse;
-    private SseBroadcaster sseBroadcaster;
-    private OutboundSseEvent.Builder eventBuilder;
-
-    @Context
-    public void setSse(Sse sse) {
-        this.sse = sse;
-        this.eventBuilder = sse.newEventBuilder();
-        this.sseBroadcaster = sse.newBroadcaster();
-    }
-
-    @GET
-    @Path("prices")
-    @Produces("text/event-stream")
-    public void getStockPrices(@Context SseEventSink sseEventSink,
-                               @HeaderParam(HttpHeaders.LAST_EVENT_ID_HEADER) @DefaultValue("-1") int lastReceivedId) {
-
-        int lastEventId = 1;
-        if (lastReceivedId != -1) {
-            lastEventId = ++lastReceivedId;
-        }
-        boolean running = true;
-        while (running) {
-            Stock stock = stockService.getNextTransaction(lastEventId);
-            if (stock != null) {
-                OutboundSseEvent sseEvent = this.eventBuilder
-                        .name("stock")
-                        .id(String.valueOf(lastEventId))
-                        .mediaType(MediaType.APPLICATION_JSON_TYPE)
-                        .data(Stock.class, stock)
-                        .reconnectDelay(3000)
-                        .comment("price change")
-                        .build();
-                sseEventSink.send(sseEvent);
-                lastEventId++;
-            }
-            //Simulate connection close
-            if (lastEventId % 5 == 0) {
-                sseEventSink.close();
-                break;
-            }
-
-            try {
-                //Wait 5 seconds
-                Thread.sleep(5 * 1000);
-            } catch (InterruptedException ex) {
-                // ...
-            }
-            //Simulatae a while boucle break
-            running = lastEventId <= 2000;
-        }
-        sseEventSink.close();
-    }
-
-    @GET
-    @Path("subscribe")
-    @Produces(MediaType.SERVER_SENT_EVENTS)
-    public void listen(@Context SseEventSink sseEventSink) {
-        sseEventSink.send(sse.newEvent("Welcome !"));
-        this.sseBroadcaster.register(sseEventSink);
-        sseEventSink.send(sse.newEvent("You are registred !"));
-    }
-
-    @GET
-    @Path("publish")
-    public void broadcast() {
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                int lastEventId = 0;
-                boolean running = true;
-                while (running) {
-                    lastEventId++;
-                    Stock stock = stockService.getNextTransaction(lastEventId);
-                    if (stock != null) {
-                        OutboundSseEvent sseEvent = eventBuilder
-                                .name("stock")
-                                .id(String.valueOf(lastEventId))
-                                .mediaType(MediaType.APPLICATION_JSON_TYPE)
-                                .data(Stock.class, stock)
-                                .reconnectDelay(3000)
-                                .comment("price change")
-                                .build();
-                        sseBroadcaster.broadcast(sseEvent);
-                    }
-                    try {
-                        //Wait 5 seconds
-                        Thread.currentThread().sleep(5 * 1000);
-                    } catch (InterruptedException ex) {
-                        // ...
-                    }
-                    //Simulatae a while boucle break
-                    running = lastEventId <= 2000;
-                }
-            }
-        };
-        new Thread(r).start();
-    }
-}
diff --git a/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/Stock.java b/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/Stock.java
deleted file mode 100644
index a186b32771..0000000000
--- a/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/Stock.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.baeldung.sse.jaxrs;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-public class Stock {
-    private Integer id;
-    private String name;
-    private BigDecimal price;
-    LocalDateTime dateTime;
-
-    public Stock(Integer id, String name, BigDecimal price, LocalDateTime dateTime) {
-        this.id = id;
-        this.name = name;
-        this.price = price;
-        this.dateTime = dateTime;
-    }
-
-    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;
-    }
-
-    public BigDecimal getPrice() {
-        return price;
-    }
-
-    public void setPrice(BigDecimal price) {
-        this.price = price;
-    }
-
-    public LocalDateTime getDateTime() {
-        return dateTime;
-    }
-
-    public void setDateTime(LocalDateTime dateTime) {
-        this.dateTime = dateTime;
-    }
-}
diff --git a/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/StockService.java b/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/StockService.java
deleted file mode 100644
index 15818ead5d..0000000000
--- a/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/StockService.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.baeldung.sse.jaxrs;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicInteger;
-
-@ApplicationScoped
-@Named
-public class StockService {
-
-    private static final BigDecimal UP = BigDecimal.valueOf(1.05f);
-    private static final BigDecimal DOWN = BigDecimal.valueOf(0.95f);
-
-    List<String> stockNames = Arrays.asList("GOOG", "IBM", "MS", "GOOG", "YAHO");
-    List<Stock> stocksDB = new ArrayList<>();
-    private AtomicInteger counter = new AtomicInteger(0);
-
-    public void init(@Observes @Initialized(ApplicationScoped.class) Object init) {
-        //Open price
-        System.out.println("@Start Init ...");
-        stockNames.forEach(stockName -> {
-            stocksDB.add(new Stock(counter.incrementAndGet(), stockName, generateOpenPrice(), LocalDateTime.now()));
-        });
-
-        Runnable runnable = new Runnable() {
-            @Override
-            public void run() {
-                //Simulate Change price and put every x seconds
-                while (true) {
-                    int indx = new Random().nextInt(stockNames.size());
-                    String stockName = stockNames.get(indx);
-                    BigDecimal price = getLastPrice(stockName);
-                    BigDecimal newprice = changePrice(price);
-                    Stock stock = new Stock(counter.incrementAndGet(), stockName, newprice, LocalDateTime.now());
-                    stocksDB.add(stock);
-
-                    int r = new Random().nextInt(30);
-                    try {
-                        Thread.currentThread().sleep(r*1000);
-                    } catch (InterruptedException ex) {
-                        // ...
-                    }
-                }
-            }
-        };
-        new Thread(runnable).start();
-        System.out.println("@End Init ...");
-    }
-
-    public Stock getNextTransaction(Integer lastEventId) {
-        return stocksDB.stream().filter(s -> s.getId().equals(lastEventId)).findFirst().orElse(null);
-    }
-
-    BigDecimal generateOpenPrice() {
-        float min = 70;
-        float max = 120;
-        return BigDecimal.valueOf(min + new Random().nextFloat() * (max - min)).setScale(4,RoundingMode.CEILING);
-    }
-
-    BigDecimal changePrice(BigDecimal price) {
-        return Math.random() >= 0.5 ? price.multiply(UP).setScale(4,RoundingMode.CEILING) : price.multiply(DOWN).setScale(4,RoundingMode.CEILING);
-    }
-
-    private BigDecimal getLastPrice(String stockName) {
-        return stocksDB.stream().filter(stock -> stock.getName().equals(stockName)).findFirst().get().getPrice();
-    }
-}
diff --git a/sse-jaxrs/sse-jaxrs-server/src/main/liberty/config/server.xml b/sse-jaxrs/sse-jaxrs-server/src/main/liberty/config/server.xml
deleted file mode 100644
index 9bf66d7795..0000000000
--- a/sse-jaxrs/sse-jaxrs-server/src/main/liberty/config/server.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<server description="OpenLiberty Server">
-    <featureManager>
-        <feature>jaxrs-2.1</feature>
-        <feature>cdi-2.0</feature>
-    </featureManager>
-    <httpEndpoint httpPort="9080" httpsPort="9443" id="defaultHttpEndpoint" host="*"/>
-</server>
diff --git a/sse-jaxrs/sse-jaxrs-server/src/main/resources/META-INF/beans.xml b/sse-jaxrs/sse-jaxrs-server/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index 4f0b3cdeeb..0000000000
--- a/sse-jaxrs/sse-jaxrs-server/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<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>
\ No newline at end of file
diff --git a/sse-jaxrs/sse-jaxrs-server/src/main/resources/logback.xml b/sse-jaxrs/sse-jaxrs-server/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/sse-jaxrs/sse-jaxrs-server/src/main/resources/logback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/sse-jaxrs/sse-jaxrs-server/src/main/webapp/WEB-INF/web.xml b/sse-jaxrs/sse-jaxrs-server/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index b4b8121fdd..0000000000
--- a/sse-jaxrs/sse-jaxrs-server/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,11 +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_4_0.xsd"
-    version="4.0">
-    <display-name>Hello Servlet</display-name>
-
-    <welcome-file-list>
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
-
-</web-app>
diff --git a/sse-jaxrs/sse-jaxrs-server/src/main/webapp/index.html b/sse-jaxrs/sse-jaxrs-server/src/main/webapp/index.html
deleted file mode 100644
index 9015a7a32c..0000000000
--- a/sse-jaxrs/sse-jaxrs-server/src/main/webapp/index.html
+++ /dev/null
@@ -1 +0,0 @@
-index
diff --git a/sse-jaxrs/sse-jaxrs-server/src/main/webapp/sse-broadcast.html b/sse-jaxrs/sse-jaxrs-server/src/main/webapp/sse-broadcast.html
deleted file mode 100644
index 5a46e2a5d3..0000000000
--- a/sse-jaxrs/sse-jaxrs-server/src/main/webapp/sse-broadcast.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Server-Sent Event Broadcasting</title>
-</head>
-<body>
-<h2>Stock prices :</h2>
-<div>
-    <ul id="data">
-    </ul>
-</div>
-<script>
-
-    var source = new EventSource('sse/stock/subscribe');
-    source.onopen = function(event) {
-        console.log(event);
-    };
-    source.addEventListener("stock", function(event) {
-        append(event.data);
-    }, false);
-
-    source.onmessage = function(event) {
-        append(event.data);
-    };
-    source.onerror = function(event) {
-        console.log(event);
-    };
-
-    function append(data) {
-        var ul = document.getElementById("data");
-        var li = document.createElement("li");
-        li.appendChild(document.createTextNode(data));
-        ul.insertBefore(li, ul.childNodes[0]);
-    };
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/sse-jaxrs/sse-jaxrs-server/src/main/webapp/sse.html b/sse-jaxrs/sse-jaxrs-server/src/main/webapp/sse.html
deleted file mode 100644
index 8fddae4717..0000000000
--- a/sse-jaxrs/sse-jaxrs-server/src/main/webapp/sse.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Server-Sent Event</title>
-</head>
-<body>
-<h2>Stock prices :</h2>
-<div>
-    <ul id="data">
-    </ul>
-</div>
-<script>
-
-    var source = new EventSource('sse/stock/prices');
-    source.onopen = function(event) {
-        console.log(event);
-    };
-    source.addEventListener("stock", function(event) {
-        append(event.data);
-    }, false);
-
-    source.onmessage = function(event) {
-        append(event.data);
-    };
-    source.onerror = function(event) {
-        console.log(event);
-    };
-
-    function append(data) {
-        var ul = document.getElementById("data");
-        var li = document.createElement("li");
-        li.appendChild(document.createTextNode(data));
-        ul.insertBefore(li, ul.childNodes[0]);
-    };
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/testing-modules/mockito/README.md b/testing-modules/mockito/README.md
index e1b9c27523..158a1918e7 100644
--- a/testing-modules/mockito/README.md
+++ b/testing-modules/mockito/README.md
@@ -14,8 +14,7 @@
 - [Mocking Void Methods with Mockito](http://www.baeldung.com/mockito-void-methods)
 - [Mocking of Private Methods Using PowerMock](http://www.baeldung.com/powermock-private-method)
 - [Mock Final Classes and Methods with Mockito](http://www.baeldung.com/mockito-final)
-- [Hamcrest Text Matchers](http://www.baeldung.com/hamcrest-text-matchers)
-- [Hamcrest File Matchers](http://www.baeldung.com/hamcrest-file-matchers)
 - [Hamcrest Custom Matchers](http://www.baeldung.com/hamcrest-custom-matchers)
 - [Hamcrest Common Core Matchers](http://www.baeldung.com/hamcrest-core-matchers)
 - [Testing Callbacks with Mockito](http://www.baeldung.com/mockito-callbacks)
+- [Using Hamcrest Number Matchers](https://www.baeldung.com/hamcrest-number-matchers)
diff --git a/vavr/README.md b/vavr/README.md
index b7ba72229b..0857765ec6 100644
--- a/vavr/README.md
+++ b/vavr/README.md
@@ -9,6 +9,5 @@
 - [Guide to Collections API in Vavr](http://www.baeldung.com/vavr-collections)
 - [Collection Factory Methods for Vavr](http://www.baeldung.com/vavr-collection-factory-methods)
 - [Introduction to Future in Vavr](http://www.baeldung.com/vavr-future)
-- [Introduction to VRaptor in Java](http://www.baeldung.com/vraptor)
 - [Introduction to Vavr’s Either](http://www.baeldung.com/vavr-either)
 - [Interoperability Between Java and Vavr](http://www.baeldung.com/java-vavr)
diff --git a/xml/pom.xml b/xml/pom.xml
index 5490f3a89f..dfdec4da16 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -24,7 +24,6 @@
             <version>${jaxen.version}</version>
         </dependency>
 
-
         <dependency>
             <groupId>org.jdom</groupId>
             <artifactId>jdom2</artifactId>
@@ -166,7 +165,7 @@
                             <excludes>
                                 <exclude>template-binding.xml</exclude>
                             </excludes>
-							<schemaBindingDirectory>src/main/resources</schemaBindingDirectory>
+                            <schemaBindingDirectory>src/main/resources</schemaBindingDirectory>
                             <includeSchemaBindings>
                                 <includeSchemaBindings>*-binding.xml</includeSchemaBindings>
                             </includeSchemaBindings>
@@ -174,14 +173,14 @@
                         </configuration>
                         <executions>
                             <execution>
-                            	<id>process-classes</id>
+                                <id>process-classes</id>
                                 <phase>process-classes</phase>
                                 <goals>
                                     <goal>bind</goal>
                                 </goals>
                             </execution>
-							<execution>
-								<id>process-test-classes</id>
+                            <execution>
+                                <id>process-test-classes</id>
                                 <phase>process-test-classes</phase>
                                 <goals>
                                     <goal>test-bind</goal>
@@ -230,34 +229,6 @@
         </profile>
     </profiles>
 
-    <repositories>
-        <repository>
-            <id>jibx.sf.net</id>
-            <name>JiBX repository</name>
-            <url>http://jibx.sf.net/maven2</url>
-            <releases>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>jibx.sf.net</id>
-            <name>JiBX repository</name>
-            <url>http://jibx.sf.net/maven2</url>
-            <releases>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <properties>
         <dom4j.version>1.6.1</dom4j.version>
         <jaxen.version>1.1.6</jaxen.version>