From df781a53faa7ab8810f61f6003ed3a52c973179c Mon Sep 17 00:00:00 2001
From: Massimo Paladin <massimo.paladin@gmail.com>
Date: Wed, 28 Sep 2016 17:45:58 +0200
Subject: [PATCH] Cleanup dependencies

---
 its/plugin/pom.xml                                          | 2 +-
 its/ruling/pom.xml                                          | 6 +++---
 .../src/test/java/org/sonar/web/it/WebRulingTest.java       | 2 +-
 pom.xml                                                     | 1 +
 sonar-web-plugin/pom.xml                                    | 6 ------
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/its/plugin/pom.xml b/its/plugin/pom.xml
index 86fb44aea..dec5ffe28 100644
--- 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
index 1bbc3aa2c..e1116e2a4 100644
--- 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
index 6ffa17a3d..d08aefc97 100644
--- 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
index 06bf543ba..2dedcb546 100644
--- 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
index 15cd4c85b..933ac13c8 100644
--- 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>