diff --git a/core-java-collections/src/test/java/com/baeldung/collection/CollectionsEmpty.java b/core-java-collections/src/test/java/com/baeldung/collection/CollectionsEmpty.java
new file mode 100644
index 0000000000..86a262107d
--- /dev/null
+++ b/core-java-collections/src/test/java/com/baeldung/collection/CollectionsEmpty.java
@@ -0,0 +1,26 @@
+package com.baeldung.collection;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class CollectionsEmpty {
+
+    @Test
+    public void givenArrayList_whenAddingElement_addsNewElement() {
+        ArrayList<String> mutableList = new ArrayList<>();
+        mutableList.add("test");
+
+        Assert.assertEquals(mutableList.size(), 1);
+        Assert.assertEquals(mutableList.get(0), "test");
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void givenCollectionsEmptyList_whenAddingElement_throwsUnsupportedOperationException() {
+        List<String> immutableList = Collections.emptyList();
+        immutableList.add("test");
+    }
+
+}
\ No newline at end of file
diff --git a/core-java-sun/pom.xml b/core-java-sun/pom.xml
index f489f3b030..7292335232 100644
--- a/core-java-sun/pom.xml
+++ b/core-java-sun/pom.xml
@@ -303,7 +303,7 @@
         <avaitility.version>1.7.0</avaitility.version>
 
         <!-- maven plugins -->
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <sun-tools.version>1.8.0</sun-tools.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
     </properties>
diff --git a/core-java/pom.xml b/core-java/pom.xml
index b83cb478d4..3f44851f97 100644
--- a/core-java/pom.xml
+++ b/core-java/pom.xml
@@ -530,7 +530,7 @@
         <assertj-core.version>3.10.0</assertj-core.version>
 
         <!-- maven plugins -->
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <springframework.spring-web.version>4.3.4.RELEASE</springframework.spring-web.version>
         <springframework.boot.spring-boot-starter.version>1.5.8.RELEASE</springframework.boot.spring-boot-starter.version>
         
diff --git a/core-java/src/main/java/com/baeldung/fileparser/BufferedReaderExample.java b/core-java/src/main/java/com/baeldung/fileparser/BufferedReaderExample.java
new file mode 100644
index 0000000000..45ff486a79
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/fileparser/BufferedReaderExample.java
@@ -0,0 +1,24 @@
+package com.baeldung.fileparser;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+
+public class BufferedReaderExample {
+
+    protected static ArrayList<String> generateArrayListFromFile(String filename) throws IOException {
+
+        ArrayList<String> result = new ArrayList<>();
+
+        try (BufferedReader br = new BufferedReader(new FileReader(filename))) {
+
+            while (br.ready()) {
+                result.add(br.readLine());
+            }
+            return result;
+        }
+
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/fileparser/FileReaderExample.java b/core-java/src/main/java/com/baeldung/fileparser/FileReaderExample.java
new file mode 100644
index 0000000000..f9dd2a9ec5
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/fileparser/FileReaderExample.java
@@ -0,0 +1,31 @@
+package com.baeldung.fileparser;
+
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+
+public class FileReaderExample {
+
+    protected static ArrayList<String> generateArrayListFromFile(String filename) throws IOException {
+
+        ArrayList<String> result = new ArrayList<>();
+
+        try (FileReader f = new FileReader(filename)) {
+            StringBuffer sb = new StringBuffer();
+            while (f.ready()) {
+                char c = (char) f.read();
+                if (c == '\n') {
+                    result.add(sb.toString());
+                    sb = new StringBuffer();
+                } else {
+                    sb.append(c);
+                }
+            }
+            if (sb.length() > 0) {
+                result.add(sb.toString());
+            }
+        }
+        
+        return result;
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/fileparser/FilesReadLinesExample.java b/core-java/src/main/java/com/baeldung/fileparser/FilesReadLinesExample.java
new file mode 100644
index 0000000000..8e74f7d386
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/fileparser/FilesReadLinesExample.java
@@ -0,0 +1,18 @@
+package com.baeldung.fileparser;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FilesReadLinesExample {
+
+    protected static ArrayList<String> generateArrayListFromFile(String filename) throws IOException {
+        
+        List<String> result = Files.readAllLines(Paths.get(filename));
+        
+        return (ArrayList<String>) result;
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/fileparser/ScannerIntExample.java b/core-java/src/main/java/com/baeldung/fileparser/ScannerIntExample.java
new file mode 100644
index 0000000000..25d17af4ea
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/fileparser/ScannerIntExample.java
@@ -0,0 +1,24 @@
+package com.baeldung.fileparser;
+
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Scanner;
+
+public class ScannerIntExample {
+
+    protected static ArrayList<Integer> generateArrayListFromFile(String filename) throws IOException {
+        
+        ArrayList<Integer> result = new ArrayList<>();
+
+        try (Scanner s = new Scanner(new FileReader(filename))) {
+
+            while (s.hasNext()) {
+                result.add(s.nextInt());
+            }
+            return result;
+        }
+
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/fileparser/ScannerStringExample.java b/core-java/src/main/java/com/baeldung/fileparser/ScannerStringExample.java
new file mode 100644
index 0000000000..ec213c9490
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/fileparser/ScannerStringExample.java
@@ -0,0 +1,24 @@
+package com.baeldung.fileparser;
+
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Scanner;
+
+public class ScannerStringExample {
+
+    protected static ArrayList<String> generateArrayListFromFile(String filename) throws IOException {
+        
+        ArrayList<String> result = new ArrayList<>();
+
+        try (Scanner s = new Scanner(new FileReader(filename))) {
+
+            while (s.hasNext()) {
+                result.add(s.nextLine());
+            }
+            return result;
+        }
+
+    }
+
+}
diff --git a/core-java/src/test/java/com/baeldung/fileparser/BufferedReaderUnitTest.java b/core-java/src/test/java/com/baeldung/fileparser/BufferedReaderUnitTest.java
new file mode 100644
index 0000000000..78f900d796
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/fileparser/BufferedReaderUnitTest.java
@@ -0,0 +1,19 @@
+package com.baeldung.fileparser;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.junit.Test;
+
+public class BufferedReaderUnitTest {
+
+    protected static final String TEXT_FILENAME = "src/test/resources/sampleTextFile.txt";
+    
+    @Test
+    public void whenParsingExistingTextFile_thenGetArrayList() throws IOException {
+        List<String> lines = BufferedReaderExample.generateArrayListFromFile(TEXT_FILENAME);
+        assertTrue("File does not has 2 lines", lines.size() == 2);
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/fileparser/FileReaderUnitTest.java b/core-java/src/test/java/com/baeldung/fileparser/FileReaderUnitTest.java
new file mode 100644
index 0000000000..a38e58d348
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/fileparser/FileReaderUnitTest.java
@@ -0,0 +1,19 @@
+package com.baeldung.fileparser;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.junit.Test;
+
+public class FileReaderUnitTest {
+
+    protected static final String TEXT_FILENAME = "src/test/resources/sampleTextFile.txt";
+    
+    @Test
+    public void whenParsingExistingTextFile_thenGetArrayList() throws IOException {
+        List<String> lines = FileReaderExample.generateArrayListFromFile(TEXT_FILENAME);
+        assertTrue("File does not has 2 lines", lines.size() == 2);
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/fileparser/FilesReadAllLinesUnitTest.java b/core-java/src/test/java/com/baeldung/fileparser/FilesReadAllLinesUnitTest.java
new file mode 100644
index 0000000000..c0b742fd47
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/fileparser/FilesReadAllLinesUnitTest.java
@@ -0,0 +1,19 @@
+package com.baeldung.fileparser;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.junit.Test;
+
+public class FilesReadAllLinesUnitTest {
+
+    protected static final String TEXT_FILENAME = "src/test/resources/sampleTextFile.txt";
+
+    @Test
+    public void whenParsingExistingTextFile_thenGetArrayList() throws IOException {
+        List<String> lines = FilesReadLinesExample.generateArrayListFromFile(TEXT_FILENAME);
+        assertTrue("File does not has 2 lines", lines.size() == 2);
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/fileparser/ScannerIntUnitTest.java b/core-java/src/test/java/com/baeldung/fileparser/ScannerIntUnitTest.java
new file mode 100644
index 0000000000..0a398ba7c6
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/fileparser/ScannerIntUnitTest.java
@@ -0,0 +1,19 @@
+package com.baeldung.fileparser;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.junit.Test;
+
+public class ScannerIntUnitTest {
+
+    protected static final String NUMBER_FILENAME = "src/test/resources/sampleNumberFile.txt";
+    
+    @Test
+    public void whenParsingExistingTextFile_thenGetIntArrayList() throws IOException {
+        List<Integer> numbers = ScannerIntExample.generateArrayListFromFile(NUMBER_FILENAME);
+        assertTrue("File does not has 2 lines", numbers.size() == 2);
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/fileparser/ScannerStringUnitTest.java b/core-java/src/test/java/com/baeldung/fileparser/ScannerStringUnitTest.java
new file mode 100644
index 0000000000..8f9b0a56c0
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/fileparser/ScannerStringUnitTest.java
@@ -0,0 +1,19 @@
+package com.baeldung.fileparser;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.junit.Test;
+
+public class ScannerStringUnitTest {
+
+    protected static final String TEXT_FILENAME = "src/test/resources/sampleTextFile.txt";
+    
+    @Test
+    public void whenParsingExistingTextFile_thenGetArrayList() throws IOException {
+        List<String> lines = ScannerStringExample.generateArrayListFromFile(TEXT_FILENAME);
+        assertTrue("File does not has 2 lines", lines.size() == 2);
+    }
+}
diff --git a/core-java/src/test/resources/sampleNumberFile.txt b/core-java/src/test/resources/sampleNumberFile.txt
new file mode 100644
index 0000000000..7787faa3c1
--- /dev/null
+++ b/core-java/src/test/resources/sampleNumberFile.txt
@@ -0,0 +1,2 @@
+111
+222
\ No newline at end of file
diff --git a/core-java/src/test/resources/sampleTextFile.txt b/core-java/src/test/resources/sampleTextFile.txt
new file mode 100644
index 0000000000..75cb50aafa
--- /dev/null
+++ b/core-java/src/test/resources/sampleTextFile.txt
@@ -0,0 +1,2 @@
+Hello 
+World
\ No newline at end of file
diff --git a/hazelcast/pom.xml b/hazelcast/pom.xml
index cc366cd0a6..705792ad05 100644
--- a/hazelcast/pom.xml
+++ b/hazelcast/pom.xml
@@ -13,16 +13,12 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>com.hazelcast</groupId>
-            <artifactId>hazelcast</artifactId>
-            <version>${hazelcast.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.hazelcast</groupId>
-            <artifactId>hazelcast-client</artifactId>
-            <version>${hazelcast.version}</version>
-        </dependency>
+        <!-- Hazelcast Jet -->
+		<dependency>
+          <groupId>com.hazelcast.jet</groupId>
+          <artifactId>hazelcast-jet</artifactId>
+          <version>${hazelcast.jet.version}</version>
+		</dependency>
     </dependencies>
 
     <build>
@@ -36,8 +32,8 @@
     </build>
 
     <properties>
-        <!-- hazelcast -->
-        <hazelcast.version>3.8.4</hazelcast.version>
+        <!-- hazelcast jet-->
+        <hazelcast.jet.version>0.6</hazelcast.jet.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/hazelcast/src/main/java/com/baeldung/hazelcast/jet/WordCounter.java b/hazelcast/src/main/java/com/baeldung/hazelcast/jet/WordCounter.java
new file mode 100644
index 0000000000..971986bcae
--- /dev/null
+++ b/hazelcast/src/main/java/com/baeldung/hazelcast/jet/WordCounter.java
@@ -0,0 +1,51 @@
+package com.baeldung.hazelcast.jet;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.hazelcast.jet.Traversers.traverseArray;
+import static com.hazelcast.jet.aggregate.AggregateOperations.counting;
+import static com.hazelcast.jet.function.DistributedFunctions.wholeItem;
+
+import com.hazelcast.jet.Jet;
+import com.hazelcast.jet.JetInstance;
+import com.hazelcast.jet.pipeline.Pipeline;
+import com.hazelcast.jet.pipeline.Sinks;
+import com.hazelcast.jet.pipeline.Sources;
+
+public class WordCounter {
+
+    private static final String LIST_NAME = "textList";
+
+    private static final String MAP_NAME = "countMap";
+
+    private Pipeline createPipeLine() {
+        Pipeline p = Pipeline.create();
+        p.drawFrom(Sources.<String> list(LIST_NAME))
+            .flatMap(word -> traverseArray(word.toLowerCase()
+                .split("\\W+")))
+            .filter(word -> !word.isEmpty())
+            .groupingKey(wholeItem())
+            .aggregate(counting())
+            .drainTo(Sinks.map(MAP_NAME));
+        return p;
+    }
+
+    public Long countWord(List<String> sentences, String word) {
+        long count = 0;
+        JetInstance jet = Jet.newJetInstance();
+        try {
+            List<String> textList = jet.getList(LIST_NAME);
+            textList.addAll(sentences);
+            Pipeline p = createPipeLine();
+            jet.newJob(p)
+                .join();
+            Map<String, Long> counts = jet.getMap(MAP_NAME);
+            count = counts.get(word);
+        } finally {
+            Jet.shutdownAll();
+        }
+        return count;
+    }
+
+}
diff --git a/hazelcast/src/test/java/com/baeldung/hazelcast/jet/WordCounterUnitTest.java b/hazelcast/src/test/java/com/baeldung/hazelcast/jet/WordCounterUnitTest.java
new file mode 100644
index 0000000000..95596b3860
--- /dev/null
+++ b/hazelcast/src/test/java/com/baeldung/hazelcast/jet/WordCounterUnitTest.java
@@ -0,0 +1,21 @@
+package com.baeldung.hazelcast.jet;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+public class WordCounterUnitTest {
+
+    @Test
+    public void whenGivenSentencesAndWord_ThenReturnCountOfWord() {
+        List<String> sentences = new ArrayList<>();
+        sentences.add("The first second was alright, but the second second was tough.");
+        WordCounter wordCounter = new WordCounter();
+        long countSecond = wordCounter.countWord(sentences, "second");
+        assertTrue(countSecond == 3);
+    }
+
+}
diff --git a/java-numbers/pom.xml b/java-numbers/pom.xml
index a9fb556517..bf4d3e8792 100644
--- a/java-numbers/pom.xml
+++ b/java-numbers/pom.xml
@@ -156,7 +156,7 @@
         <jmh-core.version>1.19</jmh-core.version>
         <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
 
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
     </properties>
diff --git a/jee-7/pom.xml b/jee-7/pom.xml
index d0246f650a..fbf102185d 100644
--- a/jee-7/pom.xml
+++ b/jee-7/pom.xml
@@ -418,7 +418,7 @@
         <arquillian-glassfish.version>1.0.0.Final</arquillian-glassfish.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <org.springframework.security.version>4.2.3.RELEASE</org.springframework.security.version>
-        <maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <taglibs.standard.version>1.1.2</taglibs.standard.version>
         <commons-io.version>2.4</commons-io.version>
         <com.sun.faces.jsf.version>2.2.14</com.sun.faces.jsf.version>
diff --git a/mustache/pom.xml b/mustache/pom.xml
index 6012c9a15a..d385246182 100644
--- a/mustache/pom.xml
+++ b/mustache/pom.xml
@@ -153,7 +153,7 @@
 
         <!-- maven plugins -->
         <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <datafactory.version>0.8</datafactory.version>
         <webjars.bootstrap.version>3.3.7</webjars.bootstrap.version>
         <java.version>1.8</java.version>
diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml
index ab6162a5a5..2fc46e4c28 100644
--- a/parent-boot-2/pom.xml
+++ b/parent-boot-2/pom.xml
@@ -8,18 +8,27 @@
     <description>Parent for all Spring Boot 2 modules</description>
 
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.1.RELEASE</version>
-        <relativePath />
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
+	<dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+       			<version>2.0.1.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>${rest-assured.version}</version>
-        </dependency>
+            </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -27,79 +36,16 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <forkCount>3</forkCount>
-                    <reuseForks>true</reuseForks>
-                    <excludes>
-                        <exclude>**/*IntegrationTest.java</exclude>
-                        <exclude>**/*IntTest.java</exclude>
-                        <exclude>**/*LongRunningUnitTest.java</exclude>
-                        <exclude>**/*ManualTest.java</exclude>
-                        <exclude>**/*LiveTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
+	<build>
+		<plugins>
+			<plugin>
+			  <groupId>org.springframework.boot</groupId>
+			  <artifactId>spring-boot-maven-plugin</artifactId>
+			  <version>2.0.1.RELEASE</version>
+			</plugin>
+		</plugins>
+	</build>
     <profiles>
-        <profile>
-            <id>integration</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>**/*ManualTest.java</exclude>
-                                        <exclude>**/*LiveTest.java</exclude>
-                                        <exclude>**/AutoconfigurationTest.java</exclude>
-                                        <exclude>**/*UnitTest.java</exclude>
-                                    </excludes>
-                                    <includes>
-                                        <include>**/*IntegrationTest.java</include>
-                                        <include>**/*IntTest.java</include>
-                                        <include>*/EthControllerTestOne.java</include>
-                                        <include>**/*EntryPointsTest.java</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <test.mime>json</test.mime>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>thin-jar</id>
             <build>
@@ -122,13 +68,8 @@
     </profiles>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
         <rest-assured.version>3.1.0</rest-assured.version>
         <!-- plugins -->
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
         <thin.version>1.0.11.RELEASE</thin.version>
     </properties>
 
diff --git a/persistence-modules/spring-data-dynamodb/pom.xml b/persistence-modules/spring-data-dynamodb/pom.xml
index 9f2b63c17c..e5bd78d208 100644
--- a/persistence-modules/spring-data-dynamodb/pom.xml
+++ b/persistence-modules/spring-data-dynamodb/pom.xml
@@ -177,46 +177,12 @@
     </build>
 
     <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
         <repository>
             <id>dynamodb-local</id>
             <name>DynamoDB Local Release Repository</name>
             <url>${dynamodblocal.repository.url}</url>
         </repository>
     </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
 
     <properties>
         <!-- The main class to start by executing java -jar -->
diff --git a/pom.xml b/pom.xml
index 34b55fd1f4..978e27f055 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,9 +43,15 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>${junit.jupiter.version}</version>
+			<version>${junit-jupiter.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+			<version>${junit-jupiter.version}</version>
+			<scope>test</scope>
+        </dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-core</artifactId>
@@ -70,6 +76,14 @@
 			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.surefire</groupId>
+			<artifactId>surefire-logger-api</artifactId>
+			<version>${maven-surefire-plugin.version}</version>
+			<!-- to get around bug https://github.com/junit-team/junit5/issues/801 -->
+			<scope>test</scope>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -98,6 +112,23 @@
 						<exclude>**/*LiveTest.java</exclude>
 					</excludes>
 				</configuration>
+				<dependencies>
+	                <dependency>
+	                    <groupId>org.junit.platform</groupId>
+	                    <artifactId>junit-platform-surefire-provider</artifactId>
+	                    <version>${junit-platform.version}</version>
+	                </dependency>
+	                <dependency>
+	                    <groupId>org.junit.jupiter</groupId>
+	                    <artifactId>junit-jupiter-engine</artifactId>
+	                    <version>${junit-jupiter.version}</version>
+	                </dependency>
+					<dependency>
+						<groupId>org.junit.vintage</groupId>
+						<artifactId>junit-vintage-engine</artifactId>
+  	                    <version>${junit-jupiter.version}</version>
+					</dependency>
+            	</dependencies>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -187,6 +218,10 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>${maven-war-plugin.version}</version>
+			</plugin>
 		</plugins>
 		<extensions>
 			<extension>
@@ -406,6 +441,7 @@
 				<module>spring-4</module>
 				<module>spring-5</module>
 				<module>spring-5-reactive</module>
+				<module>spring-5-reactive-client</module>
 				<module>spring-5-mvc</module>
 				<module>spring-5-security</module>
 				<module>spring-activiti</module>
@@ -551,7 +587,6 @@
 				<module>apache-meecrowave</module>
 				<module>spring-reactive-kotlin</module>
 				<module>jnosql</module>
-				<module>testing-modules/junit-abstract</module>
 				<module>sse-jaxrs</module>
 				<module>spring-boot-angular-ecommerce</module>
 			</modules>
@@ -664,6 +699,7 @@
 				<module>spring-4</module>
 				<module>spring-5</module>
 				<module>spring-5-reactive</module>
+				<module>spring-5-reactive-client</module>
 				<module>spring-5-mvc</module>
 				<module>spring-5-security</module>
 				<module>spring-activiti</module>
@@ -673,7 +709,6 @@
 				<module>spring-amqp-simple</module>
 				<module>spring-apache-camel</module>
 				<module>spring-batch</module>
-				<module>testing-modules/junit-abstract</module>				
 				<module>jmh</module>
 
 				<!-- group 2 - Pass, 11-16 min, 42 test failures, 4,020 KB -->
@@ -905,6 +940,7 @@
 				<module>json</module>
 				<module>jsoup</module>
 				<module>testing-modules/junit-5</module>
+				<module>testing-modules/junit5-migration</module>
 				<module>jws</module>
 				<module>libraries-data</module>
 				<module>linkrest</module>
@@ -943,6 +979,7 @@
 				<module>spark-java</module>
 				<module>spring-4</module>
 				<module>spring-5-reactive</module>
+				<module>spring-5-reactive-client</module>
 				<module>spring-5-mvc</module>
 				<module>spring-5-security</module>
 				<module>spring-activiti</module>
@@ -1079,7 +1116,6 @@
 				<module>antlr</module>
 				<module>maven-archetype</module>
 				<module>apache-meecrowave</module>
-				<module>testing-modules/junit-abstract</module>
 
                 <module>spring-hibernate4</module>
                 <module>xml</module>
@@ -1222,7 +1258,7 @@
 		<maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
 		<commons-io.version>2.5</commons-io.version>
 		<commons-cli.version>1.4</commons-cli.version>
-		<maven-war-plugin.version>2.6</maven-war-plugin.version>
+		<maven-war-plugin.version>3.0.0</maven-war-plugin.version>
 		<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
 		<jstl-api.version>1.2</jstl-api.version>
 		<javax.servlet.jsp-api.version>2.3.1</javax.servlet.jsp-api.version>
@@ -1230,7 +1266,8 @@
 		<jstl.version>1.2</jstl.version>
 		<jackson-databind.version>2.5.0</jackson-databind.version>
 		<commons-fileupload.version>1.3</commons-fileupload.version>
-		<junit.jupiter.version>5.0.2</junit.jupiter.version>
+		<junit-platform.version>1.2.0</junit-platform.version>
+		<junit-jupiter.version>5.2.0</junit-jupiter.version>
 		<directory-maven-plugin.version>0.3.1</directory-maven-plugin.version>
 		<maven-install-plugin.version>2.5.1</maven-install-plugin.version>
 		<custom-pmd.version>0.0.1</custom-pmd.version>
diff --git a/spring-5-mvc/pom.xml b/spring-5-mvc/pom.xml
index 0408550c79..f5346a0fa0 100644
--- a/spring-5-mvc/pom.xml
+++ b/spring-5-mvc/pom.xml
@@ -82,11 +82,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.jayway.restassured</groupId>
             <artifactId>rest-assured</artifactId>
@@ -137,46 +132,11 @@
                     </dependency>
                 </dependencies>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-
-                    <failIfNoTests>false</failIfNoTests>
-                    <excludes>
-                        <exclude>**/*IntegrationTest.java</exclude>
-                        <exclude>**/*IntTest.java</exclude>
-                        <exclude>**/*LiveTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
-
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
+    
     <properties>
         <jayway-rest-assured.version>2.9.0</jayway-rest-assured.version>
         <kotlin.version>1.1.2</kotlin.version>
     </properties>
-
 </project>
diff --git a/spring-5-reactive-client/pom.xml b/spring-5-reactive-client/pom.xml
index 9388ee83c1..f2f7dd1729 100644
--- a/spring-5-reactive-client/pom.xml
+++ b/spring-5-reactive-client/pom.xml
@@ -11,8 +11,8 @@
     <description>spring 5 sample project about new features</description>
 
     <parent>
-        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../parent-boot-2</relativePath>
     </parent>
@@ -43,20 +43,6 @@
             <groupId>javax.json.bind</groupId>
             <artifactId>javax.json.bind-api</artifactId>
         </dependency>
-
-        <!-- Dependencies for Yasson -->
-        <!-- <dependency> -->
-        <!-- <groupId>org.eclipse</groupId> -->
-        <!-- <artifactId>yasson</artifactId> -->
-        <!-- <version>1.0</version> -->
-        <!-- </dependency> -->
-        <!-- <dependency> -->
-        <!-- <groupId>org.glassfish</groupId> -->
-        <!-- <artifactId>javax.json</artifactId> -->
-        <!-- <version>1.1.2</version> -->
-        <!-- </dependency> -->
-        <!-- Dependencies for Johnzon -->
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-json_1.1_spec</artifactId>
@@ -102,28 +88,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-surefire-provider</artifactId>
-            <version>${junit.platform.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>${junit.platform.version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -145,54 +109,10 @@
                     <layout>JAR</layout>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkCount>3</forkCount>
-                    <reuseForks>true</reuseForks>
-                    <parallel>methods</parallel>
-                    <useUnlimitedThreads>true</useUnlimitedThreads>
-                    <excludes>
-                        <exclude>**/*IntegrationTest.java</exclude>
-                        <exclude>**/*IntTest.java</exclude>
-                        <exclude>**/*LiveTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <junit.platform.version>1.0.0</junit.platform.version>
-        <junit.jupiter.version>5.0.0</junit.jupiter.version>
-        <maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
-        <spring.version>5.0.2.RELEASE</spring.version>
         <reactor-spring.version>1.0.1.RELEASE</reactor-spring.version>
         <johnzon.version>1.1.3</johnzon.version>
         <jsonb-api.version>1.0</jsonb-api.version>
diff --git a/spring-5-reactive/pom.xml b/spring-5-reactive/pom.xml
index acc82be0d1..f89fd45581 100644
--- a/spring-5-reactive/pom.xml
+++ b/spring-5-reactive/pom.xml
@@ -43,20 +43,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-
-        <!-- Dependencies for Yasson -->
-        <!-- <dependency> -->
-        <!-- <groupId>org.eclipse</groupId> -->
-        <!-- <artifactId>yasson</artifactId> -->
-        <!-- <version>1.0</version> -->
-        <!-- </dependency> -->
-        <!-- <dependency> -->
-        <!-- <groupId>org.glassfish</groupId> -->
-        <!-- <artifactId>javax.json</artifactId> -->
-        <!-- <version>1.1.2</version> -->
-        <!-- </dependency> -->
-        <!-- Dependencies for Johnzon -->
-        <!-- lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -100,28 +86,6 @@
             <version>${commons-collections4.version}</version>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-surefire-provider</artifactId>
-            <version>${junit.platform.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>${junit.platform.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -159,29 +123,10 @@
                     <layout>JAR</layout>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkCount>3</forkCount>
-                    <reuseForks>true</reuseForks>
-                    <parallel>methods</parallel>
-                    <useUnlimitedThreads>true</useUnlimitedThreads>
-                    <excludes>
-                        <exclude>**/*IntegrationTest.java</exclude>
-                        <exclude>**/*IntTest.java</exclude>
-                        <exclude>**/*LiveTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
     <properties>
-        <junit.platform.version>1.0.0</junit.platform.version>
-        <junit.jupiter.version>5.0.2</junit.jupiter.version>
-        <maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
         <reactor-spring.version>1.0.1.RELEASE</reactor-spring.version>
         <rxjava-version>2.1.12</rxjava-version>
         <johnzon.version>1.1.3</johnzon.version>
diff --git a/spring-5-security/pom.xml b/spring-5-security/pom.xml
index 7024e6f873..1435019c24 100644
--- a/spring-5-security/pom.xml
+++ b/spring-5-security/pom.xml
@@ -76,44 +76,7 @@
                     <layout>JAR</layout>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkCount>3</forkCount>
-                    <reuseForks>true</reuseForks>
-                    <parallel>methods</parallel>
-                    <useUnlimitedThreads>true</useUnlimitedThreads>
-                    <excludes>
-                        <exclude>**/*IntegrationTest.java</exclude>
-                        <exclude>**/*IntTest.java</exclude>
-                        <exclude>**/*LiveTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
 </project>
\ No newline at end of file
diff --git a/spring-5-security/src/test/java/com/baeldung/inmemory/InMemoryAuthControllerTest.java b/spring-5-security/src/test/java/com/baeldung/inmemory/InMemoryAuthControllerIntegrationTest.java
similarity index 97%
rename from spring-5-security/src/test/java/com/baeldung/inmemory/InMemoryAuthControllerTest.java
rename to spring-5-security/src/test/java/com/baeldung/inmemory/InMemoryAuthControllerIntegrationTest.java
index 7a8ea7b248..9d08cb7cfa 100644
--- a/spring-5-security/src/test/java/com/baeldung/inmemory/InMemoryAuthControllerTest.java
+++ b/spring-5-security/src/test/java/com/baeldung/inmemory/InMemoryAuthControllerIntegrationTest.java
@@ -14,7 +14,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = InMemoryAuthApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
-public class InMemoryAuthControllerTest {
+public class InMemoryAuthControllerIntegrationTest {
 
     @Autowired
     private TestRestTemplate template;
diff --git a/spring-5/pom.xml b/spring-5/pom.xml
index e37833ff94..9f60b8a364 100644
--- a/spring-5/pom.xml
+++ b/spring-5/pom.xml
@@ -41,18 +41,6 @@
             <groupId>javax.json.bind</groupId>
             <artifactId>javax.json.bind-api</artifactId>
         </dependency>
-        <!-- Dependencies for Yasson -->
-        <!-- <dependency> -->
-        <!-- <groupId>org.eclipse</groupId> -->
-        <!-- <artifactId>yasson</artifactId> -->
-        <!-- <version>1.0</version> -->
-        <!-- </dependency> -->
-        <!-- <dependency> -->
-        <!-- <groupId>org.glassfish</groupId> -->
-        <!-- <artifactId>javax.json</artifactId> -->
-        <!-- <version>1.1.2</version> -->
-        <!-- </dependency> -->
-        <!-- Dependencies for Johnzon -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-json_1.1_spec</artifactId>
@@ -85,45 +73,21 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
             <version>${commons-collections4.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-surefire-provider</artifactId>
-            <version>${junit.platform.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>${junit.platform.version}</version>
-            <scope>test</scope>
-        </dependency>
         <!-- restdocs -->
         <dependency>
             <groupId>org.springframework.restdocs</groupId>
@@ -147,22 +111,6 @@
                     <layout>JAR</layout>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkCount>3</forkCount>
-                    <reuseForks>true</reuseForks>
-                    <parallel>methods</parallel>
-                    <useUnlimitedThreads>true</useUnlimitedThreads>
-                    <excludes>
-                        <exclude>**/*IntegrationTest.java</exclude>
-                        <exclude>**/*IntTest.java</exclude>
-                        <exclude>**/*LiveTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
@@ -190,9 +138,6 @@
     </build>
 
     <properties>
-        <junit.platform.version>1.0.0</junit.platform.version>
-        <spring.version>5.0.2.RELEASE</spring.version>
-        <reactor-spring.version>1.0.1.RELEASE</reactor-spring.version>
         <geronimo-json_1.1_spec.version>1.0</geronimo-json_1.1_spec.version>
         <asciidoctor-plugin.version>1.5.6</asciidoctor-plugin.version>
         <commons-collections4.version>4.1</commons-collections4.version>
diff --git a/spring-boot-mvc/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationTests.java b/spring-boot-mvc/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationTests.java
deleted file mode 100644
index 1add635ed8..0000000000
--- a/spring-boot-mvc/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationTests.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.baeldung.springbootmvc;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class SpringBootMvcApplicationTests {
-
-	@Test
-	public void contextLoads() {
-	}
-
-}
diff --git a/spring-boot-vue/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationTests.java b/spring-boot-vue/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationUnitTest.java
similarity index 96%
rename from spring-boot-vue/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationTests.java
rename to spring-boot-vue/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationUnitTest.java
index 6364351eb3..567b239ed2 100644
--- a/spring-boot-vue/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationTests.java
+++ b/spring-boot-vue/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationUnitTest.java
@@ -16,7 +16,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @AutoConfigureMockMvc
-public class SpringBootMvcApplicationTests {
+public class SpringBootMvcApplicationUnitTest {
 
     @Autowired
     private MockMvc mockMvc;
diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
index ef30600d45..3a43dbd828 100644
--- a/spring-boot/pom.xml
+++ b/spring-boot/pom.xml
@@ -149,6 +149,12 @@
             <artifactId>rome</artifactId>
             <version>${rome.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>chaos-monkey-spring-boot</artifactId>
+            <version>${chaos.monkey.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -219,9 +225,11 @@
         <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>3.6.0</graphql-spring-boot-starter.version>
         <graphql-java-tools.version>3.2.0</graphql-java-tools.version>
         <guava.version>18.0</guava.version>
+		<junit-platform.version>1.2.0</junit-platform.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot/src/main/java/com/baeldung/chaosmonkey/SpringBootChaosMonkeyApp.java b/spring-boot/src/main/java/com/baeldung/chaosmonkey/SpringBootChaosMonkeyApp.java
new file mode 100644
index 0000000000..16a0aea13b
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/chaosmonkey/SpringBootChaosMonkeyApp.java
@@ -0,0 +1,15 @@
+package com.baeldung.chaosmonkey;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * Created by adi on 8/2/18.
+ */
+@SpringBootApplication(scanBasePackages = { "com.baeldung.chaosmonkey" })
+public class SpringBootChaosMonkeyApp {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootChaosMonkeyApp.class, args);
+    }
+}
diff --git a/spring-boot/src/main/java/com/baeldung/chaosmonkey/controller/PermissionsController.java b/spring-boot/src/main/java/com/baeldung/chaosmonkey/controller/PermissionsController.java
new file mode 100644
index 0000000000..6ceb117f4e
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/chaosmonkey/controller/PermissionsController.java
@@ -0,0 +1,25 @@
+package com.baeldung.chaosmonkey.controller;
+
+import com.baeldung.chaosmonkey.service.PermissionsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Created by adi on 8/2/18.
+ */
+@RestController
+@RequestMapping("/permissions")
+public class PermissionsController {
+
+    @Autowired private PermissionsService permissionsService;
+
+    @GetMapping
+    public List<String> getAllPermissions() {
+        return permissionsService.getAllPermissions();
+    }
+
+}
diff --git a/spring-boot/src/main/java/com/baeldung/chaosmonkey/service/PermissionsService.java b/spring-boot/src/main/java/com/baeldung/chaosmonkey/service/PermissionsService.java
new file mode 100644
index 0000000000..435e262901
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/chaosmonkey/service/PermissionsService.java
@@ -0,0 +1,17 @@
+package com.baeldung.chaosmonkey.service;
+
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Created by adi on 8/2/18.
+ */
+@Service
+public class PermissionsService {
+
+    public List<String> getAllPermissions() {
+        return Arrays.asList("CREATE", "READ", "UPDATE", "DELETE");
+    }
+}
diff --git a/spring-boot/src/main/resources/application.properties b/spring-boot/src/main/resources/application.properties
index 8c02e528ab..629e880940 100644
--- a/spring-boot/src/main/resources/application.properties
+++ b/spring-boot/src/main/resources/application.properties
@@ -43,3 +43,34 @@ servlet.mapping=/dispatcherExampleURL
 #spring.banner.image.invert= //TODO
 
 contactInfoType=email
+
+#chaos monkey for spring boot props
+management.endpoint.chaosmonkey.enabled=true
+management.endpoint.chaosmonkeyjmx.enabled=true
+
+spring.profiles.active=chaos-monkey
+#Determine whether should execute or not
+chaos.monkey.enabled=true
+#How many requests are to be attacked. 1: attack each request; 5: each 5th request is attacked
+chaos.monkey.assaults.level=1
+#Minimum latency in ms added to the request
+chaos.monkey.assaults.latencyRangeStart=3000
+#Maximum latency in ms added to the request
+chaos.monkey.assaults.latencyRangeEnd=15000
+#Latency assault active
+chaos.monkey.assaults.latencyActive=true
+#Exception assault active
+chaos.monkey.assaults.exceptionsActive=false
+#AppKiller assault active
+chaos.monkey.assaults.killApplicationActive=false
+#Controller watcher active
+chaos.monkey.watcher.controller=false
+#RestController watcher active
+chaos.monkey.watcher.restController=false
+#Service watcher active
+chaos.monkey.watcher.service=true
+#Repository watcher active
+chaos.monkey.watcher.repository=false
+#Component watcher active
+chaos.monkey.watcher.component=false
+
diff --git a/spring-cloud/spring-cloud-connectors-heroku/pom.xml b/spring-cloud/spring-cloud-connectors-heroku/pom.xml
index 875aa5ceaa..f25c190d56 100644
--- a/spring-cloud/spring-cloud-connectors-heroku/pom.xml
+++ b/spring-cloud/spring-cloud-connectors-heroku/pom.xml
@@ -79,7 +79,7 @@
 
     <properties>
         <spring-cloud-dependencies.version>Brixton.SR7</spring-cloud-dependencies.version>
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <postgresql.version>9.4-1201-jdbc4</postgresql.version>
     </properties>
 
diff --git a/spring-cloud/spring-cloud-gateway/pom.xml b/spring-cloud/spring-cloud-gateway/pom.xml
index db57373b6f..8babbff274 100644
--- a/spring-cloud/spring-cloud-gateway/pom.xml
+++ b/spring-cloud/spring-cloud-gateway/pom.xml
@@ -28,7 +28,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-gateway</artifactId>
+            <artifactId>spring-cloud-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -54,27 +54,8 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <properties>
-        <cloud.version>2.0.0.RC2</cloud.version>
+        <cloud.version>2.0.1.RELEASE</cloud.version>
         <hibernate-validator.version>6.0.2.Final</hibernate-validator.version>
     </properties>
 
diff --git a/spring-cloud/spring-cloud-ribbon-client/pom.xml b/spring-cloud/spring-cloud-ribbon-client/pom.xml
index eb8398848c..fd69dbe043 100644
--- a/spring-cloud/spring-cloud-ribbon-client/pom.xml
+++ b/spring-cloud/spring-cloud-ribbon-client/pom.xml
@@ -38,25 +38,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <properties>
         <spring-cloud-dependencies.version>Brixton.SR7</spring-cloud-dependencies.version>
     </properties>
diff --git a/spring-reactive-kotlin/pom.xml b/spring-reactive-kotlin/pom.xml
index 8eafe9f217..f2f0dc58ec 100644
--- a/spring-reactive-kotlin/pom.xml
+++ b/spring-reactive-kotlin/pom.xml
@@ -19,9 +19,6 @@
     </parent>
 
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
 		<kotlin.version>1.2.41</kotlin.version>
 	</properties>
 
diff --git a/spring-rest-embedded-tomcat/pom.xml b/spring-rest-embedded-tomcat/pom.xml
index edccbb17d5..1a1adce6db 100644
--- a/spring-rest-embedded-tomcat/pom.xml
+++ b/spring-rest-embedded-tomcat/pom.xml
@@ -85,7 +85,6 @@
     </build>
 
     <properties>
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <jackson.library>2.9.2</jackson.library>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
diff --git a/spring-security-openid/pom.xml b/spring-security-openid/pom.xml
index 9c498f3700..a2c0b6b119 100644
--- a/spring-security-openid/pom.xml
+++ b/spring-security-openid/pom.xml
@@ -51,27 +51,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>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <properties>
         <spring-security-oauth2.version>2.2.1.RELEASE</spring-security-oauth2.version>
         <spring-security-jwt.version>1.0.9.RELEASE</spring-security-jwt.version>
diff --git a/spring-thymeleaf/pom.xml b/spring-thymeleaf/pom.xml
index c023dcdb5f..0926728aba 100644
--- a/spring-thymeleaf/pom.xml
+++ b/spring-thymeleaf/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>
     <groupId>com.baeldung</groupId>
     <artifactId>spring-thymeleaf</artifactId>
@@ -8,8 +8,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>parent-spring-5</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-spring-5</relativePath>
     </parent>
 
     <dependencies>
@@ -17,7 +18,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${org.springframework-version}</version>
+            <version>${spring.version}</version>
             <exclusions>
                 <!-- Exclude Commons Logging in favor of SLF4j -->
                 <exclusion>
@@ -29,19 +30,38 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>${org.springframework-version}</version>
+            <version>${spring.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+            <version>${spring-data.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>${javax.validation-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate-validator.version}</version>
+        </dependency>
+
         <!-- Spring Security -->
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>${springframework-security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
-            <version>${springframework-security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
+        
         <!-- Thymeleaf -->
         <dependency>
             <groupId>org.thymeleaf</groupId>
@@ -50,10 +70,9 @@
         </dependency>
         <dependency>
             <groupId>org.thymeleaf</groupId>
-            <artifactId>thymeleaf-spring4</artifactId>
+            <artifactId>thymeleaf-spring5</artifactId>
             <version>${org.thymeleaf-version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/nz.net.ultraq.thymeleaf/thymeleaf-layout-dialect -->
         <dependency>
             <groupId>nz.net.ultraq.thymeleaf</groupId>
             <artifactId>thymeleaf-layout-dialect</artifactId>
@@ -64,60 +83,29 @@
             <artifactId>thymeleaf-extras-java8time</artifactId>
             <version>${org.thymeleaf.extras-version}</version>
         </dependency>
+
         <!-- Servlet -->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
-        <!-- Validation -->
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>${javax.validation-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>${hibernate-validator.version}</version>
-        </dependency>
-        <!-- test scoped -->
 
+        <!-- test scoped -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${org.springframework-version}</version>
+            <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-test -->
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>
-            <version>${springframework-security.version}</version>
+            <version>${spring-security.version}</version>
             <scope>test</scope>
         </dependency>
-             
-<!--         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
-            <version>2.0.1.RELEASE</version>
-            <type>jar</type>
-        </dependency>
-             
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency> -->
-        
-        <!-- Spring data -->
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-commons</artifactId>
-			<version>${springFramework-data.version}</version>
-		</dependency>
 
     </dependencies>
 
@@ -131,7 +119,7 @@
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.codehaus.cargo</groupId>
                 <artifactId>cargo-maven2-plugin</artifactId>
@@ -151,7 +139,7 @@
                     </configuration>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.tomcat.maven</groupId>
                 <artifactId>tomcat7-maven-plugin</artifactId>
@@ -176,22 +164,14 @@
     </build>
 
     <properties>
-        <!-- spring -->
-        <org.springframework-version>4.3.4.RELEASE</org.springframework-version>
-        <springframework-security.version>4.2.0.RELEASE</springframework-security.version>
-        <springFramework-data.version>2.0.7.RELEASE</springFramework-data.version>
-        <javax.servlet-version>3.1.0</javax.servlet-version>
-        <!-- thymeleaf -->
+        <spring-data.version>2.0.9.RELEASE</spring-data.version>
         <org.thymeleaf-version>3.0.9.RELEASE</org.thymeleaf-version>
-        <org.thymeleaf.extras-version>3.0.0.RELEASE</org.thymeleaf.extras-version>
-        <thymeleaf-layout-dialect.version>2.1.2</thymeleaf-layout-dialect.version>
-        <!-- validation -->
-        <javax.validation-version>1.1.0.Final</javax.validation-version>
-        <hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
-        <org.hibernate-version>5.2.5.Final</org.hibernate-version>
+        <org.thymeleaf.extras-version>3.0.1.RELEASE</org.thymeleaf.extras-version>
+        <thymeleaf-layout-dialect.version>2.3.0</thymeleaf-layout-dialect.version>
+        <javax.validation-version>2.0.1.Final</javax.validation-version>
+        <hibernate-validator.version>6.0.11.Final</hibernate-validator.version>
 
         <!-- Maven plugins -->
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
         <tomcat7-maven-plugin.version>2.2</tomcat7-maven-plugin.version>
     </properties>
diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java b/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java
index 2e76877199..34a59ea391 100644
--- a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java
+++ b/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java
@@ -2,6 +2,9 @@ package com.baeldung.thymeleaf.config;
 
 import java.util.Locale;
 
+import nz.net.ultraq.thymeleaf.LayoutDialect;
+import nz.net.ultraq.thymeleaf.decorators.strategies.GroupingStrategy;
+
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Bean;
@@ -15,23 +18,20 @@ import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
-import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.extras.java8time.dialect.Java8TimeDialect;
-import org.thymeleaf.spring4.SpringTemplateEngine;
-import org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver;
-import org.thymeleaf.spring4.view.ThymeleafViewResolver;
+import org.thymeleaf.spring5.ISpringTemplateEngine;
+import org.thymeleaf.spring5.SpringTemplateEngine;
+import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
+import org.thymeleaf.spring5.view.ThymeleafViewResolver;
 import org.thymeleaf.templatemode.TemplateMode;
 import org.thymeleaf.templateresolver.ITemplateResolver;
 
 import com.baeldung.thymeleaf.formatter.NameFormatter;
 import com.baeldung.thymeleaf.utils.ArrayUtil;
 
-import nz.net.ultraq.thymeleaf.LayoutDialect;
-import nz.net.ultraq.thymeleaf.decorators.strategies.GroupingStrategy;
-
 @Configuration
 @EnableWebMvc
 @ComponentScan({ "com.baeldung.thymeleaf" })
@@ -39,10 +39,11 @@ import nz.net.ultraq.thymeleaf.decorators.strategies.GroupingStrategy;
  * Java configuration file that is used for Spring MVC and Thymeleaf
  * configurations
  */
-public class WebMVCConfig extends WebMvcConfigurerAdapter implements ApplicationContextAware {
+public class WebMVCConfig implements WebMvcConfigurer,  ApplicationContextAware {
 
     private ApplicationContext applicationContext;
 
+    @Override
     public void setApplicationContext(ApplicationContext applicationContext) {
         this.applicationContext = applicationContext;
     }
@@ -77,7 +78,7 @@ public class WebMVCConfig extends WebMvcConfigurerAdapter implements Application
         return resolver;
     }
 
-    private TemplateEngine templateEngine(ITemplateResolver templateResolver) {
+    private ISpringTemplateEngine templateEngine(ITemplateResolver templateResolver) {
         SpringTemplateEngine engine = new SpringTemplateEngine();
         engine.addDialect(new LayoutDialect(new GroupingStrategy()));
         engine.addDialect(new Java8TimeDialect());
diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java b/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java
index 46bff38a3f..ea51ca3cd9 100644
--- a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java
+++ b/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java
@@ -27,7 +27,7 @@ public class WebMVCSecurity extends WebSecurityConfigurerAdapter {
 
     @Override
     protected void configure(final AuthenticationManagerBuilder auth) throws Exception {
-        auth.inMemoryAuthentication().withUser("user1").password("user1Pass").authorities("ROLE_USER");
+        auth.inMemoryAuthentication().withUser("user1").password("{noop}user1Pass").authorities("ROLE_USER");
     }
 
     @Override
diff --git a/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/FragmentsIntegrationTest.java b/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/FragmentsIntegrationTest.java
index 5bc45d0004..c6158b76b1 100644
--- a/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/FragmentsIntegrationTest.java
+++ b/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/FragmentsIntegrationTest.java
@@ -1,10 +1,22 @@
 package com.baeldung.thymeleaf.controller;
 
+import static org.hamcrest.Matchers.containsString;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import javax.servlet.Filter;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockHttpSession;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.RequestPostProcessor;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
@@ -15,21 +27,6 @@ import com.baeldung.thymeleaf.config.WebApp;
 import com.baeldung.thymeleaf.config.WebMVCConfig;
 import com.baeldung.thymeleaf.config.WebMVCSecurity;
 
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
-import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import javax.servlet.Filter;
-
-import static org.hamcrest.Matchers.containsString;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(classes = { WebApp.class, WebMVCConfig.class, WebMVCSecurity.class, InitSecurity.class })
diff --git a/testing-modules/junit-5/pom.xml b/testing-modules/junit-5/pom.xml
index 2ef290a7c1..93365264ac 100644
--- a/testing-modules/junit-5/pom.xml
+++ b/testing-modules/junit-5/pom.xml
@@ -33,6 +33,12 @@
             <version>${junit.vintage.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-migrationsupport</artifactId>
+            <version>${junit.vintage.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
@@ -54,6 +60,24 @@
             <artifactId>spring-context</artifactId>
             <version>${spring.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -94,13 +118,14 @@
     </build>
 
     <properties>
-        <junit.jupiter.version>5.1.0</junit.jupiter.version>
-        <junit.platform.version>1.1.0</junit.platform.version>
+        <junit.jupiter.version>5.2.0</junit.jupiter.version>
+        <junit.platform.version>1.2.0</junit.platform.version>
         <junit.vintage.version>5.2.0</junit.vintage.version>
         <log4j2.version>2.8.2</log4j2.version>
         <h2.version>1.4.196</h2.version>
-        <mockito.version>2.11.0</mockito.version>
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+        <mockito.version>2.8.9</mockito.version>
+        <powermock.version>1.7.4</powermock.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <spring.version>5.0.1.RELEASE</spring.version>
     </properties>
diff --git a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/abstractmethod/AbstractMethodCalling.java b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/abstractmethod/AbstractMethodCalling.java
similarity index 83%
rename from testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/abstractmethod/AbstractMethodCalling.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/abstractmethod/AbstractMethodCalling.java
index b0709bf6bf..e55c6b98e2 100644
--- a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/abstractmethod/AbstractMethodCalling.java
+++ b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/abstractmethod/AbstractMethodCalling.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.baeldung.testing.abstractclass.abstractmethod;
+package com.baeldung.abstractclass.abstractmethod;
 
 /**
  * When method calls abstract method.
diff --git a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/indepedentmethod/AbstractIndependent.java b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/indepedentmethod/AbstractIndependent.java
similarity index 76%
rename from testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/indepedentmethod/AbstractIndependent.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/indepedentmethod/AbstractIndependent.java
index 7456a51c43..4dce2665d5 100644
--- a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/indepedentmethod/AbstractIndependent.java
+++ b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/indepedentmethod/AbstractIndependent.java
@@ -1,4 +1,4 @@
-package org.baeldung.testing.abstractclass.indepedentmethod;
+package com.baeldung.abstractclass.indepedentmethod;
 
 /**
  * Test Independent Method
diff --git a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/indepedentmethod/ConcreteImpl.java b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/indepedentmethod/ConcreteImpl.java
similarity index 68%
rename from testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/indepedentmethod/ConcreteImpl.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/indepedentmethod/ConcreteImpl.java
index f568ad4eec..6e71b88946 100644
--- a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/indepedentmethod/ConcreteImpl.java
+++ b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/indepedentmethod/ConcreteImpl.java
@@ -1,4 +1,4 @@
-package org.baeldung.testing.abstractclass.indepedentmethod;
+package com.baeldung.abstractclass.indepedentmethod;
 
 public class ConcreteImpl extends AbstractIndependent {
 
diff --git a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/instancefields/AbstractInstanceFields.java b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/instancefields/AbstractInstanceFields.java
similarity index 87%
rename from testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/instancefields/AbstractInstanceFields.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/instancefields/AbstractInstanceFields.java
index 3761eb8c3b..262f72e393 100644
--- a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/instancefields/AbstractInstanceFields.java
+++ b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/instancefields/AbstractInstanceFields.java
@@ -1,4 +1,4 @@
-package org.baeldung.testing.abstractclass.instancefields;
+package com.baeldung.abstractclass.instancefields;
 
 /**
  * Test Independent Method
diff --git a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/privatemethod/AbstractPrivateMethods.java b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/privatemethod/AbstractPrivateMethods.java
similarity index 84%
rename from testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/privatemethod/AbstractPrivateMethods.java
rename to testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/privatemethod/AbstractPrivateMethods.java
index 98a9bcaa07..fe7fb25931 100644
--- a/testing-modules/junit-abstract/src/main/java/org/baeldung/testing/abstractclass/privatemethod/AbstractPrivateMethods.java
+++ b/testing-modules/junit-5/src/main/java/com/baeldung/abstractclass/privatemethod/AbstractPrivateMethods.java
@@ -1,4 +1,4 @@
-package org.baeldung.testing.abstractclass.privatemethod;
+package com.baeldung.abstractclass.privatemethod;
 
 import java.time.LocalDateTime;
 
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/AssertionUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/AssertionUnitTest.java
index 79ba882205..31b6e14d6c 100644
--- a/testing-modules/junit-5/src/test/java/com/baeldung/AssertionUnitTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/AssertionUnitTest.java
@@ -11,14 +11,17 @@ import java.util.Optional;
 import java.util.function.BooleanSupplier;
 
 import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 /**
  * Unit test that demonstrate the different assertions available within JUnit 4
  */
+@DisplayName("Test case for assertions")
 public class AssertionUnitTest {
 
     @Test
+    @DisplayName("Arrays should be equals")
     public void whenAssertingArraysEquality_thenEqual() {
         char[] expected = {'J', 'u', 'p', 'i', 't', 'e', 'r'};
         char[] actual = "Jupiter".toCharArray();
@@ -27,6 +30,7 @@ public class AssertionUnitTest {
     }
 
     @Test
+    @DisplayName("The area of two polygons should be equal")
     public void whenAssertingEquality_thenEqual() {
         float square = 2 * 2;
         float rectangle = 2 * 2;
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/NestedUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/NestedUnitTest.java
index 7586a2f51a..299cac2480 100644
--- a/testing-modules/junit-5/src/test/java/com/baeldung/NestedUnitTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/NestedUnitTest.java
@@ -10,13 +10,13 @@ import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
 public class NestedUnitTest {
+
     Stack<Object> stack;
-    boolean isRun = false;
 
     @Test
     @DisplayName("is instantiated with new Stack()")
     void isInstantiatedWithNew() {
-        new Stack<Object>();
+        new Stack<>();
     }
 
     @Nested
@@ -25,7 +25,7 @@ public class NestedUnitTest {
 
         @BeforeEach
         void init() {
-            stack = new Stack<Object>();
+            stack = new Stack<>();
         }
 
         @Test
diff --git a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/abstractmethod/AbstractMethodCallingUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/abstractmethod/AbstractMethodCallingUnitTest.java
similarity index 94%
rename from testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/abstractmethod/AbstractMethodCallingUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/abstractmethod/AbstractMethodCallingUnitTest.java
index e02915db51..7ebd866f3d 100644
--- a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/abstractmethod/AbstractMethodCallingUnitTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/abstractmethod/AbstractMethodCallingUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.testing.abstractclass.abstractmethod;
+package com.baeldung.abstractclass.abstractmethod;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/indepedentmethod/AbstractIndependentUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/indepedentmethod/AbstractIndependentUnitTest.java
similarity index 91%
rename from testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/indepedentmethod/AbstractIndependentUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/indepedentmethod/AbstractIndependentUnitTest.java
index 80e42af756..db9811e6c1 100644
--- a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/indepedentmethod/AbstractIndependentUnitTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/indepedentmethod/AbstractIndependentUnitTest.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.baeldung.testing.abstractclass.indepedentmethod;
+package com.baeldung.abstractclass.indepedentmethod;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/instancefields/AbstractInstanceFieldsUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/instancefields/AbstractInstanceFieldsUnitTest.java
similarity index 95%
rename from testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/instancefields/AbstractInstanceFieldsUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/instancefields/AbstractInstanceFieldsUnitTest.java
index ce2577521b..5187ce00ab 100644
--- a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/instancefields/AbstractInstanceFieldsUnitTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/instancefields/AbstractInstanceFieldsUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.testing.abstractclass.instancefields;
+package com.baeldung.abstractclass.instancefields;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/privatemethod/AbstractPrivateMethodsUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/privatemethod/AbstractPrivateMethodsUnitTest.java
similarity index 95%
rename from testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/privatemethod/AbstractPrivateMethodsUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/privatemethod/AbstractPrivateMethodsUnitTest.java
index 7220d9cc47..9ce7ff8706 100644
--- a/testing-modules/junit-abstract/src/test/java/org/baeldung/testing/abstractclass/privatemethod/AbstractPrivateMethodsUnitTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/abstractclass/privatemethod/AbstractPrivateMethodsUnitTest.java
@@ -1,9 +1,7 @@
 /**
  *
  */
-package org.baeldung.testing.abstractclass.privatemethod;
-
-import java.time.LocalDateTime;
+package com.baeldung.abstractclass.privatemethod;
 
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
@@ -12,6 +10,8 @@ import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import java.time.LocalDateTime;
+
 /**
  * Providing custom values for private methods using powermock
  *
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/AssumptionUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java
similarity index 69%
rename from testing-modules/junit-5/src/test/java/com/baeldung/AssumptionUnitTest.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java
index 7d67d93486..80201a3f44 100644
--- a/testing-modules/junit-5/src/test/java/com/baeldung/AssumptionUnitTest.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/migration/junit5/AssumptionUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.migration.junit5;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
@@ -10,19 +10,19 @@ import org.junit.jupiter.api.Test;
 public class AssumptionUnitTest {
 
     @Test
-    void trueAssumption() {
-        assumeTrue(5 > 1);
+    public void trueAssumption() {
+        assumeTrue(5 > 1, () -> "5 is greater the 1");
         assertEquals(5 + 2, 7);
     }
 
     @Test
-    void falseAssumption() {
-        assumeFalse(5 < 1);
+    public void falseAssumption() {
+        assumeFalse(5 < 1, () -> "5 is less then 1");
         assertEquals(5 + 2, 7);
     }
 
     @Test
-    void assumptionThat() {
+    public void assumptionThat() {
         String someString = "Just a string";
         assumingThat(someString.equals("Just a string"), () -> assertEquals(2 + 2, 4));
     }
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/runfromjava/FirstUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/runfromjava/FirstUnitTest.java
new file mode 100644
index 0000000000..835132240e
--- /dev/null
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/runfromjava/FirstUnitTest.java
@@ -0,0 +1,24 @@
+package com.baeldung.runfromjava;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class FirstUnitTest {
+
+    @Test
+    void whenThis_thenThat() {
+        assertTrue(true);
+    }
+
+    @Test
+    void whenSomething_thenSomething() {
+        assertTrue(true);
+    }
+
+    @Test
+    void whenSomethingElse_thenSomethingElse() {
+        assertTrue(true);
+    }
+
+}
diff --git a/testing-modules/runjunitfromjava/src/test/java/com/baeldung/junit5/runfromjava/RunJUnit5Tests.java b/testing-modules/junit-5/src/test/java/com/baeldung/runfromjava/RunJUnit5TestsFromJava.java
similarity index 90%
rename from testing-modules/runjunitfromjava/src/test/java/com/baeldung/junit5/runfromjava/RunJUnit5Tests.java
rename to testing-modules/junit-5/src/test/java/com/baeldung/runfromjava/RunJUnit5TestsFromJava.java
index 8a8f3aae17..309c1bc8c9 100644
--- a/testing-modules/runjunitfromjava/src/test/java/com/baeldung/junit5/runfromjava/RunJUnit5Tests.java
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/runfromjava/RunJUnit5TestsFromJava.java
@@ -1,4 +1,4 @@
-package com.baeldung.junit5.runfromjava;
+package com.baeldung.runfromjava;
 
 import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
@@ -14,7 +14,7 @@ import static org.junit.platform.engine.discovery.ClassNameFilter.includeClassNa
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage;
 
-public class RunJUnit5Tests {
+public class RunJUnit5TestsFromJava {
     SummaryGeneratingListener listener = new SummaryGeneratingListener();
 
     public void runOne() {
@@ -32,7 +32,7 @@ public class RunJUnit5Tests {
     public void runAll() {
         LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder
           .request()
-          .selectors(selectPackage("com.baeldung.junit5.runfromjava"))
+          .selectors(selectPackage("com.baeldung.runfromjava"))
           .filters(includeClassNamePatterns(".*Test"))
           .build();
         Launcher launcher = LauncherFactory.create();
@@ -45,7 +45,7 @@ public class RunJUnit5Tests {
     }
 
     public static void main(String[] args) {
-        RunJUnit5Tests runner = new RunJUnit5Tests();
+        RunJUnit5TestsFromJava runner = new RunJUnit5TestsFromJava();
         runner.runAll();
 
         TestExecutionSummary summary = runner.listener.getSummary();
diff --git a/testing-modules/junit-5/src/test/java/com/baeldung/runfromjava/SecondUnitTest.java b/testing-modules/junit-5/src/test/java/com/baeldung/runfromjava/SecondUnitTest.java
new file mode 100644
index 0000000000..b6a387d852
--- /dev/null
+++ b/testing-modules/junit-5/src/test/java/com/baeldung/runfromjava/SecondUnitTest.java
@@ -0,0 +1,18 @@
+package com.baeldung.runfromjava;
+
+import org.junit.jupiter.api.RepeatedTest;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class SecondUnitTest {
+
+    @RepeatedTest(10)
+    void whenSomething_thenSomething() {
+        assertTrue(true);
+    }
+
+    @RepeatedTest(5)
+    void whenSomethingElse_thenSomethingElse() {
+        assertTrue(true);
+    }
+}
diff --git a/testing-modules/junit-abstract/pom.xml b/testing-modules/junit-abstract/pom.xml
deleted file mode 100644
index 106ed8e3a4..0000000000
--- a/testing-modules/junit-abstract/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>junit-abstract</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>abstractclasses</name>
-    <url>http://maven.apache.org</url>
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
-    </parent>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <powermock.version>1.7.4</powermock.version>
-        <java.version>1.8</java.version>
-        <junit.jupiter.version>5.1.0</junit.jupiter.version>
-        <junit.platform.version>1.1.0</junit.platform.version>
-        <junit.vintage.version>5.2.0</junit.vintage.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>${powermock.version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <version>${powermock.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.0</version>
-            </plugin>
-        </plugins>
-        <finalName>junit-abstract</finalName>
-    </build>
-
-</project>
-
-
diff --git a/testing-modules/junit-abstract/src/main/resources/logback.xml b/testing-modules/junit-abstract/src/main/resources/logback.xml
deleted file mode 100644
index 7d900d8ea8..0000000000
--- a/testing-modules/junit-abstract/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/testing-modules/junit5-migration/README.md b/testing-modules/junit5-migration/README.md
new file mode 100644
index 0000000000..5fe7fc1f16
--- /dev/null
+++ b/testing-modules/junit5-migration/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles:
+- [JUnit4 -> JUnit5 migration guide](http://www.baeldung.com/junit4-junit5-migration-guide)
+
diff --git a/testing-modules/junit5-migration/pom.xml b/testing-modules/junit5-migration/pom.xml
new file mode 100644
index 0000000000..9d9d418774
--- /dev/null
+++ b/testing-modules/junit5-migration/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>junit5-migration</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>junit5-migration</name>
+    <description>JUnit 4 -> JUnit 5 migration</description>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${junit.platform.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit.platform.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>${junit.vintage.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-migrationsupport</artifactId>
+            <version>${junit.vintage.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.platform</groupId>
+                        <artifactId>junit-platform-surefire-provider</artifactId>
+                        <version>${junit.platform.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>${exec-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <mainClass>com.baeldung.TestLauncher</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <junit.jupiter.version>5.2.0</junit.jupiter.version>
+        <junit.platform.version>1.2.0</junit.platform.version>
+        <junit.vintage.version>5.2.0</junit.vintage.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+    </properties>
+
+</project>
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/AnnotationTestExampleUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/AnnotationTestExampleUnitTest.java
new file mode 100644
index 0000000000..a5f5c19c65
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/AnnotationTestExampleUnitTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.junit4;
+
+import com.baeldung.junit4.categories.Annotations;
+import com.baeldung.junit4.categories.JUnit4UnitTest;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(value = { Annotations.class, JUnit4UnitTest.class })
+public class AnnotationTestExampleUnitTest {
+    @Test(expected = Exception.class)
+    public void shouldRaiseAnException() throws Exception {
+        throw new Exception("This is my expected exception");
+    }
+
+    @Test(timeout = 1)
+    @Ignore
+    public void shouldFailBecauseTimeout() throws InterruptedException {
+        Thread.sleep(10);
+    }
+
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/AssertionUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/AssertionUnitTest.java
new file mode 100644
index 0000000000..8979c9ecbc
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/AssertionUnitTest.java
@@ -0,0 +1,36 @@
+package com.baeldung.junit4;
+
+import org.junit.Assert;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+
+import static org.hamcrest.CoreMatchers.hasItems;
+import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+
+@DisplayName("Test case for assertions")
+public class AssertionUnitTest {
+
+    @Test
+    @DisplayName("Arrays should be equals")
+    public void whenAssertingArraysEquality_thenEqual() {
+        char[] expected = {'J', 'u', 'p', 'i', 't', 'e', 'r'};
+        char[] actual = "Jupiter".toCharArray();
+
+        assertArrayEquals("Arrays should be equal", expected, actual);
+    }
+
+    @Test
+    public void givenMultipleAssertion_whenAssertingAll_thenOK() {
+        assertEquals("4 is 2 times 2", 4, 2 * 2);
+        assertEquals("java", "JAVA".toLowerCase());
+        assertEquals("null is equal to null", null, null);
+    }
+
+    @Test
+    public void testAssertThatHasItems() {
+        assertThat(Arrays.asList("Java", "Kotlin", "Scala"), hasItems("Java", "Kotlin"));
+    }
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/AssumeUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/AssumeUnitTest.java
new file mode 100644
index 0000000000..f7730a3dd8
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/AssumeUnitTest.java
@@ -0,0 +1,23 @@
+package com.baeldung.junit4;
+
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+public class AssumeUnitTest {
+
+    @Test
+    public void trueAssumption() {
+        assumeTrue("5 is greater the 1", 5 > 1);
+        assertEquals(5 + 2, 7);
+    }
+
+    @Test
+    public void falseAssumption() {
+        assumeFalse("5 is less then 1", 5 < 1);
+        assertEquals(5 + 2, 7);
+    }
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/ExceptionAssertionUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/ExceptionAssertionUnitTest.java
new file mode 100644
index 0000000000..38e7f640a2
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/ExceptionAssertionUnitTest.java
@@ -0,0 +1,24 @@
+package com.baeldung.junit4;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+public class ExceptionAssertionUnitTest {
+
+    @Rule
+    public ExpectedException exceptionRule = ExpectedException.none();
+
+    @Test(expected = NullPointerException.class)
+    public void whenExceptionThrown_thenExpectationSatisfied() {
+        String test = null;
+        test.length();
+    }
+
+    @Test
+    public void whenExceptionThrown_thenRuleIsApplied() {
+        exceptionRule.expect(NumberFormatException.class);
+        exceptionRule.expectMessage("For input string");
+        Integer.parseInt("1a");
+    }
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/RuleExampleUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/RuleExampleUnitTest.java
new file mode 100644
index 0000000000..35f96b4f6a
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/RuleExampleUnitTest.java
@@ -0,0 +1,16 @@
+package com.baeldung.junit4;
+
+import org.junit.Rule;
+import org.junit.Test;
+
+public class RuleExampleUnitTest {
+
+    @Rule
+    public final TraceUnitTestRule traceRuleTests = new TraceUnitTestRule();
+
+    @Test
+    public void whenTracingTests() {
+        System.out.println("This is my test");
+        /*...*/
+    }
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/TestAnnotationsUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/TestAnnotationsUnitTest.java
new file mode 100644
index 0000000000..89c33cafe6
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/TestAnnotationsUnitTest.java
@@ -0,0 +1,34 @@
+package com.baeldung.junit4;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
+import java.util.logging.Logger;
+
+public class TestAnnotationsUnitTest {
+
+    private static final Logger log = Logger.getLogger(TestAnnotationsUnitTest.class.getName());
+
+    @BeforeClass
+    static void setup() {
+        log.info("@BeforeAll - executes once before all test methods in this class");
+    }
+
+    @Before
+    void init() {
+        log.info("@BeforeEach - executes before each test method in this class");
+    }
+
+    @After
+    void tearDown() {
+        log.info("@AfterEach - executed after each test method.");
+    }
+
+    @AfterClass
+    static void done() {
+        log.info("@AfterAll - executed after all test methods.");
+    }
+
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/TraceUnitTestRule.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/TraceUnitTestRule.java
new file mode 100644
index 0000000000..9f4811da3d
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/TraceUnitTestRule.java
@@ -0,0 +1,35 @@
+package com.baeldung.junit4;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.MultipleFailureException;
+import org.junit.runners.model.Statement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TraceUnitTestRule implements TestRule {
+
+    @Override
+    public Statement apply(Statement base, Description description) {
+
+        return new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+                List<Throwable> errors = new ArrayList<Throwable>();
+
+                System.out.println("Starting test ... " + description.getMethodName());
+                try {
+                    base.evaluate();
+                } catch (Throwable e) {
+                    errors.add(e);
+                } finally {
+                    System.out.println("... test finished. " + description.getMethodName());
+                }
+
+                MultipleFailureException.assertEmpty(errors);
+            }
+        };
+    }
+
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/categories/Annotations.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/categories/Annotations.java
new file mode 100644
index 0000000000..22214d95b6
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/categories/Annotations.java
@@ -0,0 +1,5 @@
+package com.baeldung.junit4.categories;
+
+public interface Annotations {
+
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/categories/JUnit4UnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/categories/JUnit4UnitTest.java
new file mode 100644
index 0000000000..a7474d5f24
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit4/categories/JUnit4UnitTest.java
@@ -0,0 +1,5 @@
+package com.baeldung.junit4.categories;
+
+public interface JUnit4UnitTest {
+
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/AnnotationTestExampleUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/AnnotationTestExampleUnitTest.java
new file mode 100644
index 0000000000..16de0be9d8
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/AnnotationTestExampleUnitTest.java
@@ -0,0 +1,28 @@
+package com.baeldung.junit5;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
+
+import java.time.Duration;
+
+@Tag("annotations")
+@Tag("junit5")
+@RunWith(JUnitPlatform.class)
+public class AnnotationTestExampleUnitTest {
+    @Test
+    public void shouldRaiseAnException() throws Exception {
+        Assertions.assertThrows(Exception.class, () -> {
+            throw new Exception("This is my expected exception");
+        });
+    }
+
+    @Test
+    @Disabled
+    public void shouldFailBecauseTimeout() throws InterruptedException {
+        Assertions.assertTimeout(Duration.ofMillis(1), () -> Thread.sleep(10));
+    }
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/AssertionUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/AssertionUnitTest.java
new file mode 100644
index 0000000000..d1d08c6e62
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/AssertionUnitTest.java
@@ -0,0 +1,40 @@
+package com.baeldung.junit5;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@DisplayName("Test case for assertions")
+public class AssertionUnitTest {
+
+    @Test
+    @DisplayName("Arrays should be equals")
+    public void whenAssertingArraysEquality_thenEqual() {
+        char[] expected = {'J', 'u', 'p', 'i', 't', 'e', 'r'};
+        char[] actual = "Jupiter".toCharArray();
+
+        assertArrayEquals(expected, actual, "Arrays should be equal");
+    }
+
+    @Test
+    @DisplayName("The area of two polygons should be equal")
+    public void whenAssertingEquality_thenEqual() {
+        float square = 2 * 2;
+        float rectangle = 2 * 2;
+
+        assertEquals(square, rectangle);
+    }
+
+    @Test
+    public void givenMultipleAssertion_whenAssertingAll_thenOK() {
+        assertAll(
+                "heading",
+                () -> assertEquals(4, 2 * 2, "4 is 2 times 2"),
+                () -> assertEquals("java", "JAVA".toLowerCase()),
+                () -> assertEquals(null, null, "null is equal to null")
+        );
+    }
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/AssumptionUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/AssumptionUnitTest.java
new file mode 100644
index 0000000000..4f3d827403
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/AssumptionUnitTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.junit5;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assumptions.*;
+
+public class AssumptionUnitTest {
+
+    @Test
+    public void trueAssumption() {
+        assumeTrue(5 > 1, () -> "5 is greater the 1");
+        assertEquals(5 + 2, 7);
+    }
+
+    @Test
+    public void falseAssumption() {
+        assumeFalse(5 < 1, () -> "5 is less then 1");
+        assertEquals(5 + 2, 7);
+    }
+
+    @Test
+    public void assumptionThat() {
+        String someString = "Just a string";
+        assumingThat(someString.equals("Just a string"), () -> assertEquals(2 + 2, 4));
+    }
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/ConditionalExecutionUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/ConditionalExecutionUnitTest.java
new file mode 100644
index 0000000000..7f76e237f1
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/ConditionalExecutionUnitTest.java
@@ -0,0 +1,69 @@
+package com.baeldung.junit5;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class ConditionalExecutionUnitTest {
+
+    @Test
+    @EnabledOnOs({OS.MAC})
+    void whenOperatingSystemIsMac_thenTestIsEnabled() {
+        assertEquals(5 + 2, 7);
+    }
+
+    @Test
+    @DisabledOnOs({OS.WINDOWS})
+    void whenOperatingSystemIsWindows_thenTestIsDisabled() {
+        assertEquals(5 + 2, 7);
+    }
+
+    @Test
+    @EnabledOnJre({JRE.JAVA_8})
+    void whenRunningTestsOnJRE8_thenTestIsEnabled() {
+        assertTrue(5 > 4, "5 is greater the 4");
+        assertTrue(null == null, "null is equal to null");
+    }
+
+    @Test
+    @DisabledOnJre({JRE.JAVA_10})
+    void whenRunningTestsOnJRE10_thenTestIsDisabled() {
+        assertTrue(5 > 4, "5 is greater the 4");
+        assertTrue(null == null, "null is equal to null");
+    }
+
+    @Test
+    @EnabledIfSystemProperty(named = "os.arch", matches = ".*64.*")
+    public void whenRunningTestsOn64BitArchitectures_thenTestIsDisabled() {
+        Integer value = 5; // result of an algorithm
+
+        assertNotEquals(0, value, "The result cannot be 0");
+    }
+
+    @Test
+    @DisabledIfSystemProperty(named = "ci-server", matches = "true")
+    public void whenRunningTestsOnCIServer_thenTestIsDisabled() {
+        Integer value = 5; // result of an algorithm
+
+        assertNotEquals(0, value, "The result cannot be 0");
+    }
+
+    @Test
+    @EnabledIfEnvironmentVariable(named = "ENV", matches = "staging-server")
+    public void whenRunningTestsStagingServer_thenTestIsEnabled() {
+        char[] expected = {'J', 'u', 'p', 'i', 't', 'e', 'r'};
+        char[] actual = "Jupiter".toCharArray();
+
+        assertArrayEquals(expected, actual, "Arrays should be equal");
+    }
+
+    @Test
+    @DisabledIfEnvironmentVariable(named = "ENV", matches = ".*development.*")
+    public void whenRunningTestsDevelopmentEnvironment_thenTestIsDisabled() {
+        char[] expected = {'J', 'u', 'p', 'i', 't', 'e', 'r'};
+        char[] actual = "Jupiter".toCharArray();
+
+        assertArrayEquals(expected, actual, "Arrays should be equal");
+    }
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/NestedUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/NestedUnitTest.java
new file mode 100644
index 0000000000..9eeff471ba
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/NestedUnitTest.java
@@ -0,0 +1,77 @@
+package com.baeldung.junit5;
+
+import org.junit.jupiter.api.*;
+
+import java.util.EmptyStackException;
+import java.util.Stack;
+
+public class NestedUnitTest {
+
+    Stack<Object> stack;
+
+    @Test
+    @DisplayName("is instantiated with new Stack()")
+    void isInstantiatedWithNew() {
+        new Stack<>();
+    }
+
+    @Nested
+    @DisplayName("when new")
+    class WhenNew {
+
+        @BeforeEach
+        void init() {
+            stack = new Stack<>();
+        }
+
+        @Test
+        @DisplayName("is empty")
+        void isEmpty() {
+            Assertions.assertTrue(stack.isEmpty());
+        }
+
+        @Test
+        @DisplayName("throws EmptyStackException when popped")
+        void throwsExceptionWhenPopped() {
+            Assertions.assertThrows(EmptyStackException.class, () -> stack.pop());
+        }
+
+        @Test
+        @DisplayName("throws EmptyStackException when peeked")
+        void throwsExceptionWhenPeeked() {
+            Assertions.assertThrows(EmptyStackException.class, () -> stack.peek());
+        }
+
+        @Nested
+        @DisplayName("after pushing an element")
+        class AfterPushing {
+
+            String anElement = "an element";
+
+            @BeforeEach
+            void init() {
+                stack.push(anElement);
+            }
+
+            @Test
+            @DisplayName("it is no longer empty")
+            void isEmpty() {
+                Assertions.assertFalse(stack.isEmpty());
+            }
+
+            @Test
+            @DisplayName("returns the element when popped and is empty")
+            void returnElementWhenPopped() {
+                Assertions.assertEquals(anElement, stack.pop());
+                Assertions.assertTrue(stack.isEmpty());
+            }
+
+            @Test
+            @DisplayName("returns the element when peeked but remains not empty")
+            void returnElementWhenPeeked() {
+                Assertions.assertEquals(anElement, stack.peek());
+                Assertions.assertFalse(stack.isEmpty());
+            }
+        }
+    }
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/RuleExampleUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/RuleExampleUnitTest.java
new file mode 100644
index 0000000000..297d0f1730
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/RuleExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.baeldung.junit5;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
+
+@RunWith(JUnitPlatform.class)
+@ExtendWith(TraceUnitExtension.class)
+public class RuleExampleUnitTest {
+
+    @Test
+    public void whenTracingTests() {
+        System.out.println("This is my test");
+        /*...*/
+    }
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/RuleMigrationSupportUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/RuleMigrationSupportUnitTest.java
new file mode 100644
index 0000000000..bbaa42ec7b
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/RuleMigrationSupportUnitTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.junit5;
+
+import org.junit.Rule;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.migrationsupport.rules.EnableRuleMigrationSupport;
+import org.junit.rules.ExpectedException;
+
+@EnableRuleMigrationSupport
+public class RuleMigrationSupportUnitTest {
+
+    @Rule
+    public ExpectedException exceptionRule = ExpectedException.none();
+
+    @Test
+    public void whenExceptionThrown_thenExpectationSatisfied() {
+        exceptionRule.expect(NullPointerException.class);
+        String test = null;
+        test.length();
+    }
+
+    @Test
+    public void whenExceptionThrown_thenRuleIsApplied() {
+        exceptionRule.expect(NumberFormatException.class);
+        exceptionRule.expectMessage("For input string");
+        Integer.parseInt("1a");
+    }
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/TestAnnotationsUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/TestAnnotationsUnitTest.java
new file mode 100644
index 0000000000..8daf952747
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/TestAnnotationsUnitTest.java
@@ -0,0 +1,39 @@
+package com.baeldung.junit5;
+
+import org.junit.jupiter.api.*;
+
+import java.util.logging.Logger;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestAnnotationsUnitTest {
+
+    private static final Logger log = Logger.getLogger(TestAnnotationsUnitTest.class.getName());
+
+    @BeforeAll
+    static void setup() {
+        log.info("@BeforeAll - executes once before all test methods in this class");
+    }
+
+    @BeforeEach
+    void init() {
+        log.info("@BeforeEach - executes before each test method in this class");
+    }
+
+    @Test
+    @Disabled
+    void disabledTest() {
+        assertTrue(false);
+    }
+
+    @AfterEach
+    void tearDown() {
+        log.info("@AfterEach - executed after each test method.");
+    }
+
+    @AfterAll
+    static void done() {
+        log.info("@AfterAll - executed after all test methods.");
+    }
+
+}
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/TraceUnitExtension.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/TraceUnitExtension.java
new file mode 100644
index 0000000000..bd5ae47d63
--- /dev/null
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5/TraceUnitExtension.java
@@ -0,0 +1,19 @@
+package com.baeldung.junit5;
+
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+public class TraceUnitExtension implements AfterEachCallback, BeforeEachCallback {
+
+    @Override
+    public void beforeEach(ExtensionContext context) throws Exception {
+        System.out.println("Starting test ... " + context.getDisplayName());
+    }
+
+    @Override
+    public void afterEach(ExtensionContext context) throws Exception {
+        System.out.println("... test finished. " + context.getDisplayName());
+    }
+
+}
diff --git a/testing-modules/runjunitfromjava/pom.xml b/testing-modules/runjunitfromjava/pom.xml
deleted file mode 100644
index 8ad3e7ed00..0000000000
--- a/testing-modules/runjunitfromjava/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.baeldung.junit</groupId>
-    <artifactId>applicationtesting</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>applicationtesting</name>
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
-        <junit-jupiter.version>5.2.0</junit-jupiter.version>
-        <junit-launcher.version>1.2.0</junit-launcher.version>
-        <junit4.version>4.12</junit4.version>
-        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-launcher</artifactId>
-            <version>${junit-launcher.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit4.version}</version>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/testing-modules/runjunitfromjava/src/main/java/com/baeldung/junit/runfromjava/listnode/ListNode.java b/testing-modules/runjunitfromjava/src/main/java/com/baeldung/junit/runfromjava/listnode/ListNode.java
deleted file mode 100644
index 31cbda15d3..0000000000
--- a/testing-modules/runjunitfromjava/src/main/java/com/baeldung/junit/runfromjava/listnode/ListNode.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.baeldung.junit.runfromjava.listnode;
-
-public class ListNode {
-    private int value;
-    private ListNode next;
-
-    public ListNode(int v) {
-        value = v;
-    }
-
-    public ListNode(int v, ListNode next) {
-        value = v;
-        this.next = next;
-    }
-
-    public int getValue() {
-        return value;
-    }
-
-    public ListNode getNext() {
-        return next;
-    }
-
-    public void setNext(ListNode next) {
-        this.next = next;
-    }
-
-    public String toString() {
-        String result = "";
-        ListNode tmp = this;
-
-        while (tmp.next != null) {
-            result += tmp.value + "->";
-            tmp = tmp.next;
-        }
-
-        result += tmp.value;
-
-        return result.toString();
-    }
-}
diff --git a/testing-modules/runjunitfromjava/src/main/java/com/baeldung/junit/runfromjava/listnode/MergeLists.java b/testing-modules/runjunitfromjava/src/main/java/com/baeldung/junit/runfromjava/listnode/MergeLists.java
deleted file mode 100644
index f2a24487c8..0000000000
--- a/testing-modules/runjunitfromjava/src/main/java/com/baeldung/junit/runfromjava/listnode/MergeLists.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.baeldung.junit.runfromjava.listnode;
-
-public class MergeLists {
-
-    public ListNode merge(ListNode list1, ListNode list2) {
-
-        if (list1 == null) {
-            return list2;
-        }
-        if (list2 == null) {
-            return list1;
-        }
-
-        if (list1.getValue() <= list2.getValue()) {
-            list1.setNext(merge(list1.getNext(), list2));
-            return list1;
-        } else {
-            list2.setNext(merge(list2.getNext(), list1));
-            return list2;
-        }
-    }
-}
\ No newline at end of file
diff --git a/testing-modules/runjunitfromjava/src/main/java/com/baeldung/junit/runfromjava/listnode/RemovedNthElement.java b/testing-modules/runjunitfromjava/src/main/java/com/baeldung/junit/runfromjava/listnode/RemovedNthElement.java
deleted file mode 100644
index 22357aaeee..0000000000
--- a/testing-modules/runjunitfromjava/src/main/java/com/baeldung/junit/runfromjava/listnode/RemovedNthElement.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.baeldung.junit.runfromjava.listnode;
-
-public class RemovedNthElement {
-    public ListNode removeNthFromEnd(ListNode head, int n) {
-
-        ListNode start = new ListNode(0);
-        start.setNext(head);
-
-        ListNode fast = start;
-        ListNode slow = start;
-
-        for (int i = 0; i < n + 1 && fast != null; i++) {
-            fast = fast.getNext();
-        }
-
-        while (fast != null) {
-            fast = fast.getNext();
-            slow = slow.getNext();
-        }
-
-        slow.setNext(slow.getNext()
-            .getNext());
-
-        return start.getNext();
-    }
-}
diff --git a/testing-modules/runjunitfromjava/src/main/java/com/baeldung/junit/runfromjava/listnode/RotateList.java b/testing-modules/runjunitfromjava/src/main/java/com/baeldung/junit/runfromjava/listnode/RotateList.java
deleted file mode 100644
index 52167cbacc..0000000000
--- a/testing-modules/runjunitfromjava/src/main/java/com/baeldung/junit/runfromjava/listnode/RotateList.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.baeldung.junit.runfromjava.listnode;
-
-public class RotateList {
-    public ListNode rotateRight(ListNode list, int n) {
-
-        if (list == null || list.getNext() == null) {
-            return list;
-        }
-
-        ListNode tmpList = new ListNode(0);
-        tmpList.setNext(list);
-        ListNode fast = tmpList;
-        ListNode slow = tmpList;
-
-        int listLength;
-        for (listLength = 0; fast.getNext() != null; listLength++) {
-            fast = fast.getNext();
-        }
-
-        for (int j = listLength - n % listLength; j > 0; j--) {
-            slow = slow.getNext();
-        }
-
-        fast.setNext(tmpList.getNext());
-        tmpList.setNext(slow.getNext());
-        slow.setNext(null);
-
-        return tmpList.getNext();
-    }
-}
diff --git a/testing-modules/runjunitfromjava/src/main/java/com/baeldung/junit/runfromjava/listnode/SwapNodes.java b/testing-modules/runjunitfromjava/src/main/java/com/baeldung/junit/runfromjava/listnode/SwapNodes.java
deleted file mode 100644
index 076fed0d5e..0000000000
--- a/testing-modules/runjunitfromjava/src/main/java/com/baeldung/junit/runfromjava/listnode/SwapNodes.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.baeldung.junit.runfromjava.listnode;
-
-public class SwapNodes {
-    public ListNode swapPairs(ListNode listHead) {
-
-        ListNode result = new ListNode(0);
-        result.setNext(listHead);
-
-        ListNode current = result;
-
-        while (current.getNext() != null && current
-          .getNext()
-          .getNext() != null) {
-
-            ListNode first = current.getNext();
-            ListNode second = current
-              .getNext()
-              .getNext();
-
-            first.setNext(second.getNext());
-            current.setNext(second);
-            current
-              .getNext()
-              .setNext(first);
-
-            current = current
-              .getNext()
-              .getNext();
-        }
-
-        return result.getNext();
-    }
-}
diff --git a/testing-modules/test-containers/pom.xml b/testing-modules/test-containers/pom.xml
index 2a8f434040..0ace187555 100644
--- a/testing-modules/test-containers/pom.xml
+++ b/testing-modules/test-containers/pom.xml
@@ -109,7 +109,7 @@
         <testcontainers.version>1.7.2</testcontainers.version>
         <postgresql.version>42.2.2</postgresql.version>
         <selenium-remote-driver.version>3.12.0</selenium-remote-driver.version>
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
     </properties>
 
 </project>
diff --git a/testing-modules/testing/src/test/java/com/baeldung/runfromjava/FirstUnitTest.java b/testing-modules/testing/src/test/java/com/baeldung/runfromjava/FirstUnitTest.java
new file mode 100644
index 0000000000..0e08c43021
--- /dev/null
+++ b/testing-modules/testing/src/test/java/com/baeldung/runfromjava/FirstUnitTest.java
@@ -0,0 +1,24 @@
+package com.baeldung.runfromjava;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class FirstUnitTest {
+
+    @Test
+    public void whenThis_thenThat() {
+        assertTrue(true);
+    }
+
+    @Test
+    public void whenSomething_thenSomething() {
+        assertTrue(true);
+    }
+
+    @Test
+    public void whenSomethingElse_thenSomethingElse() {
+        assertTrue(true);
+    }
+
+}
diff --git a/testing-modules/runjunitfromjava/src/test/java/com/baeldung/junit4/runfromjava/MyTestSuite.java b/testing-modules/testing/src/test/java/com/baeldung/runfromjava/MyTestSuite.java
similarity index 81%
rename from testing-modules/runjunitfromjava/src/test/java/com/baeldung/junit4/runfromjava/MyTestSuite.java
rename to testing-modules/testing/src/test/java/com/baeldung/runfromjava/MyTestSuite.java
index 4739b47b88..2413fb1ddf 100644
--- a/testing-modules/runjunitfromjava/src/test/java/com/baeldung/junit4/runfromjava/MyTestSuite.java
+++ b/testing-modules/testing/src/test/java/com/baeldung/runfromjava/MyTestSuite.java
@@ -1,4 +1,4 @@
-package com.baeldung.junit4.runfromjava;
+package com.baeldung.runfromjava;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/testing-modules/runjunitfromjava/src/test/java/com/baeldung/junit4/runfromjava/RunJUnit4Tests.java b/testing-modules/testing/src/test/java/com/baeldung/runfromjava/RunJUnit4TestsFromJava.java
similarity index 97%
rename from testing-modules/runjunitfromjava/src/test/java/com/baeldung/junit4/runfromjava/RunJUnit4Tests.java
rename to testing-modules/testing/src/test/java/com/baeldung/runfromjava/RunJUnit4TestsFromJava.java
index 69b821032a..b44b66440a 100644
--- a/testing-modules/runjunitfromjava/src/test/java/com/baeldung/junit4/runfromjava/RunJUnit4Tests.java
+++ b/testing-modules/testing/src/test/java/com/baeldung/runfromjava/RunJUnit4TestsFromJava.java
@@ -1,4 +1,4 @@
-package com.baeldung.junit4.runfromjava;
+package com.baeldung.runfromjava;
 
 import junit.extensions.ActiveTestSuite;
 import junit.extensions.RepeatedTest;
@@ -10,7 +10,7 @@ import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
 
-public class RunJUnit4Tests {
+public class RunJUnit4TestsFromJava {
 
     public static void runOne() {
         JUnitCore junit = new JUnitCore();
diff --git a/testing-modules/testing/src/test/java/com/baeldung/runfromjava/SecondUnitTest.java b/testing-modules/testing/src/test/java/com/baeldung/runfromjava/SecondUnitTest.java
new file mode 100644
index 0000000000..aa5883562e
--- /dev/null
+++ b/testing-modules/testing/src/test/java/com/baeldung/runfromjava/SecondUnitTest.java
@@ -0,0 +1,18 @@
+package com.baeldung.runfromjava;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class SecondUnitTest {
+
+    @Test
+    public void whenSomething_thenSomething() {
+        assertTrue(true);
+    }
+
+    @Test
+    public void whensomethingElse_thenSomethingElse() {
+        assertTrue(true);
+    }
+}