11 files changed, 56 insertions, 35 deletions
diff --git a/server/sonar-server/build.gradle b/server/sonar-server/build.gradle
index 327e4a3ad86..9bb11231e8a 100644
--- a/server/sonar-server/build.gradle
+++ b/server/sonar-server/build.gradle
@@ -18,12 +18,12 @@ dependencies {
   compile 'ch.qos.logback:logback-access'
   compile 'ch.qos.logback:logback-classic'
   compile 'ch.qos.logback:logback-core'
-  compile 'commons-dbcp:commons-dbcp'
-  compile 'commons-dbutils:commons-dbutils'
-  compile 'com.googlecode.java-diff-utils:diffutils'
   compile 'com.google.code.gson:gson'
   compile 'com.google.protobuf:protobuf-java'
+  compile 'com.googlecode.java-diff-utils:diffutils'
   compile 'com.hazelcast:hazelcast-client'
+  compile 'commons-dbcp:commons-dbcp'
+  compile 'commons-dbutils:commons-dbutils'
   compile 'io.jsonwebtoken:jjwt'
   compile 'javax.xml.bind:jaxb-api'
   compile 'org.apache.commons:commons-email'
diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index bb8b58b74dc..aad5006205f 100644
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -28,6 +28,8 @@ configurations {
 }
 
 dependencies {
+  // please keep list ordered
+
   compile 'org.elasticsearch.client:transport'
   compile project(':server:sonar-main')
   compile project(':server:sonar-process')
@@ -40,21 +42,21 @@ dependencies {
   server project(':server:sonar-server')
   webapp project(path: ':server:sonar-web', configuration: 'archives')
 
+  jdbc_h2 'com.h2database:h2'
   jdbc_mssql 'com.microsoft.sqlserver:mssql-jdbc'
   jdbc_mysql 'mysql:mysql-connector-java'
   jdbc_postgresql 'org.postgresql:postgresql'
-  jdbc_h2 'com.h2database:h2'
 
+  bundledPlugin 'org.sonarsource.dotnet:sonar-csharp-plugin:6.7.1.4347@jar'
+  bundledPlugin 'org.sonarsource.flex:sonar-flex-plugin:2.3@jar'
   bundledPlugin 'org.sonarsource.java:sonar-java-plugin:5.1.0.13090@jar'
   bundledPlugin 'org.sonarsource.javascript:sonar-javascript-plugin:4.0.0.5862@jar'
-  bundledPlugin 'org.sonarsource.dotnet:sonar-csharp-plugin:6.7.1.4347@jar'
-  bundledPlugin 'org.sonarsource.scm.git:sonar-scm-git-plugin:1.4.0.1037@jar'
-  bundledPlugin 'org.sonarsource.scm.svn:sonar-scm-svn-plugin:1.7.0.1017@jar'
   bundledPlugin 'org.sonarsource.php:sonar-php-plugin:2.12.1.3018@jar'
   bundledPlugin 'org.sonarsource.python:sonar-python-plugin:1.9.0.2010@jar'
-  bundledPlugin 'org.sonarsource.flex:sonar-flex-plugin:2.3@jar'
-  bundledPlugin 'org.sonarsource.xml:sonar-xml-plugin:1.4.3.1027@jar'
+  bundledPlugin 'org.sonarsource.scm.git:sonar-scm-git-plugin:1.4.0.1037@jar'
+  bundledPlugin 'org.sonarsource.scm.svn:sonar-scm-svn-plugin:1.7.0.1017@jar'
   bundledPlugin 'org.sonarsource.typescript:sonar-typescript-plugin:1.5.0.2122@jar'
+  bundledPlugin 'org.sonarsource.xml:sonar-xml-plugin:1.4.3.1027@jar'
 
   testCompile 'junit:junit'
   testCompile 'org.assertj:assertj-core'
diff --git a/sonar-core/build.gradle b/sonar-core/build.gradle
index e9cd948163e..768ec42b247 100644
--- a/sonar-core/build.gradle
+++ b/sonar-core/build.gradle
@@ -9,26 +9,30 @@ configurations {
 }
 
 dependencies {
-  compileOnly 'com.google.code.findbugs:jsr305'
+  // please keep list ordered
+
+  compile 'ch.qos.logback:logback-classic'
+  compile 'ch.qos.logback:logback-core'
+  compile 'com.google.protobuf:protobuf-java'
   compile 'commons-codec:commons-codec'
   compile 'org.apache.commons:commons-csv'
-  compile 'org.picocontainer:picocontainer'
-  compile 'com.google.protobuf:protobuf-java'
   compile 'org.codehaus.sonar:sonar-classloader'
-  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
-  compile 'org.sonarsource.update-center:sonar-update-center-common'
+  compile 'org.picocontainer:picocontainer'
   compile 'org.slf4j:slf4j-api'
-  compile 'ch.qos.logback:logback-classic'
-  compile 'ch.qos.logback:logback-core'
+  compile 'org.sonarsource.update-center:sonar-update-center-common'
+  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
+
+  compileOnly 'com.google.code.findbugs:jsr305'
 
   includeInResources project(path: ':sonar-plugin-api-deps', configuration: 'shadow')
 
+  testCompile 'com.tngtech.java:junit-dataprovider'
   testCompile 'junit:junit'
   testCompile 'org.assertj:assertj-core'
-  testCompile 'com.tngtech.java:junit-dataprovider'
   testCompile 'org.mockito:mockito-core'
-  testCompile project(':sonar-testing-harness')
   testCompile 'org.simpleframework:simple'
+  testCompile project(':sonar-testing-harness')
+
   testCompileOnly 'com.google.code.findbugs:jsr305'
 }
 
diff --git a/sonar-duplications/build.gradle b/sonar-duplications/build.gradle
index 540f457de8f..a45feb6dca7 100644
--- a/sonar-duplications/build.gradle
+++ b/sonar-duplications/build.gradle
@@ -5,6 +5,8 @@ sonarqube {
 }
 
 dependencies {
+  // please keep list ordered
+
   compile 'org.codehaus.sonar:sonar-channel'
 
   compileOnly 'com.google.code.findbugs:jsr305'
diff --git a/sonar-home/build.gradle b/sonar-home/build.gradle
index a367fdd6c35..ea6d5b07f44 100644
--- a/sonar-home/build.gradle
+++ b/sonar-home/build.gradle
@@ -5,6 +5,8 @@ sonarqube {
 }
 
 dependencies {
+  // please keep list ordered
+
   compileOnly 'com.google.code.findbugs:jsr305'
 
   testCompile 'commons-codec:commons-codec'
diff --git a/sonar-markdown/build.gradle b/sonar-markdown/build.gradle
index 28282eadad5..7b46ac42b1f 100644
--- a/sonar-markdown/build.gradle
+++ b/sonar-markdown/build.gradle
@@ -5,6 +5,8 @@ sonarqube {
 }
 
 dependencies {
+  // please keep list ordered
+
   compile 'commons-lang:commons-lang'
   compile 'org.codehaus.sonar:sonar-channel'
   compile 'org.slf4j:slf4j-api'
diff --git a/sonar-scanner-protocol/build.gradle b/sonar-scanner-protocol/build.gradle
index b852cfa3e16..ba5129d508a 100644
--- a/sonar-scanner-protocol/build.gradle
+++ b/sonar-scanner-protocol/build.gradle
@@ -6,9 +6,10 @@ sonarqube {
 }
 
 dependencies {
-  compile 'commons-io:commons-io'
+  // please keep the list ordered
   compile 'com.google.code.gson:gson'
   compile 'com.google.protobuf:protobuf-java'
+  compile 'commons-io:commons-io'
   compile 'net.jpountz.lz4:lz4'
   compile project(':sonar-core')
 
@@ -16,9 +17,9 @@ dependencies {
 
   testCompile 'com.google.guava:guava'
   testCompile 'junit:junit'
+  testCompile 'net.javacrumbs.json-unit:json-unit-assertj:0.0.15'
   testCompile 'org.assertj:assertj-core'
   testCompile 'org.mockito:mockito-core'
-  testCompile 'net.javacrumbs.json-unit:json-unit-assertj:0.0.15'
 }
 
 // Used by sonar-db-core to run DB Unit Tests
diff --git a/sonar-testing-harness/build.gradle b/sonar-testing-harness/build.gradle
index 3908c075238..2fa44152a99 100644
--- a/sonar-testing-harness/build.gradle
+++ b/sonar-testing-harness/build.gradle
@@ -5,9 +5,11 @@ sonarqube {
 }
 
 dependencies {
-  compile 'commons-io:commons-io'
-  compile 'com.googlecode.json-simple:json-simple'
+  // please keep list ordered
+
   compile 'com.google.code.gson:gson'
+  compile 'com.googlecode.json-simple:json-simple'
+  compile 'commons-io:commons-io'
   compile 'junit:junit'
   compile 'org.hamcrest:hamcrest-core'
 
diff --git a/sonar-ws-generator/build.gradle b/sonar-ws-generator/build.gradle
index 01c9b640ea6..d3834abfe1b 100644
--- a/sonar-ws-generator/build.gradle
+++ b/sonar-ws-generator/build.gradle
@@ -3,6 +3,8 @@ sonarqube {
 }
 
 dependencies {
+  // please keep list ordered
+
   compile 'com.google.code.gson:gson:2.8.2'
   compile 'com.google.guava:guava'
   compile 'org.apache.velocity:velocity:1.7'
diff --git a/sonar-ws/build.gradle b/sonar-ws/build.gradle
index 5695a5a774d..4080e7048a5 100644
--- a/sonar-ws/build.gradle
+++ b/sonar-ws/build.gradle
@@ -10,16 +10,18 @@ configurations {
 }
 
 dependencies {
-  compile 'commons-io:commons-io'
+  // please keep list ordered
+
   compile 'com.google.guava:guava'
   compile 'com.google.protobuf:protobuf-java'
   compile 'com.squareup.okhttp3:okhttp'
+  compile 'commons-io:commons-io'
 
   compileOnly 'com.google.code.findbugs:jsr305'
   compileOnly project(path: ':sonar-plugin-api', configuration: 'shadow')
 
-  testCompile 'commons-lang:commons-lang'
   testCompile 'com.squareup.okhttp3:mockwebserver'
+  testCompile 'commons-lang:commons-lang'
   testCompile 'junit:junit'
   testCompile 'org.assertj:assertj-core'
   testCompile 'org.mockito:mockito-core'
diff --git a/tests/build.gradle b/tests/build.gradle
index 3f4d6d8c61e..17d053aba7c 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -42,26 +42,28 @@ def pluginsForITs = [
 ]
 
 dependencies {
-  testCompile 'org.sonarsource.orchestrator:sonar-orchestrator'
-  testCompile project(':server:sonar-qa-util')
-  testCompile project(':sonar-ws')
+  // please keep list ordered
+
   // required version 23.0 for selenide
   testCompile 'com.google.guava:guava:23.0'
+  testCompile 'com.googlecode.json-simple:json-simple'
+  testCompile 'com.microsoft.sqlserver:mssql-jdbc'
+  testCompile 'com.oracle.jdbc:ojdbc8'
+  testCompile 'com.squareup.okhttp3:mockwebserver'
   testCompile 'junit:junit'
+  testCompile 'mysql:mysql-connector-java'
   testCompile 'org.assertj:assertj-core'
   testCompile 'org.assertj:assertj-guava'
-  testCompile 'com.googlecode.json-simple:json-simple'
-  testCompile 'org.skyscreamer:jsonassert:1.2.0'
-  testCompile 'com.squareup.okhttp3:mockwebserver'
-  testCompile 'org.subethamail:subethasmtp'
+  testCompile "org.eclipse.jetty:jetty-proxy:${jettyVersion}"
   testCompile "org.eclipse.jetty:jetty-server:${jettyVersion}"
   testCompile "org.eclipse.jetty:jetty-servlet:${jettyVersion}"
-  testCompile "org.eclipse.jetty:jetty-proxy:${jettyVersion}"
   testCompile "org.jboss.byteman:byteman-submit:${bytemanVersion}"
-  testCompile 'com.microsoft.sqlserver:mssql-jdbc'
-  testCompile 'mysql:mysql-connector-java'
   testCompile 'org.postgresql:postgresql'
-  testCompile 'com.oracle.jdbc:ojdbc8'
+  testCompile 'org.skyscreamer:jsonassert:1.2.0'
+  testCompile 'org.sonarsource.orchestrator:sonar-orchestrator'
+  testCompile 'org.subethamail:subethasmtp'
+  testCompile project(':server:sonar-qa-util')
+  testCompile project(':sonar-ws')
 
   includeInTestResources "org.jboss.byteman:byteman:${bytemanVersion}"
 }