From 4592d635902de23b402a28787a8468ba1ac3a3a4 Mon Sep 17 00:00:00 2001 From: Matteo Mara Date: Fri, 8 Mar 2024 18:08:49 +0100 Subject: SONAR-21452 move from commons-lang:commons-lang to org.apache.commons:commons-lang3 --- plugins/sonar-xoo-plugin/build.gradle | 2 +- .../main/java/org/sonar/xoo/coverage/AbstractCoverageSensor.java | 6 +++--- .../src/main/java/org/sonar/xoo/lang/LineMeasureSensor.java | 6 +++--- .../src/main/java/org/sonar/xoo/lang/MeasureSensor.java | 6 +++--- .../src/main/java/org/sonar/xoo/lang/SignificantCodeSensor.java | 2 +- .../src/main/java/org/sonar/xoo/lang/SymbolReferencesSensor.java | 2 +- .../src/main/java/org/sonar/xoo/lang/SyntaxHighlightingSensor.java | 2 +- .../src/main/java/org/sonar/xoo/rule/AnalysisErrorSensor.java | 7 +++---- .../src/main/java/org/sonar/xoo/scm/XooBlameCommand.java | 2 +- .../src/main/java/org/sonar/xoo/scm/XooScmProvider.java | 2 +- 10 files changed, 18 insertions(+), 19 deletions(-) (limited to 'plugins') diff --git a/plugins/sonar-xoo-plugin/build.gradle b/plugins/sonar-xoo-plugin/build.gradle index d3330473874..221bdc559e0 100644 --- a/plugins/sonar-xoo-plugin/build.gradle +++ b/plugins/sonar-xoo-plugin/build.gradle @@ -2,7 +2,7 @@ dependencies { api 'com.google.guava:guava' api 'commons-io:commons-io' - api 'commons-lang:commons-lang' + api 'org.apache.commons:commons-lang3' api 'org.apache.commons:commons-csv' compileOnlyApi 'com.google.code.findbugs:jsr305' diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/coverage/AbstractCoverageSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/coverage/AbstractCoverageSensor.java index b38b3e1da05..0a28bf989e5 100644 --- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/coverage/AbstractCoverageSensor.java +++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/coverage/AbstractCoverageSensor.java @@ -25,14 +25,14 @@ import java.io.IOException; import java.util.Iterator; import java.util.List; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.sensor.Sensor; import org.sonar.api.batch.sensor.SensorContext; import org.sonar.api.batch.sensor.SensorDescriptor; import org.sonar.api.batch.sensor.coverage.NewCoverage; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.sonar.xoo.Xoo; public abstract class AbstractCoverageSensor implements Sensor { diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/LineMeasureSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/LineMeasureSensor.java index cb8f065c234..86bf9ad0282 100644 --- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/LineMeasureSensor.java +++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/LineMeasureSensor.java @@ -24,7 +24,9 @@ import java.io.IOException; import java.util.List; import java.util.Map; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.sensor.Sensor; import org.sonar.api.batch.sensor.SensorContext; @@ -32,8 +34,6 @@ import org.sonar.api.batch.sensor.SensorDescriptor; import org.sonar.api.measures.FileLinesContext; import org.sonar.api.measures.FileLinesContextFactory; import org.sonar.api.utils.KeyValueFormat; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.sonar.xoo.Xoo; /** diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/MeasureSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/MeasureSensor.java index 04938314f6d..30bd9061108 100644 --- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/MeasureSensor.java +++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/MeasureSensor.java @@ -24,7 +24,9 @@ import java.io.IOException; import java.io.Serializable; import java.util.List; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.sonar.api.batch.fs.InputComponent; import org.sonar.api.batch.fs.InputDir; import org.sonar.api.batch.fs.InputFile; @@ -33,8 +35,6 @@ import org.sonar.api.batch.sensor.Sensor; import org.sonar.api.batch.sensor.SensorContext; import org.sonar.api.batch.sensor.SensorDescriptor; import org.sonar.api.batch.sensor.measure.NewMeasure; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.sonar.xoo.Xoo; import org.sonar.xoo.Xoo2; diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SignificantCodeSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SignificantCodeSensor.java index df175eeb90a..e1605c6258e 100644 --- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SignificantCodeSensor.java +++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SignificantCodeSensor.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.sensor.Sensor; import org.sonar.api.batch.sensor.SensorContext; diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SymbolReferencesSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SymbolReferencesSensor.java index 08ada34c9f6..9030056a8f5 100644 --- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SymbolReferencesSensor.java +++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SymbolReferencesSensor.java @@ -25,7 +25,7 @@ import java.io.IOException; import java.util.Iterator; import java.util.List; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.sensor.Sensor; import org.sonar.api.batch.sensor.SensorContext; diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SyntaxHighlightingSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SyntaxHighlightingSensor.java index 1e55d51e26b..cfa34658e11 100644 --- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SyntaxHighlightingSensor.java +++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/lang/SyntaxHighlightingSensor.java @@ -23,7 +23,7 @@ import java.io.File; import java.io.IOException; import java.util.List; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.sensor.Sensor; import org.sonar.api.batch.sensor.SensorContext; diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/AnalysisErrorSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/AnalysisErrorSensor.java index 9e55b60066b..94a477c2244 100644 --- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/AnalysisErrorSensor.java +++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/AnalysisErrorSensor.java @@ -23,14 +23,13 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; - -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.sensor.Sensor; import org.sonar.api.batch.sensor.SensorContext; import org.sonar.api.batch.sensor.SensorDescriptor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.sonar.xoo.Xoo; public class AnalysisErrorSensor implements Sensor { diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooBlameCommand.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooBlameCommand.java index 852a01ae591..b575b73423d 100644 --- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooBlameCommand.java +++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooBlameCommand.java @@ -34,7 +34,7 @@ import org.sonar.api.batch.scm.BlameLine; import org.sonar.api.utils.DateUtils; import static com.google.common.base.Preconditions.checkState; -import static org.apache.commons.lang.StringUtils.trimToNull; +import static org.apache.commons.lang3.StringUtils.trimToNull; public class XooBlameCommand extends BlameCommand { diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooScmProvider.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooScmProvider.java index 4b1d8391248..212f9bd4ac4 100644 --- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooScmProvider.java +++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/scm/XooScmProvider.java @@ -34,7 +34,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import javax.annotation.CheckForNull; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.batch.scm.BlameCommand; -- cgit v1.2.3