Fix log4j

package.json

@@ -0,0 +1,5 @@
+{
+  "devDependencies": {
+    "all-contributors-cli": "^6.20.0"
+  }
+}

pom.xml

@@ -90,9 +90,8 @@
         <junit.jupiter.version>5.5.2</junit.jupiter.version>
         <jetty.version>9.4.41.v20210516</jetty.version>
         <selenium.version>3.141.59</selenium.version>
-        <webdriver.manager.version>4.4.3</webdriver.manager.version>
-        <slf4j.version>1.6.4</slf4j.version>
-        <logback.version>1.2.3</logback.version>
+        <webdriver.manager.version>5.0.3</webdriver.manager.version>
+        <log4j.version>2.15.0</log4j.version>
         <apache.commons.io.version>2.9.0</apache.commons.io.version>
         <hamcrest.version>2.2</hamcrest.version>
         <jackson.version>2.12.1</jackson.version>
@@ -137,19 +136,19 @@
             <version>${dropwizard.metrics.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4j.version}</version>
         </dependency>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j.version}</version>
         </dependency>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${logback.version}</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -335,6 +334,17 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

saucelabs-fs.json

@@ -11,6 +11,6 @@
   "browserVersion": "LATEST",
   "pageLoadStrategy": "NORMAL",
   "seleniumVersion": "3.7.1",
-  "sauceLabsRemoteGridUrl": "https://ondemand.saucelabs.com/wd/hub",
+  "sauceLabsRemoteGridUrl": "https://ondemand.saucelabs.com:443/wd/hub",
   "unhandledPromptBehaviour": "DISMISS"
 }

src/main/java/uk/co/evoco/tests/BaseAbstractTest.java

@@ -6,8 +6,8 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.openqa.selenium.support.events.EventFiringWebDriver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import uk.co.evoco.webdriver.WebDriverBuilder;
 import uk.co.evoco.webdriver.configuration.TestConfigHelper;
 import uk.co.evoco.webdriver.results.ResultsManager;
@@ -22,7 +22,7 @@
  */
 public abstract class BaseAbstractTest {
 
-    private static final Logger logger = LoggerFactory.getLogger(BaseAbstractTest.class);
+    private static final Logger logger = LogManager.getLogger(BaseAbstractTest.class);
     private String testId;
     protected EventFiringWebDriver webDriver;
     protected static ResultsManager resultsManager;

src/main/java/uk/co/evoco/webdriver/WebDriverListener.java

@@ -9,8 +9,8 @@
 import org.openqa.selenium.support.events.AbstractWebDriverEventListener;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import uk.co.evoco.webdriver.configuration.TestConfigHelper;
 
 import java.io.File;
@@ -23,7 +23,7 @@
  */
 public class WebDriverListener extends AbstractWebDriverEventListener {
 
-    private static final Logger logger = LoggerFactory.getLogger(WebDriverListener.class);
+    private static final Logger logger = LogManager.getLogger(WebDriverListener.class);
     private File screenshotDirectory;
 
     /**

src/main/java/uk/co/evoco/webdriver/configuration/ConfigurationLoader.java

@@ -1,7 +1,7 @@
 package uk.co.evoco.webdriver.configuration;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import uk.co.evoco.webdriver.configuration.utils.FileLoaderUtils;
 import uk.co.evoco.webdriver.utils.JsonUtils;
 

src/main/java/uk/co/evoco/webdriver/configuration/SauceLabsCredentials.java

@@ -1,12 +1,12 @@
 package uk.co.evoco.webdriver.configuration;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import uk.co.evoco.exceptions.SauceLabsCredentialsException;
 
 public class SauceLabsCredentials {
 
-    private static final Logger logger = LoggerFactory.getLogger(SauceLabsCredentials.class);
+    private static final Logger logger = LogManager.getLogger(SauceLabsCredentials.class);
     private String username;
     private String accessKey;
 

src/main/java/uk/co/evoco/webdriver/configuration/WebDriverConfig.java

@@ -4,8 +4,8 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -29,7 +29,7 @@ public class WebDriverConfig {
     private MetricsConfig metricsConfig;
     private boolean takeScreenshotOnError;
 
-    private final Logger logger = LoggerFactory.getLogger(WebDriverConfig.class);
+    private final Logger logger = LogManager.getLogger(WebDriverConfig.class);
 
     /**
      *

src/main/java/uk/co/evoco/webdriver/configuration/utils/FileLoaderUtils.java

@@ -1,14 +1,14 @@
 package uk.co.evoco.webdriver.configuration.utils;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.File;
 import java.io.IOException;
 
 public final class FileLoaderUtils {
 
-    private final static Logger logger = LoggerFactory.getLogger(FileLoaderUtils.class);
+    private final static Logger logger = LogManager.getLogger(FileLoaderUtils.class);
     private FileLoaderUtils() {
         throw new IllegalStateException("Utility class");
     }

src/main/java/uk/co/evoco/webdriver/utils/FindByUtils.java

@@ -6,8 +6,8 @@
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ByIdOrName;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import uk.co.evoco.metrics.MetricRegistryHelper;
 
 import java.util.List;
@@ -20,7 +20,7 @@
  */
 public final class FindByUtils {
 
-    private static final Logger logger = LoggerFactory.getLogger(FindByUtils.class);
+    private static final Logger logger = LogManager.getLogger(FindByUtils.class);
     private static final Timer multipleLocatorMatchGetDisplayedAction = MetricRegistryHelper.get().timer(name("FindByUtils.multipleLocatorMatchGetDisplayedAction"));
     private static final Timer byIdOrNameAction = MetricRegistryHelper.get().timer(name("FindByUtils.byIdOrName"));
 

src/main/java/uk/co/evoco/webdriver/utils/TolerantExceptionHandler.java

@@ -1,13 +1,13 @@
 package uk.co.evoco.webdriver.utils;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.List;
 
 public class TolerantExceptionHandler {
     private List<String> tolerantExceptions;
-    private Logger logger = LoggerFactory.getLogger(TolerantInteraction.class);
+    private Logger logger = LogManager.getLogger(TolerantInteraction.class);
 
     public TolerantExceptionHandler(List<String> tolerantExceptions) {
         this.tolerantExceptions = tolerantExceptions;

src/main/java/uk/co/evoco/webdriver/utils/TolerantInteraction.java

@@ -3,8 +3,8 @@
 import org.openqa.selenium.*;
 import org.openqa.selenium.support.ui.Select;
 import org.openqa.selenium.support.ui.Sleeper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import uk.co.evoco.webdriver.configuration.TestConfigHelper;
 
 import java.time.Clock;
@@ -15,7 +15,7 @@
 
 public class TolerantInteraction {
 
-    private final Logger logger = LoggerFactory.getLogger(TolerantInteraction.class);
+    private final Logger logger = LogManager.getLogger(TolerantInteraction.class);
 
     private final Clock clock = Clock.systemDefaultZone();
     private Instant end;