Cleanup dependencies

SonarSource · Sep 28, 2016 · df781a5 · df781a5
1 parent 5cca919
commit df781a5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/its/plugin/pom.xml b/its/plugin/pom.xml
@@ -44,7 +44,7 @@
  <dependency>
  <groupId>org.assertj</groupId>
  <artifactId>assertj-core</artifactId>
- <version>3.5.2</version>
+ <version>${assertj.version}</version>
  <scope>test</scope>
  </dependency>
  </dependencies>

diff --git a/its/ruling/pom.xml b/its/ruling/pom.xml
@@ -40,9 +40,9 @@
  <scope>test</scope>
  </dependency>
  <dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert</artifactId>
- <version>1.4</version>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
  <scope>test</scope>
  </dependency>
  </dependencies>

diff --git a/its/ruling/src/test/java/org/sonar/web/it/WebRulingTest.java b/its/ruling/src/test/java/org/sonar/web/it/WebRulingTest.java
@@ -30,7 +30,7 @@
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class WebRulingTest {
 

diff --git a/pom.xml b/pom.xml
@@ -24,6 +24,7 @@
  <orchestrator.version>3.12</orchestrator.version>
  <junit.version>4.12</junit.version>
  <sslr.version>1.21</sslr.version>
+ <assertj.version>3.5.2</assertj.version>
  </properties>
 
  <url>http://redirect.sonarsource.com/plugins/web.html</url>

diff --git a/sonar-web-plugin/pom.xml b/sonar-web-plugin/pom.xml
@@ -134,12 +134,6 @@
  <version>${sonar.version}</version>
  <scope>test</scope>
  </dependency>
- <dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert</artifactId>
- <version>1.4</version>
- <scope>test</scope>
- </dependency>
  <dependency>
  <groupId>org.hamcrest</groupId>
  <artifactId>hamcrest-all</artifactId>