Skip to content

Commit 984af5a

Browse files
dbmenesespynicolas
dbmeneses
authored and
pynicolas
committed
Drop dependency on slf4j (SonarSource#154)
1 parent c5822f1 commit 984af5a

9 files changed

Lines changed: 25 additions & 36 deletions

File tree

‎pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
<logback.version>1.1.7</logback.version>
8787
<maven.project.version>2.2.1</maven.project.version>
8888
<mockito.version>1.10.19</mockito.version>
89-
<slf4j.version>1.7.21</slf4j.version>
9089
<sonar.version>6.7</sonar.version>
9190
<sonar.orchestrator.version>3.15.2.1322</sonar.orchestrator.version>
9291
<sonarlint-core.version>3.0.0.1140</sonarlint-core.version>
@@ -144,11 +143,6 @@
144143
<artifactId>commons-io</artifactId>
145144
<version>${commons.io.version}</version>
146145
</dependency>
147-
<dependency>
148-
<groupId>org.slf4j</groupId>
149-
<artifactId>slf4j-api</artifactId>
150-
<version>${slf4j.version}</version>
151-
</dependency>
152146
<dependency>
153147
<groupId>org.codehaus.woodstox</groupId>
154148
<artifactId>woodstox-core-lgpl</artifactId>

‎python-squid/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
<groupId>org.sonarsource.sslr</groupId>
2222
<artifactId>sslr-xpath</artifactId>
2323
</dependency>
24-
<dependency>
25-
<groupId>org.slf4j</groupId>
26-
<artifactId>slf4j-api</artifactId>
27-
</dependency>
2824
<dependency>
2925
<groupId>org.sonarsource.sonarqube</groupId>
3026
<artifactId>sonar-plugin-api</artifactId>

‎sonar-python-plugin/src/main/java/org/sonar/plugins/python/PythonReportSensor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
import java.io.File;
2323
import java.util.List;
2424
import java.util.Objects;
25-
import org.slf4j.Logger;
26-
import org.slf4j.LoggerFactory;
2725
import org.sonar.api.batch.fs.InputFile;
2826
import org.sonar.api.batch.sensor.Sensor;
2927
import org.sonar.api.batch.sensor.SensorContext;
3028
import org.sonar.api.batch.sensor.SensorDescriptor;
3129
import org.sonar.api.config.Configuration;
3230
import org.sonar.api.utils.WildcardPattern;
31+
import org.sonar.api.utils.log.Logger;
32+
import org.sonar.api.utils.log.Loggers;
3333

3434
public abstract class PythonReportSensor implements Sensor {
3535

36-
private static final Logger LOG = LoggerFactory.getLogger(PythonReportSensor.class);
36+
private static final Logger LOG = Loggers.get(PythonReportSensor.class);
3737

3838
protected Configuration conf;
3939

‎sonar-python-plugin/src/main/java/org/sonar/plugins/python/coverage/CoberturaParser.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030
import org.apache.commons.io.FilenameUtils;
3131
import org.apache.commons.lang.StringUtils;
3232
import org.codehaus.staxmate.in.SMInputCursor;
33-
import org.slf4j.Logger;
34-
import org.slf4j.LoggerFactory;
3533
import org.sonar.api.batch.fs.InputFile;
3634
import org.sonar.api.batch.sensor.SensorContext;
3735
import org.sonar.api.batch.sensor.coverage.NewCoverage;
36+
import org.sonar.api.utils.log.Logger;
37+
import org.sonar.api.utils.log.Loggers;
3838
import org.sonar.plugins.python.EmptyReportException;
3939
import org.sonar.plugins.python.parser.StaxParser;
4040

4141
public class CoberturaParser {
4242

43-
private static final Logger LOG = LoggerFactory.getLogger(CoberturaParser.class);
43+
private static final Logger LOG = Loggers.get(CoberturaParser.class);
4444

4545
private int unresolvedFilenameCount;
4646

‎sonar-python-plugin/src/main/java/org/sonar/plugins/python/coverage/PythonCoverageSensor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@
2929
import java.util.Set;
3030
import java.util.stream.Collectors;
3131
import javax.xml.stream.XMLStreamException;
32-
import org.slf4j.Logger;
33-
import org.slf4j.LoggerFactory;
3432
import org.sonar.api.batch.fs.InputFile;
3533
import org.sonar.api.batch.sensor.SensorContext;
3634
import org.sonar.api.batch.sensor.coverage.NewCoverage;
3735
import org.sonar.api.config.Configuration;
36+
import org.sonar.api.utils.log.Logger;
37+
import org.sonar.api.utils.log.Loggers;
3838
import org.sonar.plugins.python.EmptyReportException;
3939

4040
import static org.sonar.plugins.python.PythonReportSensor.getReports;
4141

4242
public class PythonCoverageSensor {
4343

44-
private static final Logger LOG = LoggerFactory.getLogger(PythonCoverageSensor.class);
44+
private static final Logger LOG = Loggers.get(PythonCoverageSensor.class);
4545

4646
public static final String REPORT_PATH_KEY = "sonar.python.coverage.reportPath";
4747
public static final String DEFAULT_REPORT_PATH = "coverage-reports/*coverage-*.xml";

‎sonar-python-plugin/src/main/java/org/sonar/plugins/python/pylint/PylintImportSensor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import java.util.List;
2626
import java.util.Scanner;
2727
import javax.annotation.Nullable;
28-
import org.slf4j.Logger;
29-
import org.slf4j.LoggerFactory;
3028
import org.sonar.api.batch.fs.FileSystem;
3129
import org.sonar.api.batch.fs.InputFile;
3230
import org.sonar.api.batch.rule.ActiveRule;
@@ -35,13 +33,15 @@
3533
import org.sonar.api.batch.sensor.issue.NewIssue;
3634
import org.sonar.api.config.Configuration;
3735
import org.sonar.api.rule.RuleKey;
36+
import org.sonar.api.utils.log.Logger;
37+
import org.sonar.api.utils.log.Loggers;
3838
import org.sonar.plugins.python.PythonReportSensor;
3939

4040
public class PylintImportSensor extends PythonReportSensor {
4141
public static final String REPORT_PATH_KEY = "sonar.python.pylint.reportPath";
4242
private static final String DEFAULT_REPORT_PATH = "pylint-reports/pylint-result-*.txt";
4343

44-
private static final Logger LOG = LoggerFactory.getLogger(PylintImportSensor.class);
44+
private static final Logger LOG = Loggers.get(PylintImportSensor.class);
4545

4646
public PylintImportSensor(Configuration conf) {
4747
super(conf);

‎sonar-python-plugin/src/main/java/org/sonar/plugins/python/pylint/PylintIssuesAnalyzer.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,22 @@
1919
*/
2020
package org.sonar.plugins.python.pylint;
2121

22-
import javax.annotation.Nullable;
23-
import org.apache.commons.lang.StringUtils;
24-
import org.slf4j.Logger;
25-
import org.slf4j.LoggerFactory;
26-
import org.sonar.api.utils.command.Command;
27-
import org.sonar.api.utils.command.CommandExecutor;
28-
2922
import java.io.File;
3023
import java.io.IOException;
3124
import java.nio.charset.Charset;
3225
import java.nio.file.Files;
3326
import java.util.LinkedList;
3427
import java.util.List;
28+
import javax.annotation.Nullable;
29+
import org.apache.commons.lang.StringUtils;
30+
import org.sonar.api.utils.command.Command;
31+
import org.sonar.api.utils.command.CommandExecutor;
32+
import org.sonar.api.utils.log.Logger;
33+
import org.sonar.api.utils.log.Loggers;
3534

3635
public class PylintIssuesAnalyzer {
3736

38-
private static final Logger LOG = LoggerFactory.getLogger(PylintSensor.class);
37+
private static final Logger LOG = Loggers.get(PylintIssuesAnalyzer.class);
3938

4039
private static final String FALLBACK_PYLINT = "pylint";
4140

‎sonar-python-plugin/src/main/java/org/sonar/plugins/python/pylint/PylintReportParser.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import java.util.Map;
2525
import java.util.regex.Matcher;
2626
import java.util.regex.Pattern;
27-
import org.slf4j.Logger;
28-
import org.slf4j.LoggerFactory;
27+
import org.sonar.api.utils.log.Logger;
28+
import org.sonar.api.utils.log.Loggers;
2929

3030
public class PylintReportParser {
3131
private static final Pattern PATTERN = Pattern.compile("(.+):([0-9]+): \\[(.*)\\] (.*)");
32-
private static final Logger LOG = LoggerFactory.getLogger(PylintReportParser.class);
32+
private static final Logger LOG = Loggers.get(PylintReportParser.class);
3333

3434
// Pylint 0.24 brings a nasty reidentifying of some rules...
3535
// To avoid burdening of users with rule clones we map the ids.

‎sonar-python-plugin/src/main/java/org/sonar/plugins/python/xunit/PythonXUnitSensor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@
2626
import java.util.Map;
2727
import javax.xml.stream.XMLStreamException;
2828
import org.apache.commons.lang.StringUtils;
29-
import org.slf4j.Logger;
30-
import org.slf4j.LoggerFactory;
3129
import org.sonar.api.batch.fs.FileSystem;
3230
import org.sonar.api.batch.fs.InputComponent;
3331
import org.sonar.api.batch.fs.InputFile;
3432
import org.sonar.api.batch.measure.Metric;
3533
import org.sonar.api.batch.sensor.SensorContext;
3634
import org.sonar.api.config.Configuration;
3735
import org.sonar.api.measures.CoreMetrics;
36+
import org.sonar.api.utils.log.Logger;
37+
import org.sonar.api.utils.log.Loggers;
3838
import org.sonar.plugins.python.PythonReportSensor;
3939
import org.sonar.plugins.python.parser.StaxParser;
4040

4141
public class PythonXUnitSensor extends PythonReportSensor {
42-
private static final Logger LOG = LoggerFactory.getLogger(PythonXUnitSensor.class);
42+
private static final Logger LOG = Loggers.get(PythonXUnitSensor.class);
4343

4444
public static final String REPORT_PATH_KEY = "sonar.python.xunit.reportPath";
4545
public static final String DEFAULT_REPORT_PATH = "xunit-reports/xunit-result-*.xml";

0 commit comments

Comments
 (0)