aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.gradle1
-rw-r--r--plugins/sonar-xoo-plugin/build.gradle3
-rw-r--r--server/sonar-alm-client/build.gradle3
-rw-r--r--server/sonar-ce-common/build.gradle2
-rw-r--r--server/sonar-ce-task-projectanalysis/build.gradle2
-rw-r--r--server/sonar-ce-task/build.gradle3
-rw-r--r--server/sonar-ce/build.gradle2
-rw-r--r--server/sonar-db-core/build.gradle2
-rw-r--r--server/sonar-db-dao/build.gradle2
-rw-r--r--server/sonar-process/build.gradle2
-rw-r--r--server/sonar-server-common/build.gradle3
-rw-r--r--server/sonar-webserver-api/build.gradle2
-rw-r--r--server/sonar-webserver-auth/build.gradle2
-rw-r--r--server/sonar-webserver-core/build.gradle2
-rw-r--r--server/sonar-webserver-es/build.gradle2
-rw-r--r--server/sonar-webserver-monitoring/build.gradle2
-rw-r--r--server/sonar-webserver-ws/build.gradle2
-rw-r--r--sonar-application/build.gradle2
-rw-r--r--sonar-core/build.gradle2
-rw-r--r--sonar-core/src/main/java/org/sonar/core/i18n/I18n.java2
-rw-r--r--sonar-duplications/build.gradle2
-rw-r--r--sonar-plugin-api-impl/build.gradle3
-rw-r--r--sonar-scanner-engine/build.gradle4
-rw-r--r--sonar-scanner-engine/src/test/java/org/sonar/scanner/genericcoverage/StaxParserTest.java4
-rw-r--r--sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tasks/TasksMediumTest.java19
-rw-r--r--sonar-scanner-engine/src/test/resources/org/sonar/scanner/genericcoverage/xml-dtd-test.xml5
-rw-r--r--sonar-scanner-engine/src/test/resources/org/sonar/scanner/genericcoverage/xml-xsd-test.xml6
-rw-r--r--sonar-ws/build.gradle2
-rw-r--r--ut-monitoring/build.gradle2
29 files changed, 42 insertions, 48 deletions
diff --git a/build.gradle b/build.gradle
index 6d206c9efc7..00825518e65 100644
--- a/build.gradle
+++ b/build.gradle
@@ -172,6 +172,7 @@ subprojects {
dependency 'org.sonarsource.kotlin:sonar-kotlin-plugin:2.9.0.1147'
dependency 'org.sonarsource.slang:sonar-ruby-plugin:1.9.0.3429'
dependency 'org.sonarsource.slang:sonar-scala-plugin:1.9.0.3429'
+ dependency 'org.sonarsource.api.plugin:sonar-plugin-api:9.5.0.29'
dependency 'org.sonarsource.xml:sonar-xml-plugin:2.5.0.3376'
dependency 'org.sonarsource.iac:sonar-iac-plugin:1.7.0.2012'
dependency 'org.sonarsource.text:sonar-text-plugin:1.0.0.120'
diff --git a/plugins/sonar-xoo-plugin/build.gradle b/plugins/sonar-xoo-plugin/build.gradle
index 61f7e7e5e1a..f194b7d1786 100644
--- a/plugins/sonar-xoo-plugin/build.gradle
+++ b/plugins/sonar-xoo-plugin/build.gradle
@@ -7,8 +7,9 @@ dependencies {
compile 'commons-io:commons-io'
compile 'commons-lang:commons-lang'
compile 'org.apache.commons:commons-csv'
- compileOnly project(path: ':sonar-plugin-api', configuration: 'shadow')
+
compileOnly 'com.google.code.findbugs:jsr305'
+ compileOnly 'org.sonarsource.api.plugin:sonar-plugin-api'
testCompile 'junit:junit'
testCompile 'org.assertj:assertj-core'
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')
diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index bcf36fec3a3..6c33d0cb04a 100644
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -51,12 +51,12 @@ dependencies {
compile 'org.slf4j:slf4j-api'
compile 'org.elasticsearch.client:elasticsearch-rest-high-level-client'
+ compile 'org.sonarsource.api.plugin:sonar-plugin-api'
compile project(':server:sonar-ce')
compile project(':server:sonar-main')
compile project(':server:sonar-process')
compile project(':server:sonar-webserver')
compile project(':sonar-core')
- compile project(path: ':sonar-plugin-api', configuration: 'shadow')
compile project(':sonar-plugin-api-impl')
compileOnly 'com.google.code.findbugs:jsr305'
diff --git a/sonar-core/build.gradle b/sonar-core/build.gradle
index 024708d515b..43dabb80cb4 100644
--- a/sonar-core/build.gradle
+++ b/sonar-core/build.gradle
@@ -18,9 +18,9 @@ dependencies {
compile 'javax.inject:javax.inject'
compile 'org.codehaus.sonar:sonar-classloader'
compile 'org.slf4j:slf4j-api'
+ compile 'org.sonarsource.api.plugin:sonar-plugin-api'
compile 'org.sonarsource.update-center:sonar-update-center-common'
compile 'org.springframework:spring-context'
- compile project(path: ':sonar-plugin-api', configuration: 'shadow')
compile project(':sonar-plugin-api-impl')
compileOnly 'com.google.code.findbugs:jsr305'
diff --git a/sonar-core/src/main/java/org/sonar/core/i18n/I18n.java b/sonar-core/src/main/java/org/sonar/core/i18n/I18n.java
index 599ed9206ab..ec525f1c450 100644
--- a/sonar-core/src/main/java/org/sonar/core/i18n/I18n.java
+++ b/sonar-core/src/main/java/org/sonar/core/i18n/I18n.java
@@ -27,7 +27,7 @@ import org.sonar.api.server.ServerSide;
@ServerSide
@ComputeEngineSide
-public interface I18n extends org.sonar.api.i18n.I18n {
+public interface I18n {
/**
* Searches the message of the <code>key</code> for the <code>locale</code> in the list of available bundles.
diff --git a/sonar-duplications/build.gradle b/sonar-duplications/build.gradle
index 92557e9ad62..858131ff52b 100644
--- a/sonar-duplications/build.gradle
+++ b/sonar-duplications/build.gradle
@@ -8,7 +8,7 @@ dependencies {
// please keep list ordered
compile 'org.codehaus.sonar:sonar-channel'
- compile project(path: ':sonar-plugin-api', configuration: 'shadow')
+ compile 'org.sonarsource.api.plugin:sonar-plugin-api'
compileOnly 'com.google.code.findbugs:jsr305'
diff --git a/sonar-plugin-api-impl/build.gradle b/sonar-plugin-api-impl/build.gradle
index ee9930a295d..4acfafdc0e1 100644
--- a/sonar-plugin-api-impl/build.gradle
+++ b/sonar-plugin-api-impl/build.gradle
@@ -11,8 +11,7 @@ dependencies {
compile 'commons-io:commons-io'
compile 'commons-lang:commons-lang'
compile 'org.apache.commons:commons-csv'
-
- compile project(path: ':sonar-plugin-api', configuration: 'shadow')
+ compile 'org.sonarsource.api.plugin:sonar-plugin-api'
compileOnly 'com.google.code.findbugs:jsr305'
compileOnly 'junit:junit'
diff --git a/sonar-scanner-engine/build.gradle b/sonar-scanner-engine/build.gradle
index 3aa87f8962b..62841af3c82 100644
--- a/sonar-scanner-engine/build.gradle
+++ b/sonar-scanner-engine/build.gradle
@@ -33,6 +33,7 @@ dependencies {
compile 'org.slf4j:jul-to-slf4j'
compile 'org.slf4j:log4j-over-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.springframework:spring-context'
@@ -41,9 +42,7 @@ dependencies {
compile project(':sonar-scanner-protocol')
compile project(':sonar-ws')
compile project(':sonar-duplications')
-
compile project(':sonar-plugin-api-impl')
- compile project(path: ':sonar-plugin-api', configuration: 'shadow')
compileOnly 'com.google.code.findbugs:jsr305'
@@ -58,7 +57,6 @@ dependencies {
testCompile 'org.hamcrest:hamcrest-core'
testCompile 'org.mockito:mockito-core'
testCompile project(':plugins:sonar-xoo-plugin')
- testCompile project(':sonar-plugin-api').sourceSets.test.output
}
license {
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/genericcoverage/StaxParserTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/genericcoverage/StaxParserTest.java
index 53057d5bfbe..199c74043bb 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/genericcoverage/StaxParserTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/genericcoverage/StaxParserTest.java
@@ -29,13 +29,13 @@ public class StaxParserTest {
@Test
public void testXMLWithDTD() throws XMLStreamException {
StaxParser parser = new StaxParser(getTestHandler());
- parser.parse(getClass().getClassLoader().getResourceAsStream("org/sonar/api/utils/StaxParserTest/xml-dtd-test.xml"));
+ parser.parse(getClass().getClassLoader().getResourceAsStream("org/sonar/scanner/genericcoverage/xml-dtd-test.xml"));
}
@Test
public void testXMLWithXSD() throws XMLStreamException {
StaxParser parser = new StaxParser(getTestHandler());
- parser.parse(getClass().getClassLoader().getResourceAsStream("org/sonar/api/utils/StaxParserTest/xml-xsd-test.xml"));
+ parser.parse(getClass().getClassLoader().getResourceAsStream("org/sonar/scanner/genericcoverage/xml-xsd-test.xml"));
}
private StaxParser.XmlStreamHandler getTestHandler() {
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tasks/TasksMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tasks/TasksMediumTest.java
index a566fb7b0d0..a40045a33a7 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tasks/TasksMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tasks/TasksMediumTest.java
@@ -23,8 +23,6 @@ import com.google.common.collect.ImmutableMap;
import org.junit.Rule;
import org.junit.Test;
import org.sonar.api.Plugin;
-import org.sonar.api.task.Task;
-import org.sonar.api.task.TaskDefinition;
import org.sonar.api.utils.MessageException;
import org.sonar.api.utils.log.LogTester;
import org.sonar.scanner.mediumtest.ScannerMediumTester;
@@ -39,7 +37,7 @@ public class TasksMediumTest {
@Rule
public ScannerMediumTester tester = new ScannerMediumTester()
- .registerPlugin("faketask", new FakeTaskPlugin());
+ .registerPlugin("faketask", new FakePlugin());
@Test
public void failWhenCallingTask() {
@@ -67,24 +65,11 @@ public class TasksMediumTest {
}
}
- private static class FakeTaskPlugin implements Plugin {
+ private static class FakePlugin implements Plugin {
@Override
public void define(Context context) {
- context.addExtensions(FakeTask.DEF, FakeTask.class);
}
}
- private static class FakeTask implements Task {
-
- public static final TaskDefinition DEF = TaskDefinition.builder().key("fake").description("Fake description").taskClass(FakeTask.class).build();
-
- @Override
- public void execute() {
- // TODO Auto-generated method stub
-
- }
-
- }
-
}
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/scanner/genericcoverage/xml-dtd-test.xml b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/genericcoverage/xml-dtd-test.xml
new file mode 100644
index 00000000000..7e643b8b6fe
--- /dev/null
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/genericcoverage/xml-dtd-test.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE test SYSTEM "http://com.foo.bar/fake.dtd">
+<test>
+ <another-test/>
+</test> \ No newline at end of file
diff --git a/sonar-scanner-engine/src/test/resources/org/sonar/scanner/genericcoverage/xml-xsd-test.xml b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/genericcoverage/xml-xsd-test.xml
new file mode 100644
index 00000000000..69f7f0e1ac1
--- /dev/null
+++ b/sonar-scanner-engine/src/test/resources/org/sonar/scanner/genericcoverage/xml-xsd-test.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<test xmlns="http://www.test.org"
+ xmlns:xsi="http://www.w3.org/1999/XMLSchema/instance"
+ xsi:schemaLocation="http://www.test.org http://foo.bar.org/test.xsd">
+ <another-test/>
+</test>
diff --git a/sonar-ws/build.gradle b/sonar-ws/build.gradle
index 0665efae5f6..a01d386e89d 100644
--- a/sonar-ws/build.gradle
+++ b/sonar-ws/build.gradle
@@ -15,10 +15,10 @@ dependencies {
compile 'com.google.protobuf:protobuf-java'
compile 'com.squareup.okhttp3:okhttp'
compile 'com.google.code.gson:gson'
+ compile 'org.sonarsource.api.plugin:sonar-plugin-api'
compileOnly 'com.google.code.findbugs:jsr305'
compileOnly 'javax.annotation:javax.annotation-api'
- compileOnly project(path: ':sonar-plugin-api', configuration: 'shadow')
testCompile 'com.squareup.okhttp3:mockwebserver'
testCompile 'com.squareup.okio:okio'
diff --git a/ut-monitoring/build.gradle b/ut-monitoring/build.gradle
index 84f4b1ac066..173f087ba59 100644
--- a/ut-monitoring/build.gradle
+++ b/ut-monitoring/build.gradle
@@ -9,7 +9,7 @@ dependencies {
compile 'com.google.code.gson:gson'
compile 'junit:junit'
- compile project(path: ':sonar-plugin-api', configuration: 'shadow')
+ compile 'org.sonarsource.api.plugin:sonar-plugin-api'
compileOnly 'org.aspectj:aspectjtools'
}