diff options
author | Jenkins CI <ci@sonarsource.com> | 2016-05-27 14:21:12 +0200 |
---|---|---|
committer | Jenkins CI <ci@sonarsource.com> | 2016-05-27 14:21:12 +0200 |
commit | fcdfafd618f42a6f2ad665f7b82e838a7a731147 (patch) | |
tree | b7aa6a21ccdff257cadf20db02f1560a45adac40 /tests | |
parent | 57ad719353ae6f7de4ce8c9e83bc50f0e2948a53 (diff) | |
parent | 84392b2963db685e5ea4c473da12f98b1049a52a (diff) | |
download | sonarqube-fcdfafd618f42a6f2ad665f7b82e838a7a731147.tar.gz sonarqube-fcdfafd618f42a6f2ad665f7b82e838a7a731147.zip |
Automatic merge from branch-5.6
* origin/branch-5.6:
Fix compilation of perf test
Diffstat (limited to 'tests')
-rw-r--r-- | tests/perf/src/test/java/org/sonarsource/sonarqube/perf/computation/ComputationTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/computation/ComputationTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/computation/ComputationTest.java index b720db5564c..85a9e0c99de 100644 --- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/computation/ComputationTest.java +++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/computation/ComputationTest.java @@ -23,18 +23,18 @@ import com.google.common.base.Charsets; import com.sonar.orchestrator.Orchestrator; import com.sonar.orchestrator.build.SonarScanner; import com.sonar.orchestrator.locator.FileLocation; -import org.sonarsource.sonarqube.perf.MavenLogs; -import org.sonarsource.sonarqube.perf.PerfTestCase; import java.io.File; import java.io.IOException; import java.util.List; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.sonarsource.sonarqube.perf.MavenLogs; +import org.sonarsource.sonarqube.perf.PerfTestCase; public class ComputationTest extends PerfTestCase { private static int MAX_HEAP_SIZE_IN_MEGA = 600; |