From 3946260278b43d6e2ae4e359747d721c3ceca61d Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Thu, 23 May 2019 20:23:14 +0300
Subject: [PATCH 1/3] fix conflict

---
 .../com/baeldung/logging/slf4j/Slf4jLogger.java                 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java b/core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java
index df41e071fd..aaa2d83ca6 100644
--- a/core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java
+++ b/core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java
@@ -75,6 +75,8 @@ public class Slf4jLogger implements System.Logger {
             return;
         }
 
+        String message = MessageFormat.format(format, params);
+
         switch (level) {
         case TRACE:
             logger.trace(format, params);

From 8ce748420592a04edcf6139765e6e9b241d6b64d Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Sat, 25 May 2019 21:32:32 +0300
Subject: [PATCH 2/3] downgrade surefire version

---
 .../{SubstringSearch.java => SubstringSearchUnitTest.java}    | 2 +-
 pom.xml                                                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename java-strings-2/src/test/java/com/baeldung/string/search/{SubstringSearch.java => SubstringSearchUnitTest.java} (98%)

diff --git a/java-strings-2/src/test/java/com/baeldung/string/search/SubstringSearch.java b/java-strings-2/src/test/java/com/baeldung/string/search/SubstringSearchUnitTest.java
similarity index 98%
rename from java-strings-2/src/test/java/com/baeldung/string/search/SubstringSearch.java
rename to java-strings-2/src/test/java/com/baeldung/string/search/SubstringSearchUnitTest.java
index 4a5adb45ef..293e6d2125 100644
--- a/java-strings-2/src/test/java/com/baeldung/string/search/SubstringSearch.java
+++ b/java-strings-2/src/test/java/com/baeldung/string/search/SubstringSearchUnitTest.java
@@ -10,7 +10,7 @@ import org.junit.Test;
 /**
  * BAEL-2832: Different ways to check if a Substring could be found in a String.
  */
-public class SubstringSearch {
+public class SubstringSearchUnitTest {
 
     @Test
     public void searchSubstringWithIndexOf() {
diff --git a/pom.xml b/pom.xml
index bdd7562486..92876cd07f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1527,7 +1527,7 @@
 		<logback.version>1.1.7</logback.version>
 
 		<!-- plugins -->
-		<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
 		<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
 		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
 		<java.version>1.8</java.version>
@@ -1538,7 +1538,7 @@
 		<jmh-generator.version>1.19</jmh-generator.version>
 		<hamcrest-all.version>1.3</hamcrest-all.version>
 		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
-		<maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
+		<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
 		<commons-io.version>2.5</commons-io.version>
 		<commons-cli.version>1.4</commons-cli.version>
 		<maven-war-plugin.version>3.0.0</maven-war-plugin.version>

From 148ff421e054dcade28e97de8463ed75d332938a Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Sat, 25 May 2019 21:34:44 +0300
Subject: [PATCH 3/3] fix formatting

---
 .../com/baeldung/logging/slf4j/Slf4jLogger.java                 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java b/core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java
index 1ff1087367..db19613c94 100644
--- a/core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java
+++ b/core-java-modules/core-java-9/src/modules/com.baeldung.logging.slf4j/com/baeldung/logging/slf4j/Slf4jLogger.java
@@ -75,8 +75,6 @@ public class Slf4jLogger implements System.Logger {
         if (!isLoggable(level)) {
             return;
         }
-        String message = MessageFormat.format (format, params);
-
         String message = MessageFormat.format(format, params);
 
         switch (level) {