diff --git a/apache-avro/src/main/java/com/baeldung/avro/util/serealization/AvroDeSerealizer.java b/apache-avro/src/main/java/com/baeldung/avro/util/serealization/AvroDeSerealizer.java
index d2219a45f2..7d30c3d1ee 100644
--- a/apache-avro/src/main/java/com/baeldung/avro/util/serealization/AvroDeSerealizer.java
+++ b/apache-avro/src/main/java/com/baeldung/avro/util/serealization/AvroDeSerealizer.java
@@ -5,29 +5,37 @@ import org.apache.avro.io.DatumReader;
 import org.apache.avro.io.Decoder;
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.specific.SpecificDatumReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 public class AvroDeSerealizer {
 
-public AvroHttpRequest deSerealizeAvroHttpRequestJSON(byte[] data){
-    DatumReader<AvroHttpRequest> reader = new SpecificDatumReader<>(AvroHttpRequest.class);
-    Decoder decoder = null;
-    try {
-        decoder = DecoderFactory.get().jsonDecoder(AvroHttpRequest.getClassSchema(), new String(data));
-        return reader.read(null, decoder);
-    } catch (IOException e) {
-        return null;
-    }
-}
+    private static Logger logger = LoggerFactory.getLogger(AvroDeSerealizer.class);
 
-public AvroHttpRequest deSerealizeAvroHttpRequestBinary(byte[] data){
-    DatumReader<AvroHttpRequest> employeeReader = new SpecificDatumReader<>(AvroHttpRequest.class);
-    Decoder decoder = DecoderFactory.get().binaryDecoder(data, null);
-    try {
-        return employeeReader.read(null, decoder);
-    } catch (IOException e) {
+    public AvroHttpRequest deSerealizeAvroHttpRequestJSON(byte[] data) {
+        DatumReader<AvroHttpRequest> reader = new SpecificDatumReader<>(AvroHttpRequest.class);
+        Decoder decoder = null;
+        try {
+            decoder = DecoderFactory.get()
+                .jsonDecoder(AvroHttpRequest.getClassSchema(), new String(data));
+            return reader.read(null, decoder);
+        } catch (IOException e) {
+            logger.error("Deserialization error" + e.getMessage());
+        }
+        return null;
+    }
+
+    public AvroHttpRequest deSerealizeAvroHttpRequestBinary(byte[] data) {
+        DatumReader<AvroHttpRequest> employeeReader = new SpecificDatumReader<>(AvroHttpRequest.class);
+        Decoder decoder = DecoderFactory.get()
+            .binaryDecoder(data, null);
+        try {
+            return employeeReader.read(null, decoder);
+        } catch (IOException e) {
+            logger.error("Deserialization error" + e.getMessage());
+        }
         return null;
     }
 }
-}
diff --git a/apache-avro/src/main/java/com/baeldung/avro/util/serealization/AvroSerealizer.java b/apache-avro/src/main/java/com/baeldung/avro/util/serealization/AvroSerealizer.java
index f56c89e201..767b688dea 100644
--- a/apache-avro/src/main/java/com/baeldung/avro/util/serealization/AvroSerealizer.java
+++ b/apache-avro/src/main/java/com/baeldung/avro/util/serealization/AvroSerealizer.java
@@ -3,42 +3,48 @@ package com.baeldung.avro.util.serealization;
 import com.baeldung.avro.util.model.AvroHttpRequest;
 import org.apache.avro.io.*;
 import org.apache.avro.specific.SpecificDatumWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 public class AvroSerealizer {
 
-public byte[] serealizeAvroHttpRequestJSON(AvroHttpRequest request){
-    DatumWriter<AvroHttpRequest> writer = new SpecificDatumWriter<>(AvroHttpRequest.class);
-    byte[] data = new byte[0];
-    ByteArrayOutputStream stream = new ByteArrayOutputStream();
-    Encoder jsonEncoder = null;
-    try {
-        jsonEncoder = EncoderFactory.get().jsonEncoder(AvroHttpRequest.getClassSchema(), stream);
-        writer.write(request, jsonEncoder);
-        jsonEncoder.flush();
-        data = stream.toByteArray();
-    } catch (IOException e) {
-        data =null;
-    }
-    return data;
-}
+    private static final Logger logger = LoggerFactory.getLogger(AvroSerealizer.class);
 
-public byte[] serealizeAvroHttpRequestBinary(AvroHttpRequest request){
-    DatumWriter<AvroHttpRequest> writer = new SpecificDatumWriter<>(AvroHttpRequest.class);
-    byte[] data = new byte[0];
-    ByteArrayOutputStream stream = new ByteArrayOutputStream();
-    Encoder jsonEncoder = EncoderFactory.get().binaryEncoder(stream,null);
-    try {
-        writer.write(request, jsonEncoder);
-        jsonEncoder.flush();
-        data = stream.toByteArray();
-    } catch (IOException e) {
-        data = null;
+    public byte[] serealizeAvroHttpRequestJSON(AvroHttpRequest request) {
+        DatumWriter<AvroHttpRequest> writer = new SpecificDatumWriter<>(AvroHttpRequest.class);
+        byte[] data = new byte[0];
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        Encoder jsonEncoder = null;
+        try {
+            jsonEncoder = EncoderFactory.get()
+                .jsonEncoder(AvroHttpRequest.getClassSchema(), stream);
+            writer.write(request, jsonEncoder);
+            jsonEncoder.flush();
+            data = stream.toByteArray();
+        } catch (IOException e) {
+            logger.error("Serialization error " + e.getMessage());
+        }
+        return data;
     }
 
-    return data;
-}
+    public byte[] serealizeAvroHttpRequestBinary(AvroHttpRequest request) {
+        DatumWriter<AvroHttpRequest> writer = new SpecificDatumWriter<>(AvroHttpRequest.class);
+        byte[] data = new byte[0];
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        Encoder jsonEncoder = EncoderFactory.get()
+            .binaryEncoder(stream, null);
+        try {
+            writer.write(request, jsonEncoder);
+            jsonEncoder.flush();
+            data = stream.toByteArray();
+        } catch (IOException e) {
+            logger.error("Serialization error " + e.getMessage());
+        }
+
+        return data;
+    }
 
 }
diff --git a/apache-avro/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerTest.java b/apache-avro/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerTest.java
index 937a4ae650..ecd15ccbbc 100644
--- a/apache-avro/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerTest.java
+++ b/apache-avro/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerTest.java
@@ -24,8 +24,10 @@ public class AvroSerealizerDeSerealizerTest {
         serealizer = new AvroSerealizer();
         deSerealizer = new AvroDeSerealizer();
 
-        ClientIdentifier clientIdentifier = ClientIdentifier.newBuilder().
-                setHostName("localhost").setIpAddress("255.255.255.0").build();
+        ClientIdentifier clientIdentifier = ClientIdentifier.newBuilder()
+            .setHostName("localhost")
+            .setIpAddress("255.255.255.0")
+            .build();
 
         List<CharSequence> employees = new ArrayList();
         employees.add("James");
@@ -33,43 +35,49 @@ public class AvroSerealizerDeSerealizerTest {
         employees.add("David");
         employees.add("Han");
 
-        request = AvroHttpRequest.newBuilder().setRequestTime(01l)
-                .setActive(Active.YES).setClientIdentifier(clientIdentifier)
-                .setEmployeeNames(employees).build();
+        request = AvroHttpRequest.newBuilder()
+            .setRequestTime(01l)
+            .setActive(Active.YES)
+            .setClientIdentifier(clientIdentifier)
+            .setEmployeeNames(employees)
+            .build();
     }
 
     @After
     public void tearDown() throws Exception {
     }
 
-@Test
-public void WhenSerialized_UsingJSONEncoder_ObjectGetsSerialized(){
-    byte[] data = serealizer.serealizeAvroHttpRequestJSON(request);
-    assertTrue(Objects.nonNull(data));
-    assertTrue(data.length > 0);
-}
-
-@Test
-public void WhenSerialized_UsingBinaryEncoder_ObjectGetsSerialized(){
-    byte[] data = serealizer.serealizeAvroHttpRequestBinary(request);
-    assertTrue(Objects.nonNull(data));
-    assertTrue(data.length > 0);
-}
-
-@Test
-public void WhenDeserialize_UsingJSONDecoder_ActualAndExpectedObjectsAreEqual(){
-    byte[] data = serealizer.serealizeAvroHttpRequestJSON(request);
-    AvroHttpRequest actualRequest = deSerealizer.deSerealizeAvroHttpRequestJSON(data);
-    assertEquals(actualRequest,request);
-    assertTrue(actualRequest.getRequestTime().equals(request.getRequestTime()));
-}
-
-@Test
-public void WhenDeserialize_UsingBinaryecoder_ActualAndExpectedObjectsAreEqual(){
-    byte[] data = serealizer.serealizeAvroHttpRequestBinary(request);
-    AvroHttpRequest actualRequest = deSerealizer.deSerealizeAvroHttpRequestBinary(data);
-    assertEquals(actualRequest,request);
-    assertTrue(actualRequest.getRequestTime().equals(request.getRequestTime()));
-}
+    @Test
+    public void WhenSerializedUsingJSONEncoder_thenObjectGetsSerialized() {
+        byte[] data = serealizer.serealizeAvroHttpRequestJSON(request);
+        assertTrue(Objects.nonNull(data));
+        assertTrue(data.length > 0);
+    }
+
+    @Test
+    public void WhenSerializedUsingBinaryEncoder_thenObjectGetsSerialized() {
+        byte[] data = serealizer.serealizeAvroHttpRequestBinary(request);
+        assertTrue(Objects.nonNull(data));
+        assertTrue(data.length > 0);
+    }
+
+    @Test
+    public void WhenDeserializeUsingJSONDecoder_thenActualAndExpectedObjectsAreEqual() {
+        byte[] data = serealizer.serealizeAvroHttpRequestJSON(request);
+        AvroHttpRequest actualRequest = deSerealizer.deSerealizeAvroHttpRequestJSON(data);
+        assertEquals(actualRequest, request);
+        assertTrue(actualRequest.getRequestTime()
+            .equals(request.getRequestTime()));
+    }
+
+    @Test
+    public void WhenDeserializeUsingBinaryecoder_thenActualAndExpectedObjectsAreEqual() {
+        byte[] data = serealizer.serealizeAvroHttpRequestBinary(request);
+        AvroHttpRequest actualRequest = deSerealizer.deSerealizeAvroHttpRequestBinary(data);
+        assertEquals(actualRequest, request);
+        assertTrue(actualRequest.getRequestTime()
+            .equals(request.getRequestTime()));
+    }
+    
 }
 
diff --git a/apache-cxf/pom.xml b/apache-cxf/pom.xml
index 53d9d4054c..8918fd4450 100644
--- a/apache-cxf/pom.xml
+++ b/apache-cxf/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>apache-cxf</artifactId>
@@ -17,6 +17,7 @@
         <module>cxf-spring</module>
         <module>cxf-jaxrs-implementation</module>
         <module>cxf-aegis</module>
+        <module>sse-jaxrs</module>
     </modules>
 
     <build>
diff --git a/apache-cxf/sse-jaxrs/pom.xml b/apache-cxf/sse-jaxrs/pom.xml
new file mode 100644
index 0000000000..d4b6c19d03
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>sse-jaxrs</artifactId>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>apache-cxf</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>sse-jaxrs-server</module>
+        <module>sse-jaxrs-client</module>
+   </modules>
+
+</project>
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-client/pom.xml b/apache-cxf/sse-jaxrs/sse-jaxrs-client/pom.xml
new file mode 100644
index 0000000000..0f5406fbc7
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-client/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>sse-jaxrs</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>sse-jaxrs-client</artifactId>
+
+    <properties>
+        <cxf-version>3.2.0</cxf-version>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.6.0</version>
+                <executions>
+                    <execution>
+                        <id>singleEvent</id>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>com.baeldung.sse.jaxrs.client.SseClientApp</mainClass>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>broadcast</id>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <mainClass>com.baeldung.sse.jaxrs.client.SseClientBroadcastApp</mainClass>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-client</artifactId>
+            <version>${cxf-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-sse</artifactId>
+            <version>${cxf-version}</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientApp.java b/apache-cxf/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientApp.java
new file mode 100644
index 0000000000..5d42b3a243
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientApp.java
@@ -0,0 +1,48 @@
+package com.baeldung.sse.jaxrs.client;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.sse.InboundSseEvent;
+import javax.ws.rs.sse.SseEventSource;
+import java.util.function.Consumer;
+
+public class SseClientApp {
+
+    private static final String url = "http://127.0.0.1:9080/sse-jaxrs-server/sse/stock/prices";
+
+    public static void main(String... args) throws Exception {
+
+        Client client = ClientBuilder.newClient();
+        WebTarget target = client.target(url);
+        try (SseEventSource eventSource = SseEventSource.target(target).build()) {
+
+            eventSource.register(onEvent, onError, onComplete);
+            eventSource.open();
+
+            //Consuming events for one hour
+            Thread.sleep(60 * 60 * 1000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        client.close();
+        System.out.println("End");
+    }
+
+    // A new event is received
+    private static Consumer<InboundSseEvent> onEvent = (inboundSseEvent) -> {
+        String data = inboundSseEvent.readData();
+        System.out.println(data);
+    };
+
+    //Error
+    private static Consumer<Throwable> onError = (throwable) -> {
+        throwable.printStackTrace();
+    };
+
+    //Connection close and there is nothing to receive
+    private static Runnable onComplete = () -> {
+        System.out.println("Done!");
+    };
+
+}
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientBroadcastApp.java b/apache-cxf/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientBroadcastApp.java
new file mode 100644
index 0000000000..9afc187a6d
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientBroadcastApp.java
@@ -0,0 +1,52 @@
+package com.baeldung.sse.jaxrs.client;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.sse.InboundSseEvent;
+import javax.ws.rs.sse.SseEventSource;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+
+public class SseClientBroadcastApp {
+
+    private static final String subscribeUrl = "http://localhost:9080/sse-jaxrs-server/sse/stock/subscribe";
+
+
+    public static void main(String... args) throws Exception {
+
+        Client client = ClientBuilder.newClient();
+        WebTarget target = client.target(subscribeUrl);
+        try (final SseEventSource eventSource = SseEventSource.target(target)
+                .reconnectingEvery(5, TimeUnit.SECONDS)
+                .build()) {
+            eventSource.register(onEvent, onError, onComplete);
+            eventSource.open();
+            System.out.println("Wainting for incoming event ...");
+
+            //Consuming events for one hour
+            Thread.sleep(60 * 60 * 1000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        client.close();
+        System.out.println("End");
+    }
+
+    // A new event is received
+    private static Consumer<InboundSseEvent> onEvent = (inboundSseEvent) -> {
+        String data = inboundSseEvent.readData();
+        System.out.println(data);
+    };
+
+    //Error
+    private static Consumer<Throwable> onError = (throwable) -> {
+        throwable.printStackTrace();
+    };
+
+    //Connection close and there is nothing to receive
+    private static Runnable onComplete = () -> {
+        System.out.println("Done!");
+    };
+
+}
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-client/src/main/resources/logback.xml b/apache-cxf/sse-jaxrs/sse-jaxrs-client/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-client/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-server/pom.xml b/apache-cxf/sse-jaxrs/sse-jaxrs-server/pom.xml
new file mode 100644
index 0000000000..46572a2b75
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-server/pom.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>sse-jaxrs</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>sse-jaxrs-server</artifactId>
+    <packaging>war</packaging>
+
+    <properties>
+        <liberty-maven-plugin.version>2.4.2</liberty-maven-plugin.version>
+        <failOnMissingWebXml>false</failOnMissingWebXml>
+        <openliberty-version>18.0.0.2</openliberty-version>
+    </properties>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>net.wasdev.wlp.maven.plugins</groupId>
+                <artifactId>liberty-maven-plugin</artifactId>
+                <version>${liberty-maven-plugin.version}</version>
+                <configuration>
+                    <assemblyArtifact>
+                        <groupId>io.openliberty</groupId>
+                        <artifactId>openliberty-webProfile8</artifactId>
+                        <version>${openliberty-version}</version>
+                        <type>zip</type>
+                    </assemblyArtifact>
+                    <installAppPackages>project</installAppPackages>
+                    <looseApplication>true</looseApplication>
+                    <configFile>src/main/liberty/config/server.xml</configFile>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>install-server</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>install-server</goal>
+                            <goal>create-server</goal>
+                            <goal>install-feature</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>install-apps</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>install-apps</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>2.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <version>2.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.json.bind</groupId>
+            <artifactId>javax.json.bind-api</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/AppConfig.java b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/AppConfig.java
new file mode 100644
index 0000000000..058d19f045
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/AppConfig.java
@@ -0,0 +1,8 @@
+package com.baeldung.sse.jaxrs;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("sse")
+public class AppConfig extends Application {
+}
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/SseResource.java b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/SseResource.java
new file mode 100644
index 0000000000..1f60168a1b
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/SseResource.java
@@ -0,0 +1,119 @@
+package com.baeldung.sse.jaxrs;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.sse.OutboundSseEvent;
+import javax.ws.rs.sse.Sse;
+import javax.ws.rs.sse.SseBroadcaster;
+import javax.ws.rs.sse.SseEventSink;
+
+@ApplicationScoped
+@Path("stock")
+public class SseResource {
+
+    @Inject
+    private StockService stockService;
+
+    private Sse sse;
+    private SseBroadcaster sseBroadcaster;
+    private OutboundSseEvent.Builder eventBuilder;
+
+    @Context
+    public void setSse(Sse sse) {
+        this.sse = sse;
+        this.eventBuilder = sse.newEventBuilder();
+        this.sseBroadcaster = sse.newBroadcaster();
+    }
+
+    @GET
+    @Path("prices")
+    @Produces("text/event-stream")
+    public void getStockPrices(@Context SseEventSink sseEventSink,
+                               @HeaderParam(HttpHeaders.LAST_EVENT_ID_HEADER) @DefaultValue("-1") int lastReceivedId) {
+
+        int lastEventId = 1;
+        if (lastReceivedId != -1) {
+            lastEventId = ++lastReceivedId;
+        }
+        boolean running = true;
+        while (running) {
+            Stock stock = stockService.getNextTransaction(lastEventId);
+            if (stock != null) {
+                OutboundSseEvent sseEvent = this.eventBuilder
+                        .name("stock")
+                        .id(String.valueOf(lastEventId))
+                        .mediaType(MediaType.APPLICATION_JSON_TYPE)
+                        .data(Stock.class, stock)
+                        .reconnectDelay(3000)
+                        .comment("price change")
+                        .build();
+                sseEventSink.send(sseEvent);
+                lastEventId++;
+            }
+            //Simulate connection close
+            if (lastEventId % 5 == 0) {
+                sseEventSink.close();
+                break;
+            }
+
+            try {
+                //Wait 5 seconds
+                Thread.sleep(5 * 1000);
+            } catch (InterruptedException ex) {
+                // ...
+            }
+            //Simulatae a while boucle break
+            running = lastEventId <= 2000;
+        }
+        sseEventSink.close();
+    }
+
+    @GET
+    @Path("subscribe")
+    @Produces(MediaType.SERVER_SENT_EVENTS)
+    public void listen(@Context SseEventSink sseEventSink) {
+        sseEventSink.send(sse.newEvent("Welcome !"));
+        this.sseBroadcaster.register(sseEventSink);
+        sseEventSink.send(sse.newEvent("You are registred !"));
+    }
+
+    @GET
+    @Path("publish")
+    public void broadcast() {
+        Runnable r = new Runnable() {
+            @Override
+            public void run() {
+                int lastEventId = 0;
+                boolean running = true;
+                while (running) {
+                    lastEventId++;
+                    Stock stock = stockService.getNextTransaction(lastEventId);
+                    if (stock != null) {
+                        OutboundSseEvent sseEvent = eventBuilder
+                                .name("stock")
+                                .id(String.valueOf(lastEventId))
+                                .mediaType(MediaType.APPLICATION_JSON_TYPE)
+                                .data(Stock.class, stock)
+                                .reconnectDelay(3000)
+                                .comment("price change")
+                                .build();
+                        sseBroadcaster.broadcast(sseEvent);
+                    }
+                    try {
+                        //Wait 5 seconds
+                        Thread.currentThread().sleep(5 * 1000);
+                    } catch (InterruptedException ex) {
+                        // ...
+                    }
+                    //Simulatae a while boucle break
+                    running = lastEventId <= 2000;
+                }
+            }
+        };
+        new Thread(r).start();
+    }
+}
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/Stock.java b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/Stock.java
new file mode 100644
index 0000000000..a186b32771
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/Stock.java
@@ -0,0 +1,50 @@
+package com.baeldung.sse.jaxrs;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+public class Stock {
+    private Integer id;
+    private String name;
+    private BigDecimal price;
+    LocalDateTime dateTime;
+
+    public Stock(Integer id, String name, BigDecimal price, LocalDateTime dateTime) {
+        this.id = id;
+        this.name = name;
+        this.price = price;
+        this.dateTime = dateTime;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public LocalDateTime getDateTime() {
+        return dateTime;
+    }
+
+    public void setDateTime(LocalDateTime dateTime) {
+        this.dateTime = dateTime;
+    }
+}
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/StockService.java b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/StockService.java
new file mode 100644
index 0000000000..15818ead5d
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/StockService.java
@@ -0,0 +1,78 @@
+package com.baeldung.sse.jaxrs;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.Initialized;
+import javax.enterprise.event.Event;
+import javax.enterprise.event.Observes;
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@ApplicationScoped
+@Named
+public class StockService {
+
+    private static final BigDecimal UP = BigDecimal.valueOf(1.05f);
+    private static final BigDecimal DOWN = BigDecimal.valueOf(0.95f);
+
+    List<String> stockNames = Arrays.asList("GOOG", "IBM", "MS", "GOOG", "YAHO");
+    List<Stock> stocksDB = new ArrayList<>();
+    private AtomicInteger counter = new AtomicInteger(0);
+
+    public void init(@Observes @Initialized(ApplicationScoped.class) Object init) {
+        //Open price
+        System.out.println("@Start Init ...");
+        stockNames.forEach(stockName -> {
+            stocksDB.add(new Stock(counter.incrementAndGet(), stockName, generateOpenPrice(), LocalDateTime.now()));
+        });
+
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                //Simulate Change price and put every x seconds
+                while (true) {
+                    int indx = new Random().nextInt(stockNames.size());
+                    String stockName = stockNames.get(indx);
+                    BigDecimal price = getLastPrice(stockName);
+                    BigDecimal newprice = changePrice(price);
+                    Stock stock = new Stock(counter.incrementAndGet(), stockName, newprice, LocalDateTime.now());
+                    stocksDB.add(stock);
+
+                    int r = new Random().nextInt(30);
+                    try {
+                        Thread.currentThread().sleep(r*1000);
+                    } catch (InterruptedException ex) {
+                        // ...
+                    }
+                }
+            }
+        };
+        new Thread(runnable).start();
+        System.out.println("@End Init ...");
+    }
+
+    public Stock getNextTransaction(Integer lastEventId) {
+        return stocksDB.stream().filter(s -> s.getId().equals(lastEventId)).findFirst().orElse(null);
+    }
+
+    BigDecimal generateOpenPrice() {
+        float min = 70;
+        float max = 120;
+        return BigDecimal.valueOf(min + new Random().nextFloat() * (max - min)).setScale(4,RoundingMode.CEILING);
+    }
+
+    BigDecimal changePrice(BigDecimal price) {
+        return Math.random() >= 0.5 ? price.multiply(UP).setScale(4,RoundingMode.CEILING) : price.multiply(DOWN).setScale(4,RoundingMode.CEILING);
+    }
+
+    private BigDecimal getLastPrice(String stockName) {
+        return stocksDB.stream().filter(stock -> stock.getName().equals(stockName)).findFirst().get().getPrice();
+    }
+}
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/liberty/config/server.xml b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/liberty/config/server.xml
new file mode 100644
index 0000000000..9bf66d7795
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/liberty/config/server.xml
@@ -0,0 +1,7 @@
+<server description="OpenLiberty Server">
+    <featureManager>
+        <feature>jaxrs-2.1</feature>
+        <feature>cdi-2.0</feature>
+    </featureManager>
+    <httpEndpoint httpPort="9080" httpsPort="9443" id="defaultHttpEndpoint" host="*"/>
+</server>
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/resources/META-INF/beans.xml b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000000..4f0b3cdeeb
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,6 @@
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+		http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+       bean-discovery-mode="all">
+</beans>
\ No newline at end of file
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/resources/logback.xml b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/webapp/WEB-INF/web.xml b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..b4b8121fdd
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+    version="4.0">
+    <display-name>Hello Servlet</display-name>
+
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+
+</web-app>
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/webapp/index.html b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/webapp/index.html
new file mode 100644
index 0000000000..9015a7a32c
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/webapp/index.html
@@ -0,0 +1 @@
+index
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/webapp/sse-broadcast.html b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/webapp/sse-broadcast.html
new file mode 100644
index 0000000000..5a46e2a5d3
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/webapp/sse-broadcast.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Server-Sent Event Broadcasting</title>
+</head>
+<body>
+<h2>Stock prices :</h2>
+<div>
+    <ul id="data">
+    </ul>
+</div>
+<script>
+
+    var source = new EventSource('sse/stock/subscribe');
+    source.onopen = function(event) {
+        console.log(event);
+    };
+    source.addEventListener("stock", function(event) {
+        append(event.data);
+    }, false);
+
+    source.onmessage = function(event) {
+        append(event.data);
+    };
+    source.onerror = function(event) {
+        console.log(event);
+    };
+
+    function append(data) {
+        var ul = document.getElementById("data");
+        var li = document.createElement("li");
+        li.appendChild(document.createTextNode(data));
+        ul.insertBefore(li, ul.childNodes[0]);
+    };
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/webapp/sse.html b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/webapp/sse.html
new file mode 100644
index 0000000000..8fddae4717
--- /dev/null
+++ b/apache-cxf/sse-jaxrs/sse-jaxrs-server/src/main/webapp/sse.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Server-Sent Event</title>
+</head>
+<body>
+<h2>Stock prices :</h2>
+<div>
+    <ul id="data">
+    </ul>
+</div>
+<script>
+
+    var source = new EventSource('sse/stock/prices');
+    source.onopen = function(event) {
+        console.log(event);
+    };
+    source.addEventListener("stock", function(event) {
+        append(event.data);
+    }, false);
+
+    source.onmessage = function(event) {
+        append(event.data);
+    };
+    source.onerror = function(event) {
+        console.log(event);
+    };
+
+    function append(data) {
+        var ul = document.getElementById("data");
+        var li = document.createElement("li");
+        li.appendChild(document.createTextNode(data));
+        ul.insertBefore(li, ul.childNodes[0]);
+    };
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/apache-thrift/pom.xml b/apache-thrift/pom.xml
index 6947cc71bc..b22364cb19 100644
--- a/apache-thrift/pom.xml
+++ b/apache-thrift/pom.xml
@@ -39,6 +39,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
+                <version>${build-helper-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -60,6 +61,7 @@
         <thrift.version>0.10.0</thrift.version>
         <maven-thrift.version>0.1.11</maven-thrift.version>
         <org.slf4j.slf4j-simple.version>1.7.12</org.slf4j.slf4j-simple.version>
+        <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
     </properties>
 
 </project>
diff --git a/aws/pom.xml b/aws/pom.xml
index 176ecaa40d..26bc0c8037 100644
--- a/aws/pom.xml
+++ b/aws/pom.xml
@@ -137,7 +137,7 @@
         <aws-lambda-java-core.version>1.1.0</aws-lambda-java-core.version>
         <gson.version>2.8.0</gson.version>
         <aws-java-sdk.version>1.11.290</aws-java-sdk.version>
-        <mockito-core.version>2.8.9</mockito-core.version>
+        <mockito-core.version>2.21.0</mockito-core.version>
         <assertj-core.version>3.8.0</assertj-core.version>
         <dynamodblocal.version>1.11.86</dynamodblocal.version>
         <dynamodblocal.repository.url>https://s3-us-west-2.amazonaws.com/dynamodb-local/release</dynamodblocal.repository.url>
diff --git a/core-java-8/README.md b/core-java-8/README.md
index 6f31a8b886..e0cd0e7c0a 100644
--- a/core-java-8/README.md
+++ b/core-java-8/README.md
@@ -14,7 +14,6 @@
 - [Guide to Java 8 groupingBy Collector](http://www.baeldung.com/java-groupingby-collector)
 - [Strategy Design Pattern in Java 8](http://www.baeldung.com/java-strategy-pattern)
 - [Java 8 and Infinite Streams](http://www.baeldung.com/java-inifinite-streams)
-- [String Operations with Java Streams](http://www.baeldung.com/java-stream-operations-on-strings)
 - [Exceptions in Java 8 Lambda Expressions](http://www.baeldung.com/java-lambda-exceptions)
 - [Java 8 Stream findFirst() vs. findAny()](http://www.baeldung.com/java-stream-findfirst-vs-findany)
 - [Guide to Java 8 Comparator.comparing()](http://www.baeldung.com/java-8-comparator-comparing)
@@ -34,13 +33,11 @@
 - [Copy a File with Java](http://www.baeldung.com/java-copy-file)
 - [Static and Default Methods in Interfaces in Java](http://www.baeldung.com/java-static-default-methods)
 - [Iterable to Stream in Java](http://www.baeldung.com/java-iterable-to-stream)
-- [Converting String to Stream of chars](http://www.baeldung.com/java-string-to-stream)
 - [How to Iterate Over a Stream With Indices](http://www.baeldung.com/java-stream-indices)
 - [Efficient Word Frequency Calculator in Java](http://www.baeldung.com/java-word-frequency)
 - [Primitive Type Streams in Java 8](http://www.baeldung.com/java-8-primitive-streams)
 - [Fail-Safe Iterator vs Fail-Fast Iterator](http://www.baeldung.com/java-fail-safe-vs-fail-fast-iterator)
 - [Shuffling Collections In Java](http://www.baeldung.com/java-shuffle-collection)
-- [Java 8 StringJoiner](http://www.baeldung.com/java-string-joiner)
 - [Introduction to Spliterator in Java](http://www.baeldung.com/java-spliterator)
 - [Java 8 Math New Methods](http://www.baeldung.com/java-8-math)
 - [Overview of Java Built-in Annotations](http://www.baeldung.com/java-default-annotations)
@@ -54,7 +51,6 @@
 - [Java 8 Unsigned Arithmetic Support](http://www.baeldung.com/java-unsigned-arithmetic)
 - [How to Get the Start and the End of a Day using Java](http://www.baeldung.com/java-day-start-end)
 - [Generalized Target-Type Inference in Java](http://www.baeldung.com/java-generalized-target-type-inference)
-- [Image to Base64 String Conversion](http://www.baeldung.com/java-base64-image-string)
 - [Calculate Age in Java](http://www.baeldung.com/java-get-age)
 - [Copy a List to Another List in Java](http://www.baeldung.com/java-copy-list-to-another)
 - [Increment Date in Java](http://www.baeldung.com/java-increment-date)
diff --git a/core-java-8/pom.xml b/core-java-8/pom.xml
index 7e3b8cb280..ad37cdd7e8 100644
--- a/core-java-8/pom.xml
+++ b/core-java-8/pom.xml
@@ -151,6 +151,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -184,6 +185,6 @@
         <avaitility.version>1.7.0</avaitility.version>
         <jmh-core.version>1.19</jmh-core.version>
         <jmh-generator.version>1.19</jmh-generator.version>
+        <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
     </properties>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/core-java-9/README.md b/core-java-9/README.md
index a76dcefc69..8c869f56bb 100644
--- a/core-java-9/README.md
+++ b/core-java-9/README.md
@@ -17,7 +17,6 @@
 - [Java 9 Reactive Streams](http://www.baeldung.com/java-9-reactive-streams)
 - [How to Get All Dates Between Two Dates?](http://www.baeldung.com/java-between-dates)
 - [Java 9 java.util.Objects Additions](http://www.baeldung.com/java-9-objects-new)
-- [Compact Strings in Java 9](http://www.baeldung.com/java-9-compact-string)
 - [Convert Date to LocalDate or LocalDateTime and Back](http://www.baeldung.com/java-date-to-localdate-and-localdatetime)
 - [Java 9 Variable Handles Demistyfied](http://www.baeldung.com/java-variable-handles)
 - [Exploring the New HTTP Client in Java 9](http://www.baeldung.com/java-9-http-client)
diff --git a/core-java-9/src/main/java/com/baeldung/java9/rangedates/DatesCollectionIteration.java b/core-java-9/src/main/java/com/baeldung/java9/rangedates/DatesCollectionIteration.java
new file mode 100644
index 0000000000..f5ec5d29dc
--- /dev/null
+++ b/core-java-9/src/main/java/com/baeldung/java9/rangedates/DatesCollectionIteration.java
@@ -0,0 +1,24 @@
+package com.baeldung.java9.rangedates;
+
+import java.util.Collection;
+import java.util.Date;
+
+public class DatesCollectionIteration {
+
+    public void iteratingRangeOfDatesJava7(Collection<Date> dates) {
+
+        for (Date date : dates) {
+            processDate(date);
+        }
+    }
+
+    public void iteratingRangeOfDatesJava8(Collection<Date> dates) {
+        dates.stream()
+            .forEach(this::processDate);
+    }
+
+    private void processDate(Date date) {
+        System.out.println(date);
+    }
+
+}
diff --git a/core-java-9/src/main/java/com/baeldung/java9/rangedates/RangeDatesIteration.java b/core-java-9/src/main/java/com/baeldung/java9/rangedates/RangeDatesIteration.java
new file mode 100644
index 0000000000..4972036c91
--- /dev/null
+++ b/core-java-9/src/main/java/com/baeldung/java9/rangedates/RangeDatesIteration.java
@@ -0,0 +1,43 @@
+package com.baeldung.java9.rangedates;
+
+import java.time.LocalDate;
+import java.util.Calendar;
+import java.util.Date;
+
+public class RangeDatesIteration {
+
+    public void iterateBetweenDatesJava9(LocalDate startDate, LocalDate endDate) {
+
+        startDate.datesUntil(endDate)
+            .forEach(this::processDate);
+    }
+
+    public void iterateBetweenDatesJava8(LocalDate start, LocalDate end) {
+        for (LocalDate date = start; date.isBefore(end); date = date.plusDays(1)) {
+            processDate(date);
+        }
+    }
+
+    public void iterateBetweenDatesJava7(Date start, Date end) {
+        Date current = start;
+
+        while (current.before(end)) {
+            processDate(current);
+
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(current);
+
+            calendar.add(Calendar.DATE, 1);
+
+            current = calendar.getTime();
+        }
+    }
+
+    private void processDate(LocalDate date) {
+        System.out.println(date);
+    }
+
+    private void processDate(Date date) {
+        System.out.println(date);
+    }
+}
diff --git a/core-java-9/src/test/java/com/baeldung/java9/rangedates/DatesCollectionIterationUnitTest.java b/core-java-9/src/test/java/com/baeldung/java9/rangedates/DatesCollectionIterationUnitTest.java
new file mode 100644
index 0000000000..522b00065e
--- /dev/null
+++ b/core-java-9/src/test/java/com/baeldung/java9/rangedates/DatesCollectionIterationUnitTest.java
@@ -0,0 +1,61 @@
+package com.baeldung.java9.rangedates;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.Test;
+
+public class DatesCollectionIterationUnitTest {
+
+    private Collection<LocalDate> localDates = LocalDate.now()
+        .datesUntil(LocalDate.now()
+            .plus(10L, ChronoUnit.DAYS))
+        .collect(Collectors.toList());
+
+    private Collection<Date> dates = localDates.stream()
+        .map(localDate -> Date.from(localDate.atStartOfDay(ZoneId.systemDefault())
+            .toInstant()))
+        .collect(Collectors.toList());
+
+    @Test
+    public void givenIteratingListOfDatesJava7_WhenStartTodayAndEnding10DaysAhead() {
+        DatesCollectionIteration iterateInColleciton = new DatesCollectionIteration();
+        Calendar today = Calendar.getInstance();
+        Calendar next10Ahead = (Calendar) today.clone();
+        next10Ahead.add(Calendar.DATE, 10);
+
+        iterateInColleciton.iteratingRangeOfDatesJava7(createRangeDates(today.getTime(), next10Ahead.getTime()));
+    }
+
+    @Test
+    public void givenIteratingListOfDatesJava8_WhenStartTodayAndEnd10DaysAhead() {
+        DatesCollectionIteration iterateInColleciton = new DatesCollectionIteration();
+
+        iterateInColleciton.iteratingRangeOfDatesJava8(dates);
+    }
+
+    private List<Date> createRangeDates(Date start, Date end) {
+
+        List<Date> dates = new ArrayList<>();
+        Date current = start;
+
+        while (current.before(end)) {
+            dates.add(current);
+            
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(current);
+            calendar.add(Calendar.DATE, 1);
+
+            current = calendar.getTime();
+        }
+
+        return dates;
+    }
+}
diff --git a/core-java-9/src/test/java/com/baeldung/java9/rangedates/RangeDatesIterationUnitTest.java b/core-java-9/src/test/java/com/baeldung/java9/rangedates/RangeDatesIterationUnitTest.java
new file mode 100644
index 0000000000..4f5cd17d98
--- /dev/null
+++ b/core-java-9/src/test/java/com/baeldung/java9/rangedates/RangeDatesIterationUnitTest.java
@@ -0,0 +1,48 @@
+package com.baeldung.java9.rangedates;
+
+import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
+import java.util.Calendar;
+import java.util.Date;
+
+import org.junit.Test;
+
+public class RangeDatesIterationUnitTest {
+
+    @Test
+    public void givenIterateBetweenDatesJava9_WhenStartDateAsTodayAndEndDateAs10DaysAhead() {
+        LocalDate start = LocalDate.now();
+        LocalDate end = start.plus(10L, ChronoUnit.DAYS);
+
+        RangeDatesIteration iteration = new RangeDatesIteration();
+
+        iteration.iterateBetweenDatesJava9(start, end);
+    }
+
+    @Test
+    public void givenIterateBetweenDatesJava8_WhenStartDateAsTodayAndEndDateAs10DaysAhead() {
+        LocalDate start = LocalDate.now();
+        LocalDate end = start.plus(10L, ChronoUnit.DAYS);
+
+        RangeDatesIteration iteration = new RangeDatesIteration();
+
+        iteration.iterateBetweenDatesJava8(start, end);
+    }
+
+    @Test
+    public void givenIterateBetweenDatesJava7_WhenStartDateAsTodayAndEndDateAs10DaysAhead() {
+        Calendar today = Calendar.getInstance();
+        Calendar calendar = Calendar.getInstance();
+        calendar.clear();
+        calendar.set(today.get(Calendar.YEAR), today.get(Calendar.MONTH), today.get(Calendar.DATE));
+        Date start = calendar.getTime();
+
+        calendar.add(Calendar.DATE, 10);
+        Date end = calendar.getTime();
+
+        RangeDatesIteration iteration = new RangeDatesIteration();
+
+        iteration.iterateBetweenDatesJava7(start, end);
+    }
+
+}
diff --git a/core-java-collections/README.md b/core-java-collections/README.md
index 8f5dd137ed..99d03cad26 100644
--- a/core-java-collections/README.md
+++ b/core-java-collections/README.md
@@ -36,3 +36,4 @@
 - [Remove the First Element from a List](http://www.baeldung.com/java-remove-first-element-from-list)
 - [How to Convert List to Map in Java](http://www.baeldung.com/java-list-to-map)
 - [Initializing HashSet at the Time of Construction](http://www.baeldung.com/java-initialize-hashset)
+- [Removing the First Element of an Array](https://www.baeldung.com/java-array-remove-first-element)
diff --git a/core-java-collections/pom.xml b/core-java-collections/pom.xml
index 1290419a6a..92e4278593 100644
--- a/core-java-collections/pom.xml
+++ b/core-java-collections/pom.xml
@@ -53,15 +53,27 @@
             <version>${junit.platform.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${openjdk.jmh.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>${openjdk.jmh.version}</version>
+        </dependency>
     </dependencies>
 
+
     <properties>
+        <openjdk.jmh.version>1.19</openjdk.jmh.version>
         <junit.platform.version>1.2.0</junit.platform.version>
         <commons-lang3.version>3.5</commons-lang3.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <collections-generic.version>4.01</collections-generic.version>
         <avaitility.version>1.7.0</avaitility.version>
         <assertj.version>3.6.1</assertj.version>
-        <eclipse.collections.version>9.2.0</eclipse.collections.version>
+        <eclipse.collections.version>7.1.0</eclipse.collections.version>
     </properties>
 </project>
diff --git a/core-java-collections/src/main/java/com/baeldung/performance/CollectionsBenchmark.java b/core-java-collections/src/main/java/com/baeldung/performance/CollectionsBenchmark.java
new file mode 100644
index 0000000000..921e1608ea
--- /dev/null
+++ b/core-java-collections/src/main/java/com/baeldung/performance/CollectionsBenchmark.java
@@ -0,0 +1,59 @@
+package com.baeldung.performance;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Warmup(iterations = 5)
+public class CollectionsBenchmark {
+
+    @State(Scope.Thread)
+    public static class MyState {
+        private Set<Employee> employeeSet = new HashSet<>();
+        private List<Employee> employeeList = new ArrayList<>();
+
+        private long iterations = 10000;
+
+        private Employee employee = new Employee(100L, "Harry");
+
+        @Setup(Level.Trial)
+        public void setUp() {
+
+            for (long i = 0; i < iterations; i++) {
+                employeeSet.add(new Employee(i, "John"));
+                employeeList.add(new Employee(i, "John"));
+            }
+
+            employeeList.add(employee);
+            employeeSet.add(employee);
+        }
+    }
+
+    @Benchmark
+    public boolean testArrayList(MyState state) {
+        return state.employeeList.contains(state.employee);
+    }
+
+    @Benchmark
+    public boolean testHashSet(MyState state) {
+        return state.employeeSet.contains(state.employee);
+    }
+
+    public static void main(String[] args) throws Exception {
+        Options options = new OptionsBuilder()
+                .include(CollectionsBenchmark.class.getSimpleName()).threads(1)
+                .forks(1).shouldFailOnError(true)
+                .shouldDoGC(true)
+                .jvmArgs("-server").build();
+        new Runner(options).run();
+    }
+}
diff --git a/core-java-collections/src/main/java/com/baeldung/performance/Employee.java b/core-java-collections/src/main/java/com/baeldung/performance/Employee.java
new file mode 100644
index 0000000000..daa68ae2f1
--- /dev/null
+++ b/core-java-collections/src/main/java/com/baeldung/performance/Employee.java
@@ -0,0 +1,31 @@
+package com.baeldung.performance;
+
+public class Employee {
+
+    private Long id;
+    private String name;
+
+    public Employee(Long id, String name) {
+        this.name = name;
+        this.id = id;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Employee employee = (Employee) o;
+
+        if (!id.equals(employee.id)) return false;
+        return name.equals(employee.name);
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id.hashCode();
+        result = 31 * result + name.hashCode();
+        return result;
+    }
+}
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-collections/src/test/java/com/baeldung/collection/StreamOperateAndRemoveUnitTest.java b/core-java-collections/src/test/java/com/baeldung/collection/StreamOperateAndRemoveUnitTest.java
new file mode 100644
index 0000000000..202fe00017
--- /dev/null
+++ b/core-java-collections/src/test/java/com/baeldung/collection/StreamOperateAndRemoveUnitTest.java
@@ -0,0 +1,78 @@
+package com.baeldung.collection;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class StreamOperateAndRemoveUnitTest {
+
+    private List<Item> itemList;
+
+    @Before
+    public void setup() {
+
+        itemList = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            itemList.add(new Item(i));
+        }
+    }
+
+    @Test
+    public void givenAListOf10Items_whenFilteredForQualifiedItems_thenFilteredListContains5Items() {
+
+        final List<Item> filteredList = itemList.stream().filter(item -> item.isQualified())
+            .collect(Collectors.toList());
+
+        Assert.assertEquals(5, filteredList.size());
+    }
+
+    @Test
+    public void givenAListOf10Items_whenOperateAndRemoveQualifiedItemsUsingRemoveIf_thenListContains5Items() {
+
+        itemList.stream().filter(item -> item.isQualified()).forEach(item -> item.operate());
+        itemList.removeIf(item -> item.isQualified());
+
+        Assert.assertEquals(5, itemList.size());
+    }
+
+    @Test
+    public void givenAListOf10Items_whenOperateAndRemoveQualifiedItemsUsingRemoveAll_thenListContains5Items() {
+
+        final List<Item> operatedList = new ArrayList<>();
+        itemList.stream().filter(item -> item.isQualified()).forEach(item -> {
+            item.operate();
+            operatedList.add(item);
+        });
+        itemList.removeAll(operatedList);
+
+        Assert.assertEquals(5, itemList.size());
+    }
+
+    class Item {
+
+        private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+        private final int value;
+
+        public Item(final int value) {
+
+            this.value = value;
+        }
+
+        public boolean isQualified() {
+
+            return value % 2 == 0;
+        }
+
+        public void operate() {
+
+            logger.info("Even Number: " + this.value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/core-java-collections/src/test/java/com/baeldung/list/removefirst/RemoveFirstElementUnitTest.java b/core-java-collections/src/test/java/com/baeldung/list/removefirst/RemoveFirstElementUnitTest.java
index 09f0bb248c..f2b1bd9d88 100644
--- a/core-java-collections/src/test/java/com/baeldung/list/removefirst/RemoveFirstElementUnitTest.java
+++ b/core-java-collections/src/test/java/com/baeldung/list/removefirst/RemoveFirstElementUnitTest.java
@@ -4,6 +4,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -48,4 +49,14 @@ public class RemoveFirstElementUnitTest {
         assertThat(linkedList, not(contains("cat")));
     }
 
+    @Test
+    public void givenStringArray_whenRemovingFirstElement_thenArrayIsSmallerAndElementRemoved() {
+        String[] stringArray = {"foo", "bar", "baz"};
+
+        String[] modifiedArray = Arrays.copyOfRange(stringArray, 1, stringArray.length);
+
+        assertThat(modifiedArray.length, is(2));
+        assertThat(modifiedArray[0], is("bar"));
+    }
+
 }
diff --git a/core-java-collections/src/test/java/org/baeldung/java/collections/CollectionsEmpty.java b/core-java-collections/src/test/java/org/baeldung/java/collections/CollectionsEmpty.java
new file mode 100644
index 0000000000..09ecebe47b
--- /dev/null
+++ b/core-java-collections/src/test/java/org/baeldung/java/collections/CollectionsEmpty.java
@@ -0,0 +1,26 @@
+package org.baeldung.java.collections;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Test;
+
+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");
+    }
+
+}
diff --git a/core-java-concurrency-collections/.gitignore b/core-java-concurrency-collections/.gitignore
new file mode 100644
index 0000000000..3de4cc647e
--- /dev/null
+++ b/core-java-concurrency-collections/.gitignore
@@ -0,0 +1,26 @@
+*.class
+
+0.*
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+.resourceCache
+
+# Packaged files #
+*.jar
+*.war
+*.ear
+
+# Files generated by integration tests
+*.txt
+backup-pom.xml
+/bin/
+/temp
+
+#IntelliJ specific
+.idea/
+*.iml
\ No newline at end of file
diff --git a/core-java-concurrency-collections/README.md b/core-java-concurrency-collections/README.md
new file mode 100644
index 0000000000..b982a91861
--- /dev/null
+++ b/core-java-concurrency-collections/README.md
@@ -0,0 +1,15 @@
+=========
+
+## Core Java Concurrency Collections Examples
+
+### Relevant Articles: 
+- [Guide to java.util.concurrent.BlockingQueue](http://www.baeldung.com/java-blocking-queue)
+- [A Guide to ConcurrentMap](http://www.baeldung.com/java-concurrent-map)
+- [Guide to PriorityBlockingQueue in Java](http://www.baeldung.com/java-priority-blocking-queue)
+- [Avoiding the ConcurrentModificationException in Java](http://www.baeldung.com/java-concurrentmodificationexception)
+- [Custom Thread Pools In Java 8 Parallel Streams](http://www.baeldung.com/java-8-parallel-streams-custom-threadpool)
+- [Guide to DelayQueue](http://www.baeldung.com/java-delay-queue)
+- [A Guide to Java SynchronousQueue](http://www.baeldung.com/java-synchronous-queue)
+- [Guide to the Java TransferQueue](http://www.baeldung.com/java-transfer-queue)
+- [Guide to the ConcurrentSkipListMap](http://www.baeldung.com/java-concurrent-skip-list-map)
+- [Guide to CopyOnWriteArrayList](http://www.baeldung.com/java-copy-on-write-arraylist)
diff --git a/core-java-concurrency-collections/pom.xml b/core-java-concurrency-collections/pom.xml
new file mode 100644
index 0000000000..5e0a80d33c
--- /dev/null
+++ b/core-java-concurrency-collections/pom.xml
@@ -0,0 +1,94 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>core-java-concurrency-collections</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>core-java-concurrency-collections</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>${commons-collections4.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math3</artifactId>
+            <version>${commons-math3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${avaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-concurrency-collections</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/libs</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
+        </plugins>
+    </build>
+
+    <properties>
+        <!-- util -->
+        <guava.version>21.0</guava.version>
+        <commons-lang3.version>3.5</commons-lang3.version>
+        <commons-math3.version>3.6.1</commons-math3.version>
+        <commons-collections4.version>4.1</commons-collections4.version>
+        <collections-generic.version>4.01</collections-generic.version>
+        <!-- testing -->
+        <assertj.version>3.6.1</assertj.version>
+        <avaitility.version>1.7.0</avaitility.version>
+    </properties>
+
+</project>
diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/blockingqueue/BlockingQueueUsage.java b/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/BlockingQueueUsage.java
similarity index 79%
rename from core-java-concurrency/src/main/java/com/baeldung/concurrent/blockingqueue/BlockingQueueUsage.java
rename to core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/BlockingQueueUsage.java
index 052136bfe4..842d4e630e 100644
--- a/core-java-concurrency/src/main/java/com/baeldung/concurrent/blockingqueue/BlockingQueueUsage.java
+++ b/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/BlockingQueueUsage.java
@@ -10,15 +10,18 @@ public class BlockingQueueUsage {
         int N_CONSUMERS = Runtime.getRuntime().availableProcessors();
         int poisonPill = Integer.MAX_VALUE;
         int poisonPillPerProducer = N_CONSUMERS / N_PRODUCERS;
-
+        int mod = N_CONSUMERS % N_PRODUCERS;
         BlockingQueue<Integer> queue = new LinkedBlockingQueue<>(BOUND);
 
-        for (int i = 0; i < N_PRODUCERS; i++) {
+        for (int i = 1; i < N_PRODUCERS; i++) {
             new Thread(new NumbersProducer(queue, poisonPill, poisonPillPerProducer)).start();
         }
 
         for (int j = 0; j < N_CONSUMERS; j++) {
             new Thread(new NumbersConsumer(queue, poisonPill)).start();
         }
+        
+        new Thread(new NumbersProducer(queue, poisonPill, poisonPillPerProducer+mod)).start();
+
     }
 }
\ No newline at end of file
diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersConsumer.java b/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersConsumer.java
similarity index 100%
rename from core-java-concurrency/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersConsumer.java
rename to core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersConsumer.java
diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersProducer.java b/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersProducer.java
similarity index 100%
rename from core-java-concurrency/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersProducer.java
rename to core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/blockingqueue/NumbersProducer.java
diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/delayqueue/DelayObject.java b/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayObject.java
similarity index 100%
rename from core-java-concurrency/src/main/java/com/baeldung/concurrent/delayqueue/DelayObject.java
rename to core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayObject.java
diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueConsumer.java b/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueConsumer.java
similarity index 100%
rename from core-java-concurrency/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueConsumer.java
rename to core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueConsumer.java
diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueProducer.java b/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueProducer.java
similarity index 100%
rename from core-java-concurrency/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueProducer.java
rename to core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueProducer.java
diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/skiplist/Event.java b/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/skiplist/Event.java
similarity index 100%
rename from core-java-concurrency/src/main/java/com/baeldung/concurrent/skiplist/Event.java
rename to core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/skiplist/Event.java
diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/skiplist/EventWindowSort.java b/core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/skiplist/EventWindowSort.java
similarity index 100%
rename from core-java-concurrency/src/main/java/com/baeldung/concurrent/skiplist/EventWindowSort.java
rename to core-java-concurrency-collections/src/main/java/com/baeldung/concurrent/skiplist/EventWindowSort.java
diff --git a/core-java-concurrency/src/main/java/com/baeldung/transferqueue/Consumer.java b/core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Consumer.java
similarity index 100%
rename from core-java-concurrency/src/main/java/com/baeldung/transferqueue/Consumer.java
rename to core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Consumer.java
diff --git a/core-java-concurrency/src/main/java/com/baeldung/transferqueue/Producer.java b/core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Producer.java
similarity index 100%
rename from core-java-concurrency/src/main/java/com/baeldung/transferqueue/Producer.java
rename to core-java-concurrency-collections/src/main/java/com/baeldung/transferqueue/Producer.java
diff --git a/core-java-concurrency-collections/src/main/resources/logback.xml b/core-java-concurrency-collections/src/main/resources/logback.xml
new file mode 100644
index 0000000000..ec0dc2469a
--- /dev/null
+++ b/core-java-concurrency-collections/src/main/resources/logback.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>web - %date [%thread] %-5level %logger{36} - %message%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.springframework" level="WARN" />
+    <logger name="org.springframework.transaction" level="WARN" />
+
+    <!-- in order to debug some marshalling issues, this needs to be TRACE -->
+    <logger name="org.springframework.web.servlet.mvc" level="WARN" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListUnitTest.java b/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListUnitTest.java
similarity index 100%
rename from core-java-concurrency/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListUnitTest.java
rename to core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListUnitTest.java
diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/delayqueue/DelayQueueIntegrationTest.java b/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/delayqueue/DelayQueueIntegrationTest.java
similarity index 100%
rename from core-java-concurrency/src/test/java/com/baeldung/concurrent/delayqueue/DelayQueueIntegrationTest.java
rename to core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/delayqueue/DelayQueueIntegrationTest.java
diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/priorityblockingqueue/PriorityBlockingQueueIntegrationTest.java b/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/priorityblockingqueue/PriorityBlockingQueueIntegrationTest.java
similarity index 100%
rename from core-java-concurrency/src/test/java/com/baeldung/concurrent/priorityblockingqueue/PriorityBlockingQueueIntegrationTest.java
rename to core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/priorityblockingqueue/PriorityBlockingQueueIntegrationTest.java
diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/skiplist/ConcurrentSkipListSetIntegrationTest.java b/core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/skiplist/ConcurrentSkipListSetIntegrationTest.java
similarity index 100%
rename from core-java-concurrency/src/test/java/com/baeldung/concurrent/skiplist/ConcurrentSkipListSetIntegrationTest.java
rename to core-java-concurrency-collections/src/test/java/com/baeldung/concurrent/skiplist/ConcurrentSkipListSetIntegrationTest.java
diff --git a/core-java-concurrency/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapAggregateStatusManualTest.java b/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapAggregateStatusManualTest.java
similarity index 100%
rename from core-java-concurrency/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapAggregateStatusManualTest.java
rename to core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapAggregateStatusManualTest.java
diff --git a/core-java-concurrency/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapNullKeyValueManualTest.java b/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapNullKeyValueManualTest.java
similarity index 100%
rename from core-java-concurrency/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapNullKeyValueManualTest.java
rename to core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapNullKeyValueManualTest.java
diff --git a/core-java-concurrency/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapPerformanceManualTest.java b/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapPerformanceManualTest.java
similarity index 100%
rename from core-java-concurrency/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapPerformanceManualTest.java
rename to core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentMapPerformanceManualTest.java
diff --git a/core-java-concurrency/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTest.java b/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTest.java
similarity index 100%
rename from core-java-concurrency/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTest.java
rename to core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTest.java
diff --git a/core-java-concurrency/src/test/java/com/baeldung/java/concurrentmap/ConcurretMapMemoryConsistencyManualTest.java b/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurretMapMemoryConsistencyManualTest.java
similarity index 100%
rename from core-java-concurrency/src/test/java/com/baeldung/java/concurrentmap/ConcurretMapMemoryConsistencyManualTest.java
rename to core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmap/ConcurretMapMemoryConsistencyManualTest.java
diff --git a/core-java-concurrency/src/test/java/com/baeldung/java/concurrentmodification/ConcurrentModificationUnitTest.java b/core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmodification/ConcurrentModificationUnitTest.java
similarity index 100%
rename from core-java-concurrency/src/test/java/com/baeldung/java/concurrentmodification/ConcurrentModificationUnitTest.java
rename to core-java-concurrency-collections/src/test/java/com/baeldung/java/concurrentmodification/ConcurrentModificationUnitTest.java
diff --git a/core-java-concurrency/src/test/java/com/baeldung/synchronousqueue/SynchronousQueueIntegrationTest.java b/core-java-concurrency-collections/src/test/java/com/baeldung/synchronousqueue/SynchronousQueueIntegrationTest.java
similarity index 100%
rename from core-java-concurrency/src/test/java/com/baeldung/synchronousqueue/SynchronousQueueIntegrationTest.java
rename to core-java-concurrency-collections/src/test/java/com/baeldung/synchronousqueue/SynchronousQueueIntegrationTest.java
diff --git a/core-java-concurrency/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java b/core-java-concurrency-collections/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java
similarity index 100%
rename from core-java-concurrency/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java
rename to core-java-concurrency-collections/src/test/java/com/baeldung/transferqueue/TransferQueueIntegrationTest.java
diff --git a/core-java-concurrency/src/test/java/org/baeldung/java/streams/ThreadPoolInParallelStreamIntegrationTest.java b/core-java-concurrency-collections/src/test/java/org/baeldung/java/streams/ThreadPoolInParallelStreamIntegrationTest.java
similarity index 100%
rename from core-java-concurrency/src/test/java/org/baeldung/java/streams/ThreadPoolInParallelStreamIntegrationTest.java
rename to core-java-concurrency-collections/src/test/java/org/baeldung/java/streams/ThreadPoolInParallelStreamIntegrationTest.java
diff --git a/core-java-concurrency-collections/src/test/resources/.gitignore b/core-java-concurrency-collections/src/test/resources/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/core-java-concurrency-collections/src/test/resources/.gitignore
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file
diff --git a/core-java-concurrency/README.md b/core-java-concurrency/README.md
index a16d885b0c..d775d24dff 100644
--- a/core-java-concurrency/README.md
+++ b/core-java-concurrency/README.md
@@ -7,22 +7,12 @@
 - [A Guide to the Java ExecutorService](http://www.baeldung.com/java-executor-service-tutorial)
 - [Introduction to Thread Pools in Java](http://www.baeldung.com/thread-pool-java-and-guava)
 - [Guide to java.util.concurrent.Future](http://www.baeldung.com/java-future)
-- [Guide to java.util.concurrent.BlockingQueue](http://www.baeldung.com/java-blocking-queue)
 - [Guide to CountDownLatch in Java](http://www.baeldung.com/java-countdown-latch)
-- [A Guide to ConcurrentMap](http://www.baeldung.com/java-concurrent-map)
-- [Guide to PriorityBlockingQueue in Java](http://www.baeldung.com/java-priority-blocking-queue)
-- [Avoiding the ConcurrentModificationException in Java](http://www.baeldung.com/java-concurrentmodificationexception)
-- [Custom Thread Pools In Java 8 Parallel Streams](http://www.baeldung.com/java-8-parallel-streams-custom-threadpool)
 - [Guide to java.util.concurrent.Locks](http://www.baeldung.com/java-concurrent-locks)
 - [An Introduction to ThreadLocal in Java](http://www.baeldung.com/java-threadlocal)
-- [Guide to DelayQueue](http://www.baeldung.com/java-delay-queue)
-- [A Guide to Java SynchronousQueue](http://www.baeldung.com/java-synchronous-queue)
-- [Guide to the Java TransferQueue](http://www.baeldung.com/java-transfer-queue)
-- [Guide to the ConcurrentSkipListMap](http://www.baeldung.com/java-concurrent-skip-list-map)
 - [Difference Between Wait and Sleep in Java](http://www.baeldung.com/java-wait-and-sleep)
 - [LongAdder and LongAccumulator in Java](http://www.baeldung.com/java-longadder-and-longaccumulator)
 - [The Dining Philosophers Problem in Java](http://www.baeldung.com/java-dining-philoshophers)
-- [Guide to CopyOnWriteArrayList](http://www.baeldung.com/java-copy-on-write-arraylist)
 - [Guide to the Java Phaser](http://www.baeldung.com/java-phaser)
 - [Guide to Synchronized Keyword in Java](http://www.baeldung.com/java-synchronized)
 - [An Introduction to Atomic Variables in Java](http://www.baeldung.com/java-atomic-variables)
diff --git a/core-java-io/pom.xml b/core-java-io/pom.xml
index 35bc43921c..bc71fb8838 100644
--- a/core-java-io/pom.xml
+++ b/core-java-io/pom.xml
@@ -183,6 +183,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -316,6 +317,7 @@
         <esapi.version>2.1.0.1</esapi.version>
         <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
         <async-http-client.version>2.4.5</async-http-client.version>
+        <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-io/src/main/java/com/baeldung/fileparser/BufferedReaderExample.java b/core-java-io/src/main/java/com/baeldung/fileparser/BufferedReaderExample.java
new file mode 100644
index 0000000000..45ff486a79
--- /dev/null
+++ b/core-java-io/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-io/src/main/java/com/baeldung/fileparser/FileReaderExample.java b/core-java-io/src/main/java/com/baeldung/fileparser/FileReaderExample.java
new file mode 100644
index 0000000000..f9dd2a9ec5
--- /dev/null
+++ b/core-java-io/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-io/src/main/java/com/baeldung/fileparser/FilesReadLinesExample.java b/core-java-io/src/main/java/com/baeldung/fileparser/FilesReadLinesExample.java
new file mode 100644
index 0000000000..8e74f7d386
--- /dev/null
+++ b/core-java-io/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-io/src/main/java/com/baeldung/fileparser/ScannerIntExample.java b/core-java-io/src/main/java/com/baeldung/fileparser/ScannerIntExample.java
new file mode 100644
index 0000000000..25d17af4ea
--- /dev/null
+++ b/core-java-io/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-io/src/main/java/com/baeldung/fileparser/ScannerStringExample.java b/core-java-io/src/main/java/com/baeldung/fileparser/ScannerStringExample.java
new file mode 100644
index 0000000000..ec213c9490
--- /dev/null
+++ b/core-java-io/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-io/src/test/java/com/baeldung/file/FilenameFilterManualTest.java b/core-java-io/src/test/java/com/baeldung/file/FilenameFilterManualTest.java
index 47a7973b34..f9a2ce972d 100644
--- a/core-java-io/src/test/java/com/baeldung/file/FilenameFilterManualTest.java
+++ b/core-java-io/src/test/java/com/baeldung/file/FilenameFilterManualTest.java
@@ -18,7 +18,7 @@ public class FilenameFilterManualTest {
     @BeforeClass
     public static void setupClass() {
         directory = new File(FilenameFilterManualTest.class.getClassLoader()
-            .getResource("testFolder")
+            .getResource("fileNameFilterManualTestFolder")
             .getFile());
     }
 
diff --git a/core-java-io/src/test/java/com/baeldung/fileparser/BufferedReaderUnitTest.java b/core-java-io/src/test/java/com/baeldung/fileparser/BufferedReaderUnitTest.java
new file mode 100644
index 0000000000..78f900d796
--- /dev/null
+++ b/core-java-io/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-io/src/test/java/com/baeldung/fileparser/FileReaderUnitTest.java b/core-java-io/src/test/java/com/baeldung/fileparser/FileReaderUnitTest.java
new file mode 100644
index 0000000000..a38e58d348
--- /dev/null
+++ b/core-java-io/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-io/src/test/java/com/baeldung/fileparser/FilesReadAllLinesUnitTest.java b/core-java-io/src/test/java/com/baeldung/fileparser/FilesReadAllLinesUnitTest.java
new file mode 100644
index 0000000000..c0b742fd47
--- /dev/null
+++ b/core-java-io/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-io/src/test/java/com/baeldung/fileparser/ScannerIntUnitTest.java b/core-java-io/src/test/java/com/baeldung/fileparser/ScannerIntUnitTest.java
new file mode 100644
index 0000000000..0a398ba7c6
--- /dev/null
+++ b/core-java-io/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-io/src/test/java/com/baeldung/fileparser/ScannerStringUnitTest.java b/core-java-io/src/test/java/com/baeldung/fileparser/ScannerStringUnitTest.java
new file mode 100644
index 0000000000..8f9b0a56c0
--- /dev/null
+++ b/core-java-io/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-io/src/test/resources/testFolder/people.json b/core-java-io/src/test/resources/fileNameFilterManualTestFolder/people.json
similarity index 100%
rename from core-java-io/src/test/resources/testFolder/people.json
rename to core-java-io/src/test/resources/fileNameFilterManualTestFolder/people.json
diff --git a/core-java-io/src/test/resources/testFolder/students.json b/core-java-io/src/test/resources/fileNameFilterManualTestFolder/students.json
similarity index 100%
rename from core-java-io/src/test/resources/testFolder/students.json
rename to core-java-io/src/test/resources/fileNameFilterManualTestFolder/students.json
diff --git a/core-java-io/src/test/resources/testFolder/teachers.xml b/core-java-io/src/test/resources/fileNameFilterManualTestFolder/teachers.xml
similarity index 100%
rename from core-java-io/src/test/resources/testFolder/teachers.xml
rename to core-java-io/src/test/resources/fileNameFilterManualTestFolder/teachers.xml
diff --git a/core-java-io/src/test/resources/testFolder/workers.xml b/core-java-io/src/test/resources/fileNameFilterManualTestFolder/workers.xml
similarity index 100%
rename from core-java-io/src/test/resources/testFolder/workers.xml
rename to core-java-io/src/test/resources/fileNameFilterManualTestFolder/workers.xml
diff --git a/core-java-io/src/test/resources/sampleNumberFile.txt b/core-java-io/src/test/resources/sampleNumberFile.txt
new file mode 100644
index 0000000000..7787faa3c1
--- /dev/null
+++ b/core-java-io/src/test/resources/sampleNumberFile.txt
@@ -0,0 +1,2 @@
+111
+222
\ No newline at end of file
diff --git a/core-java-io/src/test/resources/sampleTextFile.txt b/core-java-io/src/test/resources/sampleTextFile.txt
new file mode 100644
index 0000000000..75cb50aafa
--- /dev/null
+++ b/core-java-io/src/test/resources/sampleTextFile.txt
@@ -0,0 +1,2 @@
+Hello 
+World
\ No newline at end of file
diff --git a/core-java-persistence/README.md b/core-java-persistence/README.md
new file mode 100644
index 0000000000..08afcadb72
--- /dev/null
+++ b/core-java-persistence/README.md
@@ -0,0 +1,8 @@
+=========
+
+## Core Java Persistence Examples
+
+### Relevant Articles: 
+- [Introduction to JDBC](http://www.baeldung.com/java-jdbc)
+- [Batch Processing in JDBC](http://www.baeldung.com/jdbc-batch-processing)
+- [Introduction to the JDBC RowSet Interface in Java](http://www.baeldung.com/java-jdbc-rowset)
\ No newline at end of file
diff --git a/core-java-persistence/pom.xml b/core-java-persistence/pom.xml
index 0cb142c7b8..7279fd763b 100644
--- a/core-java-persistence/pom.xml
+++ b/core-java-persistence/pom.xml
@@ -39,6 +39,16 @@
             <artifactId>c3p0</artifactId>
             <version>${c3p0.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${springframework.spring-web.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <version>${springframework.boot.spring-boot-starter.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <finalName>core-java-persistence</finalName>
@@ -55,5 +65,7 @@
         <commons-dbcp2.version>2.4.0</commons-dbcp2.version>
         <HikariCP.version>3.2.0</HikariCP.version>
         <c3p0.version>0.9.5.2</c3p0.version>
+        <springframework.boot.spring-boot-starter.version>1.5.8.RELEASE</springframework.boot.spring-boot-starter.version>
+        <springframework.spring-web.version>4.3.4.RELEASE</springframework.spring-web.version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/jdbc/BatchProcessing.java b/core-java-persistence/src/main/java/com/baeldung/jdbc/BatchProcessing.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/jdbc/BatchProcessing.java
rename to core-java-persistence/src/main/java/com/baeldung/jdbc/BatchProcessing.java
diff --git a/core-java/src/main/java/com/baeldung/jdbc/Employee.java b/core-java-persistence/src/main/java/com/baeldung/jdbc/Employee.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/jdbc/Employee.java
rename to core-java-persistence/src/main/java/com/baeldung/jdbc/Employee.java
diff --git a/core-java/src/main/java/com/baeldung/jdbcrowset/DatabaseConfiguration.java b/core-java-persistence/src/main/java/com/baeldung/jdbcrowset/DatabaseConfiguration.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/jdbcrowset/DatabaseConfiguration.java
rename to core-java-persistence/src/main/java/com/baeldung/jdbcrowset/DatabaseConfiguration.java
diff --git a/core-java/src/main/java/com/baeldung/jdbcrowset/ExampleListener.java b/core-java-persistence/src/main/java/com/baeldung/jdbcrowset/ExampleListener.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/jdbcrowset/ExampleListener.java
rename to core-java-persistence/src/main/java/com/baeldung/jdbcrowset/ExampleListener.java
diff --git a/core-java/src/main/java/com/baeldung/jdbcrowset/FilterExample.java b/core-java-persistence/src/main/java/com/baeldung/jdbcrowset/FilterExample.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/jdbcrowset/FilterExample.java
rename to core-java-persistence/src/main/java/com/baeldung/jdbcrowset/FilterExample.java
diff --git a/core-java/src/main/java/com/baeldung/jdbcrowset/JdbcRowsetApplication.java b/core-java-persistence/src/main/java/com/baeldung/jdbcrowset/JdbcRowsetApplication.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/jdbcrowset/JdbcRowsetApplication.java
rename to core-java-persistence/src/main/java/com/baeldung/jdbcrowset/JdbcRowsetApplication.java
diff --git a/core-java/src/test/java/com/baeldung/jdbc/BatchProcessingLiveTest.java b/core-java-persistence/src/test/java/com/baeldung/jdbc/BatchProcessingLiveTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/jdbc/BatchProcessingLiveTest.java
rename to core-java-persistence/src/test/java/com/baeldung/jdbc/BatchProcessingLiveTest.java
diff --git a/core-java/src/test/java/com/baeldung/jdbc/JdbcLiveTest.java b/core-java-persistence/src/test/java/com/baeldung/jdbc/JdbcLiveTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/jdbc/JdbcLiveTest.java
rename to core-java-persistence/src/test/java/com/baeldung/jdbc/JdbcLiveTest.java
diff --git a/core-java/src/test/java/com/baeldung/jdbcrowset/JdbcRowSetLiveTest.java b/core-java-persistence/src/test/java/com/baeldung/jdbcrowset/JdbcRowSetLiveTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/jdbcrowset/JdbcRowSetLiveTest.java
rename to core-java-persistence/src/test/java/com/baeldung/jdbcrowset/JdbcRowSetLiveTest.java
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/README.md b/core-java/README.md
index f05b2625e8..b957060c3a 100644
--- a/core-java/README.md
+++ b/core-java/README.md
@@ -3,18 +3,14 @@
 ## Core Java Cookbooks and Examples
 
 ### Relevant Articles: 
-- [Java – Generate Random String](http://www.baeldung.com/java-random-string)
 - [Java Timer](http://www.baeldung.com/java-timer-and-timertask)
 - [How to Run a Shell Command in Java](http://www.baeldung.com/run-shell-command-in-java)
 - [MD5 Hashing in Java](http://www.baeldung.com/java-md5)
 - [Guide to Java Reflection](http://www.baeldung.com/java-reflection)
 - [A Guide to Java Sockets](http://www.baeldung.com/a-guide-to-java-sockets)
-- [Convert char to String in Java](http://www.baeldung.com/java-convert-char-to-string)
-- [Convert String to int or Integer in Java](http://www.baeldung.com/java-convert-string-to-int-or-integer)
 - [Java – Try with Resources](http://www.baeldung.com/java-try-with-resources)
 - [Guide to the Fork/Join Framework in Java](http://www.baeldung.com/java-fork-join)
 - [How to Print Screen in Java](http://www.baeldung.com/print-screen-in-java)
-- [How to Convert String to different data types in Java](http://www.baeldung.com/java-string-conversions)
 - [Introduction to Java Generics](http://www.baeldung.com/java-generics)
 - [Generate equals() and hashCode() with Eclipse](http://www.baeldung.com/java-eclipse-equals-and-hashcode)
 - [A Guide To Java Regular Expressions API](http://www.baeldung.com/regular-expressions-java)
@@ -37,8 +33,6 @@
 - [A Quick JUnit vs TestNG Comparison](http://www.baeldung.com/junit-vs-testng)
 - [Java Primitive Conversions](http://www.baeldung.com/java-primitive-conversions)
 - [Java Money and the Currency API](http://www.baeldung.com/java-money-and-currency)
-- [Converting Strings to Enums in Java](http://www.baeldung.com/java-string-to-enum)
-- [Quick Guide to the Java StringTokenizer](http://www.baeldung.com/java-stringtokenizer)
 - [JVM Log Forging](http://www.baeldung.com/jvm-log-forging)
 - [Guide to sun.misc.Unsafe](http://www.baeldung.com/java-unsafe)
 - [How to Perform a Simple HTTP Request in Java](http://www.baeldung.com/java-http-request)
@@ -53,36 +47,28 @@
 - [How to Get a Name of a Method Being Executed?](http://www.baeldung.com/java-name-of-executing-method)
 - [Dynamic Proxies in Java](http://www.baeldung.com/java-dynamic-proxies)
 - [How to Copy an Array in Java](http://www.baeldung.com/java-array-copy)
-- [Introduction to JDBC](http://www.baeldung.com/java-jdbc)
 - [Period and Duration in Java](http://www.baeldung.com/java-period-duration)
 - [Converting a Stack Trace to a String in Java](http://www.baeldung.com/java-stacktrace-to-string)
-- [Count Occurrences of a Char in a String](http://www.baeldung.com/java-count-chars)
 - [Java Double Brace Initialization](http://www.baeldung.com/java-double-brace-initialization)
 - [The StackOverflowError in Java](http://www.baeldung.com/java-stack-overflow-error)
-- [Split a String in Java](http://www.baeldung.com/java-split-string)
 - [Introduction to Java Serialization](http://www.baeldung.com/java-serialization)
-- [How to Remove the Last Character of a String?](http://www.baeldung.com/java-remove-last-character-of-string)
 - [ClassNotFoundException vs NoClassDefFoundError](http://www.baeldung.com/java-classnotfoundexception-and-noclassdeffounderror)
 - [Guide to UUID in Java](http://www.baeldung.com/java-uuid)
 - [Guide to Escaping Characters in Java RegExps](http://www.baeldung.com/java-regexp-escape-char)
 - [Guide to hashCode() in Java](http://www.baeldung.com/java-hashcode)
 - [Difference between URL and URI](http://www.baeldung.com/java-url-vs-uri)
 - [Broadcasting and Multicasting in Java](http://www.baeldung.com/java-broadcast-multicast)
-- [CharSequence vs. String in Java](http://www.baeldung.com/java-char-sequence-string)
 - [Period and Duration in Java](http://www.baeldung.com/java-period-duration)
 - [Guide to the Diamond Operator in Java](http://www.baeldung.com/java-diamond-operator)
 - [“Sneaky Throws” in Java](http://www.baeldung.com/java-sneaky-throws)
 - [OutOfMemoryError: GC Overhead Limit Exceeded](http://www.baeldung.com/java-gc-overhead-limit-exceeded)
-- [StringBuilder and StringBuffer in Java](http://www.baeldung.com/java-string-builder-string-buffer)
 - [Creating a Java Compiler Plugin](http://www.baeldung.com/java-build-compiler-plugin)
 - [A Guide to the Static Keyword in Java](http://www.baeldung.com/java-static)
 - [Initializing Arrays in Java](http://www.baeldung.com/java-initialize-array)
-- [Guide to Java String Pool](http://www.baeldung.com/java-string-pool)
 - [Quick Example - Comparator vs Comparable in Java](http://www.baeldung.com/java-comparator-comparable)
 - [Quick Guide to Java Stack](http://www.baeldung.com/java-stack)
 - [The Java continue and break Keywords](http://www.baeldung.com/java-continue-and-break)
 - [Guide to java.util.Formatter](http://www.baeldung.com/java-string-formatter)
-- [Batch Processing in JDBC](http://www.baeldung.com/jdbc-batch-processing)
 - [Check if a Java Array Contains a Value](http://www.baeldung.com/java-array-contains-value)
 - [How to Invert an Array in Java](http://www.baeldung.com/java-invert-array)
 - [Guide to the Cipher Class](http://www.baeldung.com/java-cipher-class)
@@ -90,7 +76,6 @@
 - [Implementing a Binary Tree in Java](http://www.baeldung.com/java-binary-tree)
 - [A Guide to ThreadLocalRandom in Java](http://www.baeldung.com/java-thread-local-random)
 - [RegEx for matching Date Pattern in Java](http://www.baeldung.com/java-date-regular-expressions)
-- [Introduction to the JDBC RowSet Interface in Java](http://www.baeldung.com/java-jdbc-rowset)
 - [Nested Classes in Java](http://www.baeldung.com/java-nested-classes)
 - [A Guide to Java Loops](http://www.baeldung.com/java-loops)
 - [Varargs in Java](http://www.baeldung.com/java-varargs)
@@ -105,15 +90,12 @@
 - [The Trie Data Structure in Java](http://www.baeldung.com/trie-java)
 - [Introduction to Javadoc](http://www.baeldung.com/javadoc)
 - [How to Make a Deep Copy of an Object in Java](http://www.baeldung.com/java-deep-copy)
-- [Check if a String is a Palindrome](http://www.baeldung.com/java-palindrome)
-- [Comparing Strings in Java](http://www.baeldung.com/java-compare-strings)
 - [Guide to Inheritance in Java](http://www.baeldung.com/java-inheritance)
 - [Guide to Externalizable Interface in Java](http://www.baeldung.com/java-externalizable)
 - [Object Type Casting in Java](http://www.baeldung.com/java-type-casting)
 - [A Practical Guide to DecimalFormat](http://www.baeldung.com/java-decimalformat)
 - [How to Detect the OS Using Java](http://www.baeldung.com/java-detect-os)
 - [ASCII Art in Java](http://www.baeldung.com/ascii-art-in-java)
-- [An Advanced Tagging Implementation with JPA](http://www.baeldung.com/jpa-tagging-advanced)
 - [Handling Daylight Savings Time in Java](http://www.baeldung.com/java-daylight-savings)
 - [Inheritance and Composition (Is-a vs Has-a relationship) in Java](http://www.baeldung.com/java-inheritance-composition)
 - [Finding Max/Min of a List or Collection](http://www.baeldung.com/java-collection-min-max)
@@ -139,11 +121,9 @@
 - [Infinite Loops in Java](http://www.baeldung.com/infinite-loops-java)
 - [Using Java Assertions](http://www.baeldung.com/java-assert)
 - [Pass-By-Value as a Parameter Passing Mechanism in Java](http://www.baeldung.com/java-pass-by-value-or-pass-by-reference)
-- [Check If a String Is Numeric in Java](http://www.baeldung.com/java-check-string-number)
 - [Variable and Method Hiding in Java](http://www.baeldung.com/java-variable-method-hiding)
 - [Access Modifiers in Java](http://www.baeldung.com/java-access-modifiers)
 - [Infinite Loops in Java](http://www.baeldung.com/infinite-loops-java)
-- [Why Use char[] Array Over a String for Storing Passwords in Java?](http://www.baeldung.com/java-storing-passwords)
 - [Introduction to Creational Design Patterns](http://www.baeldung.com/creational-design-patterns)
 - [Proxy, Decorator, Adapter and Bridge Patterns](http://www.baeldung.com/java-structural-design-patterns)
 - [Singletons in Java](http://www.baeldung.com/java-singleton)
@@ -157,7 +137,6 @@
 - [Importance of Main Manifest Attribute in a Self-Executing JAR](http://www.baeldung.com/java-jar-executable-manifest-main-class)
 - [Extracting Year, Month and Day from Date in Java](http://www.baeldung.com/java-year-month-day)
 - [Get Date Without Time in Java](http://www.baeldung.com/java-date-without-time)
-- [Convert a String to Title Case](http://www.baeldung.com/java-string-title-case)
 - [How to Get the File Extension of a File in Java](http://www.baeldung.com/java-file-extension)
 - [Immutable Objects in Java](http://www.baeldung.com/java-immutable-object)
 - [Console I/O in Java](http://www.baeldung.com/java-console-input-output)
@@ -171,3 +150,4 @@
 - [Guide to Java Instrumentation](http://www.baeldung.com/java-instrumentation)
 - [Getting a File’s Mime Type in Java](http://www.baeldung.com/java-file-mime-type)
 - [Common Java Exceptions](http://www.baeldung.com/java-common-exceptions)
+- [Java Constructors vs Static Factory Methods](https://www.baeldung.com/java-constructors-vs-static-factory-methods)
diff --git a/core-java/pom.xml b/core-java/pom.xml
index b83cb478d4..477a01375d 100644
--- a/core-java/pom.xml
+++ b/core-java/pom.xml
@@ -127,11 +127,6 @@
             <artifactId>spring-web</artifactId>
             <version>${springframework.spring-web.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <version>${springframework.boot.spring-boot-starter.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -142,11 +137,6 @@
             <artifactId>mail</artifactId>
             <version>${javax.mail.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.ibm.icu</groupId>
-            <artifactId>icu4j</artifactId>
-            <version>${icu4j.version}</version>
-        </dependency>
         <!-- Mime Type Resolution Libraries -->
         <dependency>
             <groupId>org.apache.tika</groupId>
@@ -530,9 +520,8 @@
         <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>
         
         <javamoney.moneta.version>1.1</javamoney.moneta.version>
         <h2database.version>1.4.197</h2database.version>
diff --git a/core-java/src/main/java/com/baeldung/binding/Animal.java b/core-java/src/main/java/com/baeldung/binding/Animal.java
new file mode 100644
index 0000000000..12eaa2a7a3
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/binding/Animal.java
@@ -0,0 +1,23 @@
+package com.baeldung.binding;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Created by madhumita.g on 25-07-2018.
+ */
+public class Animal {
+
+    final static Logger logger = LoggerFactory.getLogger(Animal.class);
+
+    public void makeNoise() {
+        logger.info("generic animal noise");
+    }
+
+    public void makeNoise(Integer repetitions) {
+        while(repetitions != 0) {
+            logger.info("generic animal noise countdown " + repetitions);
+            repetitions -= 1;
+        }
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/binding/AnimalActivity.java b/core-java/src/main/java/com/baeldung/binding/AnimalActivity.java
new file mode 100644
index 0000000000..1bd36123e3
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/binding/AnimalActivity.java
@@ -0,0 +1,43 @@
+package com.baeldung.binding;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Created by madhumita.g on 25-07-2018.
+ */
+public class AnimalActivity {
+
+    final static Logger logger = LoggerFactory.getLogger(AnimalActivity.class);
+
+
+    public static void sleep(Animal animal) {
+        logger.info("Animal is sleeping");
+    }
+
+    public static void sleep(Cat cat) {
+        logger.info("Cat is sleeping");
+    }
+
+    public static void main(String[] args) {
+
+        Animal animal = new Animal();
+
+        //calling methods of animal object
+        animal.makeNoise();
+
+        animal.makeNoise(3);
+
+
+        //assigning a dog object to reference of type Animal
+        Animal catAnimal = new Cat();
+
+        catAnimal.makeNoise();
+
+        // calling static function
+        AnimalActivity.sleep(catAnimal);
+
+        return;
+
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/binding/Cat.java b/core-java/src/main/java/com/baeldung/binding/Cat.java
new file mode 100644
index 0000000000..bbe740e412
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/binding/Cat.java
@@ -0,0 +1,18 @@
+package com.baeldung.binding;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Created by madhumita.g on 25-07-2018.
+ */
+public class Cat extends Animal {
+
+    final static Logger logger = LoggerFactory.getLogger(Cat.class);
+
+    public void makeNoise() {
+
+        logger.info("meow");
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/constructorsstaticfactorymethods/application/Application.java b/core-java/src/main/java/com/baeldung/constructorsstaticfactorymethods/application/Application.java
new file mode 100644
index 0000000000..d19772072f
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/constructorsstaticfactorymethods/application/Application.java
@@ -0,0 +1,12 @@
+package com.baeldung.constructorsstaticfactorymethods.application;
+
+import com.baeldung.constructorsstaticfactorymethods.entities.User;
+ 
+public class Application {
+
+    public static void main(String[] args) {
+        User user1 = User.createWithDefaultCountry("John", "john@domain.com");
+        User user2 = User.createWithLoggedInstantiationTime("John", "john@domain.com", "Argentina");
+        User user3 = User.getSingletonInstance("John", "john@domain.com", "Argentina");
+    }
+}
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/constructorsstaticfactorymethods/entities/User.java b/core-java/src/main/java/com/baeldung/constructorsstaticfactorymethods/entities/User.java
new file mode 100644
index 0000000000..4036b622c6
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/constructorsstaticfactorymethods/entities/User.java
@@ -0,0 +1,63 @@
+package com.baeldung.constructorsstaticfactorymethods.entities;
+
+import java.time.LocalTime;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
+
+public class User {
+
+    private static volatile User instance = null;
+    private static final Logger LOGGER = Logger.getLogger(User.class.getName());
+    private final String name;
+    private final String email;
+    private final String country;
+    
+    public static User createWithDefaultCountry(String name, String email) {
+        return new User(name, email, "Argentina");
+    }
+
+    public static User createWithLoggedInstantiationTime(String name, String email, String country) {
+        setLoggerProperties();
+        LOGGER.log(Level.INFO, "Creating User instance at : {0}", LocalTime.now());
+        return new User(name, email, country);
+    }
+
+    public static User getSingletonInstance(String name, String email, String country) {
+        if (instance == null) {
+            synchronized (User.class) {
+                if (instance == null) {
+                    instance = new User(name, email, country);
+                }
+            }
+        }
+        return instance;
+
+    }
+
+    private User(String name, String email, String country) {
+        this.name = name;
+        this.email = email;
+        this.country = country;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+    
+    private static void setLoggerProperties() {
+        ConsoleHandler handler = new ConsoleHandler();
+        handler.setLevel(Level.INFO);
+        handler.setFormatter(new SimpleFormatter());
+        LOGGER.addHandler(handler);
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/exceptionhandling/Exceptions.java b/core-java/src/main/java/com/baeldung/exceptionhandling/Exceptions.java
index eb8b733f82..9690648386 100644
--- a/core-java/src/main/java/com/baeldung/exceptionhandling/Exceptions.java
+++ b/core-java/src/main/java/com/baeldung/exceptionhandling/Exceptions.java
@@ -163,7 +163,7 @@ public class Exceptions {
         }
     }
 
-    public void throwAsGotoAntiPattern() {
+    public void throwAsGotoAntiPattern() throws MyException {
         try {
             // bunch of code
             throw new MyException();
diff --git a/core-java/src/main/java/com/baeldung/hashcode/entities/User.java b/core-java/src/main/java/com/baeldung/hashcode/entities/User.java
index c46c3de65a..524f176e6b 100644
--- a/core-java/src/main/java/com/baeldung/hashcode/entities/User.java
+++ b/core-java/src/main/java/com/baeldung/hashcode/entities/User.java
@@ -25,7 +25,7 @@ public class User {
         if (this.getClass() != o.getClass())
             return false;
         User user = (User) o;
-        return id != user.id && (!name.equals(user.name) && !email.equals(user.email));
+        return id == user.id && (name.equals(user.name) && email.equals(user.email));
     }
 
     @Override
@@ -38,4 +38,5 @@ public class User {
         return hash;
     }
     // getters and setters here
+    
 }
diff --git a/core-java/src/main/java/com/baeldung/keywords/finalize/FinalizeObject.java b/core-java/src/main/java/com/baeldung/keywords/finalize/FinalizeObject.java
new file mode 100644
index 0000000000..af0449c0da
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/keywords/finalize/FinalizeObject.java
@@ -0,0 +1,18 @@
+package com.baeldung.keywords.finalize;
+
+public class FinalizeObject {
+
+    @Override
+    protected void finalize() throws Throwable {
+        System.out.println("Execute finalize method");
+        super.finalize();
+    }
+
+    public static void main(String[] args) throws Exception {
+        FinalizeObject object = new FinalizeObject();
+        object = null;
+        System.gc();
+        Thread.sleep(1000);
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/keywords/finalkeyword/Child.java b/core-java/src/main/java/com/baeldung/keywords/finalkeyword/Child.java
new file mode 100644
index 0000000000..8615c78652
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/keywords/finalkeyword/Child.java
@@ -0,0 +1,15 @@
+package com.baeldung.keywords.finalkeyword;
+
+public final class Child extends Parent {
+
+    @Override
+    void method1(int arg1, final int arg2) {
+        // OK
+    }
+
+/*    @Override
+    void method2() {
+        // Compilation error
+    }*/
+
+}
diff --git a/core-java/src/main/java/com/baeldung/keywords/finalkeyword/GrandChild.java b/core-java/src/main/java/com/baeldung/keywords/finalkeyword/GrandChild.java
new file mode 100644
index 0000000000..1530c5037f
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/keywords/finalkeyword/GrandChild.java
@@ -0,0 +1,5 @@
+package com.baeldung.keywords.finalkeyword;
+
+/*public class GrandChild extends Child {
+    // Compilation error
+}*/
diff --git a/core-java/src/main/java/com/baeldung/keywords/finalkeyword/Parent.java b/core-java/src/main/java/com/baeldung/keywords/finalkeyword/Parent.java
new file mode 100644
index 0000000000..5cd2996e7a
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/keywords/finalkeyword/Parent.java
@@ -0,0 +1,23 @@
+package com.baeldung.keywords.finalkeyword;
+
+public class Parent {
+
+    int field1 = 1;
+    final int field2 = 2;
+
+    Parent() {
+        field1 = 2; // OK
+//        field2 = 3; // Compilation error
+    }
+
+    void method1(int arg1, final int arg2) {
+        arg1 = 2; // OK
+//        arg2 = 3; // Compilation error
+    }
+
+    final void method2() {
+        final int localVar = 2; // OK
+//        localVar = 3; // Compilation error
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/keywords/finallykeyword/FinallyExample.java b/core-java/src/main/java/com/baeldung/keywords/finallykeyword/FinallyExample.java
new file mode 100644
index 0000000000..3c0aee3196
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/keywords/finallykeyword/FinallyExample.java
@@ -0,0 +1,29 @@
+package com.baeldung.keywords.finallykeyword;
+
+public class FinallyExample {
+
+    public static void main(String args[]) throws Exception {
+        try {
+            System.out.println("Execute try block");
+            throw new Exception();
+        } catch (Exception e) {
+            System.out.println("Execute catch block");
+        } finally {
+            System.out.println("Execute finally block");
+        }
+
+        try {
+            System.out.println("Execute try block");
+        } finally {
+            System.out.println("Execute finally block");
+        }
+
+        try {
+            System.out.println("Execute try block");
+            throw new Exception();
+        } finally {
+            System.out.println("Execute finally block");
+        }
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/regexp/datepattern/optmization/OptimizedMatcher.java b/core-java/src/main/java/com/baeldung/regexp/datepattern/optmization/OptimizedMatcher.java
new file mode 100644
index 0000000000..ccae942dcc
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/regexp/datepattern/optmization/OptimizedMatcher.java
@@ -0,0 +1,6 @@
+package com.baeldung.regexp.datepattern.optmization;
+
+public class OptimizedMatcher {
+
+
+}
diff --git a/core-java/src/main/java/com/baeldung/throwsexception/Calculator.java b/core-java/src/main/java/com/baeldung/throwsexception/Calculator.java
new file mode 100644
index 0000000000..50dbc9c774
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/throwsexception/Calculator.java
@@ -0,0 +1,15 @@
+package com.baeldung.throwsexception;
+
+public class Calculator {
+
+    public double divide(double a, double b) {
+        if (b == 0) {
+            throw new DivideByZeroException("Divider cannot be equal to zero!");
+        }
+        return a/b;
+    }
+
+}
+
+
+
diff --git a/core-java/src/main/java/com/baeldung/throwsexception/DataAccessException.java b/core-java/src/main/java/com/baeldung/throwsexception/DataAccessException.java
new file mode 100644
index 0000000000..0b371dcedb
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/throwsexception/DataAccessException.java
@@ -0,0 +1,9 @@
+package com.baeldung.throwsexception;
+
+public class DataAccessException extends RuntimeException {
+
+    public DataAccessException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/throwsexception/DivideByZeroException.java b/core-java/src/main/java/com/baeldung/throwsexception/DivideByZeroException.java
new file mode 100644
index 0000000000..4413374c99
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/throwsexception/DivideByZeroException.java
@@ -0,0 +1,9 @@
+package com.baeldung.throwsexception;
+
+public class DivideByZeroException extends RuntimeException {
+
+    public DivideByZeroException(String message) {
+        super(message);
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/throwsexception/Main.java b/core-java/src/main/java/com/baeldung/throwsexception/Main.java
new file mode 100644
index 0000000000..17fbf5a582
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/throwsexception/Main.java
@@ -0,0 +1,41 @@
+package com.baeldung.throwsexception;
+
+import com.sun.mail.iap.ConnectionException;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.net.SocketException;
+
+public class Main {
+
+    public static void main(String[] args) throws FileNotFoundException {
+        TryCatch tryCatch = new TryCatch();
+
+        try {
+            tryCatch.execute();
+        } catch (ConnectionException | SocketException ex) {
+            System.out.println("IOException");
+        } catch (Exception ex) {
+            System.out.println("General exception");
+        }
+
+        checkedException();
+        checkedExceptionWithThrows();
+    }
+
+    private static void checkedExceptionWithThrows() throws FileNotFoundException {
+        File file = new File("not_existing_file.txt");
+        FileInputStream stream = new FileInputStream(file);
+    }
+
+    private static void checkedException() {
+        File file = new File("not_existing_file.txt");
+        try {
+            FileInputStream stream = new FileInputStream(file);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/throwsexception/PersonRepository.java b/core-java/src/main/java/com/baeldung/throwsexception/PersonRepository.java
new file mode 100644
index 0000000000..5fcbeb3d5f
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/throwsexception/PersonRepository.java
@@ -0,0 +1,18 @@
+package com.baeldung.throwsexception;
+
+import javax.annotation.Nullable;
+import java.sql.SQLException;
+import java.util.List;
+
+public class PersonRepository {
+
+    @Nullable
+    public String findNameById(String id) {
+        return id == null ? null : "example-name";
+    }
+
+    public List<String> findAll() throws SQLException {
+        throw new SQLException();
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/throwsexception/SimpleService.java b/core-java/src/main/java/com/baeldung/throwsexception/SimpleService.java
new file mode 100644
index 0000000000..6bb8b90bf1
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/throwsexception/SimpleService.java
@@ -0,0 +1,22 @@
+package com.baeldung.throwsexception;
+
+import java.sql.SQLException;
+
+public class SimpleService {
+
+    private PersonRepository personRepository = new PersonRepository();
+
+    public void wrappingException() {
+        try {
+            personRepository.findAll();
+        } catch (SQLException e) {
+            throw new DataAccessException("SQL Exception", e);
+        }
+    }
+
+    public void runtimeNullPointerException() {
+        String a = null;
+        a.length();
+    }
+
+}
diff --git a/core-java/src/main/java/com/baeldung/throwsexception/TryCatch.java b/core-java/src/main/java/com/baeldung/throwsexception/TryCatch.java
new file mode 100644
index 0000000000..2fd87f124d
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/throwsexception/TryCatch.java
@@ -0,0 +1,13 @@
+package com.baeldung.throwsexception;
+
+import com.sun.mail.iap.ConnectionException;
+
+import java.net.SocketException;
+
+public class TryCatch {
+
+    public void execute() throws SocketException, ConnectionException, Exception  {
+        //code that would throw any of: SocketException, ConnectionException, Exception
+    }
+
+}
diff --git a/core-java/src/test/java/com/baeldung/array/RemoveFirstElementUnitTest.java b/core-java/src/test/java/com/baeldung/array/RemoveFirstElementUnitTest.java
deleted file mode 100644
index 7d11016d7f..0000000000
--- a/core-java/src/test/java/com/baeldung/array/RemoveFirstElementUnitTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.baeldung.array;
-
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class RemoveFirstElementUnitTest {
-
-    @Test
-    public void givenStringArray_whenRemovingFirstElement_thenArrayIsSmallerAndElementRemoved() {
-        String[] stringArray = {"foo", "bar", "baz"};
-
-        String[] modifiedArray = Arrays.copyOfRange(stringArray, 1, stringArray.length);
-
-        assertThat(modifiedArray.length).isEqualTo(2);
-        assertThat(modifiedArray[0]).isEqualTo("bar");
-    }
-
-    @Test
-    public void givenArrayList_whenRemovingFirstElement_thenListSmallerAndElementRemoved() {
-        List<String> stringList = new ArrayList<>(Arrays.asList("foo", "bar", "baz"));
-        stringList.remove(0);
-
-        assertThat(stringList.size()).isEqualTo(2);
-        assertThat(stringList.get(0)).isEqualTo("bar");
-    }
-
-    @Test
-    public void givenLinkedList_whenRemovingFirstElement_thenListSmallerAndElementRemoved() {
-        List<String> stringList = new LinkedList<>(Arrays.asList("foo", "bar", "baz"));
-        stringList.remove(0);
-
-        assertThat(stringList.size()).isEqualTo(2);
-        assertThat(stringList.get(0)).isEqualTo("bar");
-    }
-
-}
diff --git a/core-java/src/test/java/com/baeldung/binding/AnimalActivityUnitTest.java b/core-java/src/test/java/com/baeldung/binding/AnimalActivityUnitTest.java
new file mode 100644
index 0000000000..41c67ff389
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/binding/AnimalActivityUnitTest.java
@@ -0,0 +1,95 @@
+package com.baeldung.binding;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.LoggingEvent;
+import ch.qos.logback.core.Appender;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.verify;
+
+/**
+ *https://gist.github.com/bloodredsun/a041de13e57bf3c6c040
+ */
+@RunWith(MockitoJUnitRunner.class)
+
+public class AnimalActivityUnitTest {
+
+    @Mock
+    private Appender mockAppender;
+    @Captor
+    private ArgumentCaptor<LoggingEvent> captorLoggingEvent;
+
+    @Before
+    public void setup() {
+        final Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+        logger.addAppender(mockAppender);
+    }
+
+    @After
+    public void teardown() {
+        final Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+        logger.detachAppender(mockAppender);
+    }
+
+    @Test
+    public void givenAnimalReference__whenRefersAnimalObject_shouldCallFunctionWithAnimalParam() {
+
+        Animal animal = new Animal();
+
+        AnimalActivity.sleep(animal);
+
+        verify(mockAppender).doAppend(captorLoggingEvent.capture());
+
+        final LoggingEvent loggingEvent = captorLoggingEvent.getValue();
+
+        assertThat(loggingEvent.getLevel(), is(Level.INFO));
+
+        assertThat(loggingEvent.getFormattedMessage(),
+                is("Animal is sleeping"));
+    }
+
+    @Test
+    public void givenDogReference__whenRefersCatObject_shouldCallFunctionWithAnimalParam() {
+
+        Cat cat = new Cat();
+
+        AnimalActivity.sleep(cat);
+
+        verify(mockAppender).doAppend(captorLoggingEvent.capture());
+
+        final LoggingEvent loggingEvent = captorLoggingEvent.getValue();
+
+        assertThat(loggingEvent.getLevel(), is(Level.INFO));
+
+        assertThat(loggingEvent.getFormattedMessage(),
+                is("Cat is sleeping"));
+    }
+
+    @Test
+    public void givenAnimaReference__whenRefersDogObject_shouldCallFunctionWithAnimalParam() {
+
+        Animal cat = new Cat();
+
+        AnimalActivity.sleep(cat);
+
+        verify(mockAppender).doAppend(captorLoggingEvent.capture());
+
+        final LoggingEvent loggingEvent = captorLoggingEvent.getValue();
+
+        assertThat(loggingEvent.getLevel(), is(Level.INFO));
+
+        assertThat(loggingEvent.getFormattedMessage(),
+                is("Animal is sleeping"));
+    }
+}
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/binding/AnimalUnitTest.java b/core-java/src/test/java/com/baeldung/binding/AnimalUnitTest.java
new file mode 100644
index 0000000000..a34640b58a
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/binding/AnimalUnitTest.java
@@ -0,0 +1,87 @@
+package com.baeldung.binding;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.LoggingEvent;
+import ch.qos.logback.core.Appender;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.util.List;
+
+/**
+ * Created by madhumita.g on 01-08-2018.
+ */
+
+@RunWith(MockitoJUnitRunner.class)
+public class AnimalUnitTest {
+    @Mock
+    private Appender mockAppender;
+    @Captor
+    private ArgumentCaptor<LoggingEvent> captorLoggingEvent;
+
+    @Before
+    public void setup() {
+        final Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+        logger.addAppender(mockAppender);
+    }
+
+    @After
+    public void teardown() {
+        final Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+        logger.detachAppender(mockAppender);
+    }
+
+    @Test
+    public void whenCalledWithoutParameters_shouldCallFunctionMakeNoiseWithoutParameters() {
+
+        Animal animal = new Animal();
+
+        animal.makeNoise();
+
+        verify(mockAppender).doAppend(captorLoggingEvent.capture());
+
+        final LoggingEvent loggingEvent = captorLoggingEvent.getValue();
+
+        assertThat(loggingEvent.getLevel(), is(Level.INFO));
+
+        assertThat(loggingEvent.getFormattedMessage(),
+                is("generic animal noise"));
+    }
+
+    @Test
+    public void whenCalledWithParameters_shouldCallFunctionMakeNoiseWithParameters() {
+
+        Animal animal = new Animal();
+
+        int testValue = 3;
+        animal.makeNoise(testValue);
+
+        verify(mockAppender,times(3)).doAppend(captorLoggingEvent.capture());
+
+        final List<LoggingEvent> loggingEvents = captorLoggingEvent.getAllValues();
+
+        for(LoggingEvent loggingEvent : loggingEvents)
+        {
+            assertThat(loggingEvent.getLevel(), is(Level.INFO));
+
+            assertThat(loggingEvent.getFormattedMessage(),
+                    is("generic animal noise countdown "+testValue));
+
+            testValue--;
+        }
+    }
+
+}
diff --git a/core-java/src/test/java/com/baeldung/binding/CatUnitTest.java b/core-java/src/test/java/com/baeldung/binding/CatUnitTest.java
new file mode 100644
index 0000000000..76ccfb7719
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/binding/CatUnitTest.java
@@ -0,0 +1,62 @@
+package com.baeldung.binding;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.LoggingEvent;
+import ch.qos.logback.core.Appender;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.verify;
+
+/**
+ * Created by madhumita.g on 01-08-2018.
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class CatUnitTest {
+
+    @Mock
+    private Appender mockAppender;
+
+    @Captor
+    private ArgumentCaptor<LoggingEvent> captorLoggingEvent;
+
+    @Before
+    public void setup() {
+        final Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+        logger.addAppender(mockAppender);
+    }
+
+    @After
+    public void teardown() {
+        final Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+        logger.detachAppender(mockAppender);
+    }
+
+    @Test
+    public void makeNoiseTest() {
+
+        Cat cat = new Cat();
+
+        cat.makeNoise();
+
+        verify(mockAppender).doAppend(captorLoggingEvent.capture());
+
+        final LoggingEvent loggingEvent = captorLoggingEvent.getValue();
+
+        assertThat(loggingEvent.getLevel(), is(Level.INFO));
+
+        assertThat(loggingEvent.getFormattedMessage(),
+                is("meow"));
+
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/constructorsstaticfactorymethods/UserUnitTest.java b/core-java/src/test/java/com/baeldung/constructorsstaticfactorymethods/UserUnitTest.java
new file mode 100644
index 0000000000..0c0266a111
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/constructorsstaticfactorymethods/UserUnitTest.java
@@ -0,0 +1,43 @@
+package com.baeldung.constructorsstaticfactorymethods;
+
+import com.baeldung.constructorsstaticfactorymethods.entities.User;
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+public class UserUnitTest {
+    
+    @Test
+    public void givenUserClass_whenCalledcreateWithDefaultCountry_thenCorrect() {
+        assertThat(User.createWithDefaultCountry("John", "john@domain.com")).isInstanceOf(User.class);
+    }
+    
+    @Test
+    public void givenUserIntanceCreatedWithcreateWithDefaultCountry_whenCalledgetName_thenCorrect() {
+        User user = User.createWithDefaultCountry("John", "john@domain.com");
+        assertThat(user.getName()).isEqualTo("John");
+    }
+    
+    @Test
+    public void givenUserIntanceCreatedWithcreateWithDefaultCountry_whenCalledgetEmail_thenCorrect() {
+        User user = User.createWithDefaultCountry("John", "john@domain.com");
+        assertThat(user.getEmail()).isEqualTo("john@domain.com");
+    }
+    
+    @Test
+    public void givenUserIntanceCreatedWithcreateWithDefaultCountry_whenCalledgetCountry_thenCorrect() {
+        User user = User.createWithDefaultCountry("John", "john@domain.com");
+        assertThat(user.getCountry()).isEqualTo("Argentina");
+    }
+    
+    @Test
+    public void givenUserInstanceCreatedWithcreateWithInstantiationTime_whenCalledcreateWithInstantiationTime_thenCorrect() {
+        assertThat(User.createWithLoggedInstantiationTime("John", "john@domain.com", "Argentina")).isInstanceOf(User.class);
+    }
+    
+    @Test
+    public void givenUserInstanceCreatedWithgetSingletonIntance_whenCalledgetSingletonInstance_thenCorrect() {
+        User user1 = User.getSingletonInstance("John", "john@domain.com", "Argentina");
+        User user2 = User.getSingletonInstance("John", "john@domain.com", "Argentina");
+        assertThat(user1).isEqualTo(user2);
+    }
+}
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/enums/PizzaUnitTest.java b/core-java/src/test/java/com/baeldung/enums/PizzaUnitTest.java
index 35aa07821c..70bfe168dd 100644
--- a/core-java/src/test/java/com/baeldung/enums/PizzaUnitTest.java
+++ b/core-java/src/test/java/com/baeldung/enums/PizzaUnitTest.java
@@ -75,26 +75,5 @@ public class PizzaUnitTest {
         pz.setStatus(Pizza.PizzaStatusEnum.READY);
         pz.deliver();
         assertTrue(pz.getStatus() == Pizza.PizzaStatusEnum.DELIVERED);
-    }
-    
-    @Test
-    public void whenConvertedIntoEnum_thenGetsConvertedCorrectly() {
-        String pizzaEnumValue = "READY";
-        PizzaStatusEnum pizzaStatusEnum = PizzaStatusEnum.valueOf(pizzaEnumValue);
-        assertTrue(pizzaStatusEnum == PizzaStatusEnum.READY);
-    }
-    
-    @Test(expected = IllegalArgumentException.class)
-    public void whenConvertedIntoEnum_thenThrowsException() {
-        String pizzaEnumValue = "rEAdY";
-        PizzaStatusEnum pizzaStatusEnum = PizzaStatusEnum.valueOf(pizzaEnumValue);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void givenInvalidEnumValueContentWiseAsString_whenConvertedIntoEnum_thenThrowsException() {
-        String pizzaEnumValue = "invalid";
-        PizzaStatusEnum pizzaStatusEnum = PizzaStatusEnum.valueOf(pizzaEnumValue);
-    }
-    
-
+    }   
 }
diff --git a/core-java/src/test/java/com/baeldung/exceptionhandling/ExceptionsUnitTest.java b/core-java/src/test/java/com/baeldung/exceptionhandling/ExceptionsUnitTest.java
index 1e86132116..b3f585cfe4 100644
--- a/core-java/src/test/java/com/baeldung/exceptionhandling/ExceptionsUnitTest.java
+++ b/core-java/src/test/java/com/baeldung/exceptionhandling/ExceptionsUnitTest.java
@@ -21,7 +21,7 @@ public class ExceptionsUnitTest {
     @Test
     public void loadAllPlayers() {
         assertThatThrownBy(() -> exceptions.loadAllPlayers(""))
-            .isInstanceOf(IOException.class);
+            .isInstanceOf(IllegalStateException.class);
     }
 
     @Test
@@ -72,12 +72,6 @@ public class ExceptionsUnitTest {
             .isInstanceOf(NullPointerException.class);
     }
     
-    @Test
-    public void throwAsGotoAntiPattern() {
-        assertThatThrownBy(() -> exceptions.throwAsGotoAntiPattern())
-            .isInstanceOf(MyException.class);
-    }
-    
     @Test
     public void getPlayerScoreSwallowingExceptionAntiPatternAlternative2() {
         assertThatThrownBy(() -> exceptions.getPlayerScoreSwallowingExceptionAntiPatternAlternative2(""))
diff --git a/core-java/src/test/java/com/baeldung/java/listInitialization/ListInitializationUnitTest.java b/core-java/src/test/java/com/baeldung/java/listInitialization/ListInitializationUnitTest.java
index bc012dae6b..b484eecef7 100644
--- a/core-java/src/test/java/com/baeldung/java/listInitialization/ListInitializationUnitTest.java
+++ b/core-java/src/test/java/com/baeldung/java/listInitialization/ListInitializationUnitTest.java
@@ -9,28 +9,15 @@ import java.util.stream.Stream;
 import lombok.extern.java.Log;
 
 import org.junit.Assert;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 @Log
 public class ListInitializationUnitTest {
 
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-
     @Test
     public void givenAnonymousInnerClass_thenInitialiseList() {
         List<String> cities = new ArrayList() {
-            // Inside declaration of the subclass
-
-            // You can have multiple initializer block
             {
-                log.info("Inside the first initializer block.");
-            }
-
-            {
-                log.info("Inside the second initializer block.");
                 add("New York");
                 add("Rio");
                 add("Tokyo");
@@ -47,11 +34,10 @@ public class ListInitializationUnitTest {
         Assert.assertTrue(list.contains("foo"));
     }
 
-    @Test
+    @Test(expected = UnsupportedOperationException.class)
     public void givenArraysAsList_whenAdd_thenUnsupportedException() {
         List<String> list = Arrays.asList("foo", "bar");
 
-        exception.expect(UnsupportedOperationException.class);
         list.add("baz");
     }
 
diff --git a/core-java/src/test/java/com/baeldung/regexp/optmization/OptimizedMatcherUnitTest.java b/core-java/src/test/java/com/baeldung/regexp/optmization/OptimizedMatcherUnitTest.java
new file mode 100644
index 0000000000..f21a755b01
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/regexp/optmization/OptimizedMatcherUnitTest.java
@@ -0,0 +1,109 @@
+package com.baeldung.regexp.optmization;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.junit.Assert.assertTrue;
+
+public class OptimizedMatcherUnitTest {
+
+    private long time;
+    private long mstimePreCompiled;
+    private long mstimeNotPreCompiled;
+
+    private String action;
+
+    private List<String> items;
+
+    @Before
+    public void setup() {
+        Random random = new Random();
+        items = new ArrayList<String>();
+        long average = 0;
+
+        for (int i = 0; i < 100000; ++i) {
+            StringBuilder s = new StringBuilder();
+            int characters = random.nextInt(7) + 1;
+            for (int k = 0; k < characters; ++ k) {
+                char c = (char)(random.nextInt('Z' - 'A') + 'A');
+                int rep = random.nextInt(95) + 5;
+                for (int j = 0; j < rep; ++ j)
+                    s.append(c);
+                average += rep;
+            }
+            items.add(s.toString());
+        }
+
+        average /= 100000;
+        System.out.println("generated data, average length: " + average);
+    }
+
+
+    @Test
+    public void givenANotPreCompiledAndAPreCompiledPatternA_whenMatcheItems_thenPreCompiledFasterThanNotPreCompiled() {
+
+        testPatterns("A*");
+        assertTrue(mstimePreCompiled < mstimeNotPreCompiled);
+    }
+
+    @Test
+    public void givenANotPreCompiledAndAPreCompiledPatternABC_whenMatcheItems_thenPreCompiledFasterThanNotPreCompiled() {
+
+        testPatterns("A*B*C*");
+        assertTrue(mstimePreCompiled < mstimeNotPreCompiled);
+    }
+
+    @Test
+    public void givenANotPreCompiledAndAPreCompiledPatternECWF_whenMatcheItems_thenPreCompiledFasterThanNotPreCompiled() {
+
+        testPatterns("E*C*W*F*");
+        assertTrue(mstimePreCompiled < mstimeNotPreCompiled);
+    }
+
+    private void testPatterns(String regex) {
+        time = System.nanoTime();
+        int matched = 0;
+        int unmatched = 0;
+
+        for (String item : this.items) {
+            if (item.matches(regex)) {
+                ++matched;
+            }
+            else {
+                ++unmatched;
+            }
+        }
+
+        this.action = "uncompiled: regex=" + regex + " matched=" + matched + " unmatched=" + unmatched;
+
+        this.mstimeNotPreCompiled = (System.nanoTime() - time) / 1000000;
+        System.out.println(this.action + ": " + mstimeNotPreCompiled + "ms");
+
+        time = System.nanoTime();
+
+        Matcher matcher = Pattern.compile(regex).matcher("");
+        matched = 0;
+        unmatched = 0;
+
+        for (String item : this.items) {
+            if (matcher.reset(item).matches()) {
+                ++matched;
+            }
+            else {
+                ++unmatched;
+            }
+        }
+
+        this.action = "compiled: regex=" + regex + " matched=" + matched + " unmatched=" + unmatched;
+
+        this.mstimePreCompiled = (System.nanoTime() - time) / 1000000;
+        System.out.println(this.action + ": " + mstimePreCompiled + "ms");
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/throwsexception/CalculatorUnitTest.java b/core-java/src/test/java/com/baeldung/throwsexception/CalculatorUnitTest.java
new file mode 100644
index 0000000000..ef838ed304
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/throwsexception/CalculatorUnitTest.java
@@ -0,0 +1,17 @@
+package com.baeldung.throwsexception;
+
+import org.junit.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class CalculatorUnitTest {
+
+    @Test
+    public void whenDividerIsZero_thenDivideByZeroExceptionIsThrown() {
+        Calculator calculator = new Calculator();
+
+        assertThrows(DivideByZeroException.class,
+                () -> calculator.divide(10, 0));
+    }
+
+}
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/throwsexception/PersonRepositoryUnitTest.java b/core-java/src/test/java/com/baeldung/throwsexception/PersonRepositoryUnitTest.java
new file mode 100644
index 0000000000..6294d40090
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/throwsexception/PersonRepositoryUnitTest.java
@@ -0,0 +1,32 @@
+package com.baeldung.throwsexception;
+
+import org.junit.Test;
+
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class PersonRepositoryUnitTest {
+
+    PersonRepository personRepository = new PersonRepository();
+
+    @Test
+    public void whenIdIsNull_thenExceptionIsThrown() throws Exception {
+        assertThrows(Exception.class,
+                () ->
+                        Optional
+                                .ofNullable(personRepository.findNameById(null))
+                                .orElseThrow(Exception::new));
+    }
+
+    @Test
+    public void whenIdIsNonNull_thenNoExceptionIsThrown() throws Exception {
+        assertAll(
+                () ->
+                        Optional
+                                .ofNullable(personRepository.findNameById("id"))
+                                .orElseThrow(Exception::new));
+    }
+
+}
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/throwsexception/SimpleServiceUnitTest.java b/core-java/src/test/java/com/baeldung/throwsexception/SimpleServiceUnitTest.java
new file mode 100644
index 0000000000..b9a658a960
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/throwsexception/SimpleServiceUnitTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.throwsexception;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class SimpleServiceUnitTest {
+
+    SimpleService simpleService = new SimpleService();
+
+    @Test
+    void whenSQLExceptionIsThrown_thenShouldBeRethrownWithWrappedException() {
+        assertThrows(DataAccessException.class,
+                () -> simpleService.wrappingException());
+    }
+
+    @Test
+    void whenCalled_thenNullPointerExceptionIsThrown() {
+        assertThrows(NullPointerException.class,
+                () -> simpleService.runtimeNullPointerException());
+    }
+}
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/unsafe/UnsafeUnitTest.java b/core-java/src/test/java/com/baeldung/unsafe/UnsafeUnitTest.java
index 6aa59e68d0..22fe0f5e57 100644
--- a/core-java/src/test/java/com/baeldung/unsafe/UnsafeUnitTest.java
+++ b/core-java/src/test/java/com/baeldung/unsafe/UnsafeUnitTest.java
@@ -1,6 +1,7 @@
 package com.baeldung.unsafe;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import sun.misc.Unsafe;
 
@@ -56,6 +57,7 @@ public class UnsafeUnitTest {
     }
 
     @Test
+    @Ignore // Uncomment for local
     public void givenArrayBiggerThatMaxInt_whenAllocateItOffHeapMemory_thenSuccess() throws NoSuchFieldException, IllegalAccessException {
         //given
         long SUPER_SIZE = (long) Integer.MAX_VALUE * 2;
diff --git a/core-java/src/test/java/org/baeldung/java/enums/PizzaUnitTest.java b/core-java/src/test/java/org/baeldung/java/enums/PizzaUnitTest.java
deleted file mode 100644
index bb3abff28d..0000000000
--- a/core-java/src/test/java/org/baeldung/java/enums/PizzaUnitTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.baeldung.java.enums;
-
-import static junit.framework.TestCase.assertTrue;
-
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.baeldung.enums.Pizza;
-
-public class PizzaUnitTest {
-
-    @Test
-    public void givenPizaOrder_whenReady_thenDeliverable() {
-        Pizza testPz = new Pizza();
-        testPz.setStatus(Pizza.PizzaStatusEnum.READY);
-        assertTrue(testPz.isDeliverable());
-    }
-
-    @Test
-    public void givenPizaOrders_whenRetrievingUnDeliveredPzs_thenCorrectlyRetrieved() {
-        List<Pizza> pzList = new ArrayList<>();
-        Pizza pz1 = new Pizza();
-        pz1.setStatus(Pizza.PizzaStatusEnum.DELIVERED);
-
-        Pizza pz2 = new Pizza();
-        pz2.setStatus(Pizza.PizzaStatusEnum.ORDERED);
-
-        Pizza pz3 = new Pizza();
-        pz3.setStatus(Pizza.PizzaStatusEnum.ORDERED);
-
-        Pizza pz4 = new Pizza();
-        pz4.setStatus(Pizza.PizzaStatusEnum.READY);
-
-        pzList.add(pz1);
-        pzList.add(pz2);
-        pzList.add(pz3);
-        pzList.add(pz4);
-
-        List<Pizza> undeliveredPzs = Pizza.getAllUndeliveredPizzas(pzList);
-        assertTrue(undeliveredPzs.size() == 3);
-    }
-
-    @Test
-    public void givenPizaOrders_whenGroupByStatusCalled_thenCorrectlyGrouped() {
-
-        List<Pizza> pzList = new ArrayList<>();
-        Pizza pz1 = new Pizza();
-        pz1.setStatus(Pizza.PizzaStatusEnum.DELIVERED);
-
-        Pizza pz2 = new Pizza();
-        pz2.setStatus(Pizza.PizzaStatusEnum.ORDERED);
-
-        Pizza pz3 = new Pizza();
-        pz3.setStatus(Pizza.PizzaStatusEnum.ORDERED);
-
-        Pizza pz4 = new Pizza();
-        pz4.setStatus(Pizza.PizzaStatusEnum.READY);
-
-        pzList.add(pz1);
-        pzList.add(pz2);
-        pzList.add(pz3);
-        pzList.add(pz4);
-
-        EnumMap<Pizza.PizzaStatusEnum, List<Pizza>> map = Pizza.groupPizzaByStatus(pzList);
-        assertTrue(map.get(Pizza.PizzaStatusEnum.DELIVERED).size() == 1);
-        assertTrue(map.get(Pizza.PizzaStatusEnum.ORDERED).size() == 2);
-        assertTrue(map.get(Pizza.PizzaStatusEnum.READY).size() == 1);
-    }
-
-    @Test
-    public void givenPizaOrder_whenDelivered_thenPizzaGetsDeliveredAndStatusChanges() {
-        Pizza pz = new Pizza();
-        pz.setStatus(Pizza.PizzaStatusEnum.READY);
-        pz.deliver();
-        assertTrue(pz.getStatus() == Pizza.PizzaStatusEnum.DELIVERED);
-    }
-
-}
diff --git a/core-kotlin/pom.xml b/core-kotlin/pom.xml
index afa7d8a963..a86359c02f 100644
--- a/core-kotlin/pom.xml
+++ b/core-kotlin/pom.xml
@@ -106,22 +106,22 @@
             <artifactId>klaxon</artifactId>
             <version>${klaxon.version}</version>
         </dependency>
-		<dependency>
-		    <groupId>io.ktor</groupId>
-		    <artifactId>ktor-server-netty</artifactId>
-		    <version>${ktor.io.version}</version>
-		</dependency>
-		<dependency>
-		    <groupId>io.ktor</groupId>
-		    <artifactId>ktor-gson</artifactId>
-		    <version>${ktor.io.version}</version>
-		</dependency>				
-		<dependency>
-		    <groupId>ch.qos.logback</groupId>
-		    <artifactId>logback-classic</artifactId>
-		    <version>1.2.1</version>
-		    <scope>test</scope>
-		</dependency>		     
+        <dependency>
+            <groupId>io.ktor</groupId>
+            <artifactId>ktor-server-netty</artifactId>
+            <version>${ktor.io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.ktor</groupId>
+            <artifactId>ktor-gson</artifactId>
+            <version>${ktor.io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -166,13 +166,13 @@
                     <target>${java.version}</target>
                 </configuration>
                 <executions>
-                    <!-- Replacing default-compile as it is treated specially 
+                    <!-- Replacing default-compile as it is treated specially
                         by maven -->
                     <execution>
                         <id>default-compile</id>
                         <phase>none</phase>
                     </execution>
-                    <!-- Replacing default-testCompile as it is treated specially 
+                    <!-- Replacing default-testCompile as it is treated specially
                         by maven -->
                     <execution>
                         <id>default-testCompile</id>
@@ -224,10 +224,10 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <kotlin-maven-plugin.version>1.2.51</kotlin-maven-plugin.version>
-        <kotlin-test-junit.version>1.2.51</kotlin-test-junit.version>
-        <kotlin-stdlib.version>1.2.51</kotlin-stdlib.version>
-        <kotlin-reflect.version>1.2.51</kotlin-reflect.version>
+        <kotlin-maven-plugin.version>1.2.60</kotlin-maven-plugin.version>
+        <kotlin-test-junit.version>1.2.60</kotlin-test-junit.version>
+        <kotlin-stdlib.version>1.2.60</kotlin-stdlib.version>
+        <kotlin-reflect.version>1.2.60</kotlin-reflect.version>
         <kotlinx.version>0.22.5</kotlinx.version>
         <ktor.io.version>0.9.2</ktor.io.version>
         <mockito-kotlin.version>1.5.0</mockito-kotlin.version>
@@ -235,9 +235,9 @@
         <klaxon.version>3.0.4</klaxon.version>
         <khttp.version>0.1.0</khttp.version>
         <commons-math3.version>3.6.1</commons-math3.version>
-        <junit.platform.version>1.0.0</junit.platform.version>
+        <junit.platform.version>1.1.1</junit.platform.version>
         <junit.vintage.version>5.2.0</junit.vintage.version>
         <assertj.version>3.10.0</assertj.version>
     </properties>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/core-kotlin/src/main/java/com/baeldung/constructor/Car.kt b/core-kotlin/src/main/java/com/baeldung/constructor/Car.kt
new file mode 100644
index 0000000000..72b8d330e8
--- /dev/null
+++ b/core-kotlin/src/main/java/com/baeldung/constructor/Car.kt
@@ -0,0 +1,17 @@
+package com.baeldung.constructor
+
+class Car {
+    val id: String
+    val type: String
+
+    constructor(id: String, type: String) {
+        this.id = id
+        this.type = type
+    }
+
+}
+
+fun main(args: Array<String>) {
+    val car = Car("1", "sport")
+    val s= Car("2", "suv")
+}
\ No newline at end of file
diff --git a/core-kotlin/src/main/java/com/baeldung/constructor/Employee.kt b/core-kotlin/src/main/java/com/baeldung/constructor/Employee.kt
new file mode 100644
index 0000000000..4483bfcf08
--- /dev/null
+++ b/core-kotlin/src/main/java/com/baeldung/constructor/Employee.kt
@@ -0,0 +1,3 @@
+package com.baeldung.constructor
+
+class Employee(name: String, val salary: Int): Person(name)
\ No newline at end of file
diff --git a/core-kotlin/src/main/java/com/baeldung/constructor/Person.java b/core-kotlin/src/main/java/com/baeldung/constructor/Person.java
new file mode 100644
index 0000000000..57911b24ee
--- /dev/null
+++ b/core-kotlin/src/main/java/com/baeldung/constructor/Person.java
@@ -0,0 +1,19 @@
+package com.baeldung.constructor;
+
+class PersonJava {
+    final String name;
+    final String surname;
+    final Integer age;
+
+    public PersonJava(String name, String surname) {
+        this.name = name;
+        this.surname = surname;
+        this.age = null;
+    }
+
+    public PersonJava(String name, String surname, Integer age) {
+        this.name = name;
+        this.surname = surname;
+        this.age = age;
+    }
+}
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrder.kt b/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrder.kt
index 7d10d849b9..1384cd9937 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrder.kt
+++ b/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrder.kt
@@ -1,39 +1,22 @@
 package com.baeldung.builder
 
-class FoodOrder private constructor(builder: FoodOrder.Builder) {
-
-    val bread: String?
-    val condiments: String?
-    val meat: String?
-    val fish: String?
-
-    init {
-        this.bread = builder.bread
-        this.condiments = builder.condiments
-        this.meat = builder.meat
-        this.fish = builder.fish
-    }
-
-    class Builder {
-
-        var bread: String? = null
-            private set
-        var condiments: String? = null
-            private set
-        var meat: String? = null
-            private set
-        var fish: String? = null
-            private set
+class FoodOrder(
+  val bread: String?,
+  val condiments: String?,
+  val meat: String?,
+  val fish: String?
+) {
+    data class Builder(
+      var bread: String? = null,
+      var condiments: String? = null,
+      var meat: String? = null,
+      var fish: String? = null) {
 
         fun bread(bread: String) = apply { this.bread = bread }
-
         fun condiments(condiments: String) = apply { this.condiments = condiments }
-
         fun meat(meat: String) = apply { this.meat = meat }
-
         fun fish(fish: String) = apply { this.fish = fish }
-
-        fun build() = FoodOrder(this)
-
+        fun build() = FoodOrder(bread, condiments, meat, fish)
     }
 }
+
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrderNamed.kt b/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrderNamed.kt
index 6e20cf51b9..0e4219b40e 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrderNamed.kt
+++ b/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrderNamed.kt
@@ -1,7 +1,7 @@
 package com.baeldung.builder
 
 data class FoodOrderNamed(
-        val bread: String? = null,
-        val condiments: String? = null,
-        val meat: String? = null,
-        val fish: String? = null)
+  val bread: String? = null,
+  val condiments: String? = null,
+  val meat: String? = null,
+  val fish: String? = null)
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/builder/Main.kt b/core-kotlin/src/main/kotlin/com/baeldung/builder/Main.kt
new file mode 100644
index 0000000000..cc348e3fbf
--- /dev/null
+++ b/core-kotlin/src/main/kotlin/com/baeldung/builder/Main.kt
@@ -0,0 +1,9 @@
+package com.baeldung.builder
+
+fun main(args: Array<String>) {
+    FoodOrder.Builder()
+      .bread("bread")
+      .condiments("condiments")
+      .meat("meat")
+      .fish("bread").let { println(it) }
+}
\ No newline at end of file
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/constructor/Person.kt b/core-kotlin/src/main/kotlin/com/baeldung/constructor/Person.kt
new file mode 100644
index 0000000000..3779d74541
--- /dev/null
+++ b/core-kotlin/src/main/kotlin/com/baeldung/constructor/Person.kt
@@ -0,0 +1,26 @@
+package com.baeldung.constructor
+
+open class Person(
+        val name: String,
+        val age: Int? = null
+) {
+    val upperCaseName: String = name.toUpperCase()
+
+    init {
+        println("Hello, I'm $name")
+
+        if (age != null && age < 0) {
+            throw IllegalArgumentException("Age cannot be less than zero!")
+        }
+    }
+
+    init {
+        println("upperCaseName is $upperCaseName")
+    }
+
+}
+
+fun main(args: Array<String>) {
+    val person = Person("John")
+    val personWithAge = Person("John", 22)
+}
\ No newline at end of file
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/nested/Computer.kt b/core-kotlin/src/main/kotlin/com/baeldung/nested/Computer.kt
new file mode 100644
index 0000000000..ee01c06646
--- /dev/null
+++ b/core-kotlin/src/main/kotlin/com/baeldung/nested/Computer.kt
@@ -0,0 +1,75 @@
+package com.baeldung.nested
+
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+class Computer(val model: String) {
+
+    companion object {
+        const val originCountry = "China"
+        fun getBuiltDate(): String {
+            return "2018-05-23"
+        }
+
+        val log: Logger = LoggerFactory.getLogger(Computer::class.java)
+    }
+
+    //Nested class
+    class MotherBoard(val manufacturer: String) {
+        fun getInfo() = "Made by $manufacturer installed in $originCountry - ${getBuiltDate()}"
+    }
+
+    //Inner class
+    inner class HardDisk(val sizeInGb: Int) {
+        fun getInfo() = "Installed on ${this@Computer} with $sizeInGb GB"
+    }
+
+    interface Switcher {
+        fun on(): String
+    }
+
+    interface Protector {
+        fun smart()
+    }
+
+    fun powerOn(): String {
+        //Local class
+        var defaultColor = "Blue"
+
+        class Led(val color: String) {
+            fun blink(): String {
+                return "blinking $color"
+            }
+
+            fun changeDefaultPowerOnColor() {
+                defaultColor = "Violet"
+            }
+        }
+
+        val powerLed = Led("Green")
+        log.debug("defaultColor is $defaultColor")
+        powerLed.changeDefaultPowerOnColor()
+        log.debug("defaultColor changed inside Led class to $defaultColor")
+        //Anonymous object
+        val powerSwitch = object : Switcher, Protector {
+            override fun on(): String {
+                return powerLed.blink()
+            }
+
+            override fun smart() {
+                log.debug("Smart protection is implemented")
+            }
+
+            fun changeDefaultPowerOnColor() {
+                defaultColor = "Yellow"
+            }
+        }
+        powerSwitch.changeDefaultPowerOnColor()
+        log.debug("defaultColor changed inside powerSwitch anonymous object to $defaultColor")
+        return powerSwitch.on()
+    }
+
+    override fun toString(): String {
+        return "Computer(model=$model)"
+    }
+}
\ No newline at end of file
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesTest.kt
index 54fafdb3e1..d724933654 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesTest.kt
+++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CoroutinesTest.kt
@@ -103,7 +103,7 @@ class CoroutinesTest {
             //given
             val job = launch(CommonPool) {
                 while (isActive) {
-                    println("is working")
+                    //println("is working")
                 }
             }
 
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/nested/ComputerUnitTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/nested/ComputerUnitTest.kt
new file mode 100644
index 0000000000..7882d85b3c
--- /dev/null
+++ b/core-kotlin/src/test/kotlin/com/baeldung/nested/ComputerUnitTest.kt
@@ -0,0 +1,28 @@
+package com.baeldung.nested
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+
+class ComputerUnitTest {
+
+    @Test
+    fun givenComputer_whenPowerOn_thenBlink() {
+        val computer = Computer("Desktop")
+
+        assertThat(computer.powerOn()).isEqualTo("blinking Green")
+    }
+
+    @Test
+    fun givenMotherboard_whenGetInfo_thenGetInstalledAndBuiltDetails() {
+        val motherBoard = Computer.MotherBoard("MotherBoard Inc.")
+
+        assertThat(motherBoard.getInfo()).isEqualTo("Made by MotherBoard Inc. installed in China - 2018-05-23")
+    }
+
+    @Test
+    fun givenHardDisk_whenGetInfo_thenGetComputerModelAndDiskSizeInGb() {
+        val hardDisk = Computer("Desktop").HardDisk(1000)
+
+        assertThat(hardDisk.getInfo()).isEqualTo("Installed on Computer(model=Desktop) with 1000 GB")
+    }
+}
\ No newline at end of file
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/random/RandomNumberTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/random/RandomNumberTest.kt
new file mode 100644
index 0000000000..2956a35f8a
--- /dev/null
+++ b/core-kotlin/src/test/kotlin/com/baeldung/random/RandomNumberTest.kt
@@ -0,0 +1,55 @@
+
+import org.junit.jupiter.api.Test
+import java.util.concurrent.ThreadLocalRandom
+import kotlin.test.assertTrue
+
+class RandomNumberTest {
+
+    @Test
+    fun whenRandomNumberWithJavaUtilMath_thenResultIsBetween0And1() {
+        val randomNumber = Math.random()
+        assertTrue { randomNumber >=0 }
+        assertTrue { randomNumber <= 1 }
+    }
+
+    @Test
+    fun whenRandomNumberWithJavaThreadLocalRandom_thenResultsInDefaultRanges() {
+        val randomDouble = ThreadLocalRandom.current().nextDouble()
+        val randomInteger = ThreadLocalRandom.current().nextInt()
+        val randomLong = ThreadLocalRandom.current().nextLong()
+        assertTrue { randomDouble >= 0 }
+        assertTrue { randomDouble <= 1 }
+        assertTrue { randomInteger >= Integer.MIN_VALUE }
+        assertTrue { randomInteger <= Integer.MAX_VALUE }
+        assertTrue { randomLong >= Long.MIN_VALUE }
+        assertTrue { randomLong <= Long.MAX_VALUE }
+    }
+
+    @Test
+    fun whenRandomNumberWithKotlinJSMath_thenResultIsBetween0And1() {
+        val randomDouble = Math.random()
+        assertTrue { randomDouble >=0 }
+        assertTrue { randomDouble <= 1 }
+    }
+
+    @Test
+    fun whenRandomNumberWithKotlinNumberRange_thenResultInGivenRange() {
+        val randomInteger = (1..12).shuffled().first()
+        assertTrue { randomInteger >= 1 }
+        assertTrue { randomInteger <= 12 }
+    }
+
+    @Test
+    fun whenRandomNumberWithJavaThreadLocalRandom_thenResultsInGivenRanges() {
+        val randomDouble = ThreadLocalRandom.current().nextDouble(1.0, 10.0)
+        val randomInteger = ThreadLocalRandom.current().nextInt(1, 10)
+        val randomLong = ThreadLocalRandom.current().nextLong(1, 10)
+        assertTrue { randomDouble >= 1 }
+        assertTrue { randomDouble <= 10 }
+        assertTrue { randomInteger >= 1 }
+        assertTrue { randomInteger <= 10 }
+        assertTrue { randomLong >= 1 }
+        assertTrue { randomLong <= 10 }
+    }
+
+}
\ No newline at end of file
diff --git a/core-kotlin/src/test/resources/Kotlin.out b/core-kotlin/src/test/resources/Kotlin.out
new file mode 100644
index 0000000000..63d15d2528
--- /dev/null
+++ b/core-kotlin/src/test/resources/Kotlin.out
@@ -0,0 +1,2 @@
+Kotlin
+Concise, Safe, Interoperable, Tool-friendly
\ No newline at end of file
diff --git a/data-structures/src/main/java/com/baeldung/tree/BinaryTree.java b/data-structures/src/main/java/com/baeldung/tree/BinaryTree.java
index e3179dca32..f435e41afa 100644
--- a/data-structures/src/main/java/com/baeldung/tree/BinaryTree.java
+++ b/data-structures/src/main/java/com/baeldung/tree/BinaryTree.java
@@ -57,7 +57,7 @@ public class BinaryTree {
     }
 
     public void delete(int value) {
-        deleteRecursive(root, value);
+        root = deleteRecursive(root, value);
     }
 
     private Node deleteRecursive(Node current, int value) {
diff --git a/data-structures/src/test/java/com/baeldung/tree/BinaryTreeTest.java b/data-structures/src/test/java/com/baeldung/tree/BinaryTreeUnitTest.java
similarity index 90%
rename from data-structures/src/test/java/com/baeldung/tree/BinaryTreeTest.java
rename to data-structures/src/test/java/com/baeldung/tree/BinaryTreeUnitTest.java
index 99e656fe28..f81247b74d 100644
--- a/data-structures/src/test/java/com/baeldung/tree/BinaryTreeTest.java
+++ b/data-structures/src/test/java/com/baeldung/tree/BinaryTreeUnitTest.java
@@ -6,7 +6,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-public class BinaryTreeTest {
+public class BinaryTreeUnitTest {
 
     @Test
     public void givenABinaryTree_WhenAddingElements_ThenTreeNotEmpty() {
@@ -70,6 +70,17 @@ public class BinaryTreeTest {
         assertEquals(initialSize, bt.getSize());
     }
 
+    @Test
+    public void it_deletes_the_root() {
+        int value = 12;
+        BinaryTree bt = new BinaryTree();
+        bt.add(value);
+
+        assertTrue(bt.containsNode(value));
+        bt.delete(value);
+        assertFalse(bt.containsNode(value));
+    }
+
     @Test
     public void givenABinaryTree_WhenTraversingInOrder_ThenPrintValues() {
 
diff --git a/data-structures/src/test/java/com/baeldung/trie/TrieTest.java b/data-structures/src/test/java/com/baeldung/trie/TrieUnitTest.java
similarity index 98%
rename from data-structures/src/test/java/com/baeldung/trie/TrieTest.java
rename to data-structures/src/test/java/com/baeldung/trie/TrieUnitTest.java
index 6f7073651e..bf9555315c 100644
--- a/data-structures/src/test/java/com/baeldung/trie/TrieTest.java
+++ b/data-structures/src/test/java/com/baeldung/trie/TrieUnitTest.java
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Assertions;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class TrieTest {
+public class TrieUnitTest {
 
     @Test
     public void whenEmptyTrie_thenNoElements() {
diff --git a/disruptor/pom.xml b/disruptor/pom.xml
index 6f3a8d9bfd..d3cef3bd9b 100644
--- a/disruptor/pom.xml
+++ b/disruptor/pom.xml
@@ -112,6 +112,7 @@
             <plugin>
                 <groupId>com.jolira</groupId>
                 <artifactId>onejar-maven-plugin</artifactId>
+                <version>${onejar-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <configuration>
@@ -138,6 +139,7 @@
         
         <maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
+        <onejar-maven-plugin.version>1.4.4</onejar-maven-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/eclipse/formatter.xml b/eclipse/formatter.xml
index 808f65cda9..6887946a4c 100644
--- a/eclipse/formatter.xml
+++ b/eclipse/formatter.xml
@@ -1,297 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <profiles version="12">
-<profile kind="CodeFormatterProfile" name="newsx" version="12">
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="260"/>
-<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="260"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-</profile>
 <profile kind="CodeFormatterProfile" name="updated-formatter" version="12">
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
diff --git a/ethereum/pom.xml b/ethereum/pom.xml
index f07ed2c6a0..bd1bacb221 100644
--- a/ethereum/pom.xml
+++ b/ethereum/pom.xml
@@ -184,6 +184,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot-maven-plugin.version}</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -213,7 +214,7 @@
         <web3j.core.version>3.3.1</web3j.core.version>
         <springframework.version>5.0.5.RELEASE</springframework.version>
         <spring.boot.version>1.5.6.RELEASE</spring.boot.version>
-        <mockito.version>1.10.19</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
         <jackson-databind.version>2.5.0</jackson-databind.version>
         <hamcrest.version>1.3</hamcrest.version>
         <jackson.version>2.9.3</jackson.version>
@@ -224,6 +225,7 @@
         <junit.version>4.12</junit.version>
         <logback.version>1.2.3</logback.version>
         <slf4j.version>1.7.25</slf4j.version>
+        <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
     </properties>
 
 </project>
diff --git a/gson/src/main/java/org/baeldung/gson/entities/User.java b/gson/src/main/java/org/baeldung/gson/entities/User.java
new file mode 100644
index 0000000000..b413f3300e
--- /dev/null
+++ b/gson/src/main/java/org/baeldung/gson/entities/User.java
@@ -0,0 +1,19 @@
+package org.baeldung.gson.entities;
+
+public class User {
+
+	private int id;
+	private String name;
+	private transient String nationality;
+
+	public User(int id, String name, String nationality) {
+		this.id = id;
+		this.name = name;
+		this.nationality = nationality;
+	}
+
+	public User(int id, String name) {
+		this(id, name, null);
+	}
+
+}
diff --git a/gson/src/test/java/org/baeldung/gson/serialization/test/JsonFileUnitTest.java b/gson/src/test/java/org/baeldung/gson/serialization/test/JsonFileUnitTest.java
new file mode 100644
index 0000000000..f6a8de080c
--- /dev/null
+++ b/gson/src/test/java/org/baeldung/gson/serialization/test/JsonFileUnitTest.java
@@ -0,0 +1,43 @@
+package org.baeldung.gson.serialization.test;
+
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import org.baeldung.gson.entities.User;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+@RunWith(Parameterized.class)
+public class JsonFileUnitTest {
+
+	@Parameter
+	public Object object;
+
+	@Parameters
+	public static Object[] data() {
+		return new Object[] { 123.45, new User(1, "Tom", "American") };
+	}
+
+	@Test
+	public void givenProperData_whenStoredInFile_shouldSaveJsonSuccessfully() {
+		String filePath = "target/output.json";
+		try (Writer writer = new FileWriter(filePath)) {
+			Gson gson = new GsonBuilder().setPrettyPrinting().create();
+			gson.toJson(object, writer);
+			Assert.assertTrue(Files.exists(Paths.get(filePath)));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+}
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaMapInitializeUnitTest.java b/guava/src/test/java/org/baeldung/guava/GuavaMapInitializeUnitTest.java
new file mode 100644
index 0000000000..69a7505316
--- /dev/null
+++ b/guava/src/test/java/org/baeldung/guava/GuavaMapInitializeUnitTest.java
@@ -0,0 +1,30 @@
+package org.baeldung.guava;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.*;
+
+import java.util.Map;
+import org.junit.Test;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+
+public class GuavaMapInitializeUnitTest {
+
+    @Test
+    public void givenKeyValuesShoudInitializeMap() {
+        Map<String, String> articles = ImmutableMap.of("Title", "My New Article", "Title2", "Second Article");
+        
+        assertThat(articles.get("Title"), equalTo("My New Article"));
+        assertThat(articles.get("Title2"), equalTo("Second Article"));
+
+    }
+    
+    
+    @Test
+    public void givenKeyValuesShouldCreateMutableMap() {
+        Map<String, String> articles = Maps.newHashMap(ImmutableMap.of("Title", "My New Article", "Title2", "Second Article"));
+
+        assertThat(articles.get("Title"), equalTo("My New Article"));
+        assertThat(articles.get("Title2"), equalTo("Second Article"));
+    }   
+}
diff --git a/guest/core-kotlin/.gitignore b/guest/core-kotlin/.gitignore
new file mode 100644
index 0000000000..0c017e8f8c
--- /dev/null
+++ b/guest/core-kotlin/.gitignore
@@ -0,0 +1,14 @@
+/bin/
+
+#ignore gradle
+.gradle/
+
+
+#ignore build and generated files
+build/
+node/
+out/
+
+#ignore installed node modules and package lock file
+node_modules/
+package-lock.json
diff --git a/guest/core-kotlin/pom.xml b/guest/core-kotlin/pom.xml
new file mode 100644
index 0000000000..6b189143a4
--- /dev/null
+++ b/guest/core-kotlin/pom.xml
@@ -0,0 +1,199 @@
+<?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>core-kotlin</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <groupId>com.stackify</groupId>
+    <packaging>jar</packaging>
+
+    <repositories>
+        <repository>
+            <id>jcenter</id>
+            <url>http://jcenter.bintray.com</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit.platform.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${kotlin-stdlib.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin-stdlib.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <version>${kotlin-test-junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-reflect</artifactId>
+            <version>${kotlin-reflect.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.spek</groupId>
+            <artifactId>spek-api</artifactId>
+            <version>1.1.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.spek</groupId>
+            <artifactId>spek-subject-extension</artifactId>
+            <version>1.1.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.spek</groupId>
+            <artifactId>spek-junit-platform-engine</artifactId>
+            <version>1.1.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.nhaarman</groupId>
+            <artifactId>mockito-kotlin</artifactId>
+            <version>${mockito-kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>${maven-compiler-plugin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>${maven-failsafe-plugin.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-maven-plugin</artifactId>
+            <version>${kotlin-maven-plugin.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <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>
+                <executions>
+                    <!-- Replacing default-compile as it is treated specially 
+                        by maven -->
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <!-- Replacing default-testCompile as it is treated specially 
+                        by maven -->
+                    <execution>
+                        <id>default-testCompile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>java-compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${maven-failsafe-plugin.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.platform</groupId>
+                        <artifactId>junit-platform-surefire-provider</artifactId>
+                        <version>${junit.platform.version}</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>junit5</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>**/*Test5.java</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <kotlin-maven-plugin.version>1.2.60</kotlin-maven-plugin.version>
+        <kotlin-test-junit.version>1.2.51</kotlin-test-junit.version>
+        <kotlin-stdlib.version>1.2.51</kotlin-stdlib.version>
+        <kotlin-reflect.version>1.2.51</kotlin-reflect.version>
+        <kotlinx.version>0.22.5</kotlinx.version>
+        <mockito-kotlin.version>1.5.0</mockito-kotlin.version>
+        <commons-math3.version>3.6.1</commons-math3.version>
+        <junit.platform.version>1.0.0</junit.platform.version>
+        <junit.vintage.version>5.2.0</junit.vintage.version>
+        <assertj.version>3.10.0</assertj.version>
+        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+    </properties>
+
+</project>
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/CompanionObjectTest.kt b/guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/CompanionObjectTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/CompanionObjectTest.kt
rename to guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/CompanionObjectTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/ConstructorTest.kt b/guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/ConstructorTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/ConstructorTest.kt
rename to guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/ConstructorTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/DataClassTest.kt b/guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/DataClassTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/DataClassTest.kt
rename to guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/DataClassTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/DelegationTest.kt b/guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/DelegationTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/DelegationTest.kt
rename to guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/DelegationTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/ExceptionsTest.kt b/guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/ExceptionsTest.kt
similarity index 88%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/ExceptionsTest.kt
rename to guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/ExceptionsTest.kt
index d1b3390544..073c4dd890 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/ExceptionsTest.kt
+++ b/guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/ExceptionsTest.kt
@@ -24,7 +24,7 @@ class ExceptionsTest {
     fun givenANullString_whenUsingElvisOperator_thenExceptionIsThrown() {
         val sampleString: String? = null
 
-        val length: Int = sampleString?.length ?: throw IllegalArgumentException("String must not be null")
+        sampleString?.length ?: throw IllegalArgumentException("String must not be null")
     }
 
     private fun funThrowingException(): Nothing {
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/ExtensionFunctionsTest.kt b/guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/ExtensionFunctionsTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/ExtensionFunctionsTest.kt
rename to guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/ExtensionFunctionsTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/FunctionsTest.kt b/guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/FunctionsTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/FunctionsTest.kt
rename to guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/FunctionsTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/IsOperatorTest.kt b/guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/IsOperatorTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/IsOperatorTest.kt
rename to guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/IsOperatorTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/NullSafetyTest.kt b/guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/NullSafetyTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/NullSafetyTest.kt
rename to guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/NullSafetyTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/OperatorsOverloadingTest.kt b/guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/OperatorsOverloadingTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/OperatorsOverloadingTest.kt
rename to guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/OperatorsOverloadingTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/PropertiesTest.kt b/guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/PropertiesTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/PropertiesTest.kt
rename to guest/core-kotlin/src/test/kotlin/com/baeldung/kotlinvsjava/PropertiesTest.kt
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/lifecycle/DirtyDataInspector.java b/hibernate5/src/main/java/com/baeldung/hibernate/lifecycle/DirtyDataInspector.java
new file mode 100644
index 0000000000..4e00be2b5c
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/lifecycle/DirtyDataInspector.java
@@ -0,0 +1,26 @@
+package com.baeldung.hibernate.lifecycle;
+
+import org.hibernate.EmptyInterceptor;
+import org.hibernate.type.Type;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class DirtyDataInspector extends EmptyInterceptor {
+    private static final ArrayList<FootballPlayer> dirtyEntities = new ArrayList<>();
+
+    @Override
+    public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types) {
+        dirtyEntities.add((FootballPlayer) entity);
+        return true;
+    }
+
+    public static List<FootballPlayer> getDirtyEntities() {
+        return dirtyEntities;
+    }
+
+    public static void clearDirtyEntitites() {
+        dirtyEntities.clear();
+    }
+}
\ No newline at end of file
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/lifecycle/FootballPlayer.java b/hibernate5/src/main/java/com/baeldung/hibernate/lifecycle/FootballPlayer.java
new file mode 100644
index 0000000000..49799a5292
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/lifecycle/FootballPlayer.java
@@ -0,0 +1,35 @@
+package com.baeldung.hibernate.lifecycle;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "Football_Player")
+public class FootballPlayer {
+    @Id
+    @GeneratedValue
+    private long id;
+
+    @Column
+    private String name;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "FootballPlayer{" + "id=" + id + ", name='" + name + '\'' + '}';
+    }
+}
\ No newline at end of file
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/lifecycle/HibernateLifecycleUtil.java b/hibernate5/src/main/java/com/baeldung/hibernate/lifecycle/HibernateLifecycleUtil.java
new file mode 100644
index 0000000000..a06685fb9c
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/lifecycle/HibernateLifecycleUtil.java
@@ -0,0 +1,96 @@
+package com.baeldung.hibernate.lifecycle;
+
+import org.h2.tools.RunScript;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.SessionFactoryBuilder;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.engine.spi.EntityEntry;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.service.ServiceRegistry;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.stream.Collectors;
+
+public class HibernateLifecycleUtil {
+    private static SessionFactory sessionFactory;
+    private static Connection connection;
+
+    public static void init() throws Exception {
+        Properties hbConfigProp = getHibernateProperties();
+        Class.forName(hbConfigProp.getProperty("hibernate.connection.driver_class"));
+        connection = DriverManager.getConnection(hbConfigProp.getProperty("hibernate.connection.url"), hbConfigProp.getProperty("hibernate.connection.username"), hbConfigProp.getProperty("hibernate.connection.password"));
+
+        try (InputStream h2InitStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("lifecycle-init.sql");
+            InputStreamReader h2InitReader = new InputStreamReader(h2InitStream)) {
+            RunScript.execute(connection, h2InitReader);
+        }
+
+        ServiceRegistry serviceRegistry = configureServiceRegistry();
+        sessionFactory = getSessionFactoryBuilder(serviceRegistry).applyInterceptor(new DirtyDataInspector()).build();
+    }
+
+    public static void tearDown() throws Exception {
+        sessionFactory.close();
+        connection.close();
+    }
+
+    public static SessionFactory getSessionFactory() {
+        return sessionFactory;
+    }
+
+    private static SessionFactoryBuilder getSessionFactoryBuilder(ServiceRegistry serviceRegistry) {
+        MetadataSources metadataSources = new MetadataSources(serviceRegistry);
+        metadataSources.addAnnotatedClass(FootballPlayer.class);
+
+        Metadata metadata = metadataSources.buildMetadata();
+        return metadata.getSessionFactoryBuilder();
+
+    }
+
+    private static ServiceRegistry configureServiceRegistry() throws IOException {
+        Properties properties = getHibernateProperties();
+        return new StandardServiceRegistryBuilder().applySettings(properties).build();
+    }
+
+    private static Properties getHibernateProperties() throws IOException {
+        Properties properties = new Properties();
+        URL propertiesURL = Thread.currentThread().getContextClassLoader().getResource("hibernate-lifecycle.properties");
+        try (FileInputStream inputStream = new FileInputStream(propertiesURL.getFile())) {
+            properties.load(inputStream);
+        }
+        return properties;
+    }
+
+    public static List<EntityEntry> getManagedEntities(Session session) {
+        Map.Entry<Object, EntityEntry>[] entries = ((SessionImplementor) session).getPersistenceContext().reentrantSafeEntityEntries();
+        return Arrays.stream(entries).map(e -> e.getValue()).collect(Collectors.toList());
+    }
+
+    public static Transaction startTransaction(Session s) {
+        Transaction tx = s.getTransaction();
+        tx.begin();
+        return tx;
+    }
+
+    public static int queryCount(String query) throws Exception {
+        try (ResultSet rs = connection.createStatement().executeQuery(query)) {
+            rs.next();
+            return rs.getInt(1);
+        }
+    }
+}
diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/interceptors/HibernateInterceptorUnitTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/interceptors/HibernateInterceptorUnitTest.java
index 0049f3a6bd..e18e989905 100644
--- a/hibernate5/src/test/java/com/baeldung/hibernate/interceptors/HibernateInterceptorUnitTest.java
+++ b/hibernate5/src/test/java/com/baeldung/hibernate/interceptors/HibernateInterceptorUnitTest.java
@@ -58,5 +58,4 @@ public class HibernateInterceptorUnitTest {
         transaction.commit();
         session.close();
     }
-    
 }
diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/lifecycle/HibernateLifecycleUnitTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/lifecycle/HibernateLifecycleUnitTest.java
new file mode 100644
index 0000000000..e682b46481
--- /dev/null
+++ b/hibernate5/src/test/java/com/baeldung/hibernate/lifecycle/HibernateLifecycleUnitTest.java
@@ -0,0 +1,164 @@
+package com.baeldung.hibernate.lifecycle;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.hibernate.engine.spi.Status;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.util.List;
+
+import static com.baeldung.hibernate.lifecycle.DirtyDataInspector.getDirtyEntities;
+import static com.baeldung.hibernate.lifecycle.HibernateLifecycleUtil.*;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class HibernateLifecycleUnitTest {
+
+    @BeforeClass
+    public static void setup() throws Exception {
+        HibernateLifecycleUtil.init();
+
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        HibernateLifecycleUtil.tearDown();
+    }
+
+    @Before
+    public void beforeMethod() {
+        DirtyDataInspector.clearDirtyEntitites();
+    }
+
+    @Test
+    public void whenEntityLoaded_thenEntityManaged() throws Exception {
+        SessionFactory sessionFactory = HibernateLifecycleUtil.getSessionFactory();
+        try (Session session = sessionFactory.openSession()) {
+            Transaction transaction = startTransaction(session);
+
+            assertThat(getManagedEntities(session)).isEmpty();
+
+            List<FootballPlayer> players = session.createQuery("from FootballPlayer").getResultList();
+            assertThat(getManagedEntities(session)).size().isEqualTo(3);
+
+            assertThat(getDirtyEntities()).isEmpty();
+
+            FootballPlayer gigiBuffon = players.stream().filter(p -> p.getId() == 3).findFirst().get();
+
+            gigiBuffon.setName("Gianluigi Buffon");
+            transaction.commit();
+
+            assertThat(getDirtyEntities()).size().isEqualTo(1);
+            assertThat(getDirtyEntities().get(0).getId()).isEqualTo(3);
+            assertThat(getDirtyEntities().get(0).getName()).isEqualTo("Gianluigi Buffon");
+        }
+    }
+
+    @Test
+    public void whenDetached_thenNotTracked() throws Exception {
+        SessionFactory sessionFactory = HibernateLifecycleUtil.getSessionFactory();
+        try (Session session = sessionFactory.openSession()) {
+            Transaction transaction = startTransaction(session);
+
+            FootballPlayer cr7 = session.get(FootballPlayer.class, 1L);
+            assertThat(getManagedEntities(session)).size().isEqualTo(1);
+            assertThat(getManagedEntities(session).get(0).getId()).isEqualTo(cr7.getId());
+
+            session.evict(cr7);
+            assertThat(getManagedEntities(session)).size().isEqualTo(0);
+
+            cr7.setName("CR7");
+            transaction.commit();
+
+            assertThat(getDirtyEntities()).isEmpty();
+        }
+    }
+
+    @Test
+    public void whenReattached_thenTrackedAgain() throws Exception {
+        SessionFactory sessionFactory = HibernateLifecycleUtil.getSessionFactory();
+        try (Session session = sessionFactory.openSession()) {
+            Transaction transaction = startTransaction(session);
+
+            FootballPlayer messi = session.get(FootballPlayer.class, 2L);
+
+            session.evict(messi);
+            messi.setName("Leo Messi");
+            transaction.commit();
+            assertThat(getDirtyEntities()).isEmpty();
+
+            transaction = startTransaction(session);
+            session.update(messi);
+            transaction.commit();
+            assertThat(getDirtyEntities()).size().isEqualTo(1);
+            assertThat(getDirtyEntities().get(0).getName()).isEqualTo("Leo Messi");
+        }
+    }
+
+    @Test
+    public void givenNewEntityWithID_whenReattached_thenManaged() throws Exception {
+        SessionFactory sessionFactory = HibernateLifecycleUtil.getSessionFactory();
+        try (Session session = sessionFactory.openSession()) {
+            Transaction transaction = startTransaction(session);
+
+            FootballPlayer gigi = new FootballPlayer();
+            gigi.setId(3);
+            gigi.setName("Gigi the Legend");
+
+            session.update(gigi);
+            assertThat(getManagedEntities(session)).size().isEqualTo(1);
+
+            transaction.commit();
+            assertThat(getDirtyEntities()).size().isEqualTo(1);
+        }
+    }
+
+    @Test
+    public void givenTransientEntity_whenSave_thenManaged() throws Exception {
+        SessionFactory sessionFactory = HibernateLifecycleUtil.getSessionFactory();
+        try (Session session = sessionFactory.openSession()) {
+            Transaction transaction = startTransaction(session);
+
+            FootballPlayer neymar = new FootballPlayer();
+            neymar.setName("Neymar");
+
+            session.save(neymar);
+            assertThat(getManagedEntities(session)).size().isEqualTo(1);
+            assertThat(neymar.getId()).isNotNull();
+
+            int count = queryCount("select count(*) from Football_Player where name='Neymar'");
+            assertThat(count).isEqualTo(0);
+
+            transaction.commit();
+
+            count = queryCount("select count(*) from Football_Player where name='Neymar'");
+            assertThat(count).isEqualTo(1);
+
+            transaction = startTransaction(session);
+            session.delete(neymar);
+            transaction.commit();
+        }
+    }
+
+    @Test()
+    public void whenDelete_thenMarkDeleted() throws Exception {
+        SessionFactory sessionFactory = HibernateLifecycleUtil.getSessionFactory();
+        try (Session session = sessionFactory.openSession()) {
+            Transaction transaction = startTransaction(session);
+
+            FootballPlayer neymar = new FootballPlayer();
+            neymar.setName("Neymar");
+
+            session.save(neymar);
+            transaction.commit();
+
+            transaction = startTransaction(session);
+            session.delete(neymar);
+            assertThat(getManagedEntities(session).get(0).getStatus()).isEqualTo(Status.DELETED);
+            transaction.commit();
+        }
+    }
+}
diff --git a/hibernate5/src/test/resources/hibernate-lifecycle.properties b/hibernate5/src/test/resources/hibernate-lifecycle.properties
new file mode 100644
index 0000000000..d043b624f2
--- /dev/null
+++ b/hibernate5/src/test/resources/hibernate-lifecycle.properties
@@ -0,0 +1,9 @@
+hibernate.connection.driver_class=org.h2.Driver
+hibernate.connection.url=jdbc:h2:mem:lifecycledb;DB_CLOSE_DELAY=-1;
+hibernate.connection.username=sa
+hibernate.connection.password=
+hibernate.connection.autocommit=true
+
+hibernate.dialect=org.hibernate.dialect.H2Dialect
+hibernate.show_sql=true
+hibernate.hbm2ddl.auto=validate
\ No newline at end of file
diff --git a/hibernate5/src/test/resources/lifecycle-init.sql b/hibernate5/src/test/resources/lifecycle-init.sql
new file mode 100644
index 0000000000..c0c9a3f34d
--- /dev/null
+++ b/hibernate5/src/test/resources/lifecycle-init.sql
@@ -0,0 +1,25 @@
+create sequence hibernate_sequence start with 1 increment by 1;
+
+create table Football_Player (
+  id bigint not null,
+  name varchar(255),
+  primary key (id)
+);
+
+insert into
+    Football_Player
+        (name, id)
+    values
+        ('Cristiano Ronaldo', next value for hibernate_sequence);
+
+insert into
+    Football_Player
+        (name, id)
+    values
+        ('Lionel Messi', next value for hibernate_sequence);
+
+insert into
+    Football_Player
+        (name, id)
+    values
+        ('Gigi Buffon', next value for hibernate_sequence);
\ No newline at end of file
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/java-strings/README.md b/java-strings/README.md
new file mode 100644
index 0000000000..d5b9b45b20
--- /dev/null
+++ b/java-strings/README.md
@@ -0,0 +1,27 @@
+=========
+
+## Java Strings Cookbooks and Examples
+
+### Relevant Articles: 
+- [String Operations with Java Streams](http://www.baeldung.com/java-stream-operations-on-strings)
+- [Converting String to Stream of chars](http://www.baeldung.com/java-string-to-stream)
+- [Java 8 StringJoiner](http://www.baeldung.com/java-string-joiner)
+- [Image to Base64 String Conversion](http://www.baeldung.com/java-base64-image-string)
+- [Java – Generate Random String](http://www.baeldung.com/java-random-string)
+- [Convert char to String in Java](http://www.baeldung.com/java-convert-char-to-string)
+- [Convert String to int or Integer in Java](http://www.baeldung.com/java-convert-string-to-int-or-integer)
+- [How to Convert String to different data types in Java](http://www.baeldung.com/java-string-conversions)
+- [Converting Strings to Enums in Java](http://www.baeldung.com/java-string-to-enum)
+- [Quick Guide to the Java StringTokenizer](http://www.baeldung.com/java-stringtokenizer)
+- [Count Occurrences of a Char in a String](http://www.baeldung.com/java-count-chars)
+- [Split a String in Java](http://www.baeldung.com/java-split-string)
+- [How to Remove the Last Character of a String?](http://www.baeldung.com/java-remove-last-character-of-string)
+- [CharSequence vs. String in Java](http://www.baeldung.com/java-char-sequence-string)
+- [StringBuilder and StringBuffer in Java](http://www.baeldung.com/java-string-builder-string-buffer)
+- [Guide to Java String Pool](http://www.baeldung.com/java-string-pool)
+- [Check if a String is a Palindrome](http://www.baeldung.com/java-palindrome)
+- [Comparing Strings in Java](http://www.baeldung.com/java-compare-strings)
+- [Check If a String Is Numeric in Java](http://www.baeldung.com/java-check-string-number)
+- [Why Use char[] Array Over a String for Storing Passwords in Java?](http://www.baeldung.com/java-storing-passwords)
+- [Convert a String to Title Case](http://www.baeldung.com/java-string-title-case)
+- [Compact Strings in Java 9](http://www.baeldung.com/java-9-compact-string)
\ No newline at end of file
diff --git a/java-strings/pom.xml b/java-strings/pom.xml
new file mode 100644
index 0000000000..86b8924c4b
--- /dev/null
+++ b/java-strings/pom.xml
@@ -0,0 +1,107 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>java-strings</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>java-strings</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>${commons-codec.version}</version>
+        </dependency>
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${jmh-core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.ibm.icu</groupId>
+            <artifactId>icu4j</artifactId>
+            <version>${icu4j.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>java-strings</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/libs</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <compilerArgument>-parameters</compilerArgument>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <!-- util -->
+        <commons-lang3.version>3.5</commons-lang3.version>
+        <commons-codec.version>1.10</commons-codec.version>
+        <!-- testing -->
+        <assertj.version>3.6.1</assertj.version>
+        <jmh-core.version>1.19</jmh-core.version>
+        <icu4j.version>61.1</icu4j.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/datetime/UseLocalDateTime.java b/java-strings/src/main/java/com/baeldung/datetime/UseLocalDateTime.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/datetime/UseLocalDateTime.java
rename to java-strings/src/main/java/com/baeldung/datetime/UseLocalDateTime.java
diff --git a/java-strings/src/main/java/com/baeldung/enums/PizzaStatusEnum.java b/java-strings/src/main/java/com/baeldung/enums/PizzaStatusEnum.java
new file mode 100644
index 0000000000..a84829c38d
--- /dev/null
+++ b/java-strings/src/main/java/com/baeldung/enums/PizzaStatusEnum.java
@@ -0,0 +1,44 @@
+package com.baeldung.enums;
+
+public enum PizzaStatusEnum {
+    ORDERED(5) {
+        @Override
+        public boolean isOrdered() {
+            return true;
+        }
+    },
+    READY(2) {
+        @Override
+        public boolean isReady() {
+            return true;
+        }
+    },
+    DELIVERED(0) {
+        @Override
+        public boolean isDelivered() {
+            return true;
+        }
+    };
+
+    private int timeToDelivery;
+
+    public boolean isOrdered() {
+        return false;
+    }
+
+    public boolean isReady() {
+        return false;
+    }
+
+    public boolean isDelivered() {
+        return false;
+    }
+
+    public int getTimeToDelivery() {
+        return timeToDelivery;
+    }
+
+    PizzaStatusEnum(int timeToDelivery) {
+        this.timeToDelivery = timeToDelivery;
+    }
+}
diff --git a/core-java-9/src/main/java/com/baeldung/java9/compactstring/CompactStringDemo.java b/java-strings/src/main/java/com/baeldung/java9/compactstring/CompactStringDemo.java
similarity index 100%
rename from core-java-9/src/main/java/com/baeldung/java9/compactstring/CompactStringDemo.java
rename to java-strings/src/main/java/com/baeldung/java9/compactstring/CompactStringDemo.java
diff --git a/core-java-8/src/main/java/com/baeldung/string/JoinerSplitter.java b/java-strings/src/main/java/com/baeldung/string/JoinerSplitter.java
similarity index 100%
rename from core-java-8/src/main/java/com/baeldung/string/JoinerSplitter.java
rename to java-strings/src/main/java/com/baeldung/string/JoinerSplitter.java
diff --git a/core-java/src/main/java/com/baeldung/string/Palindrome.java b/java-strings/src/main/java/com/baeldung/string/Palindrome.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/string/Palindrome.java
rename to java-strings/src/main/java/com/baeldung/string/Palindrome.java
diff --git a/core-java/src/main/java/com/baeldung/string/StringBufferStringBuilder.java b/java-strings/src/main/java/com/baeldung/string/StringBufferStringBuilder.java
similarity index 96%
rename from core-java/src/main/java/com/baeldung/string/StringBufferStringBuilder.java
rename to java-strings/src/main/java/com/baeldung/string/StringBufferStringBuilder.java
index 74f489d57f..72af4a9aee 100644
--- a/core-java/src/main/java/com/baeldung/string/StringBufferStringBuilder.java
+++ b/java-strings/src/main/java/com/baeldung/string/StringBufferStringBuilder.java
@@ -1,46 +1,46 @@
-package com.baeldung.string;
-
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.runner.Runner;
-import org.openjdk.jmh.runner.RunnerException;
-import org.openjdk.jmh.runner.options.Options;
-import org.openjdk.jmh.runner.options.OptionsBuilder;
-
-public class StringBufferStringBuilder {
-
-    public static void main(String[] args) throws RunnerException {
-
-        Options opt = new OptionsBuilder()
-            .include(StringBufferStringBuilder.class.getSimpleName())
-            .build();
-
-        new Runner(opt).run();
-    }
-    
-    @State(Scope.Benchmark)
-    public static class MyState {
-        int iterations = 1000;
-        String initial = "abc";
-        String suffix = "def";
-    }
-     
-    @Benchmark
-    public StringBuffer benchmarkStringBuffer(MyState state) {
-        StringBuffer stringBuffer = new StringBuffer(state.initial);
-        for (int i = 0; i < state.iterations; i++) {
-            stringBuffer.append(state.suffix);
-        }
-        return stringBuffer;
-    }
-
-    @Benchmark
-    public StringBuilder benchmarkStringBuilder(MyState state) {
-        StringBuilder stringBuilder = new StringBuilder(state.initial);
-        for (int i = 0; i < state.iterations; i++) {
-            stringBuilder.append(state.suffix);
-        }
-        return stringBuilder;
-    }
+package com.baeldung.string;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+public class StringBufferStringBuilder {
+
+    public static void main(String[] args) throws RunnerException {
+
+        Options opt = new OptionsBuilder()
+            .include(StringBufferStringBuilder.class.getSimpleName())
+            .build();
+
+        new Runner(opt).run();
+    }
+    
+    @State(Scope.Benchmark)
+    public static class MyState {
+        int iterations = 1000;
+        String initial = "abc";
+        String suffix = "def";
+    }
+     
+    @Benchmark
+    public StringBuffer benchmarkStringBuffer(MyState state) {
+        StringBuffer stringBuffer = new StringBuffer(state.initial);
+        for (int i = 0; i < state.iterations; i++) {
+            stringBuffer.append(state.suffix);
+        }
+        return stringBuffer;
+    }
+
+    @Benchmark
+    public StringBuilder benchmarkStringBuilder(MyState state) {
+        StringBuilder stringBuilder = new StringBuilder(state.initial);
+        for (int i = 0; i < state.iterations; i++) {
+            stringBuilder.append(state.suffix);
+        }
+        return stringBuilder;
+    }
 }
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/string/StringHelper.java b/java-strings/src/main/java/com/baeldung/string/StringHelper.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/string/StringHelper.java
rename to java-strings/src/main/java/com/baeldung/string/StringHelper.java
diff --git a/core-java/src/main/java/com/baeldung/string/TitleCaseConverter.java b/java-strings/src/main/java/com/baeldung/string/TitleCaseConverter.java
similarity index 97%
rename from core-java/src/main/java/com/baeldung/string/TitleCaseConverter.java
rename to java-strings/src/main/java/com/baeldung/string/TitleCaseConverter.java
index 0fdda86f2a..81043f6dac 100644
--- a/core-java/src/main/java/com/baeldung/string/TitleCaseConverter.java
+++ b/java-strings/src/main/java/com/baeldung/string/TitleCaseConverter.java
@@ -1,12 +1,13 @@
 package com.baeldung.string;
 
-import com.ibm.icu.lang.UCharacter;
-import com.ibm.icu.text.BreakIterator;
-import org.apache.commons.lang.WordUtils;
-
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.text.WordUtils;
+
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.text.BreakIterator;
+
 public class TitleCaseConverter {
 
     private static final String WORD_SEPARATOR = " ";
diff --git a/core-java/src/main/java/com/baeldung/stringisnumeric/Benchmarking.java b/java-strings/src/main/java/com/baeldung/stringisnumeric/Benchmarking.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/stringisnumeric/Benchmarking.java
rename to java-strings/src/main/java/com/baeldung/stringisnumeric/Benchmarking.java
diff --git a/core-java/src/main/java/com/baeldung/stringisnumeric/IsNumeric.java b/java-strings/src/main/java/com/baeldung/stringisnumeric/IsNumeric.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/stringisnumeric/IsNumeric.java
rename to java-strings/src/main/java/com/baeldung/stringisnumeric/IsNumeric.java
diff --git a/core-java/src/main/java/com/baeldung/stringisnumeric/IsNumericDriver.java b/java-strings/src/main/java/com/baeldung/stringisnumeric/IsNumericDriver.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/stringisnumeric/IsNumericDriver.java
rename to java-strings/src/main/java/com/baeldung/stringisnumeric/IsNumericDriver.java
diff --git a/core-java/src/main/java/com/baeldung/stringtokenizer/MyTokenizer.java b/java-strings/src/main/java/com/baeldung/stringtokenizer/MyTokenizer.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/stringtokenizer/MyTokenizer.java
rename to java-strings/src/main/java/com/baeldung/stringtokenizer/MyTokenizer.java
diff --git a/core-java/src/main/resources/data.csv b/java-strings/src/main/resources/data.csv
similarity index 100%
rename from core-java/src/main/resources/data.csv
rename to java-strings/src/main/resources/data.csv
diff --git a/java-strings/src/main/resources/logback.xml b/java-strings/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/java-strings/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/core-java/src/test/java/com/baeldung/CharArrayToStringUnitTest.java b/java-strings/src/test/java/com/baeldung/CharArrayToStringUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/CharArrayToStringUnitTest.java
rename to java-strings/src/test/java/com/baeldung/CharArrayToStringUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/CharToStringUnitTest.java b/java-strings/src/test/java/com/baeldung/CharToStringUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/CharToStringUnitTest.java
rename to java-strings/src/test/java/com/baeldung/CharToStringUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/StringToCharArrayUnitTest.java b/java-strings/src/test/java/com/baeldung/StringToCharArrayUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/StringToCharArrayUnitTest.java
rename to java-strings/src/test/java/com/baeldung/StringToCharArrayUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/StringToIntOrIntegerUnitTest.java b/java-strings/src/test/java/com/baeldung/StringToIntOrIntegerUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/StringToIntOrIntegerUnitTest.java
rename to java-strings/src/test/java/com/baeldung/StringToIntOrIntegerUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/chararraypassword/PasswordStoreExamplesUnitTest.java b/java-strings/src/test/java/com/baeldung/chararraypassword/PasswordStoreExamplesUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/chararraypassword/PasswordStoreExamplesUnitTest.java
rename to java-strings/src/test/java/com/baeldung/chararraypassword/PasswordStoreExamplesUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/enums/PizzaUnitTest.java b/java-strings/src/test/java/com/baeldung/enums/PizzaUnitTest.java
new file mode 100644
index 0000000000..3e52a89bad
--- /dev/null
+++ b/java-strings/src/test/java/com/baeldung/enums/PizzaUnitTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.enums;
+
+import static junit.framework.TestCase.assertTrue;
+
+import org.junit.Test;
+
+public class PizzaUnitTest {
+    
+    @Test
+    public void whenConvertedIntoEnum_thenGetsConvertedCorrectly() {
+        String pizzaEnumValue = "READY";
+        PizzaStatusEnum pizzaStatusEnum = PizzaStatusEnum.valueOf(pizzaEnumValue);
+        assertTrue(pizzaStatusEnum == PizzaStatusEnum.READY);
+    }
+    
+    @Test(expected = IllegalArgumentException.class)
+    public void whenConvertedIntoEnum_thenThrowsException() {
+        String pizzaEnumValue = "rEAdY";
+        PizzaStatusEnum pizzaStatusEnum = PizzaStatusEnum.valueOf(pizzaEnumValue);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void givenInvalidEnumValueContentWiseAsString_whenConvertedIntoEnum_thenThrowsException() {
+        String pizzaEnumValue = "invalid";
+        PizzaStatusEnum pizzaStatusEnum = PizzaStatusEnum.valueOf(pizzaEnumValue);
+    }
+}
\ No newline at end of file
diff --git a/core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java b/java-strings/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
rename to java-strings/src/test/java/com/baeldung/fileToBase64StringConversion/FileToBase64StringConversionUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/java/conversion/README.md b/java-strings/src/test/java/com/baeldung/java/conversion/README.md
similarity index 100%
rename from core-java/src/test/java/com/baeldung/java/conversion/README.md
rename to java-strings/src/test/java/com/baeldung/java/conversion/README.md
diff --git a/core-java/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java b/java-strings/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java
rename to java-strings/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java b/java-strings/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java
similarity index 98%
rename from core-java/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java
rename to java-strings/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java
index aeb33fe875..e2dd0ac1db 100644
--- a/core-java/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java
+++ b/java-strings/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java
@@ -1,13 +1,14 @@
 package com.baeldung.java.countingChars;
 
-import com.google.common.base.CharMatcher;
-import org.apache.commons.lang.StringUtils;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.junit.Assert.assertEquals;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
+
+import com.google.common.base.CharMatcher;
 
 
 /***
diff --git a/core-java-8/src/test/java/com/baeldung/java8/base64/ApacheCommonsEncodeDecodeUnitTest.java b/java-strings/src/test/java/com/baeldung/java8/base64/ApacheCommonsEncodeDecodeUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/base64/ApacheCommonsEncodeDecodeUnitTest.java
rename to java-strings/src/test/java/com/baeldung/java8/base64/ApacheCommonsEncodeDecodeUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/java8/base64/Java8EncodeDecodeUnitTest.java b/java-strings/src/test/java/com/baeldung/java8/base64/Java8EncodeDecodeUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/java8/base64/Java8EncodeDecodeUnitTest.java
rename to java-strings/src/test/java/com/baeldung/java8/base64/Java8EncodeDecodeUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/string/CharSequenceVsStringUnitTest.java b/java-strings/src/test/java/com/baeldung/string/CharSequenceVsStringUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/string/CharSequenceVsStringUnitTest.java
rename to java-strings/src/test/java/com/baeldung/string/CharSequenceVsStringUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/string/JoinerSplitterUnitTest.java b/java-strings/src/test/java/com/baeldung/string/JoinerSplitterUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/string/JoinerSplitterUnitTest.java
rename to java-strings/src/test/java/com/baeldung/string/JoinerSplitterUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/string/PalindromeUnitTest.java b/java-strings/src/test/java/com/baeldung/string/PalindromeUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/string/PalindromeUnitTest.java
rename to java-strings/src/test/java/com/baeldung/string/PalindromeUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/string/SplitUnitTest.java b/java-strings/src/test/java/com/baeldung/string/SplitUnitTest.java
similarity index 97%
rename from core-java/src/test/java/com/baeldung/string/SplitUnitTest.java
rename to java-strings/src/test/java/com/baeldung/string/SplitUnitTest.java
index 83fd253b97..3859a2b26b 100644
--- a/core-java/src/test/java/com/baeldung/string/SplitUnitTest.java
+++ b/java-strings/src/test/java/com/baeldung/string/SplitUnitTest.java
@@ -1,12 +1,13 @@
 package com.baeldung.string;
 
-import com.google.common.base.Splitter;
-import org.apache.commons.lang.StringUtils;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
+
+import com.google.common.base.Splitter;
 
 public class SplitUnitTest {
 
diff --git a/core-java/src/test/java/com/baeldung/string/StringComparisonUnitTest.java b/java-strings/src/test/java/com/baeldung/string/StringComparisonUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/string/StringComparisonUnitTest.java
rename to java-strings/src/test/java/com/baeldung/string/StringComparisonUnitTest.java
diff --git a/java-strings/src/test/java/com/baeldung/string/StringContainingCharactersUnitTest.java b/java-strings/src/test/java/com/baeldung/string/StringContainingCharactersUnitTest.java
new file mode 100644
index 0000000000..75548f4d73
--- /dev/null
+++ b/java-strings/src/test/java/com/baeldung/string/StringContainingCharactersUnitTest.java
@@ -0,0 +1,98 @@
+package com.baeldung.string;
+
+import org.junit.Test;
+
+import java.util.regex.Pattern;
+
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+
+public class StringContainingCharactersUnitTest {
+
+    private static final Pattern[] inputRegexes = new Pattern[4];
+
+    static {
+        inputRegexes[0] = Pattern.compile(".*[A-Z].*");
+        inputRegexes[1] = Pattern.compile(".*[a-z].*");
+        inputRegexes[2] = Pattern.compile(".*\\d.*");
+        inputRegexes[3] = Pattern.compile(".*[`~!@#$%^&*()\\-_=+\\\\|\\[{\\]};:'\",<.>/?].*");
+    }
+
+    private static boolean isMatchingRegex(String input) {
+        boolean inputMatches = true;
+        for (Pattern inputRegex : inputRegexes) {
+            if (!inputRegex
+              .matcher(input)
+              .matches()) {
+                inputMatches = false;
+            }
+        }
+        return inputMatches;
+    }
+
+    private static boolean checkString(String input) {
+        String specialChars = "~`!@#$%^&*()-_=+\\|[{]};:'\",<.>/?";
+        char currentCharacter;
+        boolean numberPresent = false;
+        boolean upperCasePresent = false;
+        boolean lowerCasePresent = false;
+        boolean specialCharacterPresent = false;
+
+        for (int i = 0; i < input.length(); i++) {
+            currentCharacter = input.charAt(i);
+            if (Character.isDigit(currentCharacter)) {
+                numberPresent = true;
+            } else if (Character.isUpperCase(currentCharacter)) {
+                upperCasePresent = true;
+            } else if (Character.isLowerCase(currentCharacter)) {
+                lowerCasePresent = true;
+            } else if (specialChars.contains(String.valueOf(currentCharacter))) {
+                specialCharacterPresent = true;
+            }
+        }
+
+        return numberPresent && upperCasePresent && lowerCasePresent && specialCharacterPresent;
+    }
+
+    @Test
+    public void givenRegexes_whenMatchingCorrectString_thenMatches() {
+        String validInput = "Ab3;";
+        assertTrue(isMatchingRegex(validInput));
+    }
+
+    @Test
+    public void givenRegexes_whenMatchingWrongStrings_thenNotMatching() {
+        String invalidInput = "Ab3";
+        assertFalse(isMatchingRegex(invalidInput));
+
+        invalidInput = "Ab;";
+        assertFalse(isMatchingRegex(invalidInput));
+
+        invalidInput = "A3;";
+        assertFalse(isMatchingRegex(invalidInput));
+
+        invalidInput = "b3;";
+        assertFalse(isMatchingRegex(invalidInput));
+    }
+
+    @Test
+    public void givenValidString_whenChecking_thenCorrect() {
+        String validInput = "Ab3;";
+        assertTrue(checkString(validInput));
+    }
+
+    @Test
+    public void givenInvalidStrings_whenChecking_thenNotCorrect() {
+        String invalidInput = "Ab3";
+        assertFalse(checkString(invalidInput));
+
+        invalidInput = "Ab;";
+        assertFalse(checkString(invalidInput));
+
+        invalidInput = "A3;";
+        assertFalse(checkString(invalidInput));
+
+        invalidInput = "b3;";
+        assertFalse(checkString(invalidInput));
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/string/StringHelperUnitTest.java b/java-strings/src/test/java/com/baeldung/string/StringHelperUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/string/StringHelperUnitTest.java
rename to java-strings/src/test/java/com/baeldung/string/StringHelperUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/string/StringToCharStreamUnitTest.java b/java-strings/src/test/java/com/baeldung/string/StringToCharStreamUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/string/StringToCharStreamUnitTest.java
rename to java-strings/src/test/java/com/baeldung/string/StringToCharStreamUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/string/StringUnitTest.java b/java-strings/src/test/java/com/baeldung/string/StringUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/string/StringUnitTest.java
rename to java-strings/src/test/java/com/baeldung/string/StringUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/string/TitleCaseConverterUnitTest.java b/java-strings/src/test/java/com/baeldung/string/TitleCaseConverterUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/string/TitleCaseConverterUnitTest.java
rename to java-strings/src/test/java/com/baeldung/string/TitleCaseConverterUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/string/formatter/StringFormatterExampleUnitTest.java b/java-strings/src/test/java/com/baeldung/string/formatter/StringFormatterExampleUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/string/formatter/StringFormatterExampleUnitTest.java
rename to java-strings/src/test/java/com/baeldung/string/formatter/StringFormatterExampleUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/stringisnumeric/CoreJavaIsNumericUnitTest.java b/java-strings/src/test/java/com/baeldung/stringisnumeric/CoreJavaIsNumericUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/stringisnumeric/CoreJavaIsNumericUnitTest.java
rename to java-strings/src/test/java/com/baeldung/stringisnumeric/CoreJavaIsNumericUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/stringisnumeric/NumberUtilsIsCreatableUnitTest.java b/java-strings/src/test/java/com/baeldung/stringisnumeric/NumberUtilsIsCreatableUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/stringisnumeric/NumberUtilsIsCreatableUnitTest.java
rename to java-strings/src/test/java/com/baeldung/stringisnumeric/NumberUtilsIsCreatableUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/stringisnumeric/NumberUtilsIsParsableUnitTest.java b/java-strings/src/test/java/com/baeldung/stringisnumeric/NumberUtilsIsParsableUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/stringisnumeric/NumberUtilsIsParsableUnitTest.java
rename to java-strings/src/test/java/com/baeldung/stringisnumeric/NumberUtilsIsParsableUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/stringisnumeric/RegularExpressionsUnitTest.java b/java-strings/src/test/java/com/baeldung/stringisnumeric/RegularExpressionsUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/stringisnumeric/RegularExpressionsUnitTest.java
rename to java-strings/src/test/java/com/baeldung/stringisnumeric/RegularExpressionsUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/stringisnumeric/StringUtilsIsNumericSpaceUnitTest.java b/java-strings/src/test/java/com/baeldung/stringisnumeric/StringUtilsIsNumericSpaceUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/stringisnumeric/StringUtilsIsNumericSpaceUnitTest.java
rename to java-strings/src/test/java/com/baeldung/stringisnumeric/StringUtilsIsNumericSpaceUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/stringisnumeric/StringUtilsIsNumericUnitTest.java b/java-strings/src/test/java/com/baeldung/stringisnumeric/StringUtilsIsNumericUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/stringisnumeric/StringUtilsIsNumericUnitTest.java
rename to java-strings/src/test/java/com/baeldung/stringisnumeric/StringUtilsIsNumericUnitTest.java
diff --git a/core-java-8/src/test/java/com/baeldung/stringjoiner/StringJoinerUnitTest.java b/java-strings/src/test/java/com/baeldung/stringjoiner/StringJoinerUnitTest.java
similarity index 100%
rename from core-java-8/src/test/java/com/baeldung/stringjoiner/StringJoinerUnitTest.java
rename to java-strings/src/test/java/com/baeldung/stringjoiner/StringJoinerUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java b/java-strings/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java
rename to java-strings/src/test/java/com/baeldung/stringpool/StringPoolUnitTest.java
diff --git a/core-java/src/test/java/com/baeldung/stringtokenizer/TokenizerUnitTest.java b/java-strings/src/test/java/com/baeldung/stringtokenizer/TokenizerUnitTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/stringtokenizer/TokenizerUnitTest.java
rename to java-strings/src/test/java/com/baeldung/stringtokenizer/TokenizerUnitTest.java
diff --git a/java-strings/src/test/resources/.gitignore b/java-strings/src/test/resources/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/java-strings/src/test/resources/.gitignore
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file
diff --git a/core-java-8/src/test/resources/test_image.jpg b/java-strings/src/test/resources/test_image.jpg
similarity index 100%
rename from core-java-8/src/test/resources/test_image.jpg
rename to java-strings/src/test/resources/test_image.jpg
diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml
index afee807428..7b4eecd880 100644
--- a/javax-servlets/pom.xml
+++ b/javax-servlets/pom.xml
@@ -84,7 +84,7 @@
         <spring-test.version>5.0.5.RELEASE</spring-test.version>
         <gson.version>2.8.2</gson.version>
         <assertj.version>3.9.1</assertj.version>
-        <mockito.version>2.18.3</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
         <commons-fileupload.version>1.3.3</commons-fileupload.version>
         <commons-io.version>2.6</commons-io.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
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/json/pom.xml b/json/pom.xml
index c55e833b40..fa3fcafa65 100644
--- a/json/pom.xml
+++ b/json/pom.xml
@@ -33,6 +33,20 @@
             <artifactId>json</artifactId>
             <version>20171018</version>
         </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- https://search.maven.org/search?q=g:org.glassfish%20AND%20a:javax.json&core=gav  -->
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.json</artifactId>
+            <version>1.1.2</version>
+        </dependency>
+        
     </dependencies>
 
     <properties>
diff --git a/json/src/main/java/com/baeldung/jsonpointer/JsonPointerCrud.java b/json/src/main/java/com/baeldung/jsonpointer/JsonPointerCrud.java
new file mode 100644
index 0000000000..4398aa7867
--- /dev/null
+++ b/json/src/main/java/com/baeldung/jsonpointer/JsonPointerCrud.java
@@ -0,0 +1,95 @@
+package com.baeldung.jsonpointer;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.json.JsonPointer;
+import javax.json.JsonReader;
+import javax.json.JsonString;
+import javax.json.JsonStructure;
+
+public class JsonPointerCrud {
+
+    private JsonStructure jsonStructure = null;
+
+    public JsonPointerCrud(String fileName) throws IOException {
+
+        try (JsonReader reader = Json.createReader(Files.newBufferedReader(Paths.get(fileName)))) {
+            jsonStructure = reader.read();
+        } catch (FileNotFoundException e) {
+            System.out.println("Error to open json file: " + e.getMessage());
+        }
+
+    }
+
+    public JsonPointerCrud(InputStream stream) {
+
+        JsonReader reader = Json.createReader(stream);
+        jsonStructure = reader.read();
+        reader.close();
+
+    }
+
+    public JsonStructure insert(String key, String value) {
+
+        JsonPointer jsonPointer = Json.createPointer("/" + key);
+        JsonString jsonValue = Json.createValue(value);
+        jsonStructure = jsonPointer.add(jsonStructure, jsonValue);
+
+        return jsonStructure;
+
+    }
+
+    public JsonStructure update(String key, String newValue) {
+
+        JsonPointer jsonPointer = Json.createPointer("/" + key);
+        JsonString jsonNewValue = Json.createValue(newValue);
+        jsonStructure = jsonPointer.replace(jsonStructure, jsonNewValue);
+
+        return jsonStructure;
+    }
+
+    public JsonStructure delete(String key) {
+
+        JsonPointer jsonPointer = Json.createPointer("/" + key);
+        jsonPointer.getValue(jsonStructure);
+        jsonStructure = jsonPointer.remove(jsonStructure);
+
+        return jsonStructure;
+
+    }
+
+    public String fetchValueFromKey(String key) {
+        JsonPointer jsonPointer = Json.createPointer("/" + key);
+        JsonString jsonString = (JsonString) jsonPointer.getValue(jsonStructure);
+
+        return jsonString.getString();
+    }
+
+    public String fetchListValues(String key) {
+        JsonPointer jsonPointer = Json.createPointer("/" + key);
+        JsonObject jsonObject = (JsonObject) jsonPointer.getValue(jsonStructure);
+
+        return jsonObject.toString();
+    }
+
+    public String fetchFullJSON() {
+        JsonPointer jsonPointer = Json.createPointer("");
+        JsonObject jsonObject = (JsonObject) jsonPointer.getValue(jsonStructure);
+
+        return jsonObject.toString();
+
+    }
+
+    public boolean check(String key) {
+        JsonPointer jsonPointer = Json.createPointer("/" + key);
+        boolean found = jsonPointer.containsValue(jsonStructure);
+
+        return found;
+    }
+}
diff --git a/json/src/test/java/com/baeldung/jsonpointer/JsonPointerCrudUnitTest.java b/json/src/test/java/com/baeldung/jsonpointer/JsonPointerCrudUnitTest.java
new file mode 100644
index 0000000000..c1553db325
--- /dev/null
+++ b/json/src/test/java/com/baeldung/jsonpointer/JsonPointerCrudUnitTest.java
@@ -0,0 +1,59 @@
+package com.baeldung.jsonpointer;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class JsonPointerCrudUnitTest {
+
+    @Test
+    public void testJsonPointerCrudForAddress() {
+
+        JsonPointerCrud jsonPointerCrud = new JsonPointerCrud(JsonPointerCrudUnitTest.class.getResourceAsStream("/address.json"));
+
+        assertFalse(jsonPointerCrud.check("city"));
+
+        // insert a value
+        jsonPointerCrud.insert("city", "Rio de Janeiro");
+
+        assertTrue(jsonPointerCrud.check("city"));
+
+        // fetch full json
+        String fullJSON = jsonPointerCrud.fetchFullJSON();
+
+        assertTrue(fullJSON.contains("name"));
+
+        assertTrue(fullJSON.contains("city"));
+
+        // fetch value
+        String cityName = jsonPointerCrud.fetchValueFromKey("city");
+
+        assertEquals(cityName, "Rio de Janeiro");
+
+        // update value
+        jsonPointerCrud.update("city", "Sao Paulo");
+
+        // fetch value
+        cityName = jsonPointerCrud.fetchValueFromKey("city");
+
+        assertEquals(cityName, "Sao Paulo");
+
+        // delete
+        jsonPointerCrud.delete("city");
+
+        assertFalse(jsonPointerCrud.check("city"));
+
+    }
+
+    @Test
+    public void testJsonPointerCrudForBooks() {
+
+        JsonPointerCrud jsonPointerCrud = new JsonPointerCrud(JsonPointerCrudUnitTest.class.getResourceAsStream("/books.json"));
+
+        // fetch value
+        String book = jsonPointerCrud.fetchListValues("books/1");
+
+        assertEquals(book, "{\"title\":\"Title 2\",\"author\":\"John Doe\"}");
+
+    }
+}
\ No newline at end of file
diff --git a/json/src/test/resources/address.json b/json/src/test/resources/address.json
new file mode 100644
index 0000000000..599fcae12b
--- /dev/null
+++ b/json/src/test/resources/address.json
@@ -0,0 +1,4 @@
+{
+    "name": "Customer 01",
+    "street name": "Street 01"
+}
\ No newline at end of file
diff --git a/json/src/test/resources/books.json b/json/src/test/resources/books.json
new file mode 100644
index 0000000000..0defc3de98
--- /dev/null
+++ b/json/src/test/resources/books.json
@@ -0,0 +1,7 @@
+{
+    "library": "My Personal Library",
+    "books": [
+        { "title":"Title 1", "author":"Jane Doe" },
+        { "title":"Title 2", "author":"John Doe" }
+    ]
+}
\ No newline at end of file
diff --git a/maven/pom.xml b/maven/pom.xml
index a409432f8b..4bec533226 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -1,18 +1,60 @@
 <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>maven</artifactId>
     <version>0.0.1-SNAPSHOT</version>
+    <packaging>war</packaging>
 
-    <parent>
-        <artifactId>parent-modules</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet-core</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>${jetty.version}</version>
+                <configuration>
+                    <httpConnector>
+                        <port>8999</port>
+                    </httpConnector>
+                    <stopKey>quit</stopKey>
+                    <stopPort>9000</stopPort>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>start-jetty</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>start</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>stop-jetty</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>${maven.resources.version}</version>
@@ -31,7 +73,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
+                <version>${maven.compiler.version}</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -42,11 +84,13 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
+                <version>${maven.surefire.version}</version>
                 <configuration>
                     <excludes>
                         <exclude>DataTest.java</exclude>
+                        <exclude>**/*IntegrationTest</exclude>
                     </excludes>
+                    <excludedGroups>com.baeldung.maven.it.Integration</excludedGroups>
                     <includes>
                         <include>TestFail.java</include>
                         <include>DataCheck.java</include>
@@ -94,15 +138,166 @@
                     </filesets>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>${maven.build.helper.version}</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/another-src</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>add-integration-test-source</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/integration-test/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>add-integration-test-resource</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                            <goal>add-test-resource</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/integration-test/resources</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>default</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven.surefire.version}</version>
+                        <configuration>
+                            <excludes>
+                                <exclude>DataTest.java</exclude>
+                            </excludes>
+                            <includes>
+                                <include>TestFail.java</include>
+                                <include>DataCheck.java</include>
+                            </includes>
+                            <testFailureIgnore>true</testFailureIgnore>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>failsafe</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>${maven.failsafe.version}</version>
+                        <configuration>
+                            <includes>
+                                <include>**/*RestIT</include>
+                                <include>**/RestITCase</include>
+                            </includes>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>surefire</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven.surefire.version}</version>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>none</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/*IntegrationTest</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>category</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>${maven.failsafe.version}</version>
+                        <configuration>
+                            <includes>
+                                <include>**/*</include>
+                            </includes>
+                            <groups>com.baeldung.maven.it.Integration</groups>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <properties>
+        <java.version>1.8</java.version>
         <maven.resources.version>3.0.2</maven.resources.version>
-        <maven.failsafe.version>2.21.0</maven.failsafe.version>
+        <maven.compiler.version>3.8.0</maven.compiler.version>
+        <maven.surefire.version>2.22.0</maven.surefire.version>
+        <maven.failsafe.version>2.22.0</maven.failsafe.version>
         <maven.verifier.version>1.1</maven.verifier.version>
         <maven.clean.version>3.0.0</maven.clean.version>
+        <maven.build.helper.version>3.0.0</maven.build.helper.version>
         <resources.name>Baeldung</resources.name>
+        <jetty.version>9.4.11.v20180605</jetty.version>
+        <jersey.version>2.27</jersey.version>
+        <junit.version>4.12</junit.version>
     </properties>
-
 </project>
\ No newline at end of file
diff --git a/maven/src/integration-test/java/com/baeldung/maven/it/RestITCase.java b/maven/src/integration-test/java/com/baeldung/maven/it/RestITCase.java
new file mode 100644
index 0000000000..aaeeedb661
--- /dev/null
+++ b/maven/src/integration-test/java/com/baeldung/maven/it/RestITCase.java
@@ -0,0 +1,24 @@
+package com.baeldung.maven.it;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Scanner;
+
+import static org.junit.Assert.assertEquals;
+
+public class RestITCase {
+    @Test
+    public void whenSendingGet_thenMessageIsReturned() throws IOException {
+        String url = "http://localhost:8999";
+        URLConnection connection = new URL(url).openConnection();
+        try (InputStream response = connection.getInputStream();
+             Scanner scanner = new Scanner(response)) {
+            String responseBody = scanner.nextLine();
+            assertEquals("Welcome to Baeldung!", responseBody);
+        }
+    }
+}
diff --git a/maven/src/main/another-src/com/baeldung/maven/plugins/Foo.java b/maven/src/main/another-src/com/baeldung/maven/plugins/Foo.java
new file mode 100644
index 0000000000..f8a6fe9853
--- /dev/null
+++ b/maven/src/main/another-src/com/baeldung/maven/plugins/Foo.java
@@ -0,0 +1,10 @@
+package com.baeldung.maven.plugins;
+
+public class Foo {
+
+    public static String foo() {
+        return "foo";
+    }
+
+}
+
diff --git a/maven/src/main/java/com/baeldung/maven/it/EndpointConfig.java b/maven/src/main/java/com/baeldung/maven/it/EndpointConfig.java
new file mode 100644
index 0000000000..919210ccff
--- /dev/null
+++ b/maven/src/main/java/com/baeldung/maven/it/EndpointConfig.java
@@ -0,0 +1,9 @@
+package com.baeldung.maven.it;
+
+import org.glassfish.jersey.server.ResourceConfig;
+
+public class EndpointConfig extends ResourceConfig {
+    public EndpointConfig() {
+        register(RestEndpoint.class);
+    }
+}
diff --git a/maven/src/main/java/com/baeldung/maven/it/RestEndpoint.java b/maven/src/main/java/com/baeldung/maven/it/RestEndpoint.java
new file mode 100644
index 0000000000..c234891865
--- /dev/null
+++ b/maven/src/main/java/com/baeldung/maven/it/RestEndpoint.java
@@ -0,0 +1,12 @@
+package com.baeldung.maven.it;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/")
+public class RestEndpoint {
+    @GET
+    public String hello() {
+        return "Welcome to Baeldung!";
+    }
+}
diff --git a/maven/src/main/java/com/baeldung/maven/plugins/MultipleSrcFolders.java b/maven/src/main/java/com/baeldung/maven/plugins/MultipleSrcFolders.java
new file mode 100644
index 0000000000..d403918dd3
--- /dev/null
+++ b/maven/src/main/java/com/baeldung/maven/plugins/MultipleSrcFolders.java
@@ -0,0 +1,9 @@
+package com.baeldung.maven.plugins;
+
+public class MultipleSrcFolders {
+
+    public static void callFoo() {
+        Foo.foo();
+    }
+
+}
diff --git a/maven/src/main/webapp/WEB-INF/web.xml b/maven/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..1751ad17a5
--- /dev/null
+++ b/maven/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,17 @@
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+    <servlet>
+        <servlet-name>rest-servlet</servlet-name>
+        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+        <init-param>
+            <param-name>javax.ws.rs.Application</param-name>
+            <param-value>com.baeldung.maven.it.EndpointConfig</param-value>
+        </init-param>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>rest-servlet</servlet-name>
+        <url-pattern>/*</url-pattern>
+    </servlet-mapping>
+</web-app>
\ No newline at end of file
diff --git a/maven/src/test/java/com/baeldung/maven/it/Integration.java b/maven/src/test/java/com/baeldung/maven/it/Integration.java
new file mode 100644
index 0000000000..112ce178ce
--- /dev/null
+++ b/maven/src/test/java/com/baeldung/maven/it/Integration.java
@@ -0,0 +1,4 @@
+package com.baeldung.maven.it;
+
+public interface Integration {
+}
diff --git a/maven/src/test/java/com/baeldung/maven/it/RestIT.java b/maven/src/test/java/com/baeldung/maven/it/RestIT.java
new file mode 100644
index 0000000000..0115d34f1e
--- /dev/null
+++ b/maven/src/test/java/com/baeldung/maven/it/RestIT.java
@@ -0,0 +1,24 @@
+package com.baeldung.maven.it;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Scanner;
+
+import static org.junit.Assert.assertEquals;
+
+public class RestIT {
+    @Test
+    public void whenSendingGet_thenMessageIsReturned() throws IOException {
+        String url = "http://localhost:8999";
+        URLConnection connection = new URL(url).openConnection();
+        try (InputStream response = connection.getInputStream();
+             Scanner scanner = new Scanner(response)) {
+            String responseBody = scanner.nextLine();
+            assertEquals("Welcome to Baeldung!", responseBody);
+        }
+    }
+}
diff --git a/maven/src/test/java/com/baeldung/maven/it/RestIntegrationTest.java b/maven/src/test/java/com/baeldung/maven/it/RestIntegrationTest.java
new file mode 100644
index 0000000000..2f913c8429
--- /dev/null
+++ b/maven/src/test/java/com/baeldung/maven/it/RestIntegrationTest.java
@@ -0,0 +1,24 @@
+package com.baeldung.maven.it;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Scanner;
+
+import static org.junit.Assert.assertEquals;
+
+public class RestIntegrationTest {
+    @Test
+    public void whenSendingGet_thenMessageIsReturned() throws IOException {
+        String url = "http://localhost:8999";
+        URLConnection connection = new URL(url).openConnection();
+        try (InputStream response = connection.getInputStream();
+             Scanner scanner = new Scanner(response)) {
+            String responseBody = scanner.nextLine();
+            assertEquals("Welcome to Baeldung!", responseBody);
+        }
+    }
+}
diff --git a/maven/src/test/java/com/baeldung/maven/it/RestJUnitTest.java b/maven/src/test/java/com/baeldung/maven/it/RestJUnitTest.java
new file mode 100644
index 0000000000..60995d75bd
--- /dev/null
+++ b/maven/src/test/java/com/baeldung/maven/it/RestJUnitTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.maven.it;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Scanner;
+
+import static org.junit.Assert.assertEquals;
+
+@Category(Integration.class)
+public class RestJUnitTest {
+    @Test
+    public void whenSendingGet_thenMessageIsReturned() throws IOException {
+        String url = "http://localhost:8999";
+        URLConnection connection = new URL(url).openConnection();
+        try (InputStream response = connection.getInputStream();
+             Scanner scanner = new Scanner(response)) {
+            String responseBody = scanner.nextLine();
+            assertEquals("Welcome to Baeldung!", responseBody);
+        }
+    }
+}
diff --git a/maven/src/test/java/testfail/TestFail.java b/maven/src/test/java/testfail/TestFail.java
index 16f1619db4..3febd21031 100644
--- a/maven/src/test/java/testfail/TestFail.java
+++ b/maven/src/test/java/testfail/TestFail.java
@@ -1,10 +1,13 @@
 package testfail;
 
 import org.junit.Test;
+import org.junit.Ignore;
 
 import static org.junit.Assert.assertNotNull;
 
 public class TestFail {
+	
+    @Ignore //ignored so the entire tutorials build passes
     @Test
     public void whenMessageAssigned_thenItIsNotNull() {
         String message = "hello there";
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/patterns/design-patterns/src/main/java/com/baeldung/state/DeliveredState.java b/patterns/design-patterns/src/main/java/com/baeldung/state/DeliveredState.java
new file mode 100644
index 0000000000..9f5e4d8fc4
--- /dev/null
+++ b/patterns/design-patterns/src/main/java/com/baeldung/state/DeliveredState.java
@@ -0,0 +1,25 @@
+package com.baeldung.state;
+
+public class DeliveredState implements PackageState {
+
+    @Override
+    public void next(Package pkg) {
+        pkg.setState(new ReceivedState());
+    }
+
+    @Override
+    public void prev(Package pkg) {
+        pkg.setState(new OrderedState());
+    }
+
+    @Override
+    public void printStatus() {
+        System.out.println("Package delivered to post office, not received yet.");
+    }
+
+    @Override
+    public String toString() {
+        return "DeliveredState{}";
+    }
+
+}
\ No newline at end of file
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/state/OrderedState.java b/patterns/design-patterns/src/main/java/com/baeldung/state/OrderedState.java
new file mode 100644
index 0000000000..0642c4c73c
--- /dev/null
+++ b/patterns/design-patterns/src/main/java/com/baeldung/state/OrderedState.java
@@ -0,0 +1,24 @@
+package com.baeldung.state;
+
+public class OrderedState implements PackageState {
+
+    @Override
+    public void next(Package pkg) {
+        pkg.setState(new DeliveredState());
+    }
+
+    @Override
+    public void prev(Package pkg) {
+        System.out.println("The package is in it's root state.");
+    }
+
+    @Override
+    public void printStatus() {
+        System.out.println("Package ordered, not delivered to the office yet.");
+    }
+
+    @Override
+    public String toString() {
+        return "OrderedState{}";
+    }
+}
\ No newline at end of file
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/state/Package.java b/patterns/design-patterns/src/main/java/com/baeldung/state/Package.java
new file mode 100644
index 0000000000..f3dfbb3fa7
--- /dev/null
+++ b/patterns/design-patterns/src/main/java/com/baeldung/state/Package.java
@@ -0,0 +1,26 @@
+package com.baeldung.state;
+
+public class Package {
+
+    private PackageState state = new OrderedState();
+
+    public PackageState getState() {
+        return state;
+    }
+
+    public void setState(PackageState state) {
+        this.state = state;
+    }
+
+    public void previousState() {
+        state.prev(this);
+    }
+
+    public void nextState() {
+        state.next(this);
+    }
+
+    public void printStatus() {
+        state.printStatus();
+    }
+}
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/state/PackageState.java b/patterns/design-patterns/src/main/java/com/baeldung/state/PackageState.java
new file mode 100644
index 0000000000..d6656c78ac
--- /dev/null
+++ b/patterns/design-patterns/src/main/java/com/baeldung/state/PackageState.java
@@ -0,0 +1,10 @@
+package com.baeldung.state;
+
+public interface PackageState {
+
+    void next(Package pkg);
+
+    void prev(Package pkg);
+
+    void printStatus();
+}
\ No newline at end of file
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/state/ReceivedState.java b/patterns/design-patterns/src/main/java/com/baeldung/state/ReceivedState.java
new file mode 100644
index 0000000000..84136fa48e
--- /dev/null
+++ b/patterns/design-patterns/src/main/java/com/baeldung/state/ReceivedState.java
@@ -0,0 +1,24 @@
+package com.baeldung.state;
+
+public class ReceivedState implements PackageState {
+
+    @Override
+    public void next(Package pkg) {
+        System.out.println("This package is already received by a client.");
+    }
+
+    @Override
+    public void prev(Package pkg) {
+        pkg.setState(new DeliveredState());
+    }
+
+    @Override
+    public void printStatus() {
+        System.out.println("Package was received by client.");
+    }
+
+    @Override
+    public String toString() {
+        return "ReceivedState{}";
+    }
+}
\ No newline at end of file
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/state/StateDemo.java b/patterns/design-patterns/src/main/java/com/baeldung/state/StateDemo.java
new file mode 100644
index 0000000000..1a63ea3ddf
--- /dev/null
+++ b/patterns/design-patterns/src/main/java/com/baeldung/state/StateDemo.java
@@ -0,0 +1,19 @@
+package com.baeldung.state;
+
+public class StateDemo {
+
+    public static void main(String[] args) {
+
+        Package pkg = new Package();
+        pkg.printStatus();
+
+        pkg.nextState();
+        pkg.printStatus();
+
+        pkg.nextState();
+        pkg.printStatus();
+
+        pkg.nextState();
+        pkg.printStatus();
+    }
+}
diff --git a/patterns/design-patterns/src/test/java/com/baeldung/state/StatePatternUnitTest.java b/patterns/design-patterns/src/test/java/com/baeldung/state/StatePatternUnitTest.java
new file mode 100644
index 0000000000..731974f92b
--- /dev/null
+++ b/patterns/design-patterns/src/test/java/com/baeldung/state/StatePatternUnitTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.state;
+
+import com.baeldung.state.Package;
+
+import static org.junit.Assert.assertThat;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
+import org.junit.Test;
+
+public class StatePatternUnitTest {
+
+    @Test
+    public void givenNewPackage_whenPackageReceived_thenStateReceived() {
+        Package pkg = new Package();
+
+        assertThat(pkg.getState(), instanceOf(OrderedState.class));
+        pkg.nextState();
+
+        assertThat(pkg.getState(), instanceOf(DeliveredState.class));
+        pkg.nextState();
+
+        assertThat(pkg.getState(), instanceOf(ReceivedState.class));
+    }
+
+    @Test
+    public void givenDeliveredPackage_whenPrevState_thenStateOrdered() {
+        Package pkg = new Package();
+        pkg.setState(new DeliveredState());
+        pkg.previousState();
+
+        assertThat(pkg.getState(), instanceOf(OrderedState.class));
+    }
+}
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/persistence-modules/spring-hibernate-5/README.md b/persistence-modules/spring-hibernate-5/README.md
index d48723ac31..b4d73708c3 100644
--- a/persistence-modules/spring-hibernate-5/README.md
+++ b/persistence-modules/spring-hibernate-5/README.md
@@ -3,3 +3,4 @@
 - [Guide to @Immutable Annotation in Hibernate](http://www.baeldung.com/hibernate-immutable)
 - [Hibernate Many to Many Annotation Tutorial](http://www.baeldung.com/hibernate-many-to-many)
 - [Programmatic Transactions in the Spring TestContext Framework](http://www.baeldung.com/spring-test-programmatic-transactions)
+- [Hibernate Criteria Queries](http://www.baeldung.com/hibernate-criteria-queries)
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/criteria/model/Item.java b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/criteria/model/Item.java
new file mode 100644
index 0000000000..957207b7e6
--- /dev/null
+++ b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/criteria/model/Item.java
@@ -0,0 +1,81 @@
+package com.baeldung.hibernate.criteria.model;
+
+import java.io.Serializable;
+
+public class Item implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Integer itemId;
+    private String itemName;
+    private String itemDescription;
+    private Integer itemPrice;
+
+    // constructors
+    public Item() {
+
+    }
+
+    public Item(final Integer itemId, final String itemName, final String itemDescription) {
+        super();
+        this.itemId = itemId;
+        this.itemName = itemName;
+        this.itemDescription = itemDescription;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((itemId == null) ? 0 : itemId.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        final Item other = (Item) obj;
+        if (itemId == null) {
+            if (other.itemId != null)
+                return false;
+        } else if (!itemId.equals(other.itemId))
+            return false;
+        return true;
+    }
+
+    public Integer getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(final Integer itemId) {
+        this.itemId = itemId;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(final String itemName) {
+        this.itemName = itemName;
+    }
+
+    public String getItemDescription() {
+        return itemDescription;
+    }
+
+    public Integer getItemPrice() {
+        return itemPrice;
+    }
+
+    public void setItemPrice(final Integer itemPrice) {
+        this.itemPrice = itemPrice;
+    }
+
+    public void setItemDescription(final String itemDescription) {
+        this.itemDescription = itemDescription;
+    }
+}
diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java
similarity index 100%
rename from spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java
rename to persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java
new file mode 100644
index 0000000000..72d4dea377
--- /dev/null
+++ b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java
@@ -0,0 +1,335 @@
+/**
+ * ApplicationViewer is the class that starts the application
+ * First it creates the session object and then creates the
+ * criteria query.
+ *
+ *  @author  Pritam Banerjee
+ *  @version 1.0
+ *  @since   07/20/2016
+ */
+
+package com.baeldung.hibernate.criteria.view;
+
+import java.util.List;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.hibernate.Session;
+import org.hibernate.query.Query;
+
+import com.baeldung.hibernate.criteria.model.Item;
+import com.baeldung.hibernate.criteria.util.HibernateUtil;
+
+public class ApplicationView {
+
+    // default Constructor
+    public ApplicationView() {
+
+    }
+
+    public boolean checkIfCriteriaTimeLower() {
+        final Session session = HibernateUtil.getHibernateSession();
+        final CriteriaBuilder cb = session.getCriteriaBuilder();
+        final CriteriaQuery<Item> cr = cb.createQuery(Item.class);
+        final Root<Item> root = cr.from(Item.class);
+
+        // calculate the time taken by criteria
+        final long startTimeCriteria = System.nanoTime();
+        cr.select(root)
+            .where(cb.like(root.get("itemName"), "%item One%"));
+        // .add(Restrictions.like("itemName", "%item One%"));
+        Query<Item> query = session.createQuery(cr);
+
+        final List<Item> results = query.getResultList();
+        final long endTimeCriteria = System.nanoTime();
+        final long durationCriteria = (endTimeCriteria - startTimeCriteria) / 1000;
+
+        // calculate the time taken by HQL
+        final long startTimeHQL = System.nanoTime();
+        session.beginTransaction();
+        final List<Item> items = session.createQuery("FROM Item where itemName like '%item One%'")
+            .list();
+        final long endTimeHQL = System.nanoTime();
+        final long durationHQL = (endTimeHQL - startTimeHQL) / 1000;
+
+        if (durationCriteria > durationHQL) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    // To get items having price more than 1000
+    public String[] greaterThanCriteria() {
+        final Session session = HibernateUtil.getHibernateSession();
+        final CriteriaBuilder cb = session.getCriteriaBuilder();
+        final CriteriaQuery<Item> cr = cb.createQuery(Item.class);
+        final Root<Item> root = cr.from(Item.class);
+        cr.select(root)
+            .where(cb.gt(root.get("itemPrice"), 1000));
+        // cr.add(Restrictions.gt("itemPrice", 1000));
+        Query<Item> query = session.createQuery(cr);
+        final List<Item> greaterThanItemsList = query.getResultList();
+        final String greaterThanItems[] = new String[greaterThanItemsList.size()];
+        for (int i = 0; i < greaterThanItemsList.size(); i++) {
+            greaterThanItems[i] = greaterThanItemsList.get(i)
+                .getItemName();
+        }
+        session.close();
+        return greaterThanItems;
+    }
+
+    // To get items having price less than 1000
+    public String[] lessThanCriteria() {
+        final Session session = HibernateUtil.getHibernateSession();
+        final CriteriaBuilder cb = session.getCriteriaBuilder();
+        final CriteriaQuery<Item> cr = cb.createQuery(Item.class);
+        final Root<Item> root = cr.from(Item.class);
+        cr.select(root)
+            .where(cb.lt(root.get("itemPrice"), 1000));
+        // cr.add(Restrictions.lt("itemPrice", 1000));
+        Query<Item> query = session.createQuery(cr);
+        final List<Item> lessThanItemsList = query.getResultList();
+        final String lessThanItems[] = new String[lessThanItemsList.size()];
+        for (int i = 0; i < lessThanItemsList.size(); i++) {
+            lessThanItems[i] = lessThanItemsList.get(i)
+                .getItemName();
+        }
+        session.close();
+        return lessThanItems;
+    }
+
+    // To get items whose Name start with Chair
+    public String[] likeCriteria() {
+        final Session session = HibernateUtil.getHibernateSession();
+        final CriteriaBuilder cb = session.getCriteriaBuilder();
+        final CriteriaQuery<Item> cr = cb.createQuery(Item.class);
+        final Root<Item> root = cr.from(Item.class);
+        cr.select(root)
+            .where(cb.like(root.get("itemName"), "%chair%"));
+        // cr.add(Restrictions.like("itemName", "%chair%"));
+        Query<Item> query = session.createQuery(cr);
+        final List<Item> likeItemsList = query.getResultList();
+        final String likeItems[] = new String[likeItemsList.size()];
+        for (int i = 0; i < likeItemsList.size(); i++) {
+            likeItems[i] = likeItemsList.get(i)
+                .getItemName();
+        }
+        session.close();
+        return likeItems;
+    }
+
+    // Case sensitive search
+    public String[] likeCaseCriteria() {
+        final Session session = HibernateUtil.getHibernateSession();
+        final CriteriaBuilder cb = session.getCriteriaBuilder();
+        final CriteriaQuery<Item> cr = cb.createQuery(Item.class);
+        final Root<Item> root = cr.from(Item.class);
+        cr.select(root)
+            .where(cb.like(cb.lower(root.get("itemName")), "%chair%"));
+        // cr.add(Restrictions.ilike("itemName", "%Chair%"));
+        Query<Item> query = session.createQuery(cr);
+        final List<Item> ilikeItemsList = query.getResultList();
+        final String ilikeItems[] = new String[ilikeItemsList.size()];
+        for (int i = 0; i < ilikeItemsList.size(); i++) {
+            ilikeItems[i] = ilikeItemsList.get(i)
+                .getItemName();
+        }
+        session.close();
+        return ilikeItems;
+    }
+
+    // To get records having itemPrice in between 100 and 200
+    public String[] betweenCriteria() {
+        final Session session = HibernateUtil.getHibernateSession();
+        final CriteriaBuilder cb = session.getCriteriaBuilder();
+        final CriteriaQuery<Item> cr = cb.createQuery(Item.class);
+        final Root<Item> root = cr.from(Item.class);
+        cr.select(root)
+            .where(cb.between(root.get("itemPrice"), 100, 200));
+        // cr.add(Restrictions.between("itemPrice", 100, 200));
+        Query<Item> query = session.createQuery(cr);
+        final List<Item> betweenItemsList = query.getResultList();
+        final String betweenItems[] = new String[betweenItemsList.size()];
+        for (int i = 0; i < betweenItemsList.size(); i++) {
+            betweenItems[i] = betweenItemsList.get(i)
+                .getItemName();
+        }
+        session.close();
+        return betweenItems;
+    }
+
+    // To check if the given property is null
+    public String[] nullCriteria() {
+        final Session session = HibernateUtil.getHibernateSession();
+        final CriteriaBuilder cb = session.getCriteriaBuilder();
+        final CriteriaQuery<Item> cr = cb.createQuery(Item.class);
+        final Root<Item> root = cr.from(Item.class);
+        cr.select(root)
+            .where(cb.isNull(root.get("itemDescription")));
+        // cr.add(Restrictions.isNull("itemDescription"));
+        Query<Item> query = session.createQuery(cr);
+        final List<Item> nullItemsList = query.getResultList();
+        final String nullDescItems[] = new String[nullItemsList.size()];
+        for (int i = 0; i < nullItemsList.size(); i++) {
+            nullDescItems[i] = nullItemsList.get(i)
+                .getItemName();
+        }
+        session.close();
+        return nullDescItems;
+    }
+
+    // To check if the given property is not null
+    public String[] notNullCriteria() {
+        final Session session = HibernateUtil.getHibernateSession();
+        final CriteriaBuilder cb = session.getCriteriaBuilder();
+        final CriteriaQuery<Item> cr = cb.createQuery(Item.class);
+        final Root<Item> root = cr.from(Item.class);
+        cr.select(root)
+            .where(cb.isNotNull(root.get("itemDescription")));
+        // cr.add(Restrictions.isNotNull("itemDescription"));
+        Query<Item> query = session.createQuery(cr);
+        final List<Item> notNullItemsList = query.getResultList();
+        final String notNullDescItems[] = new String[notNullItemsList.size()];
+        for (int i = 0; i < notNullItemsList.size(); i++) {
+            notNullDescItems[i] = notNullItemsList.get(i)
+                .getItemName();
+        }
+        session.close();
+        return notNullDescItems;
+    }
+
+    // Adding more than one expression in one cr
+    public String[] twoCriteria() {
+        final Session session = HibernateUtil.getHibernateSession();
+        final CriteriaBuilder cb = session.getCriteriaBuilder();
+        final CriteriaQuery<Item> cr = cb.createQuery(Item.class);
+        final Root<Item> root = cr.from(Item.class);
+        Predicate[] predicates = new Predicate[2];
+        predicates[0] = cb.isNull(root.get("itemDescription"));
+        predicates[1] = cb.like(root.get("itemName"), "chair%");
+        cr.select(root)
+            .where(predicates);
+        // cr.add(Restrictions.isNull("itemDescription"));
+        // cr.add(Restrictions.like("itemName", "chair%"));
+        Query<Item> query = session.createQuery(cr);
+        final List<Item> notNullItemsList = query.getResultList();
+        final String notNullDescItems[] = new String[notNullItemsList.size()];
+        for (int i = 0; i < notNullItemsList.size(); i++) {
+            notNullDescItems[i] = notNullItemsList.get(i)
+                .getItemName();
+        }
+        session.close();
+        return notNullDescItems;
+    }
+
+    // To get items matching with the above defined conditions joined
+    // with Logical AND
+    public String[] andLogicalCriteria() {
+        final Session session = HibernateUtil.getHibernateSession();
+        final CriteriaBuilder cb = session.getCriteriaBuilder();
+        final CriteriaQuery<Item> cr = cb.createQuery(Item.class);
+        final Root<Item> root = cr.from(Item.class);
+        Predicate greaterThanPrice = cb.gt(root.get("itemPrice"), 1000);
+        Predicate chairItems = cb.like(root.get("itemName"), "Chair%");
+        cr.select(root)
+            .where(cb.and(greaterThanPrice, chairItems));
+        // final Criterion greaterThanPrice = Restrictions.gt("itemPrice", 1000);
+        // final Criterion chairItems = Restrictions.like("itemName", "Chair%");
+        // final LogicalExpression andExample = Restrictions.and(greaterThanPrice, chairItems);
+        // cr.add(andExample);
+        Query<Item> query = session.createQuery(cr);
+        final List<Item> andItemsList = query.getResultList();
+        final String andItems[] = new String[andItemsList.size()];
+        for (int i = 0; i < andItemsList.size(); i++) {
+            andItems[i] = andItemsList.get(i)
+                .getItemName();
+        }
+        session.close();
+        return andItems;
+    }
+
+    // To get items matching with the above defined conditions joined
+    // with Logical OR
+    public String[] orLogicalCriteria() {
+        final Session session = HibernateUtil.getHibernateSession();
+        final CriteriaBuilder cb = session.getCriteriaBuilder();
+        final CriteriaQuery<Item> cr = cb.createQuery(Item.class);
+        final Root<Item> root = cr.from(Item.class);
+        Predicate greaterThanPrice = cb.gt(root.get("itemPrice"), 1000);
+        Predicate chairItems = cb.like(root.get("itemName"), "Chair%");
+        cr.select(root)
+            .where(cb.or(greaterThanPrice, chairItems));
+        Query<Item> query = session.createQuery(cr);
+        final List<Item> orItemsList = query.getResultList();
+        final String orItems[] = new String[orItemsList.size()];
+        for (int i = 0; i < orItemsList.size(); i++) {
+            orItems[i] = orItemsList.get(i)
+                .getItemName();
+        }
+        session.close();
+        return orItems;
+    }
+
+    // Sorting example
+    public String[] sortingCriteria() {
+        final Session session = HibernateUtil.getHibernateSession();
+        final CriteriaBuilder cb = session.getCriteriaBuilder();
+        final CriteriaQuery<Item> cr = cb.createQuery(Item.class);
+        final Root<Item> root = cr.from(Item.class);
+        cr.select(root);
+        cr.orderBy(cb.asc(root.get("itemName")), cb.desc(root.get("itemPrice")));
+        // cr.addOrder(Order.asc("itemName"));
+        // cr.addOrder(Order.desc("itemPrice")).list();
+        Query<Item> query = session.createQuery(cr);
+        final List<Item> sortedItemsList = query.getResultList();
+        final String sortedItems[] = new String[sortedItemsList.size()];
+        for (int i = 0; i < sortedItemsList.size(); i++) {
+            sortedItems[i] = sortedItemsList.get(i)
+                .getItemName();
+        }
+        session.close();
+        return sortedItems;
+    }
+
+    // Set projections Row Count
+    public Long[] projectionRowCount() {
+        final Session session = HibernateUtil.getHibernateSession();
+        final CriteriaBuilder cb = session.getCriteriaBuilder();
+        final CriteriaQuery<Long> cr = cb.createQuery(Long.class);
+        final Root<Item> root = cr.from(Item.class);
+        cr.select(cb.count(root));
+        Query<Long> query = session.createQuery(cr);
+        final List<Long> itemProjected = query.getResultList();
+        // session.createCriteria(Item.class).setProjection(Projections.rowCount()).list();
+        final Long projectedRowCount[] = new Long[itemProjected.size()];
+        for (int i = 0; i < itemProjected.size(); i++) {
+            projectedRowCount[i] = itemProjected.get(i);
+        }
+        session.close();
+        return projectedRowCount;
+    }
+
+    // Set projections average of itemPrice
+    public Double[] projectionAverage() {
+        final Session session = HibernateUtil.getHibernateSession();
+        final CriteriaBuilder cb = session.getCriteriaBuilder();
+        final CriteriaQuery<Double> cr = cb.createQuery(Double.class);
+        final Root<Item> root = cr.from(Item.class);
+        cr.select(cb.avg(root.get("itemPrice")));
+        Query<Double> query = session.createQuery(cr);
+        final List avgItemPriceList = query.getResultList();
+        // session.createCriteria(Item.class).setProjection(Projections.projectionList().add(Projections.avg("itemPrice"))).list();
+
+        final Double avgItemPrice[] = new Double[avgItemPriceList.size()];
+        for (int i = 0; i < avgItemPriceList.size(); i++) {
+            avgItemPrice[i] = (Double) avgItemPriceList.get(i);
+        }
+        session.close();
+        return avgItemPrice;
+    }
+
+}
diff --git a/persistence-modules/spring-hibernate-5/src/main/resources/import.sql b/persistence-modules/spring-hibernate-5/src/main/resources/import.sql
new file mode 100644
index 0000000000..ae008f29bc
--- /dev/null
+++ b/persistence-modules/spring-hibernate-5/src/main/resources/import.sql
@@ -0,0 +1,31 @@
+insert into item (item_id, item_name, item_desc, item_price)     
+values(1,'item One', 'test 1', 35.12);
+
+insert into item (item_id, item_name, item_desc, item_price)     
+values(2,'Pogo stick', 'Pogo stick', 466.12);
+insert into item (item_id, item_name, item_desc, item_price)     
+values(3,'Raft', 'Raft', 345.12);
+
+insert into item (item_id, item_name, item_desc, item_price)     
+values(4,'Skate Board', 'Skating', 135.71);
+
+insert into item (item_id, item_name, item_desc, item_price)     
+values(5,'Umbrella', 'Umbrella for Rain', 619.25);
+
+insert into item (item_id, item_name, item_desc, item_price)     
+values(6,'Glue', 'Glue for home', 432.73);
+
+insert into item (item_id, item_name, item_desc, item_price)     
+values(7,'Paint', 'Paint for Room', 1311.40);
+
+insert into item (item_id, item_name, item_desc, item_price)     
+values(8,'Red paint', 'Red paint for room', 1135.71);
+
+insert into item (item_id, item_name, item_desc, item_price)     
+values(9,'Household Chairs', 'Chairs for house', 25.71);
+
+insert into item (item_id, item_name, item_desc, item_price)     
+values(10,'Office Chairs', 'Chairs for office', 395.98);
+
+insert into item (item_id, item_name, item_desc, item_price)     
+values(11,'Outdoor Chairs', 'Chairs for outdoor activities', 1234.36);
diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java b/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java
similarity index 99%
rename from spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java
rename to persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java
index 2275bf14f2..723b097305 100644
--- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java
+++ b/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java
@@ -43,7 +43,6 @@ public class HibernateCriteriaIntegrationTest {
         }
         session.close();
         assertArrayEquals(expectedChairCaseItems, av.likeCaseCriteria());
-
     }
 
     @Test
diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java b/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java
similarity index 100%
rename from spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java
rename to persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestRunner.java
diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java b/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java
similarity index 100%
rename from spring-hibernate4/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java
rename to persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaTestSuite.java
diff --git a/spring-hibernate4/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml b/persistence-modules/spring-hibernate-5/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml
similarity index 100%
rename from spring-hibernate4/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml
rename to persistence-modules/spring-hibernate-5/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml
diff --git a/spring-hibernate4/src/test/resources/criteria.cfg.xml b/persistence-modules/spring-hibernate-5/src/test/resources/criteria.cfg.xml
similarity index 82%
rename from spring-hibernate4/src/test/resources/criteria.cfg.xml
rename to persistence-modules/spring-hibernate-5/src/test/resources/criteria.cfg.xml
index 726e9acb3f..bc4fed9680 100644
--- a/spring-hibernate4/src/test/resources/criteria.cfg.xml
+++ b/persistence-modules/spring-hibernate-5/src/test/resources/criteria.cfg.xml
@@ -10,8 +10,8 @@
 		<property name="hibernate.connection.username">sa</property>
 		<property name="hibernate.connection.password"></property>
 		<property name="hibernate.dialect">org.hibernate.dialect.H2Dialect</property>
-	    <property name="hibernate.hbm2ddl.auto">update</property>
-	    <property name="show_sql">true</property>
+	    <property name="hibernate.hbm2ddl.auto">create-drop</property>
+	    <property name="show_sql">false</property>        
 	    <mapping resource="com/baeldung/hibernate/criteria/model/Item.hbm.xml" />
 	</session-factory>
 </hibernate-configuration>
\ No newline at end of file
diff --git a/persistence-modules/spring-hibernate-5/src/test/resources/import.sql b/persistence-modules/spring-hibernate-5/src/test/resources/import.sql
new file mode 100644
index 0000000000..087d62d331
--- /dev/null
+++ b/persistence-modules/spring-hibernate-5/src/test/resources/import.sql
@@ -0,0 +1,21 @@
+insert into item (item_id, item_name, item_desc, item_price) values(1,'item One', 'test 1', 35.12);
+
+insert into item (item_id, item_name, item_desc, item_price) values(2,'Pogo stick', 'Pogo stick', 466.12);
+
+insert into item (item_id, item_name, item_desc, item_price) values(3,'Raft', 'Raft', 345.12);
+
+insert into item (item_id, item_name, item_desc, item_price) values(4,'Skate Board', 'Skating', 135.71);
+
+insert into item (item_id, item_name, item_desc, item_price) values(5,'Umbrella', 'Umbrella for Rain', 619.25);
+
+insert into item (item_id, item_name, item_desc, item_price) values(6,'Glue', 'Glue for home', 432.73);
+
+insert into item (item_id, item_name, item_desc, item_price) values(7,'Paint', 'Paint for Room', 1311.40);
+
+insert into item (item_id, item_name, item_desc, item_price) values(8,'Red paint', 'Red paint for room', 1135.71);
+
+insert into item (item_id, item_name, item_desc, item_price) values(9,'Household Chairs', 'Chairs for house', 25.71);
+
+insert into item (item_id, item_name, item_desc, item_price) values(10,'Office Chairs', 'Chairs for office', 395.98);
+
+insert into item (item_id, item_name, item_desc, item_price) values(11,'Outdoor Chairs', 'Chairs for outdoor activities', 1234.36);
diff --git a/pom.xml b/pom.xml
index a9aaff3e22..080c288987 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>
@@ -307,6 +342,7 @@
 				<module>azure</module>
 				<module>bootique</module>
 				<module>cdi</module>
+				<module>java-strings</module>
 				<!--<module>core-java-9</module> --> <!-- Commented because we have still not upgraded to java 9 -->
 				<module>core-java</module>
 				<module>core-java-collections</module>
@@ -316,6 +352,7 @@
 				<module>core-kotlin</module>
 				<module>core-groovy</module>
 				<module>core-java-concurrency</module>
+				<module>core-java-concurrency-collections</module>
 				<module>couchbase</module>
 				<module>deltaspike</module>
 				<module>dozer</module>
@@ -399,6 +436,7 @@
 				<module>testing-modules/rest-testing</module>
 				<module>resteasy</module>
 				<module>rxjava</module>
+				<module>rxjava-2</module>
 				<module>spring-swagger-codegen</module>
 				<module>testing-modules/selenium-junit-testng</module>
 				<module>persistence-modules/solr</module>
@@ -406,6 +444,8 @@
 				<module>spring-4</module>
 				<module>spring-5</module>
 				<module>spring-5-reactive</module>
+				<module>spring-5-reactive-security</module>
+				<module>spring-5-reactive-client</module>
 				<module>spring-5-mvc</module>
 				<module>spring-5-security</module>
 				<module>spring-activiti</module>
@@ -551,7 +591,6 @@
 				<module>apache-meecrowave</module>
 				<module>spring-reactive-kotlin</module>
 				<module>jnosql</module>
-				<module>sse-jaxrs</module>
 				<module>spring-boot-angular-ecommerce</module>
 			</modules>
 
@@ -656,6 +695,7 @@
 				<module>testing-modules/rest-testing</module>
 				<module>resteasy</module>
 				<module>rxjava</module>
+				<module>rxjava-2</module>
 				<module>spring-swagger-codegen</module>
 				<module>testing-modules/selenium-junit-testng</module>
 				<module>persistence-modules/solr</module>
@@ -663,6 +703,8 @@
 				<module>spring-4</module>
 				<module>spring-5</module>
 				<module>spring-5-reactive</module>
+				<module>spring-5-reactive-security</module>
+				<module>spring-5-reactive-client</module>
 				<module>spring-5-mvc</module>
 				<module>spring-5-security</module>
 				<module>spring-activiti</module>
@@ -855,6 +897,7 @@
 				<module>azure</module>
 				<module>bootique</module>
 				<module>cdi</module>
+				<module>java-strings</module>
 				<!--<module>core-java-9</module> --> <!-- Commented because we have still not upgraded to java 9 -->
 				<module>core-java-collections</module>
 				<module>core-java-io</module>
@@ -936,12 +979,15 @@
 				<module>testing-modules/rest-testing</module>
 				<module>resteasy</module>
 				<module>rxjava</module>
+				<module>rxjava-2</module>
 				<module>spring-swagger-codegen</module>
 				<module>testing-modules/selenium-junit-testng</module>
 				<module>persistence-modules/solr</module>
 				<module>spark-java</module>
 				<module>spring-4</module>
 				<module>spring-5-reactive</module>
+				<module>spring-5-reactive-security</module>
+				<module>spring-5-reactive-client</module>
 				<module>spring-5-mvc</module>
 				<module>spring-5-security</module>
 				<module>spring-activiti</module>
@@ -1174,6 +1220,7 @@
                 <module>hibernate5</module>
                 <module>spring-data-elasticsearch</module>
                 <module>core-java-concurrency</module>
+				<module>core-java-concurrency-collections</module>
             </modules>
 
         </profile>
@@ -1201,7 +1248,7 @@
 		<!-- <gib.enabled>false</gib.enabled> -->
 		<junit.version>4.12</junit.version>
 		<org.hamcrest.version>1.3</org.hamcrest.version>
-		<mockito.version>2.8.9</mockito.version>
+		<mockito.version>2.21.0</mockito.version>
 		<!-- logging -->
 		<org.slf4j.version>1.7.21</org.slf4j.version>
 		<logback.version>1.1.7</logback.version>
@@ -1220,7 +1267,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>
@@ -1228,7 +1275,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/rxjava-2/README.md b/rxjava-2/README.md
new file mode 100644
index 0000000000..ccf575757f
--- /dev/null
+++ b/rxjava-2/README.md
@@ -0,0 +1,6 @@
+## Relevant articles:
+
+- [RxJava and Error Handling](http://www.baeldung.com/rxjava-error-handling)
+- [RxJava 2 – Flowable](http://www.baeldung.com/rxjava-2-flowable)
+- [RxJava Maybe](http://www.baeldung.com/rxjava-maybe)
+- [Introduction to RxRelay for RxJava](http://www.baeldung.com/rx-relay)
\ No newline at end of file
diff --git a/rxjava-2/pom.xml b/rxjava-2/pom.xml
new file mode 100644
index 0000000000..4c5ea014d7
--- /dev/null
+++ b/rxjava-2/pom.xml
@@ -0,0 +1,46 @@
+<?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>rxjava-2</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.reactivex.rxjava2</groupId>
+            <artifactId>rxjava</artifactId>
+            <version>${rx.java2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${awaitility.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.jakewharton.rxrelay2</groupId>
+            <artifactId>rxrelay</artifactId>
+            <version>${rxrelay.version}</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <assertj.version>3.8.0</assertj.version>
+        <rx.java2.version>2.1.3</rx.java2.version>
+        <awaitility.version>1.7.0</awaitility.version>
+        <rxrelay.version>2.0.0</rxrelay.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/rxjava/src/main/java/com/baeldung/rxjava/RandomRelay.java b/rxjava-2/src/main/java/com/baeldung/rxjava/RandomRelay.java
similarity index 100%
rename from rxjava/src/main/java/com/baeldung/rxjava/RandomRelay.java
rename to rxjava-2/src/main/java/com/baeldung/rxjava/RandomRelay.java
diff --git a/rxjava-2/src/main/resources/logback.xml b/rxjava-2/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/rxjava-2/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/rxjava/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java b/rxjava-2/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java
similarity index 100%
rename from rxjava/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java
rename to rxjava-2/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java
diff --git a/rxjava/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java b/rxjava-2/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java
similarity index 100%
rename from rxjava/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java
rename to rxjava-2/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java
diff --git a/rxjava/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java b/rxjava-2/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java
similarity index 100%
rename from rxjava/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java
rename to rxjava-2/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java
diff --git a/rxjava/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java b/rxjava-2/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java
similarity index 100%
rename from rxjava/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java
rename to rxjava-2/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java
diff --git a/rxjava/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java b/rxjava-2/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java
similarity index 100%
rename from rxjava/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java
rename to rxjava-2/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java
diff --git a/rxjava-2/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java b/rxjava-2/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java
new file mode 100644
index 0000000000..ade48a2cb9
--- /dev/null
+++ b/rxjava-2/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java
@@ -0,0 +1,65 @@
+package com.baeldung.rxjava.operators;
+
+import io.reactivex.Observable;
+import io.reactivex.schedulers.TestScheduler;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static org.hamcrest.CoreMatchers.hasItems;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+public class RxFlatmapAndSwitchmapUnitTest {
+    @Test
+    public void givenObservable_whenFlatmap_shouldAssertAllItemsReturned() {
+        //given
+        List<String> actualOutput = new ArrayList<>();
+        final TestScheduler scheduler = new TestScheduler();
+        final List<String> keywordToSearch = Arrays.asList("b", "bo", "boo", "book", "books");
+
+        //when
+        Observable.fromIterable(keywordToSearch)
+          .flatMap(s -> Observable
+            .just(s + " FirstResult", s + " SecondResult")
+            .delay(10, TimeUnit.SECONDS, scheduler))
+          .toList()
+          .doOnSuccess(s -> actualOutput.addAll(s))
+          .subscribe();
+
+        scheduler.advanceTimeBy(1, TimeUnit.MINUTES);
+
+        //then
+        assertThat(actualOutput, hasItems("b FirstResult", "b SecondResult",
+          "boo FirstResult", "boo SecondResult",
+          "bo FirstResult", "bo SecondResult",
+          "book FirstResult", "book SecondResult",
+          "books FirstResult", "books SecondResult"));
+    }
+
+    @Test
+    public void givenObservable_whenSwitchmap_shouldAssertLatestItemReturned() {
+        //given
+        List<String> actualOutput = new ArrayList<>();
+        final TestScheduler scheduler = new TestScheduler();
+        final List<String> keywordToSearch = Arrays.asList("b", "bo", "boo", "book", "books");
+
+        //when
+        Observable.fromIterable(keywordToSearch)
+          .switchMap(s -> Observable
+            .just(s + " FirstResult", s + " SecondResult")
+            .delay(10, TimeUnit.SECONDS, scheduler))
+          .toList()
+          .doOnSuccess(s -> actualOutput.addAll(s))
+          .subscribe();
+
+        scheduler.advanceTimeBy(1, TimeUnit.MINUTES);
+
+        //then
+        assertEquals(2, actualOutput.size());
+        assertThat(actualOutput, hasItems("books FirstResult", "books SecondResult"));
+    }
+}
diff --git a/rxjava/README.md b/rxjava/README.md
index 5c60e3bbce..76135797a6 100644
--- a/rxjava/README.md
+++ b/rxjava/README.md
@@ -4,15 +4,11 @@
 - [How to Test RxJava?](http://www.baeldung.com/rxjava-testing)
 - [Implementing Custom Operators in RxJava](http://www.baeldung.com/rxjava-custom-operators)
 - [Introduction to RxJava](http://www.baeldung.com/rx-java)
-- [RxJava and Error Handling](http://www.baeldung.com/rxjava-error-handling)
 - [Observable Utility Operators in RxJava](http://www.baeldung.com/rxjava-observable-operators)
 - [Introduction to rxjava-jdbc](http://www.baeldung.com/rxjava-jdbc)
 - [Schedulers in RxJava](http://www.baeldung.com/rxjava-schedulers)
 - [Mathematical and Aggregate Operators in RxJava](http://www.baeldung.com/rxjava-math)
 - [Combining Observables in RxJava](http://www.baeldung.com/rxjava-combine-observables)
-- [RxJava 2 – Flowable](http://www.baeldung.com/rxjava-2-flowable)
 - [RxJava StringObservable](http://www.baeldung.com/rxjava-string)
-- [RxJava Maybe](http://www.baeldung.com/rxjava-maybe)
-- [Introduction to RxRelay for RxJava](http://www.baeldung.com/rx-relay)
 - [Filtering Observables in RxJava](http://www.baeldung.com/rxjava-filtering)
 - [RxJava One Observable, Multiple Subscribers](http://www.baeldung.com/rxjava-multiple-subscribers-observable)
diff --git a/rxjava/pom.xml b/rxjava/pom.xml
index 49732c1ef4..b316001d87 100644
--- a/rxjava/pom.xml
+++ b/rxjava/pom.xml
@@ -20,12 +20,6 @@
             <version>${rx.java.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>io.reactivex.rxjava2</groupId>
-            <artifactId>rxjava</artifactId>
-            <version>${rx.java2.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>io.reactivex</groupId>
             <artifactId>rxjava-math</artifactId>
@@ -59,22 +53,15 @@
             <artifactId>assertj-core</artifactId>
             <version>${assertj.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.jakewharton.rxrelay2</groupId>
-            <artifactId>rxrelay</artifactId>
-            <version>${rxrelay.version}</version>
-        </dependency>
     </dependencies>
 
     <properties>
         <assertj.version>3.8.0</assertj.version>
         <rx.java.version>1.2.5</rx.java.version>
-        <rx.java2.version>2.1.3</rx.java2.version>
         <rx.java.jdbc.version>0.7.11</rx.java.jdbc.version>
         <rx.java.math.version>1.0.0</rx.java.math.version>
         <rx.java.string.version>1.1.1</rx.java.string.version>
         <awaitility.version>1.7.0</awaitility.version>
-        <rxrelay.version>2.0.0</rxrelay.version>
         <h2.version>1.4.196</h2.version>
     </properties>
 
diff --git a/spring-4/pom.xml b/spring-4/pom.xml
index d2632b5f55..62da44882f 100644
--- a/spring-4/pom.xml
+++ b/spring-4/pom.xml
@@ -19,6 +19,27 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.tomcat</groupId>
+                    <artifactId>tomcat-jdbc</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2database.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>${hikaricp.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -58,6 +79,7 @@
         <flips-web.version>1.0.1</flips-web.version>
         <lombok.version>1.16.18</lombok.version>
         <java.version>1.8</java.version>
+        <h2database.version>1.4.197</h2database.version>
     </properties>
 
 </project>
diff --git a/spring-4/src/test/java/com/baeldung/connectionpool/ApplicationWithHikariConnectionPool.java b/spring-4/src/test/java/com/baeldung/connectionpool/ApplicationWithHikariConnectionPool.java
new file mode 100644
index 0000000000..0bd8637681
--- /dev/null
+++ b/spring-4/src/test/java/com/baeldung/connectionpool/ApplicationWithHikariConnectionPool.java
@@ -0,0 +1,12 @@
+package com.baeldung.connectionpool;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ApplicationWithHikariConnectionPool {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ApplicationWithHikariConnectionPool.class, args);
+    }
+}
diff --git a/spring-4/src/test/java/com/baeldung/connectionpool/HikariIntegrationTest.java b/spring-4/src/test/java/com/baeldung/connectionpool/HikariIntegrationTest.java
new file mode 100644
index 0000000000..0cc876d5b1
--- /dev/null
+++ b/spring-4/src/test/java/com/baeldung/connectionpool/HikariIntegrationTest.java
@@ -0,0 +1,28 @@
+package com.baeldung.connectionpool;
+
+import static org.junit.Assert.*;
+
+import javax.sql.DataSource;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(
+    // instead of setting this property, we can exclude the dependency to org.apache.tomcat:tomcat-jdbc in pom.xml
+    properties = "spring.datasource.type=com.zaxxer.hikari.HikariDataSource")
+public class HikariIntegrationTest {
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Test
+    public void hikariConnectionPoolIsConfigured() {
+        assertEquals("com.zaxxer.hikari.HikariDataSource", dataSource.getClass()
+            .getName());
+    }
+
+}
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-security/.gitignore b/spring-5-reactive-security/.gitignore
new file mode 100644
index 0000000000..dec013dfa4
--- /dev/null
+++ b/spring-5-reactive-security/.gitignore
@@ -0,0 +1,12 @@
+#folders#
+.idea
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file
diff --git a/spring-5-reactive-security/README.md b/spring-5-reactive-security/README.md
new file mode 100644
index 0000000000..3395cf5562
--- /dev/null
+++ b/spring-5-reactive-security/README.md
@@ -0,0 +1,11 @@
+## Spring 5 Reactive Security Examples
+
+### The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
+### Relevant Articles
+
+- [Spring Boot Actuator](http://www.baeldung.com/spring-boot-actuators)
+- [Spring Security 5 for Reactive Applications](http://www.baeldung.com/spring-security-5-reactive)
+- [Guide to Spring 5 WebFlux](http://www.baeldung.com/spring-webflux)
+
diff --git a/spring-5-reactive-security/pom.xml b/spring-5-reactive-security/pom.xml
new file mode 100644
index 0000000000..3b64b9b3ac
--- /dev/null
+++ b/spring-5-reactive-security/pom.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-5-reactive-security</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>spring-5-reactive-security</name>
+    <description>spring 5 security sample project about new features</description>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectreactor</groupId>
+            <artifactId>reactor-spring</artifactId>
+            <version>${reactor-spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.json.bind</groupId>
+            <artifactId>javax.json.bind-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-json_1.1_spec</artifactId>
+            <version>${geronimo-json_1.1_spec.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.johnzon</groupId>
+            <artifactId>johnzon-jsonb</artifactId>
+        </dependency>
+        <!-- utils -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <!-- runtime and test scoped -->
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <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.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>${commons-collections4.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.reactivex.rxjava2</groupId>
+            <artifactId>rxjava</artifactId>
+            <version>${rxjava-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <version>${project-reactor-test}</version>
+            <scope>test</scope>
+        </dependency>
+	    <dependency>
+	        <groupId>org.springframework.boot</groupId>
+	        <artifactId>spring-boot-starter-security</artifactId>
+	    </dependency>
+	    <dependency>
+	        <groupId>org.springframework.security</groupId>
+	        <artifactId>spring-security-test</artifactId>
+	        <scope>test</scope>
+	    </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.baeldung.webflux.EmployeeSpringApplication</mainClass>
+                    <layout>JAR</layout>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <reactor-spring.version>1.0.1.RELEASE</reactor-spring.version>
+        <rxjava-version>2.1.12</rxjava-version>
+        <johnzon.version>1.1.3</johnzon.version>
+        <jsonb-api.version>1.0</jsonb-api.version>
+        <geronimo-json_1.1_spec.version>1.0</geronimo-json_1.1_spec.version>
+        <commons-collections4.version>4.1</commons-collections4.version>
+        <project-reactor-test>3.1.6.RELEASE</project-reactor-test>
+    </properties>
+
+</project>
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceReactiveHealthIndicator.java b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceReactiveHealthIndicator.java
similarity index 100%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceReactiveHealthIndicator.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceReactiveHealthIndicator.java
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/actuator/FeaturesEndpoint.java b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/FeaturesEndpoint.java
similarity index 100%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/actuator/FeaturesEndpoint.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/FeaturesEndpoint.java
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/actuator/InfoWebEndpointExtension.java b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/InfoWebEndpointExtension.java
similarity index 100%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/actuator/InfoWebEndpointExtension.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/InfoWebEndpointExtension.java
diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java
new file mode 100644
index 0000000000..f07ddfb0f7
--- /dev/null
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java
@@ -0,0 +1,15 @@
+package com.baeldung.reactive.actuator;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+
+@SpringBootApplication
+public class Spring5ReactiveApplication{
+
+    public static void main(String[] args) {
+        SpringApplication.run(Spring5ReactiveApplication.class, args);
+    }
+
+}
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/actuator/WebSecurityConfig.java b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/WebSecurityConfig.java
similarity index 91%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/actuator/WebSecurityConfig.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/WebSecurityConfig.java
index 427fd70a6c..07f805fea4 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/actuator/WebSecurityConfig.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/WebSecurityConfig.java
@@ -22,7 +22,7 @@ public class WebSecurityConfig {
             .authorizeExchange()
                 .matchers(EndpointRequest.to(
                        FeaturesEndpoint.class
-                )).permitAll().and().csrf().disable().build();
+                )).permitAll().anyExchange().permitAll().and().csrf().disable().build();
     }
     
 }
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/security/GreetController.java b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/security/GreetController.java
similarity index 100%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/security/GreetController.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/reactive/security/GreetController.java
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/security/GreetService.java b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/security/GreetService.java
similarity index 100%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/security/GreetService.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/reactive/security/GreetService.java
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/security/SecurityConfig.java b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/security/SecurityConfig.java
similarity index 76%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/security/SecurityConfig.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/reactive/security/SecurityConfig.java
index 5ec3b6e241..225f78b3f7 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/security/SecurityConfig.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/security/SecurityConfig.java
@@ -8,6 +8,8 @@ import org.springframework.security.config.web.server.ServerHttpSecurity;
 import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.server.SecurityWebFilterChain;
 
 import com.baeldung.reactive.actuator.FeaturesEndpoint;
@@ -35,19 +37,24 @@ public class SecurityConfig {
 
     @Bean
     public MapReactiveUserDetailsService userDetailsService() {
-        UserDetails user = User.withDefaultPasswordEncoder()
-            .username("user")
-            .password("password")
+        UserDetails user = User
+            .withUsername("user")
+            .password(passwordEncoder().encode("password"))
             .roles("USER")
             .build();
 
-        UserDetails admin = User.withDefaultPasswordEncoder()
-            .username("admin")
-            .password("password")
+        UserDetails admin = User
+            .withUsername("admin")
+            .password(passwordEncoder().encode("password"))
             .roles("ADMIN")
             .build();
 
         return new MapReactiveUserDetailsService(user, admin);
     }
+    
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+    	return new BCryptPasswordEncoder();
+    }
 
 }
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/SpringSecurity5Application.java b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/security/SpringSecurity5Application.java
similarity index 97%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/SpringSecurity5Application.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/reactive/security/SpringSecurity5Application.java
index ca49ec6826..f2963c4fa5 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/SpringSecurity5Application.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/security/SpringSecurity5Application.java
@@ -1,4 +1,4 @@
-package com.baeldung.reactive;
+package com.baeldung.reactive.security;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/Employee.java b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/Employee.java
similarity index 81%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/Employee.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/webflux/Employee.java
index 6a03555654..bbdf85d293 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/Employee.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/Employee.java
@@ -1,17 +1,17 @@
-package com.baeldung.reactive.webflux;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class Employee {
-
-    private String id;
-    private String name;
-    
-    // standard getters and setters
-    
-}
+package com.baeldung.webflux;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Employee {
+
+    private String id;
+    private String name;
+    
+    // standard getters and setters
+    
+}
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeConfig.java b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeConfig.java
similarity index 93%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeConfig.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeConfig.java
index 082be68698..6e73004650 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeConfig.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeConfig.java
@@ -1,33 +1,33 @@
-package com.baeldung.reactive.webflux;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.reactive.HandlerMapping;
-import org.springframework.web.reactive.config.EnableWebFlux;
-import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
-import org.springframework.web.reactive.socket.WebSocketHandler;
-import org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter;
-
-@Configuration
-@EnableWebFlux
-public class EmployeeConfig {
-
-    @Bean
-    public HandlerMapping handlerMapping() {
-        Map<String, WebSocketHandler> map = new HashMap<>();
-        map.put("/employee-feed", new EmployeeWebSocketHandler());
-
-        SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
-        mapping.setUrlMap(map);
-        mapping.setOrder(10);
-        return mapping;
-    }
-    
-    @Bean
-    public WebSocketHandlerAdapter handlerAdapter() {
-        return new WebSocketHandlerAdapter();
-    }
-}
+package com.baeldung.webflux;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.reactive.HandlerMapping;
+import org.springframework.web.reactive.config.EnableWebFlux;
+import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
+import org.springframework.web.reactive.socket.WebSocketHandler;
+import org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter;
+
+@Configuration
+@EnableWebFlux
+public class EmployeeConfig {
+
+    @Bean
+    public HandlerMapping handlerMapping() {
+        Map<String, WebSocketHandler> map = new HashMap<>();
+        map.put("/employee-feed", new EmployeeWebSocketHandler());
+
+        SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
+        mapping.setUrlMap(map);
+        mapping.setOrder(10);
+        return mapping;
+    }
+    
+    @Bean
+    public WebSocketHandlerAdapter handlerAdapter() {
+        return new WebSocketHandlerAdapter();
+    }
+}
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeController.java b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeController.java
similarity index 93%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeController.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeController.java
index 98b16dafab..34e44afc8b 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeController.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeController.java
@@ -1,38 +1,38 @@
-package com.baeldung.reactive.webflux;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-@RestController
-@RequestMapping("/employees")
-public class EmployeeController {
-
-    private EmployeeRepository employeeRepository;
-
-    public EmployeeController(EmployeeRepository employeeRepository) {
-        this.employeeRepository = employeeRepository;
-    }
-
-    @GetMapping("/{id}")
-    private Mono<Employee> getEmployeeById(@PathVariable String id) {
-        return employeeRepository.findEmployeeById(id);
-    }
-
-    @GetMapping
-    private Flux<Employee> getAllEmployees() {
-        return employeeRepository.findAllEmployees();
-    }
-
-    @PostMapping("/update")
-    private Mono<Employee> updateEmployee(@RequestBody Employee employee) {
-        return employeeRepository.updateEmployee(employee);
-    }
-
-}
+package com.baeldung.webflux;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@RestController
+@RequestMapping("/employees")
+public class EmployeeController {
+
+    private EmployeeRepository employeeRepository;
+
+    public EmployeeController(EmployeeRepository employeeRepository) {
+        this.employeeRepository = employeeRepository;
+    }
+
+    @GetMapping("/{id}")
+    private Mono<Employee> getEmployeeById(@PathVariable String id) {
+        return employeeRepository.findEmployeeById(id);
+    }
+
+    @GetMapping
+    private Flux<Employee> getAllEmployees() {
+        return employeeRepository.findAllEmployees();
+    }
+
+    @PostMapping("/update")
+    private Mono<Employee> updateEmployee(@RequestBody Employee employee) {
+        return employeeRepository.updateEmployee(employee);
+    }
+
+}
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeCreationEvent.java b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeCreationEvent.java
similarity index 89%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeCreationEvent.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeCreationEvent.java
index 7a66e1e147..d4f9a4fb02 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeCreationEvent.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeCreationEvent.java
@@ -1,4 +1,4 @@
-package com.baeldung.reactive.webflux;
+package com.baeldung.webflux;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeRepository.java b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeRepository.java
similarity index 95%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeRepository.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeRepository.java
index a407c76fa8..d7f618f178 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeRepository.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeRepository.java
@@ -1,64 +1,64 @@
-package com.baeldung.reactive.webflux;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.stereotype.Repository;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-@Repository
-public class EmployeeRepository {
-    
-    static Map<String,Employee> employeeData;
-
-    static Map<String,String> employeeAccessData;
-
-    static
-    {
-        employeeData = new HashMap<>();
-        employeeData.put("1",new Employee("1","Employee 1"));
-        employeeData.put("2",new Employee("2","Employee 2"));
-        employeeData.put("3",new Employee("3","Employee 3"));
-        employeeData.put("4",new Employee("4","Employee 4"));
-        employeeData.put("5",new Employee("5","Employee 5"));
-        employeeData.put("6",new Employee("6","Employee 6"));
-        employeeData.put("7",new Employee("7","Employee 7"));
-        employeeData.put("8",new Employee("8","Employee 8"));
-        employeeData.put("9",new Employee("9","Employee 9"));
-        employeeData.put("10",new Employee("10","Employee 10"));
-        
-        employeeAccessData=new HashMap<>();
-        employeeAccessData.put("1", "Employee 1 Access Key");
-        employeeAccessData.put("2", "Employee 2 Access Key");
-        employeeAccessData.put("3", "Employee 3 Access Key");
-        employeeAccessData.put("4", "Employee 4 Access Key");
-        employeeAccessData.put("5", "Employee 5 Access Key");
-        employeeAccessData.put("6", "Employee 6 Access Key");
-        employeeAccessData.put("7", "Employee 7 Access Key");
-        employeeAccessData.put("8", "Employee 8 Access Key");
-        employeeAccessData.put("9", "Employee 9 Access Key");
-        employeeAccessData.put("10", "Employee 10 Access Key");
-    }
-    
-    public Mono<Employee> findEmployeeById(String id)
-    {
-        return Mono.just(employeeData.get(id));
-    }
-    
-    public Flux<Employee> findAllEmployees()
-    {
-        return Flux.fromIterable(employeeData.values());
-    }
-    
-    public Mono<Employee> updateEmployee(Employee employee)
-    {
-        Employee existingEmployee=employeeData.get(employee.getId());
-        if(existingEmployee!=null)
-        {
-            existingEmployee.setName(employee.getName());
-        }
-        return Mono.just(existingEmployee);
-    }
-}
+package com.baeldung.webflux;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.stereotype.Repository;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@Repository
+public class EmployeeRepository {
+    
+    static Map<String,Employee> employeeData;
+
+    static Map<String,String> employeeAccessData;
+
+    static
+    {
+        employeeData = new HashMap<>();
+        employeeData.put("1",new Employee("1","Employee 1"));
+        employeeData.put("2",new Employee("2","Employee 2"));
+        employeeData.put("3",new Employee("3","Employee 3"));
+        employeeData.put("4",new Employee("4","Employee 4"));
+        employeeData.put("5",new Employee("5","Employee 5"));
+        employeeData.put("6",new Employee("6","Employee 6"));
+        employeeData.put("7",new Employee("7","Employee 7"));
+        employeeData.put("8",new Employee("8","Employee 8"));
+        employeeData.put("9",new Employee("9","Employee 9"));
+        employeeData.put("10",new Employee("10","Employee 10"));
+        
+        employeeAccessData=new HashMap<>();
+        employeeAccessData.put("1", "Employee 1 Access Key");
+        employeeAccessData.put("2", "Employee 2 Access Key");
+        employeeAccessData.put("3", "Employee 3 Access Key");
+        employeeAccessData.put("4", "Employee 4 Access Key");
+        employeeAccessData.put("5", "Employee 5 Access Key");
+        employeeAccessData.put("6", "Employee 6 Access Key");
+        employeeAccessData.put("7", "Employee 7 Access Key");
+        employeeAccessData.put("8", "Employee 8 Access Key");
+        employeeAccessData.put("9", "Employee 9 Access Key");
+        employeeAccessData.put("10", "Employee 10 Access Key");
+    }
+    
+    public Mono<Employee> findEmployeeById(String id)
+    {
+        return Mono.just(employeeData.get(id));
+    }
+    
+    public Flux<Employee> findAllEmployees()
+    {
+        return Flux.fromIterable(employeeData.values());
+    }
+    
+    public Mono<Employee> updateEmployee(Employee employee)
+    {
+        Employee existingEmployee=employeeData.get(employee.getId());
+        if(existingEmployee!=null)
+        {
+            existingEmployee.setName(employee.getName());
+        }
+        return Mono.just(existingEmployee);
+    }
+}
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeSpringApplication.java b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeSpringApplication.java
similarity index 88%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeSpringApplication.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeSpringApplication.java
index 54b23a18de..2652c36695 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeSpringApplication.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeSpringApplication.java
@@ -1,17 +1,17 @@
-package com.baeldung.reactive.webflux;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class EmployeeSpringApplication {
-
-    public static void main(String[] args) {
-        
-        SpringApplication.run(EmployeeSpringApplication.class, args);
-
-        EmployeeWebClient employeeWebClient = new EmployeeWebClient();
-        employeeWebClient.consume();
-    }
-
-}
+package com.baeldung.webflux;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class EmployeeSpringApplication {
+
+    public static void main(String[] args) {
+        
+        SpringApplication.run(EmployeeSpringApplication.class, args);
+
+        EmployeeWebClient employeeWebClient = new EmployeeWebClient();
+        employeeWebClient.consume();
+    }
+
+}
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeWebClient.java b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebClient.java
similarity index 91%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeWebClient.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebClient.java
index 45d42ecda9..eb32408a7f 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeWebClient.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebClient.java
@@ -1,28 +1,28 @@
-package com.baeldung.reactive.webflux;
-
-import org.springframework.web.reactive.function.client.WebClient;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-public class EmployeeWebClient {
-
-    WebClient client = WebClient.create("http://localhost:8080");
-    
-    public void consume() {
-
-        Mono<Employee> employeeMono = client.get()
-            .uri("/employees/{id}", "1")
-            .retrieve()
-            .bodyToMono(Employee.class);
-
-        employeeMono.subscribe(System.out::println);
-        
-        Flux<Employee> employeeFlux = client.get()
-            .uri("/employees")
-            .retrieve()
-            .bodyToFlux(Employee.class);
-        
-        employeeFlux.subscribe(System.out::println);
-    }
+package com.baeldung.webflux;
+
+import org.springframework.web.reactive.function.client.WebClient;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public class EmployeeWebClient {
+
+    WebClient client = WebClient.create("http://localhost:8080");
+    
+    public void consume() {
+
+        Mono<Employee> employeeMono = client.get()
+            .uri("/employees/{id}", "1")
+            .retrieve()
+            .bodyToMono(Employee.class);
+
+        employeeMono.subscribe(System.out::println);
+        
+        Flux<Employee> employeeFlux = client.get()
+            .uri("/employees")
+            .retrieve()
+            .bodyToFlux(Employee.class);
+        
+        employeeFlux.subscribe(System.out::println);
+    }
 }
\ No newline at end of file
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeWebSecurityConfig.java b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSecurityConfig.java
similarity index 71%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeWebSecurityConfig.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSecurityConfig.java
index 7922e6ba44..75475a0f08 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeWebSecurityConfig.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSecurityConfig.java
@@ -1,38 +1,46 @@
-package com.baeldung.reactive.webflux;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.http.HttpMethod;
-import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
-import org.springframework.security.config.web.server.ServerHttpSecurity;
-import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
-import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.web.server.SecurityWebFilterChain;
-
-@EnableWebFluxSecurity
-public class EmployeeWebSecurityConfig {
-
-    @Bean
-    public MapReactiveUserDetailsService userDetailsService() {
-        UserDetails user = User.withDefaultPasswordEncoder()
-            .username("admin")
-            .password("password")
-            .roles("ADMIN")
-            .build();
-        return new MapReactiveUserDetailsService(user);
-    }
-
-    @Bean
-    public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
-        http.csrf()
-            .disable()
-            .authorizeExchange()
-            .pathMatchers(HttpMethod.POST, "/employees/update")
-            .hasRole("ADMIN")
-            .pathMatchers("/**")
-            .permitAll()
-            .and()
-            .httpBasic();
-        return http.build();
-    }
-}
+package com.baeldung.webflux;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
+import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.server.SecurityWebFilterChain;
+
+@EnableWebFluxSecurity
+public class EmployeeWebSecurityConfig {
+	
+    @Bean
+    public MapReactiveUserDetailsService userDetailsService() {
+        UserDetails user = User
+            .withUsername("admin")
+            .password(passwordEncoder().encode("password"))
+            .roles("ADMIN")
+            .build();
+        return new MapReactiveUserDetailsService(user);
+    }
+
+    @Bean
+    public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
+        http.csrf()
+            .disable()
+            .authorizeExchange()
+            .pathMatchers(HttpMethod.POST, "/employees/update")
+            .hasRole("ADMIN")
+            .pathMatchers("/**")
+            .permitAll()
+            .and()
+            .httpBasic();
+        return http.build();
+    }
+    
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+    	return new BCryptPasswordEncoder();
+    }
+}
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeWebSocketClient.java b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketClient.java
similarity index 94%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeWebSocketClient.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketClient.java
index 4571cadc47..feb1eb62fb 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeWebSocketClient.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketClient.java
@@ -1,4 +1,4 @@
-package com.baeldung.reactive.webflux;
+package com.baeldung.webflux;
 
 import java.net.URI;
 
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeWebSocketHandler.java b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketHandler.java
similarity index 94%
rename from spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeWebSocketHandler.java
rename to spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketHandler.java
index c696bc8215..40b7b760ee 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/reactive/webflux/EmployeeWebSocketHandler.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketHandler.java
@@ -1,39 +1,39 @@
-package com.baeldung.reactive.webflux;
-
-import static java.time.LocalDateTime.now;
-import static java.util.UUID.randomUUID;
-
-import java.time.Duration;
-
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.socket.WebSocketHandler;
-import org.springframework.web.reactive.socket.WebSocketSession;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-@Component("EmployeeWebSocketHandler")
-public class EmployeeWebSocketHandler implements WebSocketHandler {
-
-    ObjectMapper om = new ObjectMapper();
-
-    @Override
-    public Mono<Void> handle(WebSocketSession webSocketSession) {
-
-        Flux<String> employeeCreationEvent = Flux.generate(sink -> {
-            EmployeeCreationEvent event = new EmployeeCreationEvent(randomUUID().toString(), now().toString());
-            try {
-                sink.next(om.writeValueAsString(event));
-            } catch (JsonProcessingException e) {
-                sink.error(e);
-            }
-        });
-
-        return webSocketSession.send(employeeCreationEvent
-            .map(webSocketSession::textMessage)
-            .delayElements(Duration.ofSeconds(1)));
-    }
-}
+package com.baeldung.webflux;
+
+import static java.time.LocalDateTime.now;
+import static java.util.UUID.randomUUID;
+
+import java.time.Duration;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.socket.WebSocketHandler;
+import org.springframework.web.reactive.socket.WebSocketSession;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@Component("EmployeeWebSocketHandler")
+public class EmployeeWebSocketHandler implements WebSocketHandler {
+
+    ObjectMapper om = new ObjectMapper();
+
+    @Override
+    public Mono<Void> handle(WebSocketSession webSocketSession) {
+
+        Flux<String> employeeCreationEvent = Flux.generate(sink -> {
+            EmployeeCreationEvent event = new EmployeeCreationEvent(randomUUID().toString(), now().toString());
+            try {
+                sink.next(om.writeValueAsString(event));
+            } catch (JsonProcessingException e) {
+                sink.error(e);
+            }
+        });
+
+        return webSocketSession.send(employeeCreationEvent
+            .map(webSocketSession::textMessage)
+            .delayElements(Duration.ofSeconds(1)));
+    }
+}
diff --git a/spring-5-reactive-security/src/main/resources/application.properties b/spring-5-reactive-security/src/main/resources/application.properties
new file mode 100644
index 0000000000..234834b894
--- /dev/null
+++ b/spring-5-reactive-security/src/main/resources/application.properties
@@ -0,0 +1,5 @@
+logging.level.root=INFO
+
+management.endpoints.web.exposure.include.=*
+
+info.app.name=Spring Boot 2 actuator Application
diff --git a/spring-5-reactive-security/src/main/resources/files/hello.txt b/spring-5-reactive-security/src/main/resources/files/hello.txt
new file mode 100644
index 0000000000..b6fc4c620b
--- /dev/null
+++ b/spring-5-reactive-security/src/main/resources/files/hello.txt
@@ -0,0 +1 @@
+hello
\ No newline at end of file
diff --git a/spring-5-reactive-security/src/main/resources/files/test/test.txt b/spring-5-reactive-security/src/main/resources/files/test/test.txt
new file mode 100644
index 0000000000..30d74d2584
--- /dev/null
+++ b/spring-5-reactive-security/src/main/resources/files/test/test.txt
@@ -0,0 +1 @@
+test
\ No newline at end of file
diff --git a/spring-5-reactive-security/src/main/resources/logback.xml b/spring-5-reactive-security/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/spring-5-reactive-security/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/spring-5-reactive-security/src/main/resources/static/client-websocket.html b/spring-5-reactive-security/src/main/resources/static/client-websocket.html
new file mode 100644
index 0000000000..3f840e8bd4
--- /dev/null
+++ b/spring-5-reactive-security/src/main/resources/static/client-websocket.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<title>Baeldung: Spring 5 Reactive Client WebSocket (Browser)</title>
+</head>
+<body>
+
+	<div class="events"></div>
+	<script>
+		var clientWebSocket = new WebSocket("ws://localhost:8080/event-emitter");
+		clientWebSocket.onopen = function() {
+			console.log("clientWebSocket.onopen", clientWebSocket);
+			console.log("clientWebSocket.readyState", "websocketstatus");
+			clientWebSocket.send("event-me-from-browser");
+		}
+		clientWebSocket.onclose = function(error) {
+			console.log("clientWebSocket.onclose", clientWebSocket, error);
+			events("Closing connection");
+		}
+		clientWebSocket.onerror = function(error) {
+			console.log("clientWebSocket.onerror", clientWebSocket, error);
+			events("An error occured");
+		}
+		clientWebSocket.onmessage = function(error) {
+			console.log("clientWebSocket.onmessage", clientWebSocket, error);
+			events(error.data);
+		}
+		function events(responseEvent) {
+			document.querySelector(".events").innerHTML += responseEvent + "<br>";
+		}
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-5-reactive-security/src/main/webapp/WEB-INF/web.xml b/spring-5-reactive-security/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..bfcf43dad2
--- /dev/null
+++ b/spring-5-reactive-security/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+
+    <display-name>Spring Functional Application</display-name>
+
+    <servlet>
+        <servlet-name>functional</servlet-name>
+        <servlet-class>com.baeldung.functional.RootServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+        <async-supported>true</async-supported>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>functional</servlet-name>
+        <url-pattern>/</url-pattern>
+    </servlet-mapping>
+
+
+</web-app>
\ No newline at end of file
diff --git a/spring-5-reactive/src/test/java/com/baeldung/reactive/actuator/ActuatorInfoIntegrationTest.java b/spring-5-reactive-security/src/test/java/com/baeldung/reactive/actuator/ActuatorInfoIntegrationTest.java
similarity index 95%
rename from spring-5-reactive/src/test/java/com/baeldung/reactive/actuator/ActuatorInfoIntegrationTest.java
rename to spring-5-reactive-security/src/test/java/com/baeldung/reactive/actuator/ActuatorInfoIntegrationTest.java
index 3020e86723..94979a18ca 100644
--- a/spring-5-reactive/src/test/java/com/baeldung/reactive/actuator/ActuatorInfoIntegrationTest.java
+++ b/spring-5-reactive-security/src/test/java/com/baeldung/reactive/actuator/ActuatorInfoIntegrationTest.java
@@ -9,8 +9,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.reactive.Spring5ReactiveApplication;
-
 import java.io.IOException;
 
 import static org.junit.Assert.assertEquals;
diff --git a/spring-5-reactive/src/test/java/com/baeldung/reactive/webflux/EmployeeControllerIntegrationTest.java b/spring-5-reactive-security/src/test/java/com/baeldung/reactive/webflux/EmployeeControllerIntegrationTest.java
similarity index 93%
rename from spring-5-reactive/src/test/java/com/baeldung/reactive/webflux/EmployeeControllerIntegrationTest.java
rename to spring-5-reactive-security/src/test/java/com/baeldung/reactive/webflux/EmployeeControllerIntegrationTest.java
index e8c8c25723..3dc832d781 100644
--- a/spring-5-reactive/src/test/java/com/baeldung/reactive/webflux/EmployeeControllerIntegrationTest.java
+++ b/spring-5-reactive-security/src/test/java/com/baeldung/reactive/webflux/EmployeeControllerIntegrationTest.java
@@ -1,74 +1,76 @@
-package com.baeldung.reactive.webflux;
-
-import static org.mockito.BDDMockito.given;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.web.reactive.server.WebTestClient;
-
-import com.baeldung.reactive.Spring5ReactiveApplication;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes=Spring5ReactiveApplication.class)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class EmployeeControllerIntegrationTest {
-
-    @Autowired
-    private WebTestClient testClient;
-
-    @MockBean
-    private EmployeeRepository employeeRepository;
-
-    @Test
-    public void givenEmployeeId_whenGetEmployeeById_thenCorrectEmployee() {
-
-        Employee employee = new Employee("1", "Employee 1 Name");
-        
-        given(employeeRepository.findEmployeeById("1")).willReturn(Mono.just(employee));
-        testClient.get()
-            .uri("/employees/1")
-            .exchange()
-            .expectStatus()
-            .isOk()
-            .expectBody(Employee.class)
-            .isEqualTo(employee);
-    }
-
-    @Test
-    public void whenGetAllEmployees_thenCorrectEmployees() {
-
-        List<Employee> employeeList = new ArrayList<>();
-
-        Employee employee1 = new Employee("1", "Employee 1 Name");
-        Employee employee2 = new Employee("2", "Employee 2 Name");
-        Employee employee3 = new Employee("3", "Employee 3 Name");
-
-        employeeList.add(employee1);
-        employeeList.add(employee2);
-        employeeList.add(employee3);
-
-        Flux<Employee> employeeFlux = Flux.fromIterable(employeeList);
-
-        given(employeeRepository.findAllEmployees()).willReturn(employeeFlux);
-        testClient.get()
-            .uri("/employees")
-            .exchange()
-            .expectStatus()
-            .isOk()
-            .expectBodyList(Employee.class)
-            .hasSize(3)
-            .isEqualTo(employeeList);
-    }
-}
+package com.baeldung.reactive.webflux;
+
+import static org.mockito.BDDMockito.given;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+import com.baeldung.reactive.actuator.Spring5ReactiveApplication;
+import com.baeldung.webflux.Employee;
+import com.baeldung.webflux.EmployeeRepository;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes=Spring5ReactiveApplication.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class EmployeeControllerIntegrationTest {
+
+    @Autowired
+    private WebTestClient testClient;
+
+    @MockBean
+    private EmployeeRepository employeeRepository;
+
+    @Test
+    public void givenEmployeeId_whenGetEmployeeById_thenCorrectEmployee() {
+
+        Employee employee = new Employee("1", "Employee 1 Name");
+        
+        given(employeeRepository.findEmployeeById("1")).willReturn(Mono.just(employee));
+        testClient.get()
+            .uri("/employees/1")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectBody(Employee.class)
+            .isEqualTo(employee);
+    }
+
+    @Test
+    public void whenGetAllEmployees_thenCorrectEmployees() {
+
+        List<Employee> employeeList = new ArrayList<>();
+
+        Employee employee1 = new Employee("1", "Employee 1 Name");
+        Employee employee2 = new Employee("2", "Employee 2 Name");
+        Employee employee3 = new Employee("3", "Employee 3 Name");
+
+        employeeList.add(employee1);
+        employeeList.add(employee2);
+        employeeList.add(employee3);
+
+        Flux<Employee> employeeFlux = Flux.fromIterable(employeeList);
+
+        given(employeeRepository.findAllEmployees()).willReturn(employeeFlux);
+        testClient.get()
+            .uri("/employees")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectBodyList(Employee.class)
+            .hasSize(3)
+            .isEqualTo(employeeList);
+    }
+}
diff --git a/spring-5-reactive/src/test/java/com/baeldung/security/SecurityIntegrationTest.java b/spring-5-reactive-security/src/test/java/com/baeldung/security/SecurityIntegrationTest.java
similarity index 94%
rename from spring-5-reactive/src/test/java/com/baeldung/security/SecurityIntegrationTest.java
rename to spring-5-reactive-security/src/test/java/com/baeldung/security/SecurityIntegrationTest.java
index a59ef57db8..423500e09c 100644
--- a/spring-5-reactive/src/test/java/com/baeldung/security/SecurityIntegrationTest.java
+++ b/spring-5-reactive-security/src/test/java/com/baeldung/security/SecurityIntegrationTest.java
@@ -1,6 +1,5 @@
 package com.baeldung.security;
 
-import com.baeldung.reactive.SpringSecurity5Application;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -12,6 +11,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
+import com.baeldung.reactive.security.SpringSecurity5Application;
+
 @RunWith(SpringRunner.class)
 @ContextConfiguration(classes = SpringSecurity5Application.class)
 public class SecurityIntegrationTest {
diff --git a/spring-5-reactive-security/src/test/resources/baeldung-weekly.png b/spring-5-reactive-security/src/test/resources/baeldung-weekly.png
new file mode 100644
index 0000000000..a1b7eebcab
Binary files /dev/null and b/spring-5-reactive-security/src/test/resources/baeldung-weekly.png differ
diff --git a/spring-5-reactive/README.md b/spring-5-reactive/README.md
index 0a7fe7a47e..0665eb4f57 100644
--- a/spring-5-reactive/README.md
+++ b/spring-5-reactive/README.md
@@ -1,4 +1,4 @@
-## Spring REST Example Project
+## Spring 5 Reactive Project
 
 ### The Course
 The "REST With Spring" Classes: http://bit.ly/restwithspring
@@ -7,12 +7,9 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 - [Introduction to the Functional Web Framework in Spring 5](http://www.baeldung.com/spring-5-functional-web)
 - [Spring 5 WebClient](http://www.baeldung.com/spring-5-webclient)
-- [Spring Boot Actuator](http://www.baeldung.com/spring-boot-actuators)
 - [Exploring the Spring 5 MVC URL Matching Improvements](http://www.baeldung.com/spring-5-mvc-url-matching)
-- [Spring Security 5 for Reactive Applications](http://www.baeldung.com/spring-security-5-reactive)
 - [Reactive WebSockets with Spring 5](http://www.baeldung.com/spring-5-reactive-websockets)
 - [Spring Webflux Filters](http://www.baeldung.com/spring-webflux-filters)
 - [How to Set a Header on a Response with Spring 5](http://www.baeldung.com/spring-response-header)
 - [Spring Webflux and CORS](http://www.baeldung.com/spring-webflux-cors)
 - [Handling Errors in Spring WebFlux](http://www.baeldung.com/spring-webflux-errors)
-- [Guide to Spring 5 WebFlux](http://www.baeldung.com/spring-webflux)
diff --git a/spring-5-reactive/pom.xml b/spring-5-reactive/pom.xml
index acc82be0d1..e81d3d8b79 100644
--- a/spring-5-reactive/pom.xml
+++ b/spring-5-reactive/pom.xml
@@ -39,24 +39,6 @@
             <groupId>javax.json.bind</groupId>
             <artifactId>javax.json.bind-api</artifactId>
         </dependency>
-        <dependency>
-            <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>
@@ -101,32 +83,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.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>
@@ -138,15 +94,6 @@
             <version>${project-reactor-test}</version>
             <scope>test</scope>
         </dependency>
-	    <dependency>
-	        <groupId>org.springframework.boot</groupId>
-	        <artifactId>spring-boot-starter-security</artifactId>
-	    </dependency>
-	    <dependency>
-	        <groupId>org.springframework.security</groupId>
-	        <artifactId>spring-security-test</artifactId>
-	        <scope>test</scope>
-	    </dependency>
     </dependencies>
 
     <build>
@@ -159,29 +106,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-reactive/src/main/java/com/baeldung/functional/FunctionalSpringBootApplication.java b/spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalSpringBootApplication.java
index 402b607b19..a1d5d87d5c 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalSpringBootApplication.java
+++ b/spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalSpringBootApplication.java
@@ -21,9 +21,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.server.reactive.HttpHandler;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.RouterFunctions;
 import org.springframework.web.reactive.function.server.ServerResponse;
@@ -68,18 +65,6 @@ public class FunctionalSpringBootApplication {
         return registrationBean;
     }
 
-    @Configuration
-    @EnableWebSecurity
-    @Profile("!https")
-    static class SecurityConfig extends WebSecurityConfigurerAdapter {
-        @Override
-        protected void configure(final HttpSecurity http) throws Exception {
-            http.authorizeRequests()
-                .anyRequest()
-                .permitAll();
-        }
-    }
-
     public static void main(String[] args) {
         SpringApplication.run(FunctionalSpringBootApplication.class, args);
     }
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/util/CpuUtils.java b/spring-5-reactive/src/main/java/com/baeldung/reactive/util/CpuUtils.java
new file mode 100644
index 0000000000..8d16434920
--- /dev/null
+++ b/spring-5-reactive/src/main/java/com/baeldung/reactive/util/CpuUtils.java
@@ -0,0 +1,15 @@
+package com.baeldung.reactive.util;
+
+import com.sun.management.OperatingSystemMXBean;
+
+import java.lang.management.ManagementFactory;
+
+public class CpuUtils {
+
+    private static OperatingSystemMXBean operatingSystemMXBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
+
+    static Double getUsage() {
+        return (operatingSystemMXBean.getSystemCpuLoad() / operatingSystemMXBean.getAvailableProcessors()) * 100;
+    }
+
+}
diff --git a/spring-5-reactive/src/main/resources/application.properties b/spring-5-reactive/src/main/resources/application.properties
index 234834b894..92f3116f84 100644
--- a/spring-5-reactive/src/main/resources/application.properties
+++ b/spring-5-reactive/src/main/resources/application.properties
@@ -1,5 +1,2 @@
 logging.level.root=INFO
 
-management.endpoints.web.exposure.include.=*
-
-info.app.name=Spring Boot 2 actuator Application
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/README.md b/spring-5/README.md
index 47bae09862..baf03fb3b3 100644
--- a/spring-5/README.md
+++ b/spring-5/README.md
@@ -12,4 +12,3 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Introduction to Spring REST Docs](http://www.baeldung.com/spring-rest-docs)
 - [Spring ResponseStatusException](http://www.baeldung.com/spring-response-status-exception)
 - [Spring Assert Statements](http://www.baeldung.com/spring-assert)
-- [Spring Security 5 – OAuth2 Login](http://www.baeldung.com/spring-security-5-oauth2-login)
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-5/src/test/java/com/baeldung/connectionpool/ApplicationWithHikariConnectionPool.java b/spring-5/src/test/java/com/baeldung/connectionpool/ApplicationWithHikariConnectionPool.java
new file mode 100644
index 0000000000..0bd8637681
--- /dev/null
+++ b/spring-5/src/test/java/com/baeldung/connectionpool/ApplicationWithHikariConnectionPool.java
@@ -0,0 +1,12 @@
+package com.baeldung.connectionpool;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ApplicationWithHikariConnectionPool {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ApplicationWithHikariConnectionPool.class, args);
+    }
+}
diff --git a/spring-5/src/test/java/com/baeldung/connectionpool/HikariIntegrationTest.java b/spring-5/src/test/java/com/baeldung/connectionpool/HikariIntegrationTest.java
new file mode 100644
index 0000000000..d91cca85ee
--- /dev/null
+++ b/spring-5/src/test/java/com/baeldung/connectionpool/HikariIntegrationTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.connectionpool;
+
+import static org.junit.Assert.*;
+
+import javax.sql.DataSource;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class HikariIntegrationTest {
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Test
+    public void hikariConnectionPoolIsConfigured() {
+        assertEquals("com.zaxxer.hikari.HikariDataSource", dataSource.getClass()
+            .getName());
+    }
+
+}
diff --git a/spring-boot-admin/spring-boot-admin-client/pom.xml b/spring-boot-admin/spring-boot-admin-client/pom.xml
index fcbbb11cd7..ea03d6ef6d 100644
--- a/spring-boot-admin/spring-boot-admin-client/pom.xml
+++ b/spring-boot-admin/spring-boot-admin-client/pom.xml
@@ -46,6 +46,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -59,6 +60,7 @@
 
     <properties>
         <spring-boot-admin-starter-client.version>1.5.4</spring-boot-admin-starter-client.version>
+        <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
     </properties>
 
 </project>
diff --git a/spring-boot-admin/spring-boot-admin-server/pom.xml b/spring-boot-admin/spring-boot-admin-server/pom.xml
index 50228034c1..d8e7bb5574 100644
--- a/spring-boot-admin/spring-boot-admin-server/pom.xml
+++ b/spring-boot-admin/spring-boot-admin-server/pom.xml
@@ -76,6 +76,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot-maven-plugin.version}</version>
             </plugin>
         </plugins>
     </build>
@@ -83,6 +84,7 @@
     <properties>
         <spring-boot-admin-server.version>1.5.4</spring-boot-admin-server.version>
         <spring-boot-admin-starter-client.version>1.5.4</spring-boot-admin-starter-client.version>
+        <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
     </properties>
 
 </project>
diff --git a/spring-boot-angular-ecommerce/src/main/frontend/package.json b/spring-boot-angular-ecommerce/src/main/frontend/package.json
index 28e716b9a6..958e9f1023 100644
--- a/spring-boot-angular-ecommerce/src/main/frontend/package.json
+++ b/spring-boot-angular-ecommerce/src/main/frontend/package.json
@@ -5,6 +5,9 @@
     "ng": "ng",
     "start": "ng serve --proxy-config proxy-conf.json",
     "build": "ng build",
+    "postbuild": "npm run deploy",
+    "predeploy": "rimraf ../resources/static/ && mkdirp ../resources/static",
+    "deploy": "copyfiles -f dist/** ../resources/static",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"
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-persistence/README.MD b/spring-boot-persistence/README.MD
index 3fe6eb62c8..72fdca74fa 100644
--- a/spring-boot-persistence/README.MD
+++ b/spring-boot-persistence/README.MD
@@ -1,3 +1,5 @@
 ### Relevant Articles:
 
 - [Spring Boot with Multiple SQL Import Files](http://www.baeldung.com/spring-boot-sql-import-files)
+- [Configuring Separate Spring DataSource for Tests](http://www.baeldung.com/spring-testing-separate-data-source)
+- [Quick Guide on data.sql and schema.sql Files in Spring Boot](http://www.baeldung.com/spring-boot-data-sql-and-schema-sql)
diff --git a/spring-boot-persistence/pom.xml b/spring-boot-persistence/pom.xml
index 60e6689e31..a16d953581 100644
--- a/spring-boot-persistence/pom.xml
+++ b/spring-boot-persistence/pom.xml
@@ -1,53 +1,57 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-boot-persistence</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>spring-boot-persistence</name>
-    <description>This is a simple Spring Data Repositories test</description>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.baeldung</groupId>
+	<artifactId>spring-boot-persistence</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+	<name>spring-boot-persistence</name>
+	<description>This is a simple Spring Data Repositories test</description>
 
-    <parent>
-        <artifactId>parent-boot-2</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
-    </parent>
+	<parent>
+		<artifactId>parent-boot-2</artifactId>
+		<groupId>com.baeldung</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../parent-boot-2</relativePath>
+	</parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+	</dependencies>
 
-    <build>
-        <finalName>spring-boot-persistence</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+	<build>
+		<finalName>spring-boot-persistence</finalName>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>pl.project13.maven</groupId>
+				<artifactId>git-commit-id-plugin</artifactId>
+				<version>${git-commit-id-plugin.version}</version>
+			</plugin>
+		</plugins>
+	</build>
 
+	<properties>
+		<git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
+	</properties>
 </project>
\ No newline at end of file
diff --git a/spring-boot-persistence/src/main/java/com/baeldung/boot/config/H2JpaConfig.java b/spring-boot-persistence/src/main/java/com/baeldung/boot/config/H2JpaConfig.java
new file mode 100644
index 0000000000..ef90714347
--- /dev/null
+++ b/spring-boot-persistence/src/main/java/com/baeldung/boot/config/H2JpaConfig.java
@@ -0,0 +1,67 @@
+package com.baeldung.boot.config;
+
+import java.util.Properties;
+
+import javax.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@Configuration
+@EnableJpaRepositories(basePackages = { "org.baeldung.boot.repository", "org.baeldung.repository" })
+@PropertySource("classpath:persistence-generic-entity.properties")
+@EnableTransactionManagement
+public class H2JpaConfig {
+
+    @Autowired
+    private Environment env;
+
+    @Bean
+    public DataSource dataSource() {
+        final DriverManagerDataSource dataSource = new DriverManagerDataSource();
+        dataSource.setDriverClassName(env.getProperty("jdbc.driverClassName"));
+        dataSource.setUrl(env.getProperty("jdbc.url"));
+        dataSource.setUsername(env.getProperty("jdbc.user"));
+        dataSource.setPassword(env.getProperty("jdbc.pass"));
+
+        return dataSource;
+    }
+
+    @Bean
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
+        final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(dataSource());
+        em.setPackagesToScan(new String[] { "org.baeldung.boot.domain" });
+        em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
+        em.setJpaProperties(additionalProperties());
+        return em;
+    }
+
+    @Bean
+    JpaTransactionManager transactionManager(final EntityManagerFactory entityManagerFactory) {
+        final JpaTransactionManager transactionManager = new JpaTransactionManager();
+        transactionManager.setEntityManagerFactory(entityManagerFactory);
+        return transactionManager;
+    }
+
+    final Properties additionalProperties() {
+        final Properties hibernateProperties = new Properties();
+
+        hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
+        hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
+        hibernateProperties.setProperty("hibernate.show_sql", env.getProperty("hibernate.show_sql"));
+
+        return hibernateProperties;
+    }
+
+}
diff --git a/spring-boot-persistence/src/main/java/com/baeldung/domain/Country.java b/spring-boot-persistence/src/main/java/com/baeldung/domain/Country.java
new file mode 100644
index 0000000000..e6a88c7121
--- /dev/null
+++ b/spring-boot-persistence/src/main/java/com/baeldung/domain/Country.java
@@ -0,0 +1,36 @@
+package com.baeldung.domain;
+
+import static javax.persistence.GenerationType.IDENTITY;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Country {
+
+    @Id
+    @GeneratedValue(strategy = IDENTITY)
+    private Integer id;
+
+    @Column(nullable = false)
+    private String name;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/spring-boot/src/main/java/org/baeldung/boot/domain/GenericEntity.java b/spring-boot-persistence/src/main/java/org/baeldung/boot/domain/GenericEntity.java
similarity index 100%
rename from spring-boot/src/main/java/org/baeldung/boot/domain/GenericEntity.java
rename to spring-boot-persistence/src/main/java/org/baeldung/boot/domain/GenericEntity.java
diff --git a/spring-boot/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java b/spring-boot-persistence/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java
similarity index 100%
rename from spring-boot/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java
rename to spring-boot-persistence/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java
diff --git a/spring-boot-persistence/src/main/resources/application.properties b/spring-boot-persistence/src/main/resources/application.properties
index e69de29bb2..d0fb785fe8 100644
--- a/spring-boot-persistence/src/main/resources/application.properties
+++ b/spring-boot-persistence/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+spring.jpa.show-sql=true
+spring.jpa.hibernate.ddl-auto=none
\ No newline at end of file
diff --git a/spring-boot-persistence/src/main/resources/data.sql b/spring-boot-persistence/src/main/resources/data.sql
new file mode 100644
index 0000000000..feef02b6cf
--- /dev/null
+++ b/spring-boot-persistence/src/main/resources/data.sql
@@ -0,0 +1,10 @@
+insert into users values (1, 'Alex', 1);
+insert into users values (2, 'Bob', 1);
+insert into users values (3, 'John', 0);
+insert into users values (4, 'Harry', 0);
+insert into users values (5, 'Smith', 1);
+
+INSERT INTO country (name) VALUES ('India');
+INSERT INTO country (name) VALUES ('Brazil');
+INSERT INTO country (name) VALUES ('USA');
+INSERT INTO country (name) VALUES ('Italy');
\ No newline at end of file
diff --git a/spring-boot-persistence/src/main/resources/persistence-generic-entity.properties b/spring-boot-persistence/src/main/resources/persistence-generic-entity.properties
new file mode 100644
index 0000000000..b19304cb1f
--- /dev/null
+++ b/spring-boot-persistence/src/main/resources/persistence-generic-entity.properties
@@ -0,0 +1,8 @@
+jdbc.driverClassName=org.h2.Driver
+jdbc.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
+jdbc.user=sa
+jdbc.pass=sa
+
+hibernate.dialect=org.hibernate.dialect.H2Dialect
+hibernate.show_sql=true
+hibernate.hbm2ddl.auto=create-drop
diff --git a/spring-boot-persistence/src/main/resources/schema.sql b/spring-boot-persistence/src/main/resources/schema.sql
new file mode 100644
index 0000000000..4cfc8a7927
--- /dev/null
+++ b/spring-boot-persistence/src/main/resources/schema.sql
@@ -0,0 +1,15 @@
+drop table if exists USERS;
+drop table if exists country;
+
+create table USERS(
+  ID int not null AUTO_INCREMENT,
+  NAME varchar(100) not null,
+  STATUS int,
+  PRIMARY KEY ( ID )
+);
+
+CREATE TABLE country (
+  id   INTEGER      NOT NULL AUTO_INCREMENT,
+  name VARCHAR(128) NOT NULL,
+  PRIMARY KEY (id)
+);
\ No newline at end of file
diff --git a/spring-boot/src/test/java/org/baeldung/SpringBootH2IntegrationTest.java b/spring-boot-persistence/src/test/java/com/baeldung/SpringBootH2IntegrationTest.java
similarity index 91%
rename from spring-boot/src/test/java/org/baeldung/SpringBootH2IntegrationTest.java
rename to spring-boot-persistence/src/test/java/com/baeldung/SpringBootH2IntegrationTest.java
index 290cfbe081..6479e90113 100644
--- a/spring-boot/src/test/java/org/baeldung/SpringBootH2IntegrationTest.java
+++ b/spring-boot-persistence/src/test/java/com/baeldung/SpringBootH2IntegrationTest.java
@@ -1,7 +1,8 @@
-package org.baeldung;
+package com.baeldung;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
-import org.baeldung.boot.Application;
-import org.baeldung.boot.config.H2JpaConfig;
 import org.baeldung.boot.domain.GenericEntity;
 import org.baeldung.boot.repository.GenericEntityRepository;
 import org.junit.Test;
@@ -10,8 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import com.baeldung.boot.config.H2JpaConfig;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = { Application.class, H2JpaConfig.class })
diff --git a/spring-boot-persistence/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java b/spring-boot-persistence/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java
new file mode 100644
index 0000000000..eef9ebe953
--- /dev/null
+++ b/spring-boot-persistence/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java
@@ -0,0 +1,27 @@
+package com.baeldung;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.baeldung.boot.domain.GenericEntity;
+import org.baeldung.boot.repository.GenericEntityRepository;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringBootJPAIntegrationTest {
+    @Autowired
+    private GenericEntityRepository genericEntityRepository;
+
+    @Test
+    public void givenGenericEntityRepository_whenSaveAndRetreiveEntity_thenOK() {
+        GenericEntity genericEntity = genericEntityRepository.save(new GenericEntity("test"));
+        GenericEntity foundEntity = genericEntityRepository.findById(genericEntity.getId()).orElse(null);
+        assertNotNull(foundEntity);
+        assertEquals(genericEntity.getValue(), foundEntity.getValue());
+    }
+}
\ No newline at end of file
diff --git a/spring-boot/src/test/java/org/baeldung/SpringBootProfileIntegrationTest.java b/spring-boot-persistence/src/test/java/com/baeldung/SpringBootProfileIntegrationTest.java
similarity index 95%
rename from spring-boot/src/test/java/org/baeldung/SpringBootProfileIntegrationTest.java
rename to spring-boot-persistence/src/test/java/com/baeldung/SpringBootProfileIntegrationTest.java
index 128a05f103..4c68f1d4a0 100644
--- a/spring-boot/src/test/java/org/baeldung/SpringBootProfileIntegrationTest.java
+++ b/spring-boot-persistence/src/test/java/com/baeldung/SpringBootProfileIntegrationTest.java
@@ -1,6 +1,8 @@
-package org.baeldung;
+package com.baeldung;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
-import org.baeldung.boot.Application;
 import org.baeldung.boot.domain.GenericEntity;
 import org.baeldung.boot.repository.GenericEntityRepository;
 import org.baeldung.config.H2TestProfileJPAConfig;
@@ -11,9 +13,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { Application.class, H2TestProfileJPAConfig.class })
 @ActiveProfiles("test")
diff --git a/spring-boot/src/test/java/org/baeldung/config/H2TestProfileJPAConfig.java b/spring-boot-persistence/src/test/java/org/baeldung/config/H2TestProfileJPAConfig.java
similarity index 94%
rename from spring-boot/src/test/java/org/baeldung/config/H2TestProfileJPAConfig.java
rename to spring-boot-persistence/src/test/java/org/baeldung/config/H2TestProfileJPAConfig.java
index d0b92a7a93..7f962e1417 100644
--- a/spring-boot/src/test/java/org/baeldung/config/H2TestProfileJPAConfig.java
+++ b/spring-boot-persistence/src/test/java/org/baeldung/config/H2TestProfileJPAConfig.java
@@ -18,7 +18,7 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
-@EnableJpaRepositories(basePackages = { "org.baeldung.repository", "org.baeldung.boot.repository", "org.baeldung.boot.boottest" })
+@EnableJpaRepositories(basePackages = { "org.baeldung.repository", "org.baeldung.boot.repository" })
 @EnableTransactionManagement
 public class H2TestProfileJPAConfig {
 
@@ -41,7 +41,7 @@ public class H2TestProfileJPAConfig {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "org.baeldung.domain", "org.baeldung.boot.domain", "org.baeldung.boot.boottest", "org.baeldung.model" });
+        em.setPackagesToScan(new String[] { "org.baeldung.domain", "org.baeldung.boot.domain" });
         em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
         em.setJpaProperties(additionalProperties());
         return em;
diff --git a/spring-boot-persistence/src/test/resources/application.properties b/spring-boot-persistence/src/test/resources/application.properties
index a5d09db840..a5c1d983cf 100644
--- a/spring-boot-persistence/src/test/resources/application.properties
+++ b/spring-boot-persistence/src/test/resources/application.properties
@@ -13,4 +13,4 @@ hibernate.cache.use_query_cache=true
 hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory
 
 spring.jpa.properties.hibernate.hbm2ddl.import_files=migrated_users.sql
-spring.datasource.data=import_*_users.sql,import_articles.sql
\ No newline at end of file
+spring.datasource.data=import_*_users.sql
\ No newline at end of file
diff --git a/spring-boot-security/pom.xml b/spring-boot-security/pom.xml
index 12f51eec94..5283a69c2d 100644
--- a/spring-boot-security/pom.xml
+++ b/spring-boot-security/pom.xml
@@ -67,12 +67,14 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot-maven-plugin.version}</version>
             </plugin>
         </plugins>
     </build>
 
     <properties>
         <spring-boot.version>1.5.9.RELEASE</spring-boot.version>
+        <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
     </properties>
 
 </project>
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/README.MD b/spring-boot/README.MD
index 1532889a5c..6892278f09 100644
--- a/spring-boot/README.MD
+++ b/spring-boot/README.MD
@@ -12,7 +12,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Using Custom Banners in Spring Boot](http://www.baeldung.com/spring-boot-custom-banners)
 - [Guide to Internationalization in Spring Boot](http://www.baeldung.com/spring-boot-internationalization)
 - [Create a Custom FailureAnalyzer with Spring Boot](http://www.baeldung.com/spring-boot-failure-analyzer)
-- [Configuring Separate Spring DataSource for Tests](http://www.baeldung.com/spring-testing-separate-data-source)
 - [Dynamic DTO Validation Config Retrieved from DB](http://www.baeldung.com/spring-dynamic-dto-validation)
 - [Custom Information in Spring Boot Info Endpoint](http://www.baeldung.com/spring-boot-info-actuator-custom)
 - [Using @JsonComponent in Spring Boot](http://www.baeldung.com/spring-boot-jsoncomponent)
@@ -23,7 +22,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Spring Boot and Togglz Aspect](http://www.baeldung.com/spring-togglz)
 - [Getting Started with GraphQL and Spring Boot](http://www.baeldung.com/spring-graphql)
 - [Guide to Spring Type Conversions](http://www.baeldung.com/spring-type-conversions)
-- [Quick Guide on data.sql and schema.sql Files in Spring Boot](http://www.baeldung.com/spring-boot-data-sql-and-schema-sql)
 - [Spring Data Java 8 Support](http://www.baeldung.com/spring-data-java-8)
 - [An Introduction to Kong](http://www.baeldung.com/kong)
 - [Spring Boot Customize Whitelabel Error Page](http://www.baeldung.com/spring-boot-custom-error-page)
diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
index ef30600d45..0667a24416 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>
@@ -170,6 +176,7 @@
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
+                <version>${git-commit-id-plugin.version}</version>
             </plugin>
 
         </plugins>
@@ -219,9 +226,12 @@
         <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>
+		<git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.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/java/com/baeldung/componentscan/ExampleBean.java b/spring-boot/src/main/java/com/baeldung/componentscan/ExampleBean.java
new file mode 100644
index 0000000000..9ddcf12d4e
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/componentscan/ExampleBean.java
@@ -0,0 +1,5 @@
+package com.baeldung.componentscan;
+
+public class ExampleBean {
+
+}
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springapp/SpringComponentScanApp.java b/spring-boot/src/main/java/com/baeldung/componentscan/springapp/SpringComponentScanApp.java
new file mode 100644
index 0000000000..2377ed7a56
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/componentscan/springapp/SpringComponentScanApp.java
@@ -0,0 +1,38 @@
+package com.baeldung.componentscan.springapp;
+
+import org.springframework.context.annotation.FilterType;
+import org.springframework.stereotype.Component;
+
+import com.baeldung.componentscan.ExampleBean;
+import com.baeldung.componentscan.springapp.flowers.Rose;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan
+//@ComponentScan(excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = Rose.class))
+//@ComponentScan(basePackages = "com.baeldung.componentscan.springapp")
+//@ComponentScan(basePackages = "com.baeldung.componentscan.springapp.animals")
+//@ComponentScan (excludeFilters = @ComponentScan.Filter(type=FilterType.REGEX,pattern="com\\.baeldung\\.componentscan\\.springapp\\.flowers\\..*"))
+public class SpringComponentScanApp {
+
+    private static ApplicationContext applicationContext;
+
+    @Bean
+    public ExampleBean exampleBean() {
+        return new ExampleBean();
+    }
+
+    public static void main(String[] args) {
+        applicationContext = new AnnotationConfigApplicationContext(SpringComponentScanApp.class);
+
+        for (String beanName : applicationContext.getBeanDefinitionNames()) {
+            System.out.println(beanName);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springapp/animals/Cat.java b/spring-boot/src/main/java/com/baeldung/componentscan/springapp/animals/Cat.java
new file mode 100644
index 0000000000..5f5b482972
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/componentscan/springapp/animals/Cat.java
@@ -0,0 +1,8 @@
+package com.baeldung.componentscan.springapp.animals;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class Cat {
+
+}
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springapp/animals/Dog.java b/spring-boot/src/main/java/com/baeldung/componentscan/springapp/animals/Dog.java
new file mode 100644
index 0000000000..009162b57f
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/componentscan/springapp/animals/Dog.java
@@ -0,0 +1,8 @@
+package com.baeldung.componentscan.springapp.animals;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class Dog {
+
+}
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springapp/flowers/Rose.java b/spring-boot/src/main/java/com/baeldung/componentscan/springapp/flowers/Rose.java
new file mode 100644
index 0000000000..b777b073b9
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/componentscan/springapp/flowers/Rose.java
@@ -0,0 +1,8 @@
+package com.baeldung.componentscan.springapp.flowers;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class Rose {
+
+}
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/SpringBootComponentScanApp.java b/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/SpringBootComponentScanApp.java
new file mode 100644
index 0000000000..ba29a4e1f5
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/SpringBootComponentScanApp.java
@@ -0,0 +1,37 @@
+package com.baeldung.componentscan.springbootapp;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+
+import com.baeldung.componentscan.ExampleBean;
+import com.baeldung.componentscan.springbootapp.flowers.Rose;
+
+@SpringBootApplication
+//@ComponentScan(basePackages = "com.baeldung.componentscan.springbootapp.animals")
+//@ComponentScan ( excludeFilters = @ComponentScan.Filter(type=FilterType.REGEX,pattern="com\\.baeldung\\.componentscan\\.springbootapp\\.flowers\\..*"))
+//@ComponentScan(excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = Rose.class))
+
+public class SpringBootComponentScanApp {
+    private static ApplicationContext applicationContext;
+
+    @Bean
+    public ExampleBean exampleBean() {
+        return new ExampleBean();
+    }
+
+    public static void main(String[] args) {
+        applicationContext = SpringApplication.run(SpringBootComponentScanApp.class, args);
+        checkBeansPresence("cat", "dog", "rose", "exampleBean", "springBootApp");
+
+    }
+
+    private static void checkBeansPresence(String... beans) {
+        for (String beanName : beans) {
+            System.out.println("Is " + beanName + " in ApplicationContext: " + applicationContext.containsBean(beanName));
+        }
+    }
+}
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/animals/Cat.java b/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/animals/Cat.java
new file mode 100644
index 0000000000..7c43d6a24c
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/animals/Cat.java
@@ -0,0 +1,8 @@
+package com.baeldung.componentscan.springbootapp.animals;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class Cat {
+
+}
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/animals/Dog.java b/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/animals/Dog.java
new file mode 100644
index 0000000000..145430cb54
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/animals/Dog.java
@@ -0,0 +1,8 @@
+package com.baeldung.componentscan.springbootapp.animals;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class Dog {
+
+}
diff --git a/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/flowers/Rose.java b/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/flowers/Rose.java
new file mode 100644
index 0000000000..0ccf782685
--- /dev/null
+++ b/spring-boot/src/main/java/com/baeldung/componentscan/springbootapp/flowers/Rose.java
@@ -0,0 +1,8 @@
+package com.baeldung.componentscan.springbootapp.flowers;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class Rose {
+
+}
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/pom.xml b/spring-cloud/pom.xml
index 373a12da9e..1fdab4213c 100644
--- a/spring-cloud/pom.xml
+++ b/spring-cloud/pom.xml
@@ -31,6 +31,7 @@
         <module>spring-cloud-zuul-eureka-integration</module>
         <module>spring-cloud-contract</module>
         <module>spring-cloud-kubernetes</module>
+        <module>spring-cloud-archaius</module>
     </modules>
 
     <build>
diff --git a/spring-cloud/spring-cloud-archaius/README.md b/spring-cloud/spring-cloud-archaius/README.md
new file mode 100644
index 0000000000..9de26352e1
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/README.md
@@ -0,0 +1,14 @@
+# Spring Cloud Archaius
+
+#### Basic Config
+This service has the basic, out-of-the-box Spring Cloud Netflix Archaius configuration.
+
+#### Extra Configs
+This service customizes some properties supported by Archaius.
+
+These properties are set up on the main method, since Archaius uses System properties, but they could be added as command line arguments when launching the app.
+
+#### Additional Sources
+In this service we create a new AbstractConfiguration bean, setting up a new Configuration Properties source.
+
+These properties have precedence over all the other properties in the Archaius Composite Configuration.
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/pom.xml b/spring-cloud/spring-cloud-archaius/additional-sources-simple/pom.xml
new file mode 100644
index 0000000000..1ae6d543fb
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/additional-sources-simple/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>additional-sources-simple</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>additional-sources-simple</name>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-archaius</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/AdditionalSourcesSimpleApplication.java b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/AdditionalSourcesSimpleApplication.java
new file mode 100644
index 0000000000..e1a1d106cf
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/AdditionalSourcesSimpleApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.spring.cloud.archaius.additionalsources;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class AdditionalSourcesSimpleApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(AdditionalSourcesSimpleApplication.class, args);
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/config/ApplicationPropertiesConfigurations.java b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/config/ApplicationPropertiesConfigurations.java
new file mode 100644
index 0000000000..f2d8ca2638
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/config/ApplicationPropertiesConfigurations.java
@@ -0,0 +1,21 @@
+package com.baeldung.spring.cloud.archaius.additionalsources.config;
+
+import org.apache.commons.configuration.AbstractConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.netflix.config.DynamicConfiguration;
+import com.netflix.config.FixedDelayPollingScheduler;
+import com.netflix.config.PolledConfigurationSource;
+import com.netflix.config.sources.URLConfigurationSource;
+
+@Configuration
+public class ApplicationPropertiesConfigurations {
+
+    @Bean
+    public AbstractConfiguration addApplicationPropertiesSource() {
+        PolledConfigurationSource source = new URLConfigurationSource("classpath:other-config.properties");
+        return new DynamicConfiguration(source, new FixedDelayPollingScheduler());
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/controller/ConfigPropertiesController.java b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/controller/ConfigPropertiesController.java
new file mode 100644
index 0000000000..304369a036
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/controller/ConfigPropertiesController.java
@@ -0,0 +1,37 @@
+package com.baeldung.spring.cloud.archaius.additionalsources.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.netflix.config.DynamicPropertyFactory;
+import com.netflix.config.DynamicStringProperty;
+
+@RestController
+public class ConfigPropertiesController {
+
+    private DynamicStringProperty propertyOneWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.one", "not found!");
+
+    private DynamicStringProperty propertyTwoWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.two", "not found!");
+
+    private DynamicStringProperty propertyThreeWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.three", "not found!");
+
+    private DynamicStringProperty propertyFourWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.four", "not found!");
+
+    @GetMapping("/properties-from-dynamic")
+    public Map<String, String> getPropertiesFromDynamic() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put(propertyOneWithDynamic.getName(), propertyOneWithDynamic.get());
+        properties.put(propertyTwoWithDynamic.getName(), propertyTwoWithDynamic.get());
+        properties.put(propertyThreeWithDynamic.getName(), propertyThreeWithDynamic.get());
+        properties.put(propertyFourWithDynamic.getName(), propertyFourWithDynamic.get());
+        return properties;
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/application.properties b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/application.properties
new file mode 100644
index 0000000000..bf55e89a27
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+server.port=8082
+baeldung.archaius.properties.one=one FROM:application.properties
+baeldung.archaius.properties.two=two FROM:application.properties
diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/config.properties b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/config.properties
new file mode 100644
index 0000000000..b104c0c488
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/config.properties
@@ -0,0 +1,2 @@
+baeldung.archaius.properties.one=one FROM:config.properties
+baeldung.archaius.properties.three=three FROM:config.properties
diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/other-config.properties b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/other-config.properties
new file mode 100644
index 0000000000..00fe8ff2aa
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/other-config.properties
@@ -0,0 +1,2 @@
+baeldung.archaius.properties.one=one FROM:other-config.properties
+baeldung.archaius.properties.four=four FROM:other-config.properties
diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/ArchaiusAdditionalSourcesLiveTest.java b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/ArchaiusAdditionalSourcesLiveTest.java
new file mode 100644
index 0000000000..f3a345d869
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/ArchaiusAdditionalSourcesLiveTest.java
@@ -0,0 +1,54 @@
+package com.baeldung.spring.cloud.archaius.additionalsources;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class ArchaiusAdditionalSourcesLiveTest {
+
+    private static final String BASE_URL = "http://localhost:8082";
+
+    private static final String DYNAMIC_PROPERTIES_URL = "/properties-from-dynamic";
+    private static final Map<String, String> EXPECTED_ARCHAIUS_PROPERTIES = createExpectedArchaiusProperties();
+
+    private static Map<String, String> createExpectedArchaiusProperties() {
+        Map<String, String> map = new HashMap<>();
+        map.put("baeldung.archaius.properties.one", "one FROM:other-config.properties");
+        map.put("baeldung.archaius.properties.two", "two FROM:application.properties");
+        map.put("baeldung.archaius.properties.three", "three FROM:config.properties");
+        map.put("baeldung.archaius.properties.four", "four FROM:other-config.properties");
+        return map;
+    }
+
+    @Autowired
+    ConfigurableApplicationContext context;
+
+    @Autowired
+    private TestRestTemplate template;
+
+    private <T> Map<T, T> exchangeAsMap(String uri, ParameterizedTypeReference<Map<T, T>> responseType) {
+        return template.exchange(uri, HttpMethod.GET, null, responseType)
+            .getBody();
+    }
+
+    @Test
+    public void givenNonDefaultConfigurationFilesSetup_whenRequestProperties_thenEndpointRetrievesValuesInFiles() {
+        Map<String, String> initialResponse = this.exchangeAsMap(BASE_URL + DYNAMIC_PROPERTIES_URL, new ParameterizedTypeReference<Map<String, String>>() {
+        });
+
+        assertThat(initialResponse).containsAllEntriesOf(EXPECTED_ARCHAIUS_PROPERTIES);
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/basic-config/pom.xml b/spring-cloud/spring-cloud-archaius/basic-config/pom.xml
new file mode 100644
index 0000000000..b5b091712d
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/basic-config/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>basic-config</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>basic-config</name>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-archaius</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/BasicArchaiusApplication.java b/spring-cloud/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/BasicArchaiusApplication.java
new file mode 100644
index 0000000000..e6e578eed3
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/BasicArchaiusApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.spring.cloud.archaius.basic;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class BasicArchaiusApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(BasicArchaiusApplication.class, args);
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/controller/ConfigPropertiesController.java b/spring-cloud/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/controller/ConfigPropertiesController.java
new file mode 100644
index 0000000000..46b8f345f6
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/controller/ConfigPropertiesController.java
@@ -0,0 +1,70 @@
+package com.baeldung.spring.cloud.archaius.basic.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.netflix.config.DynamicIntProperty;
+import com.netflix.config.DynamicPropertyFactory;
+import com.netflix.config.DynamicStringProperty;
+
+@RestController
+public class ConfigPropertiesController {
+
+    @Value("${baeldung.archaius.properties.one:not found!}")
+    private String propertyOneWithValue;
+
+    @Value("${baeldung.archaius.properties.two:not found!}")
+    private String propertyTwoWithValue;
+
+    @Value("${baeldung.archaius.properties.three:not found!}")
+    private String propertyThreeWithValue;
+
+    @Value("${baeldung.archaius.properties.four:not found!}")
+    private String propertyFourWithValue;
+
+    private DynamicStringProperty propertyOneWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.one", "not found!");
+
+    private DynamicStringProperty propertyTwoWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.two", "not found!");
+
+    private DynamicStringProperty propertyThreeWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.three", "not found!");
+
+    private DynamicStringProperty propertyFourWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.four", "not found!");
+
+    private DynamicIntProperty intPropertyWithDynamic = DynamicPropertyFactory.getInstance()
+        .getIntProperty("baeldung.archaius.properties.int", 0);
+
+    @GetMapping("/properties-from-value")
+    public Map<String, String> getPropertiesFromValue() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put("baeldung.archaius.properties.one", propertyOneWithValue);
+        properties.put("baeldung.archaius.properties.two", propertyTwoWithValue);
+        properties.put("baeldung.archaius.properties.three", propertyThreeWithValue);
+        properties.put("baeldung.archaius.properties.four", propertyFourWithValue);
+        return properties;
+    }
+
+    @GetMapping("/properties-from-dynamic")
+    public Map<String, String> getPropertiesFromDynamic() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put(propertyOneWithDynamic.getName(), propertyOneWithDynamic.get());
+        properties.put(propertyTwoWithDynamic.getName(), propertyTwoWithDynamic.get());
+        properties.put(propertyThreeWithDynamic.getName(), propertyThreeWithDynamic.get());
+        properties.put(propertyFourWithDynamic.getName(), propertyFourWithDynamic.get());
+        return properties;
+    }
+
+    @GetMapping("/int-property")
+    public Map<String, Integer> getIntPropertyFromDynamic() {
+        Map<String, Integer> properties = new HashMap<>();
+        properties.put(intPropertyWithDynamic.getName(), intPropertyWithDynamic.get());
+        return properties;
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/application.properties b/spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/application.properties
new file mode 100644
index 0000000000..1a35a22197
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+server.port=8080
+baeldung.archaius.properties.one=one FROM:application.properties
+baeldung.archaius.properties.two=two FROM:application.properties
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/config.properties b/spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/config.properties
new file mode 100644
index 0000000000..86ae575d20
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/config.properties
@@ -0,0 +1,4 @@
+baeldung.archaius.properties.one=one FROM:config.properties
+baeldung.archaius.properties.three=three FROM:config.properties
+
+baeldung.archaius.properties.int=1
diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/other.properties b/spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/other.properties
new file mode 100644
index 0000000000..26796b7341
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/other.properties
@@ -0,0 +1,2 @@
+baeldung.archaius.properties.one=one FROM:other.properties
+baeldung.archaius.properties.four=four FROM:other.properties
diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationIntegrationTest.java b/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationIntegrationTest.java
new file mode 100644
index 0000000000..2948606c0b
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationIntegrationTest.java
@@ -0,0 +1,45 @@
+package com.baeldung.spring.cloud.archaius.basic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Collections;
+
+import org.junit.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import com.netflix.config.DynamicPropertyFactory;
+import com.netflix.config.DynamicStringProperty;
+
+@RunWith(JUnitPlatform.class)
+@ExtendWith(SpringExtension.class)
+@SpringBootTest
+public class ArchaiusBasicConfigurationIntegrationTest {
+
+    @Autowired
+    ConfigurableApplicationContext context;
+
+    private DynamicStringProperty testPropertyWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.test.properties.one", "not found!");
+
+    @Test
+    public void givenIntialPropertyValue_whenPropertyChanges_thenArchaiusRetrievesNewValue() {
+        String initialValue = testPropertyWithDynamic.get();
+
+        TestPropertyValues.of("baeldung.archaius.test.properties.one=new-value")
+            .applyTo(context);
+        context.publishEvent(new EnvironmentChangeEvent(Collections.singleton("baeldung.archaius.test.properties.one")));
+        String finalValue = testPropertyWithDynamic.get();
+
+        assertThat(initialValue).isEqualTo("test-one");
+        assertThat(finalValue).isEqualTo("new-value");
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationLiveTest.java b/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationLiveTest.java
new file mode 100644
index 0000000000..70d43df60d
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationLiveTest.java
@@ -0,0 +1,74 @@
+package com.baeldung.spring.cloud.archaius.basic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class ArchaiusBasicConfigurationLiveTest {
+
+    private static final String BASE_URL = "http://localhost:8080";
+
+    private static final String DYNAMIC_PROPERTIES_URL = "/properties-from-dynamic";
+    private static final Map<String, String> EXPECTED_ARCHAIUS_PROPERTIES = createExpectedArchaiusProperties();
+
+    private static Map<String, String> createExpectedArchaiusProperties() {
+        Map<String, String> map = new HashMap<>();
+        map.put("baeldung.archaius.properties.one", "one FROM:application.properties");
+        map.put("baeldung.archaius.properties.two", "two FROM:application.properties");
+        map.put("baeldung.archaius.properties.three", "three FROM:config.properties");
+        map.put("baeldung.archaius.properties.four", "not found!");
+        return map;
+    }
+
+    private static final String VALUE_PROPERTIES_URL = "/properties-from-value";
+    private static final Map<String, String> EXPECTED_VALUE_PROPERTIES = createExpectedValueProperties();
+
+    private static Map<String, String> createExpectedValueProperties() {
+        Map<String, String> map = new HashMap<>();
+        map.put("baeldung.archaius.properties.one", "one FROM:application.properties");
+        map.put("baeldung.archaius.properties.two", "two FROM:application.properties");
+        map.put("baeldung.archaius.properties.three", "not found!");
+        map.put("baeldung.archaius.properties.four", "not found!");
+        return map;
+    }
+
+    @Autowired
+    ConfigurableApplicationContext context;
+
+    @Autowired
+    private TestRestTemplate template;
+
+    private <T> Map<T, T> exchangeAsMap(String uri, ParameterizedTypeReference<Map<T, T>> responseType) {
+        return template.exchange(uri, HttpMethod.GET, null, responseType)
+            .getBody();
+    }
+
+    @Test
+    public void givenDefaultConfigurationSetup_whenRequestProperties_thenEndpointRetrievesValuesInFiles() {
+        Map<String, String> initialResponse = this.exchangeAsMap(BASE_URL + DYNAMIC_PROPERTIES_URL, new ParameterizedTypeReference<Map<String, String>>() {
+        });
+
+        assertThat(initialResponse).containsAllEntriesOf(EXPECTED_ARCHAIUS_PROPERTIES);
+    }
+
+    @Test
+    public void givenNonDefaultConfigurationFilesSetup_whenRequestSpringVisibleProperties_thenEndpointDoesntRetrieveArchaiusProperties() {
+        Map<String, String> initialResponse = this.exchangeAsMap(BASE_URL + VALUE_PROPERTIES_URL, new ParameterizedTypeReference<Map<String, String>>() {
+        });
+
+        assertThat(initialResponse).containsAllEntriesOf(EXPECTED_VALUE_PROPERTIES);
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/resources/config.properties b/spring-cloud/spring-cloud-archaius/basic-config/src/test/resources/config.properties
new file mode 100644
index 0000000000..1ceb5d1161
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/basic-config/src/test/resources/config.properties
@@ -0,0 +1,3 @@
+baeldung.archaius.test.properties.one=test-one
+baeldung.archaius.test.properties.two=test-two
+baeldung.archaius.test.properties.int=1
diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/pom.xml b/spring-cloud/spring-cloud-archaius/extra-configs/pom.xml
new file mode 100644
index 0000000000..2f3f2b084a
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/extra-configs/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>extra-configs</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>extra-configs</name>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-archaius</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-archaius</artifactId>
+        </dependency>
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-netflix</artifactId>
+                <version>${spring-cloud-dependencies.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <properties>
+        <spring-cloud-dependencies.version>2.0.1.RELEASE</spring-cloud-dependencies.version>
+    </properties>
+</project>
diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/ExtraConfigsApplication.java b/spring-cloud/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/ExtraConfigsApplication.java
new file mode 100644
index 0000000000..4747d875db
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/ExtraConfigsApplication.java
@@ -0,0 +1,16 @@
+package com.baeldung.spring.cloud.archaius.extraconfigs;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ExtraConfigsApplication {
+
+    public static void main(String[] args) {
+        // System properties can be set as command line arguments too
+        System.setProperty("archaius.configurationSource.additionalUrls", "classpath:other-config-dir/extra.properties");
+        System.setProperty("archaius.configurationSource.defaultFileName", "other.properties");
+        SpringApplication.run(ExtraConfigsApplication.class, args);
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/controllers/ConfigPropertiesController.java b/spring-cloud/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/controllers/ConfigPropertiesController.java
new file mode 100644
index 0000000000..382c6b3a2c
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/controllers/ConfigPropertiesController.java
@@ -0,0 +1,60 @@
+package com.baeldung.spring.cloud.archaius.extraconfigs.controllers;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.netflix.config.DynamicPropertyFactory;
+import com.netflix.config.DynamicStringProperty;
+
+@RestController
+public class ConfigPropertiesController {
+
+    @Value("${baeldung.archaius.properties.one:not found!}")
+    private String propertyOneWithValue;
+
+    @Value("${baeldung.archaius.properties.two:not found!}")
+    private String propertyTwoWithValue;
+
+    @Value("${baeldung.archaius.properties.three:not found!}")
+    private String propertyThreeWithValue;
+
+    @Value("${baeldung.archaius.properties.four:not found!}")
+    private String propertyFourWithValue;
+
+    private DynamicStringProperty propertyOneWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.one", "not found!");
+
+    private DynamicStringProperty propertyTwoWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.two", "not found!");
+
+    private DynamicStringProperty propertyThreeWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.three", "not found!");
+
+    private DynamicStringProperty propertyFourWithDynamic = DynamicPropertyFactory.getInstance()
+        .getStringProperty("baeldung.archaius.properties.four", "not found!");
+
+    @GetMapping("/properties-from-value")
+    public Map<String, String> getPropertiesFromValue() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put("baeldung.archaius.properties.one", propertyOneWithValue);
+        properties.put("baeldung.archaius.properties.two", propertyTwoWithValue);
+        properties.put("baeldung.archaius.properties.three", propertyThreeWithValue);
+        properties.put("baeldung.archaius.properties.four", propertyFourWithValue);
+        return properties;
+    }
+
+    @GetMapping("/properties-from-dynamic")
+    public Map<String, String> getPropertiesFromDynamic() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put("baeldung.archaius.properties.one", propertyOneWithDynamic.get());
+        properties.put("baeldung.archaius.properties.two", propertyTwoWithDynamic.get());
+        properties.put("baeldung.archaius.properties.three", propertyThreeWithDynamic.get());
+        properties.put("baeldung.archaius.properties.four", propertyFourWithDynamic.get());
+        return properties;
+    }
+
+}
diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/application.properties b/spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/application.properties
new file mode 100644
index 0000000000..1e36b134d4
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+server.port=8081
+baeldung.archaius.properties.one=one FROM:application.properties
+baeldung.archaius.properties.two=two FROM:application.properties
diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/other-config-dir/extra.properties b/spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/other-config-dir/extra.properties
new file mode 100644
index 0000000000..ea99914cc1
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/other-config-dir/extra.properties
@@ -0,0 +1,2 @@
+baeldung.archaius.properties.one=one FROM:extra.properties
+baeldung.archaius.properties.three=three FROM:extra.properties
diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/other.properties b/spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/other.properties
new file mode 100644
index 0000000000..26796b7341
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/other.properties
@@ -0,0 +1,2 @@
+baeldung.archaius.properties.one=one FROM:other.properties
+baeldung.archaius.properties.four=four FROM:other.properties
diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/spring/cloud/archaius/extraconfigs/ArchaiusExtraConfigsLiveTest.java b/spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/spring/cloud/archaius/extraconfigs/ArchaiusExtraConfigsLiveTest.java
new file mode 100644
index 0000000000..232ca73352
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/spring/cloud/archaius/extraconfigs/ArchaiusExtraConfigsLiveTest.java
@@ -0,0 +1,54 @@
+package com.baeldung.spring.cloud.archaius.extraconfigs;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class ArchaiusExtraConfigsLiveTest {
+
+    private static final String BASE_URL = "http://localhost:8081";
+
+    private static final String DYNAMIC_PROPERTIES_URL = "/properties-from-dynamic";
+    private static final Map<String, String> EXPECTED_ARCHAIUS_PROPERTIES = createExpectedArchaiusProperties();
+
+    private static Map<String, String> createExpectedArchaiusProperties() {
+        Map<String, String> map = new HashMap<>();
+        map.put("baeldung.archaius.properties.one", "one FROM:application.properties");
+        map.put("baeldung.archaius.properties.two", "two FROM:application.properties");
+        map.put("baeldung.archaius.properties.three", "three FROM:extra.properties");
+        map.put("baeldung.archaius.properties.four", "four FROM:other.properties");
+        return map;
+    }
+
+    @Autowired
+    ConfigurableApplicationContext context;
+
+    @Autowired
+    private TestRestTemplate template;
+
+    private <T> Map<T, T> exchangeAsMap(String uri, ParameterizedTypeReference<Map<T, T>> responseType) {
+        return template.exchange(uri, HttpMethod.GET, null, responseType)
+            .getBody();
+    }
+
+    @Test
+    public void givenNonDefaultConfigurationFilesSetup_whenRequestProperties_thenEndpointRetrievesValuesInFiles() {
+        Map<String, String> initialResponse = this.exchangeAsMap(BASE_URL + DYNAMIC_PROPERTIES_URL, new ParameterizedTypeReference<Map<String, String>>() {
+        });
+
+        assertThat(initialResponse).containsAllEntriesOf(EXPECTED_ARCHAIUS_PROPERTIES);
+    }
+}
diff --git a/spring-cloud/spring-cloud-archaius/pom.xml b/spring-cloud/spring-cloud-archaius/pom.xml
new file mode 100644
index 0000000000..cd102f86cd
--- /dev/null
+++ b/spring-cloud/spring-cloud-archaius/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.spring.cloud</groupId>
+    <artifactId>spring-cloud-archaius</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <name>spring-cloud-archaius</name>
+    <description>Spring Cloud Archaius Pom parent</description>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <modules>
+        <module>basic-config</module>
+        <module>additional-sources-simple</module>
+        <module>extra-configs</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-archaius</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit.platform.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-netflix</artifactId>
+                <version>${spring-cloud-dependencies.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <properties>
+        <spring-cloud-dependencies.version>2.0.1.RELEASE</spring-cloud-dependencies.version>
+        <junit.platform.version>1.2.0</junit.platform.version>
+    </properties>
+</project>
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-core/pom.xml b/spring-core/pom.xml
index 9e885462f3..60f3262f08 100644
--- a/spring-core/pom.xml
+++ b/spring-core/pom.xml
@@ -16,11 +16,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>${mockito.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -82,15 +77,7 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <url>https://maven.java.net/content/repositories/releases/</url>
-        </repository>
-    </repositories>
-
     <properties>
-        <mockito.version>1.10.19</mockito.version>
         <mockito.spring.boot.version>1.4.4.RELEASE</mockito.spring.boot.version>
         <javax.inject.version>1</javax.inject.version>
         <guava.version>20.0</guava.version>
diff --git a/spring-data-jpa/src/main/java/com/baeldung/domain/Item.java b/spring-data-jpa/src/main/java/com/baeldung/domain/Item.java
new file mode 100644
index 0000000000..97ce14d92d
--- /dev/null
+++ b/spring-data-jpa/src/main/java/com/baeldung/domain/Item.java
@@ -0,0 +1,81 @@
+package com.baeldung.domain;
+
+import java.math.BigDecimal;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class Item {
+
+    private String color;
+    private String grade;
+
+    @Id
+    private Long id;
+
+    @ManyToOne
+    private ItemType itemType;
+
+    private String name;
+    private BigDecimal price;
+    @ManyToOne
+    private Store store;
+
+    public String getColor() {
+        return color;
+    }
+
+    public String getGrade() {
+        return grade;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public ItemType getItemType() {
+        return itemType;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public Store getStore() {
+        return store;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setItemType(ItemType itemType) {
+        this.itemType = itemType;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public void setStore(Store store) {
+        this.store = store;
+    }
+}
diff --git a/spring-data-jpa/src/main/java/com/baeldung/domain/ItemType.java b/spring-data-jpa/src/main/java/com/baeldung/domain/ItemType.java
new file mode 100644
index 0000000000..412079c2ae
--- /dev/null
+++ b/spring-data-jpa/src/main/java/com/baeldung/domain/ItemType.java
@@ -0,0 +1,46 @@
+package com.baeldung.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+
+@Entity
+public class ItemType {
+
+    @Id
+    private Long id;
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "ITEM_TYPE_ID")
+    private List<Item> items = new ArrayList<>();
+
+    private String name;
+
+    public Long getId() {
+        return id;
+    }
+
+    public List<Item> getItems() {
+        return items;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setItems(List<Item> items) {
+        this.items = items;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/spring-data-jpa/src/main/java/com/baeldung/domain/Location.java b/spring-data-jpa/src/main/java/com/baeldung/domain/Location.java
new file mode 100644
index 0000000000..2178d378eb
--- /dev/null
+++ b/spring-data-jpa/src/main/java/com/baeldung/domain/Location.java
@@ -0,0 +1,55 @@
+package com.baeldung.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+
+@Entity
+public class Location {
+
+    private String city;
+    private String country;
+    @Id
+    private Long id;
+
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "LOCATION_ID")
+    private List<Store> stores = new ArrayList<>();
+
+    public String getCity() {
+        return city;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public List<Store> getStores() {
+        return stores;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setStores(List<Store> stores) {
+        this.stores = stores;
+    }
+}
diff --git a/spring-data-jpa/src/main/java/com/baeldung/domain/Store.java b/spring-data-jpa/src/main/java/com/baeldung/domain/Store.java
new file mode 100644
index 0000000000..e04684c479
--- /dev/null
+++ b/spring-data-jpa/src/main/java/com/baeldung/domain/Store.java
@@ -0,0 +1,76 @@
+package com.baeldung.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+
+@Entity
+public class Store {
+
+    private Boolean active;
+    @Id
+    private Long id;
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "STORE_ID")
+    private List<Item> items = new ArrayList<>();
+    private Long itemsSold;
+
+    @ManyToOne
+    private Location location;
+
+    private String name;
+
+    public Boolean getActive() {
+        return active;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public List<Item> getItems() {
+        return items;
+    }
+
+    public Long getItemsSold() {
+        return itemsSold;
+    }
+
+    public Location getLocation() {
+        return location;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setActive(Boolean active) {
+        this.active = active;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setItems(List<Item> items) {
+        this.items = items;
+    }
+
+    public void setItemsSold(Long itemsSold) {
+        this.itemsSold = itemsSold;
+    }
+
+    public void setLocation(Location location) {
+        this.location = location;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/spring-data-jpa/src/main/java/com/baeldung/repository/CustomItemRepository.java b/spring-data-jpa/src/main/java/com/baeldung/repository/CustomItemRepository.java
new file mode 100644
index 0000000000..91eddb800a
--- /dev/null
+++ b/spring-data-jpa/src/main/java/com/baeldung/repository/CustomItemRepository.java
@@ -0,0 +1,15 @@
+package com.baeldung.repository;
+
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.domain.Item;
+
+@Repository
+public interface CustomItemRepository {
+
+    void deleteCustom(Item entity);
+
+    Item findItemById(Long id);
+
+    void findThenDelete(Long id);
+}
diff --git a/spring-data-jpa/src/main/java/com/baeldung/repository/CustomItemTypeRepository.java b/spring-data-jpa/src/main/java/com/baeldung/repository/CustomItemTypeRepository.java
new file mode 100644
index 0000000000..77bbf294a0
--- /dev/null
+++ b/spring-data-jpa/src/main/java/com/baeldung/repository/CustomItemTypeRepository.java
@@ -0,0 +1,13 @@
+package com.baeldung.repository;
+
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.domain.ItemType;
+
+@Repository
+public interface CustomItemTypeRepository {
+
+    void deleteCustom(ItemType entity);
+
+    void findThenDelete(Long id);
+}
diff --git a/spring-data-jpa/src/main/java/com/baeldung/repository/ItemTypeRepository.java b/spring-data-jpa/src/main/java/com/baeldung/repository/ItemTypeRepository.java
new file mode 100644
index 0000000000..c3146aa297
--- /dev/null
+++ b/spring-data-jpa/src/main/java/com/baeldung/repository/ItemTypeRepository.java
@@ -0,0 +1,10 @@
+package com.baeldung.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.domain.ItemType;
+
+@Repository
+public interface ItemTypeRepository extends JpaRepository<ItemType, Long>, CustomItemTypeRepository, CustomItemRepository {
+}
diff --git a/spring-data-jpa/src/main/java/com/baeldung/repository/LocationRepository.java b/spring-data-jpa/src/main/java/com/baeldung/repository/LocationRepository.java
new file mode 100644
index 0000000000..f119ff916b
--- /dev/null
+++ b/spring-data-jpa/src/main/java/com/baeldung/repository/LocationRepository.java
@@ -0,0 +1,10 @@
+package com.baeldung.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.domain.Location;
+
+@Repository
+public interface LocationRepository extends JpaRepository<Location, Long> {
+}
diff --git a/spring-data-jpa/src/main/java/com/baeldung/repository/ReadOnlyLocationRepository.java b/spring-data-jpa/src/main/java/com/baeldung/repository/ReadOnlyLocationRepository.java
new file mode 100644
index 0000000000..2107712484
--- /dev/null
+++ b/spring-data-jpa/src/main/java/com/baeldung/repository/ReadOnlyLocationRepository.java
@@ -0,0 +1,15 @@
+package com.baeldung.repository;
+
+import java.util.Optional;
+
+import org.springframework.data.repository.Repository;
+
+import com.baeldung.domain.Location;
+
+@org.springframework.stereotype.Repository
+public interface ReadOnlyLocationRepository extends Repository<Location, Long> {
+
+    Optional<Location> findById(Long id);
+
+    Location save(Location location);
+}
diff --git a/spring-data-jpa/src/main/java/com/baeldung/repository/StoreRepository.java b/spring-data-jpa/src/main/java/com/baeldung/repository/StoreRepository.java
new file mode 100644
index 0000000000..939ca1dacb
--- /dev/null
+++ b/spring-data-jpa/src/main/java/com/baeldung/repository/StoreRepository.java
@@ -0,0 +1,13 @@
+package com.baeldung.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.domain.Store;
+
+@Repository
+public interface StoreRepository extends JpaRepository<Store, Long> {
+    List<Store> findStoreByLocationId(Long locationId);
+}
diff --git a/spring-data-jpa/src/main/java/com/baeldung/repository/impl/CustomItemRepositoryImpl.java b/spring-data-jpa/src/main/java/com/baeldung/repository/impl/CustomItemRepositoryImpl.java
new file mode 100644
index 0000000000..44492a8f35
--- /dev/null
+++ b/spring-data-jpa/src/main/java/com/baeldung/repository/impl/CustomItemRepositoryImpl.java
@@ -0,0 +1,32 @@
+package com.baeldung.repository.impl;
+
+import javax.persistence.EntityManager;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.domain.Item;
+import com.baeldung.repository.CustomItemRepository;
+
+@Repository
+public class CustomItemRepositoryImpl implements CustomItemRepository {
+
+    @Autowired
+    private EntityManager entityManager;
+
+    @Override
+    public void deleteCustom(Item item) {
+        entityManager.remove(item);
+    }
+
+    @Override
+    public Item findItemById(Long id) {
+        return entityManager.find(Item.class, id);
+    }
+
+    @Override
+    public void findThenDelete(Long id) {
+        final Item item = entityManager.find(Item.class, id);
+        entityManager.remove(item);
+    }
+}
diff --git a/spring-data-jpa/src/main/java/com/baeldung/repository/impl/CustomItemTypeRepositoryImpl.java b/spring-data-jpa/src/main/java/com/baeldung/repository/impl/CustomItemTypeRepositoryImpl.java
new file mode 100644
index 0000000000..594fd24ea9
--- /dev/null
+++ b/spring-data-jpa/src/main/java/com/baeldung/repository/impl/CustomItemTypeRepositoryImpl.java
@@ -0,0 +1,31 @@
+package com.baeldung.repository.impl;
+
+import javax.persistence.EntityManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.domain.ItemType;
+import com.baeldung.repository.CustomItemTypeRepository;
+
+@Repository
+public class CustomItemTypeRepositoryImpl implements CustomItemTypeRepository {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CustomItemTypeRepositoryImpl.class);
+
+    @Autowired
+    private EntityManager entityManager;
+
+    @Override
+    public void deleteCustom(ItemType itemType) {
+        entityManager.remove(itemType);
+    }
+
+    @Override
+    public void findThenDelete(Long id) {
+        ItemType itemTypeToDelete = entityManager.find(ItemType.class, id);
+        entityManager.remove(itemTypeToDelete);
+    }
+}
diff --git a/spring-data-jpa/src/test/java/com/baeldung/repository/JpaRepositoriesIntegrationTest.java b/spring-data-jpa/src/test/java/com/baeldung/repository/JpaRepositoriesIntegrationTest.java
new file mode 100644
index 0000000000..d8b7bc4a88
--- /dev/null
+++ b/spring-data-jpa/src/test/java/com/baeldung/repository/JpaRepositoriesIntegrationTest.java
@@ -0,0 +1,93 @@
+package com.baeldung.repository;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.assertTrue;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.domain.Item;
+import com.baeldung.domain.ItemType;
+import com.baeldung.domain.Location;
+import com.baeldung.domain.Store;
+
+@RunWith(SpringRunner.class)
+@DataJpaTest
+public class JpaRepositoriesIntegrationTest {
+    @Autowired
+    private LocationRepository locationRepository;
+    @Autowired
+    private StoreRepository storeRepository;
+    @Autowired
+    private ItemTypeRepository compositeRepository;
+    @Autowired
+    private ReadOnlyLocationRepository readOnlyRepository;
+
+    @Test
+    public void whenSaveLocation_ThenGetSameLocation() {
+        Location location = new Location();
+        location.setId(100L);
+        location.setCountry("Country H");
+        location.setCity("City Hundred");
+        location = locationRepository.saveAndFlush(location);
+
+        Location otherLocation = locationRepository.getOne(location.getId());
+        assertEquals("Country H", otherLocation.getCountry());
+        assertEquals("City Hundred", otherLocation.getCity());
+
+        locationRepository.delete(otherLocation);
+    }
+
+    @Test
+    public void givenLocationId_whenFindStores_thenGetStores() {
+        List<Store> stores = storeRepository.findStoreByLocationId(1L);
+        assertEquals(1, stores.size());
+    }
+
+    @Test
+    public void givenItemTypeId_whenDeleted_ThenItemTypeDeleted() {
+        Optional<ItemType> itemType = compositeRepository.findById(1L);
+        assertTrue(itemType.isPresent());
+        compositeRepository.deleteCustom(itemType.get());
+        itemType = compositeRepository.findById(1L);
+        assertFalse(itemType.isPresent());
+    }
+
+    @Test
+    public void givenItemId_whenUsingCustomRepo_ThenDeleteAppropriateEntity() {
+        Item item = compositeRepository.findItemById(1L);
+        assertNotNull(item);
+        compositeRepository.deleteCustom(item);
+        item = compositeRepository.findItemById(1L);
+        assertNull(item);
+    }
+
+    @Test
+    public void givenItemAndItemType_WhenAmbiguousDeleteCalled_ThenItemTypeDeletedAndNotItem() {
+        Optional<ItemType> itemType = compositeRepository.findById(1L);
+        assertTrue(itemType.isPresent());
+        Item item = compositeRepository.findItemById(2L);
+        assertNotNull(item);
+
+        compositeRepository.findThenDelete(1L);
+        Optional<ItemType> sameItemType = compositeRepository.findById(1L);
+        assertFalse(sameItemType.isPresent());
+        Item sameItem = compositeRepository.findItemById(2L);
+        assertNotNull(sameItem);
+    }
+
+    @Test
+    public void whenCreatingReadOnlyRepo_thenHaveOnlyReadOnlyOperationsAvailable() {
+        Optional<Location> location = readOnlyRepository.findById(1L);
+        assertNotNull(location);
+    }
+}
diff --git a/spring-data-jpa/src/test/resources/application.properties b/spring-data-jpa/src/test/resources/application.properties
index de6ee2e6b5..73d72bc7d6 100644
--- a/spring-data-jpa/src/test/resources/application.properties
+++ b/spring-data-jpa/src/test/resources/application.properties
@@ -12,4 +12,4 @@ hibernate.cache.use_second_level_cache=true
 hibernate.cache.use_query_cache=true
 hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory
 
-spring.datasource.data=import_articles.sql
\ No newline at end of file
+spring.datasource.data=import_entities.sql
\ No newline at end of file
diff --git a/spring-data-jpa/src/test/resources/import_articles.sql b/spring-data-jpa/src/test/resources/import_articles.sql
deleted file mode 100644
index 4fe18bf4aa..0000000000
--- a/spring-data-jpa/src/test/resources/import_articles.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-insert into Article(id, publication_date, publication_time, creation_date_time) values(1, TO_DATE('01/01/2018', 'DD/MM/YYYY'), TO_DATE('15:00', 'HH24:MI'), TO_DATE('31/12/2017 07:30', 'DD/MM/YYYY HH24:MI'));
-insert into Article(id, publication_date, publication_time, creation_date_time) values(2, TO_DATE('01/01/2018', 'DD/MM/YYYY'), TO_DATE('15:30', 'HH24:MI'), TO_DATE('15/12/2017 08:00', 'DD/MM/YYYY HH24:MI'));
-insert into Article(id, publication_date, publication_time, creation_date_time) values(3, TO_DATE('15/12/2017', 'DD/MM/YYYY'), TO_DATE('16:00', 'HH24:MI'), TO_DATE('01/12/2017 13:45', 'DD/MM/YYYY HH24:MI'));
\ No newline at end of file
diff --git a/spring-data-jpa/src/test/resources/import_entities.sql b/spring-data-jpa/src/test/resources/import_entities.sql
new file mode 100644
index 0000000000..deb9d07f05
--- /dev/null
+++ b/spring-data-jpa/src/test/resources/import_entities.sql
@@ -0,0 +1,21 @@
+insert into Article(id, publication_date, publication_time, creation_date_time) values(1, TO_DATE('01/01/2018', 'DD/MM/YYYY'), TO_DATE('15:00', 'HH24:MI'), TO_DATE('31/12/2017 07:30', 'DD/MM/YYYY HH24:MI'));
+insert into Article(id, publication_date, publication_time, creation_date_time) values(2, TO_DATE('01/01/2018', 'DD/MM/YYYY'), TO_DATE('15:30', 'HH24:MI'), TO_DATE('15/12/2017 08:00', 'DD/MM/YYYY HH24:MI'));
+insert into Article(id, publication_date, publication_time, creation_date_time) values(3, TO_DATE('15/12/2017', 'DD/MM/YYYY'), TO_DATE('16:00', 'HH24:MI'), TO_DATE('01/12/2017 13:45', 'DD/MM/YYYY HH24:MI'));
+
+insert into location (id, country, city) values (1, 'Country X', 'City One');
+insert into location (id, country, city) values (2, 'Country X', 'City Two');
+insert into location (id, country, city) values (3, 'Country X', 'City Three');
+
+insert into store (id, name, location_id, items_sold, active) values (1, 'Store One', 3, 130000, true);
+insert into store (id, name, location_id, items_sold, active) values (2, 'Store Two', 1, 170000, false);
+
+insert into item_type (id, name) values (1, 'Food');
+insert into item_type (id, name) values (2, 'Furniture');
+insert into item_type (id, name) values (3, 'Electronics');
+
+insert into item (id, name, store_id, item_type_id, price, grade, color) values (1, 'Food Item One', 1, 1, 100, 'A', 'Color x');
+insert into item (id, name, store_id, item_type_id, price, grade, color) values (2, 'Furniture Item One', 1, 2, 2500, 'B', 'Color y');
+insert into item (id, name, store_id, item_type_id, price, grade, color) values (3, 'Food Item Two', 1, 1, 35, 'A', 'Color z');
+insert into item (id, name, store_id, item_type_id, price, grade, color) values (5, 'Furniture Item Two', 2, 2, 1600, 'A', 'Color w');
+insert into item (id, name, store_id, item_type_id, price, grade, color) values (6, 'Food Item Three', 2, 1, 5, 'B', 'Color a');
+insert into item (id, name, store_id, item_type_id, price, grade, color) values (7, 'Electronics Item One', 2, 3, 999, 'B', 'Color b');
diff --git a/spring-hibernate4/README.md b/spring-hibernate4/README.md
index 88ee7fadd3..b15b7278f4 100644
--- a/spring-hibernate4/README.md
+++ b/spring-hibernate4/README.md
@@ -11,7 +11,6 @@
 - [Stored Procedures with Hibernate](http://www.baeldung.com/stored-procedures-with-hibernate-tutorial)
 - [Hibernate: save, persist, update, merge, saveOrUpdate](http://www.baeldung.com/hibernate-save-persist-update-merge-saveorupdate)
 - [Eager/Lazy Loading In Hibernate](http://www.baeldung.com/hibernate-lazy-eager-loading)
-- [Hibernate Criteria Queries](http://www.baeldung.com/hibernate-criteria-queries)
 - [Hibernate One to Many Annotation Tutorial](http://www.baeldung.com/hibernate-one-to-many)
 - [Guide to @Immutable Annotation in Hibernate](http://www.baeldung.com/hibernate-immutable)
 - [The DAO with Spring and Hibernate](http://www.baeldung.com/persistence-layer-with-spring-and-hibernate)
diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java b/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java
deleted file mode 100644
index 83e3c2f9a5..0000000000
--- a/spring-hibernate4/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/**
- * ApplicationViewer is the class that starts the application
- * First it creates the session object and then creates the
- * criteria query.
- *
- *  @author  Pritam Banerjee
- *  @version 1.0
- *  @since   07/20/2016
- */
-
-package com.baeldung.hibernate.criteria.view;
-
-import java.util.List;
-
-import org.hibernate.Criteria;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.LogicalExpression;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projections;
-import org.hibernate.criterion.Restrictions;
-
-import com.baeldung.hibernate.criteria.model.Item;
-import com.baeldung.hibernate.criteria.util.HibernateUtil;
-
-public class ApplicationView {
-
-    // default Constructor
-    public ApplicationView() {
-
-    }
-
-    public boolean checkIfCriteriaTimeLower() {
-        final Session session = HibernateUtil.getHibernateSession();
-        final Criteria cr = session.createCriteria(Item.class);
-        Transaction tx = null;
-
-        // calculate the time taken by criteria
-        final long startTimeCriteria = System.nanoTime();
-        cr.add(Restrictions.like("itemName", "%item One%"));
-        final List results = cr.list();
-        final long endTimeCriteria = System.nanoTime();
-        final long durationCriteria = (endTimeCriteria - startTimeCriteria) / 1000;
-
-        // calculate the time taken by HQL
-        final long startTimeHQL = System.nanoTime();
-        tx = session.beginTransaction();
-        final List items = session.createQuery("FROM Item where itemName like '%item One%'").list();
-        final long endTimeHQL = System.nanoTime();
-        final long durationHQL = (endTimeHQL - startTimeHQL) / 1000;
-
-        if (durationCriteria > durationHQL) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    // To get items having price more than 1000
-    public String[] greaterThanCriteria() {
-        final Session session = HibernateUtil.getHibernateSession();
-        final Criteria cr = session.createCriteria(Item.class);
-        cr.add(Restrictions.gt("itemPrice", 1000));
-        final List<Item> greaterThanItemsList = cr.list();
-        final String greaterThanItems[] = new String[greaterThanItemsList.size()];
-        for (int i = 0; i < greaterThanItemsList.size(); i++) {
-            greaterThanItems[i] = greaterThanItemsList.get(i).getItemName();
-        }
-        session.close();
-        return greaterThanItems;
-    }
-
-    // To get items having price less than 1000
-    public String[] lessThanCriteria() {
-        final Session session = HibernateUtil.getHibernateSession();
-        final Criteria cr = session.createCriteria(Item.class);
-        cr.add(Restrictions.lt("itemPrice", 1000));
-        final List<Item> lessThanItemsList = cr.list();
-        final String lessThanItems[] = new String[lessThanItemsList.size()];
-        for (int i = 0; i < lessThanItemsList.size(); i++) {
-            lessThanItems[i] = lessThanItemsList.get(i).getItemName();
-        }
-        session.close();
-        return lessThanItems;
-    }
-
-    // To get items whose Name start with Chair
-    public String[] likeCriteria() {
-        final Session session = HibernateUtil.getHibernateSession();
-
-        final Criteria cr = session.createCriteria(Item.class);
-        cr.add(Restrictions.like("itemName", "%chair%"));
-        final List<Item> likeItemsList = cr.list();
-        final String likeItems[] = new String[likeItemsList.size()];
-        for (int i = 0; i < likeItemsList.size(); i++) {
-            likeItems[i] = likeItemsList.get(i).getItemName();
-        }
-        session.close();
-        return likeItems;
-    }
-
-    // Case sensitive search
-    public String[] likeCaseCriteria() {
-        final Session session = HibernateUtil.getHibernateSession();
-        final Criteria cr = session.createCriteria(Item.class);
-        cr.add(Restrictions.ilike("itemName", "%Chair%"));
-        final List<Item> ilikeItemsList = cr.list();
-        final String ilikeItems[] = new String[ilikeItemsList.size()];
-        for (int i = 0; i < ilikeItemsList.size(); i++) {
-            ilikeItems[i] = ilikeItemsList.get(i).getItemName();
-        }
-        session.close();
-        return ilikeItems;
-    }
-
-    // To get records having itemPrice in between 100 and 200
-    public String[] betweenCriteria() {
-        final Session session = HibernateUtil.getHibernateSession();
-        final Criteria cr = session.createCriteria(Item.class);
-        // To get items having price more than 1000
-        cr.add(Restrictions.between("itemPrice", 100, 200));
-        final List<Item> betweenItemsList = cr.list();
-        final String betweenItems[] = new String[betweenItemsList.size()];
-        for (int i = 0; i < betweenItemsList.size(); i++) {
-            betweenItems[i] = betweenItemsList.get(i).getItemName();
-        }
-        session.close();
-        return betweenItems;
-    }
-
-    // To check if the given property is null
-    public String[] nullCriteria() {
-        final Session session = HibernateUtil.getHibernateSession();
-        final Criteria cr = session.createCriteria(Item.class);
-        cr.add(Restrictions.isNull("itemDescription"));
-        final List<Item> nullItemsList = cr.list();
-        final String nullDescItems[] = new String[nullItemsList.size()];
-        for (int i = 0; i < nullItemsList.size(); i++) {
-            nullDescItems[i] = nullItemsList.get(i).getItemName();
-        }
-        session.close();
-        return nullDescItems;
-    }
-
-    // To check if the given property is not null
-    public String[] notNullCriteria() {
-        final Session session = HibernateUtil.getHibernateSession();
-        final Criteria cr = session.createCriteria(Item.class);
-        cr.add(Restrictions.isNotNull("itemDescription"));
-        final List<Item> notNullItemsList = cr.list();
-        final String notNullDescItems[] = new String[notNullItemsList.size()];
-        for (int i = 0; i < notNullItemsList.size(); i++) {
-            notNullDescItems[i] = notNullItemsList.get(i).getItemName();
-        }
-        session.close();
-        return notNullDescItems;
-    }
-
-    // Adding more than one expression in one cr
-    public String[] twoCriteria() {
-        final Session session = HibernateUtil.getHibernateSession();
-        final Criteria cr = session.createCriteria(Item.class);
-        cr.add(Restrictions.isNull("itemDescription"));
-        cr.add(Restrictions.like("itemName", "chair%"));
-        final List<Item> notNullItemsList = cr.list();
-        final String notNullDescItems[] = new String[notNullItemsList.size()];
-        for (int i = 0; i < notNullItemsList.size(); i++) {
-            notNullDescItems[i] = notNullItemsList.get(i).getItemName();
-        }
-        session.close();
-        return notNullDescItems;
-    }
-
-    // To get items matching with the above defined conditions joined
-    // with Logical AND
-    public String[] andLogicalCriteria() {
-        final Session session = HibernateUtil.getHibernateSession();
-        final Criteria cr = session.createCriteria(Item.class);
-        final Criterion greaterThanPrice = Restrictions.gt("itemPrice", 1000);
-        final Criterion chairItems = Restrictions.like("itemName", "Chair%");
-        final LogicalExpression andExample = Restrictions.and(greaterThanPrice, chairItems);
-        cr.add(andExample);
-        final List<Item> andItemsList = cr.list();
-        final String andItems[] = new String[andItemsList.size()];
-        for (int i = 0; i < andItemsList.size(); i++) {
-            andItems[i] = andItemsList.get(i).getItemName();
-        }
-        session.close();
-        return andItems;
-    }
-
-    // To get items matching with the above defined conditions joined
-    // with Logical OR
-    public String[] orLogicalCriteria() {
-        final Session session = HibernateUtil.getHibernateSession();
-        final Criteria cr = session.createCriteria(Item.class);
-        final Criterion greaterThanPrice = Restrictions.gt("itemPrice", 1000);
-        final Criterion chairItems = Restrictions.like("itemName", "Chair%");
-        final LogicalExpression orExample = Restrictions.or(greaterThanPrice, chairItems);
-        cr.add(orExample);
-        final List<Item> orItemsList = cr.list();
-        final String orItems[] = new String[orItemsList.size()];
-        for (int i = 0; i < orItemsList.size(); i++) {
-            orItems[i] = orItemsList.get(i).getItemName();
-        }
-        session.close();
-        return orItems;
-    }
-
-    // Sorting example
-    public String[] sortingCriteria() {
-        final Session session = HibernateUtil.getHibernateSession();
-        final Criteria cr = session.createCriteria(Item.class);
-        cr.addOrder(Order.asc("itemName"));
-        cr.addOrder(Order.desc("itemPrice")).list();
-        final List<Item> sortedItemsList = cr.list();
-        final String sortedItems[] = new String[sortedItemsList.size()];
-        for (int i = 0; i < sortedItemsList.size(); i++) {
-            sortedItems[i] = sortedItemsList.get(i).getItemName();
-        }
-        session.close();
-        return sortedItems;
-    }
-
-    // Set projections Row Count
-    public Long[] projectionRowCount() {
-        final Session session = HibernateUtil.getHibernateSession();
-        final List<Long> itemProjected = session.createCriteria(Item.class).setProjection(Projections.rowCount()).list();
-        final Long projectedRowCount[] = new Long[itemProjected.size()];
-        for (int i = 0; i < itemProjected.size(); i++) {
-            projectedRowCount[i] = itemProjected.get(i);
-        }
-        session.close();
-        return projectedRowCount;
-    }
-
-    // Set projections average of itemPrice
-    public Double[] projectionAverage() {
-        final Session session = HibernateUtil.getHibernateSession();
-        final List avgItemPriceList = session.createCriteria(Item.class).setProjection(Projections.projectionList().add(Projections.avg("itemPrice"))).list();
-
-        final Double avgItemPrice[] = new Double[avgItemPriceList.size()];
-        for (int i = 0; i < avgItemPriceList.size(); i++) {
-            avgItemPrice[i] = (Double) avgItemPriceList.get(i);
-        }
-        session.close();
-        return avgItemPrice;
-    }
-
-}
diff --git a/spring-hibernate4/src/main/resources/criteria.cfg.xml b/spring-hibernate4/src/main/resources/criteria.cfg.xml
deleted file mode 100644
index a39a32e151..0000000000
--- a/spring-hibernate4/src/main/resources/criteria.cfg.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE hibernate-configuration PUBLIC
-"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
-
-
-<hibernate-configuration>
-	<session-factory>
-		<property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
-		<property name="hibernate.connection.url">jdbc:mysql://localhost:3306/test</property>
-		<property name="hibernate.connection.username">root</property>
-		<property name="hibernate.connection.password">iamtheking</property>
-		<property name="hibernate.dialect">org.hibernate.dialect.MySQLDialect</property>
-		<property name="show_sql">true</property>
-		<mapping resource="com/baeldung/hibernate/criteria/model/Item.hbm.xml" />
-	</session-factory>
-</hibernate-configuration>
\ No newline at end of file
diff --git a/spring-hibernate4/src/main/resources/criteria_create_queries.sql b/spring-hibernate4/src/main/resources/criteria_create_queries.sql
deleted file mode 100644
index 3a627dd38c..0000000000
--- a/spring-hibernate4/src/main/resources/criteria_create_queries.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE `item` (
-  `ITEM_ID` int(11) NOT NULL AUTO_INCREMENT,
-  `ITEM_DESC` varchar(100) DEFAULT NULL,
-  `ITEM_PRICE` int(11) NOT NULL,
-  `ITEM_NAME` varchar(255) NOT NULL,
-  PRIMARY KEY (`ITEM_ID`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=latin1;
diff --git a/spring-mockito/pom.xml b/spring-mockito/pom.xml
index 6aeaa9a1e8..d1fa7f410e 100644
--- a/spring-mockito/pom.xml
+++ b/spring-mockito/pom.xml
@@ -24,13 +24,13 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <version>${mockito.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
-        <mockito.version>1.10.19</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
     </properties>
 
 </project>
diff --git a/spring-mockito/src/main/java/com/baeldung/domain/util/MessageMatcher.java b/spring-mockito/src/main/java/com/baeldung/domain/util/MessageMatcher.java
index 05cb43e4df..51db07fde7 100644
--- a/spring-mockito/src/main/java/com/baeldung/domain/util/MessageMatcher.java
+++ b/spring-mockito/src/main/java/com/baeldung/domain/util/MessageMatcher.java
@@ -3,7 +3,7 @@ package com.baeldung.domain.util;
 import com.baeldung.domain.model.Message;
 import org.mockito.ArgumentMatcher;
 
-public class MessageMatcher extends ArgumentMatcher<Message> {
+public class MessageMatcher implements ArgumentMatcher<Message> {
 
     private Message left;
 
@@ -12,16 +12,11 @@ public class MessageMatcher extends ArgumentMatcher<Message> {
     }
 
     @Override
-    public boolean matches(Object object) {
-        if (object instanceof Message) {
-            Message right = (Message) object;
-            return left.getFrom().equals(right.getFrom()) &&
-                    left.getTo().equals(right.getTo()) &&
-                    left.getText().equals(right.getText()) &&
-                    right.getDate() != null &&
-                    right.getId() != null;
-        }
-
-        return false;
+    public boolean matches(Message right) {
+        return left.getFrom().equals(right.getFrom()) &&
+          left.getTo().equals(right.getTo()) &&
+          left.getText().equals(right.getText()) &&
+          right.getDate() != null &&
+          right.getId() != null;
     }
 }
\ No newline at end of file
diff --git a/spring-mvc-forms-jsp/pom.xml b/spring-mvc-forms-jsp/pom.xml
index a51f76f9e1..6c75c9299b 100644
--- a/spring-mvc-forms-jsp/pom.xml
+++ b/spring-mvc-forms-jsp/pom.xml
@@ -83,7 +83,6 @@
                                 <warSourceDirectory>src/main/webapp</warSourceDirectory>
                                 <warName>spring-mvc-forms</warName>
                                 <failOnMissingWebXml>false</failOnMissingWebXml>
-                                <outputDirectory>${deploy-path}</outputDirectory>
                             </configuration>
                         </plugin>
                     </plugins>
@@ -99,7 +98,6 @@
         <javax.servlet.jsp-api.version>2.3.1</javax.servlet.jsp-api.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
-        <deploy-path>server default deploy directory</deploy-path>
         <fileupload.version>1.3.3</fileupload.version>
         <hibernate.version>5.2.5.Final</hibernate.version>
         <mysql-connector-java.version>6.0.6</mysql-connector-java.version>
diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml
index 068824eba0..83f2556fe0 100644
--- a/spring-mvc-java/pom.xml
+++ b/spring-mvc-java/pom.xml
@@ -163,6 +163,7 @@
 
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
+                <version>${maven-resources-plugin.version}</version>
             </plugin>
 
             <plugin>
@@ -283,6 +284,7 @@
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
+        <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
 
         <!-- AspectJ -->
         <aspectj.version>1.8.9</aspectj.version>
diff --git a/spring-reactive-kotlin/pom.xml b/spring-reactive-kotlin/pom.xml
index 8eafe9f217..2bac2d1961 100644
--- a/spring-reactive-kotlin/pom.xml
+++ b/spring-reactive-kotlin/pom.xml
@@ -12,18 +12,11 @@
 	<description>Demo project for Spring Boot</description>
 
 	<parent>
-        <artifactId>parent-boot-2</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
-    </parent>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-		<kotlin.version>1.2.41</kotlin.version>
-	</properties>
+		<artifactId>parent-boot-2</artifactId>
+		<groupId>com.baeldung</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../parent-boot-2</relativePath>
+	</parent>
 
 	<dependencies>
 		<dependency>
@@ -70,6 +63,7 @@
 			<plugin>
 				<artifactId>kotlin-maven-plugin</artifactId>
 				<groupId>org.jetbrains.kotlin</groupId>
+				<version>${kotlin-maven-plugin.version}</version>
 				<configuration>
 					<args>
 						<arg>-Xjsr305=strict</arg>
@@ -89,5 +83,8 @@
 		</plugins>
 	</build>
 
-
+	<properties>
+		<kotlin.version>1.2.41</kotlin.version>
+		<kotlin-maven-plugin.version>1.2.60</kotlin-maven-plugin.version>
+	</properties>
 </project>
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-rest-full/README.md b/spring-rest-full/README.md
index 23b0b0435b..0dd25b276b 100644
--- a/spring-rest-full/README.md
+++ b/spring-rest-full/README.md
@@ -41,5 +41,5 @@ mysql -u root -p
 ### Use the REST Service
 
 ```
-curl http://localhost:8080/spring-rest-full/foos
+curl http://localhost:8082/spring-rest-full/auth/foos
 ```
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-swagger-codegen/spring-swagger-codegen-api-client/README.md b/spring-swagger-codegen/spring-swagger-codegen-api-client/README.md
index b1b7a63a9c..455a69b2f3 100644
--- a/spring-swagger-codegen/spring-swagger-codegen-api-client/README.md
+++ b/spring-swagger-codegen/spring-swagger-codegen-api-client/README.md
@@ -153,3 +153,5 @@ It's recommended to create an instance of `ApiClient` per thread in a multithrea
 
 apiteam@swagger.io
 
+
+
diff --git a/spring-swagger-codegen/spring-swagger-codegen-app/pom.xml b/spring-swagger-codegen/spring-swagger-codegen-app/pom.xml
index ece534dc74..281ed59857 100644
--- a/spring-swagger-codegen/spring-swagger-codegen-app/pom.xml
+++ b/spring-swagger-codegen/spring-swagger-codegen-app/pom.xml
@@ -31,6 +31,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring.version}</version>
             </plugin>
         </plugins>
     </build>
@@ -40,5 +41,4 @@
         <spring-swagger-codegen-api-client.version>0.0.1-SNAPSHOT</spring-swagger-codegen-api-client.version>
 		<spring.version>1.5.10.RELEASE</spring.version>
     </properties>
-
-</project>
\ No newline at end of file
+</project>
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/java-faker/pom.xml b/testing-modules/java-faker/pom.xml
deleted file mode 100644
index 4ac5368e24..0000000000
--- a/testing-modules/java-faker/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.baeldung</groupId>
-    <artifactId>java-faker</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.github.javafaker</groupId>
-            <artifactId>javafaker</artifactId>
-            <version>0.15</version>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/junit/junit -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-
-</project>
diff --git a/testing-modules/java-faker/src/test/java/com/baeldung/JavaFakerTest.java b/testing-modules/java-faker/src/test/java/com/baeldung/JavaFakerTest.java
deleted file mode 100644
index 8d89fa0ab2..0000000000
--- a/testing-modules/java-faker/src/test/java/com/baeldung/JavaFakerTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.baeldung;
-
-import com.github.javafaker.Faker;
-import com.github.javafaker.service.FakeValuesService;
-import com.github.javafaker.service.FakerIDN;
-import com.github.javafaker.service.LocaleDoesNotExistException;
-import com.github.javafaker.service.RandomService;
-import javafx.scene.Parent;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import java.util.Locale;
-import java.util.Random;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-public class JavaFakerTest {
-
-  private Faker faker;
-
-  @Before
-  public void setUp() throws Exception {
-    faker = new Faker();
-  }
-
-  @Test
-  public void givenJavaFaker_whenAddressObjectCalled_checkValidAddressInfoGiven() throws Exception {
-
-    Faker faker = new Faker();
-
-    String streetName = faker.address().streetName();
-    String number = faker.address().buildingNumber();
-    String city = faker.address().city();
-    String country = faker.address().country();
-
-    System.out.println(String.format("%s\n%s\n%s\n%s",
-      number,
-      streetName,
-      city,
-      country));
-
-  }
-
-  @Test
-  public void givenJavaFakersWithSameSeed_whenNameCalled_CheckSameName() throws Exception {
-
-    Faker faker1 = new Faker(new Random(24));
-    Faker faker2 = new Faker(new Random(24));
-
-    assertEquals(faker1.name().firstName(), faker2.name().firstName());
-  }
-
-  @Test
-  public void givenJavaFakersWithDifferentLocals_checkZipCodesMatchRegex() throws Exception {
-
-    Faker ukFaker = new Faker(new Locale("en-GB"));
-    Faker usFaker = new Faker(new Locale("en-US"));
-
-    System.out.println(String.format("American zipcode: %s", usFaker.address().zipCode()));
-    System.out.println(String.format("British postcode: %s", ukFaker.address().zipCode()));
-
-    Pattern ukPattern = Pattern.compile("([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([A-Za-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9]?[A-Za-z]))))\\s?[0-9][A-Za-z]{2})");
-    Matcher ukMatcher = ukPattern.matcher(ukFaker.address().zipCode());
-
-    assertTrue(ukMatcher.find());
-
-    Matcher usMatcher = Pattern.compile("^\\d{5}(?:[-\\s]\\d{4})?$").matcher(usFaker.address().zipCode());
-
-    assertTrue(usMatcher.find());
-
-  }
-
-  @Test
-  public void givenJavaFakerService_testFakersCreated() throws Exception {
-
-    RandomService randomService = new RandomService();
-
-    System.out.println(randomService.nextBoolean());
-    System.out.println(randomService.nextDouble());
-
-    Faker faker = new Faker(new Random(randomService.nextLong()));
-
-    System.out.println(faker.address().city());
-
-  }
-
-  @Test
-  public void testFakeValuesService() throws Exception {
-
-    FakeValuesService fakeValuesService = new FakeValuesService(new Locale("en-GB"), new RandomService());
-
-    String email = fakeValuesService.bothify("????##@gmail.com");
-    Matcher emailMatcher = Pattern.compile("\\w{4}\\d{2}@gmail.com").matcher(email);
-    assertTrue(emailMatcher.find());
-
-    String alphaNumericString = fakeValuesService.regexify("[a-z1-9]{10}");
-    Matcher alphaNumericMatcher = Pattern.compile("[a-z1-9]{10}").matcher(alphaNumericString);
-    assertTrue(alphaNumericMatcher.find());
-
-  }
-
-
-  @Test(expected = LocaleDoesNotExistException.class)
-  public void givenWrongLocale_whenFakerIsInitialised_testLocaleDoesNotExistExceptionIsThrown() throws Exception {
-
-    Faker wrongLocaleFaker = new Faker(new Locale("en-seaWorld"));
-
-  }
-}
diff --git a/testing-modules/junit-5/pom.xml b/testing-modules/junit-5/pom.xml
index c60cc00c2c..93365264ac 100644
--- a/testing-modules/junit-5/pom.xml
+++ b/testing-modules/junit-5/pom.xml
@@ -118,14 +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.8.9</mockito.version>
         <powermock.version>1.7.4</powermock.version>
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.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/junit5-migration/pom.xml b/testing-modules/junit5-migration/pom.xml
index ae46b479bb..9d9d418774 100644
--- a/testing-modules/junit5-migration/pom.xml
+++ b/testing-modules/junit5-migration/pom.xml
@@ -80,10 +80,10 @@
     </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>
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
     </properties>
 
diff --git a/testing-modules/mockito-2/pom.xml b/testing-modules/mockito-2/pom.xml
index 4b7dc70155..cab4d7977b 100644
--- a/testing-modules/mockito-2/pom.xml
+++ b/testing-modules/mockito-2/pom.xml
@@ -15,6 +15,6 @@
     </parent>
 
     <properties>
-        <mockito.version>2.8.9</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
     </properties>
 </project>
diff --git a/testing-modules/mocks/jmockit/src/main/java/com/baeldung/mocks/jmockit/AppManager.java b/testing-modules/mocks/jmockit/src/main/java/com/baeldung/mocks/jmockit/AppManager.java
new file mode 100644
index 0000000000..615650ea6d
--- /dev/null
+++ b/testing-modules/mocks/jmockit/src/main/java/com/baeldung/mocks/jmockit/AppManager.java
@@ -0,0 +1,26 @@
+package com.baeldung.mocks.jmockit;
+
+import java.util.Random;
+
+public class AppManager {
+
+    public boolean managerResponse(String question) {
+        return AppManager.isResponsePositive(question);
+    }
+
+    public static boolean isResponsePositive(String value) {
+        if (value == null)
+            return false;
+        int orgLength = value.length();
+        int randomNumber = randomNumber();
+        return orgLength == randomNumber ? true : false;
+    }
+
+    private static int randomNumber() {
+        return new Random().nextInt(7);
+    }
+
+    private static Integer stringToInteger(String num) {
+        return Integer.parseInt(num);
+    }
+}
diff --git a/testing-modules/mocks/jmockit/src/test/java/com/baeldung/mocks/jmockit/AppManagerUnitTest.java b/testing-modules/mocks/jmockit/src/test/java/com/baeldung/mocks/jmockit/AppManagerUnitTest.java
new file mode 100644
index 0000000000..2c5aa2a3ed
--- /dev/null
+++ b/testing-modules/mocks/jmockit/src/test/java/com/baeldung/mocks/jmockit/AppManagerUnitTest.java
@@ -0,0 +1,44 @@
+package com.baeldung.mocks.jmockit;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import mockit.Deencapsulation;
+import mockit.Mock;
+import mockit.MockUp;
+
+public class AppManagerUnitTest {
+
+    private AppManager appManager;
+
+    @BeforeEach
+    public void setUp() {
+        appManager = new AppManager();
+    }
+
+    @Test
+    public void givenAppManager_whenStaticMethodCalled_thenValidateExpectedResponse() {
+        new MockUp<AppManager>() {
+            @Mock
+            public boolean isResponsePositive(String value) {
+                return false;
+            }
+        };
+
+        Assertions.assertFalse(appManager.managerResponse("Why are you coming late?"));
+    }
+
+    @Test
+    public void givenAppManager_whenPrivateStaticMethod_thenValidateExpectedResponse() {
+        final int response = Deencapsulation.invoke(AppManager.class, "stringToInteger", "110");
+        Assertions.assertEquals(110, response);
+    }
+
+    @Test
+    public void givenAppManager_whenPrivateStaticMethod_thenExpectException() {
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            Deencapsulation.invoke(AppManager.class, "stringToInteger", "11r");
+        });
+    }
+}
diff --git a/testing-modules/mocks/mock-comparisons/pom.xml b/testing-modules/mocks/mock-comparisons/pom.xml
index 9424757a7a..ae36280300 100644
--- a/testing-modules/mocks/mock-comparisons/pom.xml
+++ b/testing-modules/mocks/mock-comparisons/pom.xml
@@ -46,9 +46,10 @@
     </build>
 
     <properties>
-        <mockito.version>2.9.0</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
         <easymock.version>3.5.1</easymock.version>
-        <jmockit.version>1.34</jmockit.version>
+        <jmockit.version>1.41</jmockit.version>
+        
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/testing-modules/parallel-tests-junit/math-test-functions/pom.xml b/testing-modules/parallel-tests-junit/math-test-functions/pom.xml
new file mode 100644
index 0000000000..18d2b562f3
--- /dev/null
+++ b/testing-modules/parallel-tests-junit/math-test-functions/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>parallel-tests-junit</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>math-test-functions</artifactId>
+	<name>math-test-functions</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</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>
+				<configuration>
+					<parallel>all</parallel>
+					<threadCount>10</threadCount>
+					<threadCountSuites>2</threadCountSuites>
+					<threadCountClasses>2</threadCountClasses>
+					<threadCountMethods>6</threadCountMethods>
+					<parallelTestTimeoutInSeconds>3.5</parallelTestTimeoutInSeconds>
+					<parallelTestTimeoutForcedInSeconds>5</parallelTestTimeoutForcedInSeconds>
+					<perCoreThreadCount>true</perCoreThreadCount>
+					<includes>
+						<include>FunctionTestSuite.class</include>
+					</includes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/testing-modules/parallel-tests-junit/src/test/java/com/baeldung/MathFunctionTest.java b/testing-modules/parallel-tests-junit/math-test-functions/src/test/java/com/baeldung/ArithmeticFunctionTest.java
similarity index 78%
rename from testing-modules/parallel-tests-junit/src/test/java/com/baeldung/MathFunctionTest.java
rename to testing-modules/parallel-tests-junit/math-test-functions/src/test/java/com/baeldung/ArithmeticFunctionTest.java
index 9a609c3e93..df0aa695fc 100644
--- a/testing-modules/parallel-tests-junit/src/test/java/com/baeldung/MathFunctionTest.java
+++ b/testing-modules/parallel-tests-junit/math-test-functions/src/test/java/com/baeldung/ArithmeticFunctionTest.java
@@ -1,29 +1,28 @@
-package com.baeldung;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class MathFunctionTest {
-
-    @Test
-    public void test_addingIntegers_returnsSum() throws InterruptedException {
-        assertEquals(22, Math.addExact(10, 12));
-
-    }
-
-    @Test
-    public void test_multiplyingIntegers_returnsProduct() {
-        assertEquals(120, Math.multiplyExact(10, 12));
-    }
-
-    @Test
-    public void test_subtractingIntegers_returnsDifference() {
-        assertEquals(2, Math.subtractExact(12, 10));
-    }
-
-    @Test
-    public void test_minimumInteger() {
-        assertEquals(10, Math.min(10, 12));
-    }
-}
+package com.baeldung;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class ArithmeticFunctionTest {
+
+    @Test
+    public void test_addingIntegers_returnsSum() {
+        assertEquals(22, Math.addExact(10, 12));
+    }
+
+    @Test
+    public void test_multiplyingIntegers_returnsProduct() {
+        assertEquals(120, Math.multiplyExact(10, 12));
+    }
+
+    @Test
+    public void test_subtractingIntegers_returnsDifference() {
+        assertEquals(2, Math.subtractExact(12, 10));
+    }
+
+    @Test
+    public void test_minimumInteger() {
+        assertEquals(10, Math.min(10, 12));
+    }
+}
diff --git a/testing-modules/parallel-tests-junit/math-test-functions/src/test/java/com/baeldung/ComparisonFunctionTest.java b/testing-modules/parallel-tests-junit/math-test-functions/src/test/java/com/baeldung/ComparisonFunctionTest.java
new file mode 100644
index 0000000000..4f72c87279
--- /dev/null
+++ b/testing-modules/parallel-tests-junit/math-test-functions/src/test/java/com/baeldung/ComparisonFunctionTest.java
@@ -0,0 +1,19 @@
+package com.baeldung;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class ComparisonFunctionTest {
+
+    @Test
+    public void test_findMax() {
+        assertEquals(20, Math.max(10, 20));
+    }
+
+    @Test
+    public void test_findMin() {
+        assertEquals(10, Math.min(10, 20));
+    }
+
+}
diff --git a/testing-modules/parallel-tests-junit/src/test/java/com/baeldung/FunctionTestSuite.java b/testing-modules/parallel-tests-junit/math-test-functions/src/test/java/com/baeldung/FunctionTestSuite.java
similarity index 71%
rename from testing-modules/parallel-tests-junit/src/test/java/com/baeldung/FunctionTestSuite.java
rename to testing-modules/parallel-tests-junit/math-test-functions/src/test/java/com/baeldung/FunctionTestSuite.java
index c7f4050b18..4fe551b365 100644
--- a/testing-modules/parallel-tests-junit/src/test/java/com/baeldung/FunctionTestSuite.java
+++ b/testing-modules/parallel-tests-junit/math-test-functions/src/test/java/com/baeldung/FunctionTestSuite.java
@@ -1,11 +1,11 @@
-package com.baeldung;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Suite.class)
-@SuiteClasses({StringFunctionTest.class, MathFunctionTest.class})
-public class FunctionTestSuite {
-
-}
+package com.baeldung;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({ ComparisonFunctionTest.class, ArithmeticFunctionTest.class })
+public class FunctionTestSuite {
+
+}
diff --git a/testing-modules/parallel-tests-junit/pom.xml b/testing-modules/parallel-tests-junit/pom.xml
index 1a42437b1b..3fd4e695e5 100644
--- a/testing-modules/parallel-tests-junit/pom.xml
+++ b/testing-modules/parallel-tests-junit/pom.xml
@@ -1,50 +1,12 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.baeldung</groupId>
-	<artifactId>parallel-tests-junit</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<name>parallel-tests-junit</name>
-	<url>http://maven.apache.org</url>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</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>
-				<configuration>
-					<parallel>all</parallel>
-					<threadCount>10</threadCount>
-					<threadCountSuites>2</threadCountSuites>
-					<threadCountClasses>2</threadCountClasses>
-					<threadCountMethods>6</threadCountMethods>
-					<parallelTestTimeoutInSeconds>3.5</parallelTestTimeoutInSeconds>
-					<parallelTestTimeoutForcedInSeconds>5</parallelTestTimeoutForcedInSeconds>
-					<perCoreThreadCount>true</perCoreThreadCount>
-					<includes>
-						<include>FunctionTestSuite.class</include>
-					</includes>
-
-				</configuration>
-
-			</plugin>
-		</plugins>
-	</build>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.baeldung</groupId>
+  <artifactId>parallel-tests-junit</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <modules>
+  <module>math-test-functions</module>
+  <module>string-test-functions</module>
+  </modules>
 </project>
diff --git a/testing-modules/parallel-tests-junit/string-test-functions/pom.xml b/testing-modules/parallel-tests-junit/string-test-functions/pom.xml
new file mode 100644
index 0000000000..af61cfce8e
--- /dev/null
+++ b/testing-modules/parallel-tests-junit/string-test-functions/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>parallel-tests-junit</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>string-test-functions</artifactId>
+	<name>string-test-functions</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</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>
+				<configuration>
+					<parallel>all</parallel>
+					<useUnlimitedThreads>true</useUnlimitedThreads>
+					<threadCountMethods>2</threadCountMethods>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/testing-modules/parallel-tests-junit/src/test/java/com/baeldung/StringFunctionTest.java b/testing-modules/parallel-tests-junit/string-test-functions/src/test/java/com/baeldung/StringFunctionTest.java
similarity index 94%
rename from testing-modules/parallel-tests-junit/src/test/java/com/baeldung/StringFunctionTest.java
rename to testing-modules/parallel-tests-junit/string-test-functions/src/test/java/com/baeldung/StringFunctionTest.java
index 9adfea8ff0..7f2bc5e5e7 100644
--- a/testing-modules/parallel-tests-junit/src/test/java/com/baeldung/StringFunctionTest.java
+++ b/testing-modules/parallel-tests-junit/string-test-functions/src/test/java/com/baeldung/StringFunctionTest.java
@@ -1,18 +1,18 @@
-package com.baeldung;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class StringFunctionTest {
-
-    @Test
-    public void test_upperCase() {
-        assertEquals("TESTCASE", "testCase".toUpperCase());
-    }
-
-    @Test
-    public void test_indexOf() {
-        assertEquals(1, "testCase".indexOf("e"));
-    }
-}
+package com.baeldung;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class StringFunctionTest {
+
+    @Test
+    public void test_upperCase() {
+        assertEquals("TESTCASE", "testCase".toUpperCase());
+    }
+
+    @Test
+    public void test_indexOf() {
+        assertEquals(1, "testCase".indexOf("e"));
+    }
+}
diff --git a/testing-modules/test-containers/pom.xml b/testing-modules/test-containers/pom.xml
index 2a8f434040..1f4c483988 100644
--- a/testing-modules/test-containers/pom.xml
+++ b/testing-modules/test-containers/pom.xml
@@ -104,12 +104,12 @@
         <junit.vintage.version>4.12.1</junit.vintage.version>
         <log4j2.version>2.8.2</log4j2.version>
         <h2.version>1.4.196</h2.version>
-        <mockito.version>2.11.0</mockito.version>
+        <mockito.version>2.21.0</mockito.version>
         <spring.version>5.0.1.RELEASE</spring.version>
         <testcontainers.version>1.7.2</testcontainers.version>
         <postgresql.version>42.2.2</postgresql.version>
         <selenium-remote-driver.version>3.12.0</selenium-remote-driver.version>
-        <maven-surefire-plugin.version>2.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/pom.xml b/testing-modules/testing/pom.xml
index 7b2fe76d0f..2e783b2116 100644
--- a/testing-modules/testing/pom.xml
+++ b/testing-modules/testing/pom.xml
@@ -88,6 +88,11 @@
             <artifactId>javalite-common</artifactId>
             <version>${javalite.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.javafaker</groupId>
+            <artifactId>javafaker</artifactId>
+            <version>0.15</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/testing-modules/testing/src/test/java/com/baeldung/javafaker/JavaFakerUnitTest.java b/testing-modules/testing/src/test/java/com/baeldung/javafaker/JavaFakerUnitTest.java
new file mode 100644
index 0000000000..7a3b9771fb
--- /dev/null
+++ b/testing-modules/testing/src/test/java/com/baeldung/javafaker/JavaFakerUnitTest.java
@@ -0,0 +1,121 @@
+package com.baeldung.javafaker;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Locale;
+import java.util.Random;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.github.javafaker.Faker;
+import com.github.javafaker.service.FakeValuesService;
+import com.github.javafaker.service.LocaleDoesNotExistException;
+import com.github.javafaker.service.RandomService;
+
+public class JavaFakerUnitTest {
+
+    private Faker faker;
+
+    @Before
+    public void setUp() throws Exception {
+        faker = new Faker();
+    }
+
+    @Test
+    public void givenJavaFaker_whenAddressObjectCalled_checkValidAddressInfoGiven() throws Exception {
+
+        Faker faker = new Faker();
+
+        String streetName = faker.address()
+            .streetName();
+        String number = faker.address()
+            .buildingNumber();
+        String city = faker.address()
+            .city();
+        String country = faker.address()
+            .country();
+
+        System.out.println(String.format("%s\n%s\n%s\n%s", number, streetName, city, country));
+
+    }
+
+    @Test
+    public void givenJavaFakersWithSameSeed_whenNameCalled_CheckSameName() throws Exception {
+
+        Faker faker1 = new Faker(new Random(24));
+        Faker faker2 = new Faker(new Random(24));
+
+        assertEquals(faker1.name()
+            .firstName(),
+            faker2.name()
+                .firstName());
+    }
+
+    @Test
+    public void givenJavaFakersWithDifferentLocals_checkZipCodesMatchRegex() throws Exception {
+
+        Faker ukFaker = new Faker(new Locale("en-GB"));
+        Faker usFaker = new Faker(new Locale("en-US"));
+
+        System.out.println(String.format("American zipcode: %s", usFaker.address()
+            .zipCode()));
+        System.out.println(String.format("British postcode: %s", ukFaker.address()
+            .zipCode()));
+
+        Pattern ukPattern = Pattern.compile("([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([A-Za-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9]?[A-Za-z]))))\\s?[0-9][A-Za-z]{2})");
+        Matcher ukMatcher = ukPattern.matcher(ukFaker.address()
+            .zipCode());
+
+        assertTrue(ukMatcher.find());
+
+        Matcher usMatcher = Pattern.compile("^\\d{5}(?:[-\\s]\\d{4})?$")
+            .matcher(usFaker.address()
+                .zipCode());
+
+        assertTrue(usMatcher.find());
+
+    }
+
+    @Test
+    public void givenJavaFakerService_testFakersCreated() throws Exception {
+
+        RandomService randomService = new RandomService();
+
+        System.out.println(randomService.nextBoolean());
+        System.out.println(randomService.nextDouble());
+
+        Faker faker = new Faker(new Random(randomService.nextLong()));
+
+        System.out.println(faker.address()
+            .city());
+
+    }
+
+    @Test
+    public void testFakeValuesService() throws Exception {
+
+        FakeValuesService fakeValuesService = new FakeValuesService(new Locale("en-GB"), new RandomService());
+
+        String email = fakeValuesService.bothify("????##@gmail.com");
+        Matcher emailMatcher = Pattern.compile("\\w{4}\\d{2}@gmail.com")
+            .matcher(email);
+        assertTrue(emailMatcher.find());
+
+        String alphaNumericString = fakeValuesService.regexify("[a-z1-9]{10}");
+        Matcher alphaNumericMatcher = Pattern.compile("[a-z1-9]{10}")
+            .matcher(alphaNumericString);
+        assertTrue(alphaNumericMatcher.find());
+
+    }
+
+    @Test(expected = LocaleDoesNotExistException.class)
+    public void givenWrongLocale_whenFakerIsInitialised_testLocaleDoesNotExistExceptionIsThrown() throws Exception {
+
+        Faker wrongLocaleFaker = new Faker(new Locale("en-seaWorld"));
+
+    }
+}
\ No newline at end of file