SONAR-16232 Add dependencies to new sonar-plugin-api

- fix tests
- use plugin api from artifactory

15 files changed, 16 insertions, 17 deletions

diff --git a/server/sonar-alm-client/build.gradle b/server/sonar-alm-client/build.gradle
index 24941c47926..3a973be49b2 100644
--- a/server/sonar-alm-client/build.gradle
+++ b/server/sonar-alm-client/build.gradle
@@ -1,15 +1,16 @@
 description = 'SonarQube :: ALM integrations :: Clients'
 
 dependencies {
-    compile project(path: ':sonar-plugin-api', configuration: 'shadow')
     compile project(':sonar-ws')
     compile project(':server:sonar-webserver-api')
+
     compile 'com.google.code.gson:gson'
     compile 'com.google.guava:guava'
     compile 'com.squareup.okhttp3:okhttp'
     compile 'commons-codec:commons-codec'
     compile 'com.auth0:java-jwt'
     compile 'org.bouncycastle:bcpkix-jdk15on:1.70'
+    compile'org.sonarsource.api.plugin:sonar-plugin-api'
 
     testCompile project(':sonar-plugin-api-impl')
 
diff --git a/server/sonar-ce-common/build.gradle b/server/sonar-ce-common/build.gradle
index 02edbe428bc..f02fe38e611 100644
--- a/server/sonar-ce-common/build.gradle
+++ b/server/sonar-ce-common/build.gradle
@@ -34,10 +34,10 @@ dependencies {
   compile 'com.google.guava:guava'
   compile 'org.slf4j:jul-to-slf4j'
   compile 'org.slf4j:slf4j-api'
+  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
   compile project(':server:sonar-ce-task')
   compile project(':server:sonar-server-common')
   compile project(':sonar-core')
-  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
 
   compileOnly 'com.google.code.findbugs:jsr305'
 
diff --git a/server/sonar-ce-task-projectanalysis/build.gradle b/server/sonar-ce-task-projectanalysis/build.gradle
index bca65c795f6..78d04b04452 100644
--- a/server/sonar-ce-task-projectanalysis/build.gradle
+++ b/server/sonar-ce-task-projectanalysis/build.gradle
@@ -29,6 +29,7 @@ dependencies {
   compile 'com.google.protobuf:protobuf-java'
   compile 'com.googlecode.java-diff-utils:diffutils'
   compile 'org.mybatis:mybatis'
+  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
 
   compile project(':sonar-core')
   compile project(':server:sonar-ce-common')
@@ -36,7 +37,6 @@ dependencies {
   compile project(':server:sonar-db-migration')
   compile project(':server:sonar-process')
   compile project(':server:sonar-server-common')
-  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
   compile project(':sonar-plugin-api-impl')
   compile project(':sonar-duplications')
   compile project(':sonar-scanner-protocol')
diff --git a/server/sonar-ce-task/build.gradle b/server/sonar-ce-task/build.gradle
index d7d426b8b51..5bbea313583 100644
--- a/server/sonar-ce-task/build.gradle
+++ b/server/sonar-ce-task/build.gradle
@@ -24,8 +24,8 @@ dependencies {
   compile project(':server:sonar-server-common')
   compile project(':sonar-core')
 
-  compileOnly project(path: ':sonar-plugin-api', configuration: 'shadow')
   compileOnly 'com.google.code.findbugs:jsr305'
+  compileOnly 'org.sonarsource.api.plugin:sonar-plugin-api'
 
   testCompile 'ch.qos.logback:logback-access'
   testCompile 'ch.qos.logback:logback-classic'
@@ -41,7 +41,6 @@ dependencies {
   testCompile testFixtures(project(':server:sonar-db-dao'))
 
   testFixturesApi 'org.assertj:assertj-core'
-  testFixturesApi project(path: ':sonar-plugin-api', configuration: 'shadow')
 
   testFixturesCompileOnly 'com.google.code.findbugs:jsr305'
 }
diff --git a/server/sonar-ce/build.gradle b/server/sonar-ce/build.gradle
index a495260bd6f..8225b29b676 100644
--- a/server/sonar-ce/build.gradle
+++ b/server/sonar-ce/build.gradle
@@ -15,6 +15,7 @@ dependencies {
   compile 'commons-io:commons-io'
   compile 'org.apache.commons:commons-dbcp2'
   compile 'org.nanohttpd:nanohttpd'
+  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
   compile project(':server:sonar-ce-common')
   compile project(':server:sonar-ce-task')
   compile project(':server:sonar-ce-task-projectanalysis')
@@ -22,7 +23,6 @@ dependencies {
   compile project(':server:sonar-ce-task')
   compile project(':server:sonar-server-common')
   compile project(':sonar-core')
-  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
   compile project(':sonar-plugin-api-impl')
   compile project(':sonar-ws')
   
diff --git a/server/sonar-db-core/build.gradle b/server/sonar-db-core/build.gradle
index 3e1290bfd7c..83bd1e9c8c2 100644
--- a/server/sonar-db-core/build.gradle
+++ b/server/sonar-db-core/build.gradle
@@ -15,8 +15,8 @@ dependencies {
   compile 'org.apache.commons:commons-dbcp2'
   compile 'org.mybatis:mybatis'
   compile 'org.slf4j:slf4j-api'
+  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
   compile project(':server:sonar-process')
-  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
   compile project(':sonar-plugin-api-impl')
 
   compileOnly 'com.google.code.findbugs:jsr305'
diff --git a/server/sonar-db-dao/build.gradle b/server/sonar-db-dao/build.gradle
index cb317501714..eecd0a08593 100644
--- a/server/sonar-db-dao/build.gradle
+++ b/server/sonar-db-dao/build.gradle
@@ -13,7 +13,7 @@ dependencies {
   compile 'commons-lang:commons-lang'
   compile 'net.jpountz.lz4:lz4'
   compile 'org.mybatis:mybatis'
-  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
+  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
 
   compile project(':server:sonar-db-core')
   compile project(':server:sonar-db-migration')
diff --git a/server/sonar-process/build.gradle b/server/sonar-process/build.gradle
index e075136b8e1..fcdce73fbf0 100644
--- a/server/sonar-process/build.gradle
+++ b/server/sonar-process/build.gradle
@@ -19,8 +19,8 @@ dependencies {
   compile 'com.hazelcast:hazelcast-kubernetes'
   compile 'org.slf4j:jul-to-slf4j'
   compile 'org.slf4j:slf4j-api'
+  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
   compile project(':sonar-core')
-  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
 
   compileOnly 'com.google.code.findbugs:jsr305'
 
diff --git a/server/sonar-server-common/build.gradle b/server/sonar-server-common/build.gradle
index 4d768ea1f69..71e74568cfd 100644
--- a/server/sonar-server-common/build.gradle
+++ b/server/sonar-server-common/build.gradle
@@ -16,12 +16,12 @@ dependencies {
   compile 'org.slf4j:slf4j-api'
   compile 'com.squareup.okhttp3:okhttp'
   compile 'org.elasticsearch.client:elasticsearch-rest-high-level-client'
+  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
   compile project(':server:sonar-db-dao')
   compile project(':server:sonar-db-migration')
   compile project(':server:sonar-process')
   compile project(':sonar-core')
   compile project(':sonar-markdown')
-  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
   compile project(':sonar-ws')
 
   compileOnly 'com.google.code.findbugs:jsr305'
@@ -39,7 +39,6 @@ dependencies {
   testCompile 'org.hamcrest:hamcrest-core'
   testCompile 'org.mockito:mockito-core'
   testCompile testFixtures(project(':server:sonar-db-dao'))
-  testCompile project(path: ':sonar-plugin-api', configuration: 'shadow')
   testCompile project(':sonar-plugin-api-impl')
   testCompile project(':sonar-testing-harness')
     
diff --git a/server/sonar-webserver-api/build.gradle b/server/sonar-webserver-api/build.gradle
index bdf336d1874..baa5b8aa75a 100644
--- a/server/sonar-webserver-api/build.gradle
+++ b/server/sonar-webserver-api/build.gradle
@@ -20,10 +20,10 @@ dependencies {
   compile 'com.google.guava:guava'
   compile 'io.jsonwebtoken:jjwt-api'
   compile 'io.jsonwebtoken:jjwt-impl'
+  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
   compile project(':sonar-core')
   compile project(':server:sonar-process')
   compile project(':server:sonar-server-common')
-  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
   compile project(':sonar-plugin-api-impl')
   compile 'org.mindrot:jbcrypt'
 
diff --git a/server/sonar-webserver-auth/build.gradle b/server/sonar-webserver-auth/build.gradle
index c4ecfce2477..70141fa24f5 100644
--- a/server/sonar-webserver-auth/build.gradle
+++ b/server/sonar-webserver-auth/build.gradle
@@ -11,11 +11,11 @@ dependencies {
   compile 'com.google.guava:guava'
   compile 'io.jsonwebtoken:jjwt-api'
   compile 'io.jsonwebtoken:jjwt-impl'
+  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
   compile project(':sonar-core')
   compile project(':server:sonar-process')
   compile project(':server:sonar-server-common')
   compile project(':server:sonar-webserver-api')
-  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
   compile project(':sonar-plugin-api-impl')
   compile 'org.mindrot:jbcrypt'
 
diff --git a/server/sonar-webserver-core/build.gradle b/server/sonar-webserver-core/build.gradle
index 3c76f65098e..622bbfb5a95 100644
--- a/server/sonar-webserver-core/build.gradle
+++ b/server/sonar-webserver-core/build.gradle
@@ -31,6 +31,7 @@ dependencies {
   compile 'org.apache.commons:commons-dbcp2'
   compile 'org.slf4j:jul-to-slf4j'
   compile 'org.slf4j:slf4j-api'
+  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
   compile 'org.sonarsource.update-center:sonar-update-center-common'
   compile 'org.mindrot:jbcrypt'
 
@@ -47,7 +48,6 @@ dependencies {
   compile project(':sonar-duplications')
   compile project(':sonar-scanner-protocol')
   compile project(':sonar-markdown')
-  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
   compile project(':sonar-plugin-api-impl')
   compile project(':sonar-ws')
 
diff --git a/server/sonar-webserver-es/build.gradle b/server/sonar-webserver-es/build.gradle
index 1e72c130fc7..dd127fd35c3 100644
--- a/server/sonar-webserver-es/build.gradle
+++ b/server/sonar-webserver-es/build.gradle
@@ -8,9 +8,9 @@ dependencies {
   // please keep the list grouped by configuration and ordered by name
 
   compile 'com.google.guava:guava'
+  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
   compile project(':server:sonar-server-common')
   compile project(':server:sonar-webserver-auth')
-  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
 
   compileOnly 'com.google.code.findbugs:jsr305'
   compileOnly 'javax.servlet:javax.servlet-api'
diff --git a/server/sonar-webserver-monitoring/build.gradle b/server/sonar-webserver-monitoring/build.gradle
index 45541df8947..2c5bd4674b4 100644
--- a/server/sonar-webserver-monitoring/build.gradle
+++ b/server/sonar-webserver-monitoring/build.gradle
@@ -1,11 +1,11 @@
 description = 'SonarQube :: Monitoring'
 
 dependencies {
-    compile project(path: ':sonar-plugin-api', configuration: 'shadow')
     compile project(':server:sonar-webserver-api')
     compile project(':server:sonar-webserver-pushapi')
     compile project(':server:sonar-alm-client')
     compile 'io.prometheus:simpleclient'
+    compile'org.sonarsource.api.plugin:sonar-plugin-api'
 
     testCompile 'junit:junit'
     testCompile 'org.assertj:assertj-core'
diff --git a/server/sonar-webserver-ws/build.gradle b/server/sonar-webserver-ws/build.gradle
index 3fa8fed9bb6..535d1036e5f 100644
--- a/server/sonar-webserver-ws/build.gradle
+++ b/server/sonar-webserver-ws/build.gradle
@@ -10,9 +10,9 @@ dependencies {
   // please keep the list grouped by configuration and ordered by name
 
   compile 'com.google.guava:guava'
+  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
   compile project(':sonar-core')
   compile project(':server:sonar-webserver-api')
-  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
   compile project(':sonar-plugin-api-impl')
   compile project(':sonar-ws')