Browse Source

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

- fix tests
- use plugin api from artifactory
tags/9.5.0.56709
Duarte Meneses 2 years ago
parent
commit
b2b5d2819a
29 changed files with 42 additions and 48 deletions
  1. 1
    0
      build.gradle
  2. 2
    1
      plugins/sonar-xoo-plugin/build.gradle
  3. 2
    1
      server/sonar-alm-client/build.gradle
  4. 1
    1
      server/sonar-ce-common/build.gradle
  5. 1
    1
      server/sonar-ce-task-projectanalysis/build.gradle
  6. 1
    2
      server/sonar-ce-task/build.gradle
  7. 1
    1
      server/sonar-ce/build.gradle
  8. 1
    1
      server/sonar-db-core/build.gradle
  9. 1
    1
      server/sonar-db-dao/build.gradle
  10. 1
    1
      server/sonar-process/build.gradle
  11. 1
    2
      server/sonar-server-common/build.gradle
  12. 1
    1
      server/sonar-webserver-api/build.gradle
  13. 1
    1
      server/sonar-webserver-auth/build.gradle
  14. 1
    1
      server/sonar-webserver-core/build.gradle
  15. 1
    1
      server/sonar-webserver-es/build.gradle
  16. 1
    1
      server/sonar-webserver-monitoring/build.gradle
  17. 1
    1
      server/sonar-webserver-ws/build.gradle
  18. 1
    1
      sonar-application/build.gradle
  19. 1
    1
      sonar-core/build.gradle
  20. 1
    1
      sonar-core/src/main/java/org/sonar/core/i18n/I18n.java
  21. 1
    1
      sonar-duplications/build.gradle
  22. 1
    2
      sonar-plugin-api-impl/build.gradle
  23. 1
    3
      sonar-scanner-engine/build.gradle
  24. 2
    2
      sonar-scanner-engine/src/test/java/org/sonar/scanner/genericcoverage/StaxParserTest.java
  25. 2
    17
      sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tasks/TasksMediumTest.java
  26. 5
    0
      sonar-scanner-engine/src/test/resources/org/sonar/scanner/genericcoverage/xml-dtd-test.xml
  27. 6
    0
      sonar-scanner-engine/src/test/resources/org/sonar/scanner/genericcoverage/xml-xsd-test.xml
  28. 1
    1
      sonar-ws/build.gradle
  29. 1
    1
      ut-monitoring/build.gradle

+ 1
- 0
build.gradle View File

@@ -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'

+ 2
- 1
plugins/sonar-xoo-plugin/build.gradle View File

@@ -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'

+ 2
- 1
server/sonar-alm-client/build.gradle View File

@@ -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')


+ 1
- 1
server/sonar-ce-common/build.gradle View File

@@ -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'


+ 1
- 1
server/sonar-ce-task-projectanalysis/build.gradle View File

@@ -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')

+ 1
- 2
server/sonar-ce-task/build.gradle View File

@@ -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'
}

+ 1
- 1
server/sonar-ce/build.gradle View File

@@ -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')

+ 1
- 1
server/sonar-db-core/build.gradle View File

@@ -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'

+ 1
- 1
server/sonar-db-dao/build.gradle View File

@@ -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')

+ 1
- 1
server/sonar-process/build.gradle View File

@@ -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'


+ 1
- 2
server/sonar-server-common/build.gradle View File

@@ -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')

+ 1
- 1
server/sonar-webserver-api/build.gradle View File

@@ -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'


+ 1
- 1
server/sonar-webserver-auth/build.gradle View File

@@ -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'


+ 1
- 1
server/sonar-webserver-core/build.gradle View File

@@ -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')


+ 1
- 1
server/sonar-webserver-es/build.gradle View File

@@ -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
- 1
server/sonar-webserver-monitoring/build.gradle View File

@@ -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'

+ 1
- 1
server/sonar-webserver-ws/build.gradle View File

@@ -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')


+ 1
- 1
sonar-application/build.gradle View File

@@ -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'

+ 1
- 1
sonar-core/build.gradle View File

@@ -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'

+ 1
- 1
sonar-core/src/main/java/org/sonar/core/i18n/I18n.java View File

@@ -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.

+ 1
- 1
sonar-duplications/build.gradle View File

@@ -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'


+ 1
- 2
sonar-plugin-api-impl/build.gradle View File

@@ -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'

+ 1
- 3
sonar-scanner-engine/build.gradle View File

@@ -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 {

+ 2
- 2
sonar-scanner-engine/src/test/java/org/sonar/scanner/genericcoverage/StaxParserTest.java View File

@@ -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() {

+ 2
- 17
sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tasks/TasksMediumTest.java View File

@@ -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

}

}

}

+ 5
- 0
sonar-scanner-engine/src/test/resources/org/sonar/scanner/genericcoverage/xml-dtd-test.xml View File

@@ -0,0 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE test SYSTEM "http://com.foo.bar/fake.dtd">
<test>
<another-test/>
</test>

+ 6
- 0
sonar-scanner-engine/src/test/resources/org/sonar/scanner/genericcoverage/xml-xsd-test.xml View File

@@ -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>

+ 1
- 1
sonar-ws/build.gradle View File

@@ -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'

+ 1
- 1
ut-monitoring/build.gradle View File

@@ -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'
}

Loading…
Cancel
Save