Update log4j to 2.17.1

build.gradle

@@ -29,7 +29,13 @@ targetCompatibility = 11
 repositories
 {
     // For geotools
-    maven { url "http://repo.osgeo.org/repository/release/" }
+    maven {
+      url "http://repo.osgeo.org/repository/release/"
+      content {
+        // osgeo removed the jar and added a -norce version
+        excludeVersion("log4j", "log4j", "1.2.17")
+      }
+    }
     mavenCentral()
     // For Spark CDH
     maven { url "https://repository.cloudera.com/content/repositories/releases/" }

dependencies.gradle

@@ -1,6 +1,6 @@
 project.ext.versions = [
     checkstyle: '8.18',
-    jacoco: '0.8.3',
+    jacoco: '0.8.7',
     atlas: '6.5.7',
     commons:'2.6',
     atlas_generator: '5.3.6',
@@ -9,10 +9,10 @@ project.ext.versions = [
     postgres: '42.2.6',
     spring: '4.2.2.RELEASE',
     mockito: '2.23.0',
-    junit4: '4.13.1',
-    junit: '5.7.0',
-    sqlite: '3.32.3.2',
-    log4j: '1.2.17'
+    junit4: '4.13.2',
+    junit: '5.8.2',
+    sqlite: '3.36.0.3',
+    log4j: '2.17.1'
 ]
 
 project.ext.packages = [
@@ -33,5 +33,5 @@ project.ext.packages = [
         params: "org.junit.jupiter:junit-jupiter-params:${versions.junit}",
     ],
     sqlite: "org.xerial:sqlite-jdbc:${versions.sqlite}",
-    log4j: "log4j:log4j:${versions.log4j}"
+    log4j: "org.apache.logging.log4j:log4j:${versions.log4j}"
 ]

src/main/java/org/openstreetmap/atlas/checks/utility/ElevationUtilities.java

@@ -17,13 +17,14 @@
 import javax.annotation.Nonnull;
 
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.log4j.Logger;
 import org.openstreetmap.atlas.checks.base.ExternalDataFetcher;
 import org.openstreetmap.atlas.geography.Location;
 import org.openstreetmap.atlas.geography.Longitude;
 import org.openstreetmap.atlas.streaming.resource.Resource;
 import org.openstreetmap.atlas.utilities.configuration.Configuration;
 import org.openstreetmap.atlas.utilities.scalars.Distance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Used to determine assumed direction for some features (e.g. waterways). Assumptions are that any
@@ -40,7 +41,7 @@ public final class ElevationUtilities implements Serializable
      */
     private static final String SRTM_EXTENSION = "hgt";
     /** The logger */
-    private static final Logger logger = Logger.getLogger(ElevationUtilities.class);
+    private static final Logger logger = LoggerFactory.getLogger(ElevationUtilities.class);
     /**
      * The assumed extent of a HGT SRTM file (lat/lon) in degrees
      */

src/main/java/org/openstreetmap/atlas/checks/utility/SQLiteUtils.java

@@ -14,11 +14,12 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
 import org.openstreetmap.atlas.checks.base.ExternalDataFetcher;
 import org.openstreetmap.atlas.generator.tools.filesystem.FileSystemHelper;
 import org.openstreetmap.atlas.streaming.resource.File;
 import org.openstreetmap.atlas.streaming.resource.Resource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sparkproject.guava.cache.CacheBuilder;
 import org.sparkproject.guava.cache.CacheLoader;
 import org.sparkproject.guava.cache.LoadingCache;
@@ -41,7 +42,7 @@ public class SQLiteUtils implements Serializable
     private transient Connection connection;
     /** The db "file" for in memory databases */
     public static final String MEMORY_DB = ":memory:";
-    private static Logger logger = Logger.getLogger(SQLiteUtils.class);
+    private static Logger logger = LoggerFactory.getLogger(SQLiteUtils.class);
     private static final int DEFAULT_CACHE_MAX = 1000;
 
     /**
@@ -171,7 +172,7 @@ public Map<String, Object> load(final String statement) throws Exception
         }
         catch (final ExecutionException e)
         {
-            logger.error(e);
+            logger.error("Failed to get row for " + statement, e);
             return Collections.emptyMap();
         }
     }