Skip to content

PersistenceTools: log4j -> slf4j logging #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adahn6 merged 4 commits into from
Apr 9, 2022
Merged

PersistenceTools: log4j -> slf4j logging #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b84cf8c
PersistenceTools: log4j -> slf4j logging
tsmock Dec 16, 2021
598c66a
Dependency updates
tsmock Dec 27, 2021
5eb2b8a
Remove logger.error, since we are throwing a CoreException (SONAR)
tsmock Dec 27, 2021
ca2025c
Merge branch 'dev' into cve-2021-44228
adahn6 Apr 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ plugins {
id 'signing'
id 'checkstyle'
id 'jacoco'
id "com.diffplug.gradle.spotless" version "3.27.0"
id 'org.sonarqube' version '2.8'
id "com.diffplug.spotless" version "6.1.0"
id 'org.sonarqube' version '3.3'
// id "io.codearte.nexus-staging" version "0.12.0"
}

Expand Down
4 changes: 2 additions & 2 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
project.ext.versions = [
checkstyle: '8.18',
jacoco: '0.8.3',
jacoco: '0.8.7',
atlas: '7.0.4',
spark: '3.0.1',
snappy: '1.1.1.6',
atlas_checkstyle: '5.6.9',
jline: '3.7.0'
jline: '3.21.0'
]

project.ext.packages = [
Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
distributionSha256Sum=8b356fd8702d5ffa2e066ed0be45a023a779bba4dd1a68fd11bc2a6bdc981e8f
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 0 additions & 3 deletions ...main/java/org/openstreetmap/atlas/generator/tools/spark/persistence/PersistenceTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.IOUtils;
import org.apache.log4j.Logger;
import org.openstreetmap.atlas.exception.CoreException;
import org.openstreetmap.atlas.generator.sharding.AtlasSharding;
import org.openstreetmap.atlas.generator.tools.spark.SparkJob;
Expand Down Expand Up @@ -37,7 +36,6 @@ public class PersistenceTools

private static final Integer BUFFER_SIZE = 4 * 1024;
private final Map<String, String> configurationMap;
private static final Logger logger = Logger.getLogger(PersistenceTools.class);

public PersistenceTools(final Map<String, String> configurationMap)
{
Expand All @@ -53,7 +51,6 @@ public CountryBoundaryMap boundaries(final String input)
}
catch (final Exception e)
{
logger.error(e);
throw new CoreException("Could not close {}",
SparkFileHelper.combine(input, BOUNDARIES_FILE), e);
}
Expand Down