- fix tests - use plugin api from artifactorytags/9.5.0.56709
@@ -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' |
@@ -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' |
@@ -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') | |||
@@ -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' | |||
@@ -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') |
@@ -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' | |||
} |
@@ -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') | |||
@@ -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' |
@@ -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') |
@@ -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' | |||
@@ -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') | |||
@@ -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' | |||
@@ -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' | |||
@@ -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') | |||
@@ -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' |
@@ -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' |
@@ -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') | |||
@@ -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' |
@@ -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' |
@@ -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. |
@@ -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' | |||
@@ -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' |
@@ -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 { |
@@ -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() { |
@@ -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 | |||
} | |||
} | |||
} |
@@ -0,0 +1,5 @@ | |||
<?xml version="1.0"?> | |||
<!DOCTYPE test SYSTEM "http://com.foo.bar/fake.dtd"> | |||
<test> | |||
<another-test/> | |||
</test> |
@@ -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> |
@@ -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' |
@@ -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' | |||
} |