@@ -87,8 +87,8 @@ allprojects { | |||
subprojects { | |||
apply plugin: 'com.github.hierynomus.license' | |||
apply plugin: 'io.spring.dependency-management' | |||
apply plugin: 'java' | |||
apply plugin: 'jacoco' | |||
apply plugin: 'java' | |||
apply plugin: 'idea' | |||
apply plugin: 'org.owasp.dependencycheck' | |||
@@ -153,12 +153,14 @@ subprojects { | |||
dependency 'io.jsonwebtoken:jjwt-api:0.10.5' | |||
dependency 'io.jsonwebtoken:jjwt-impl:0.10.5' | |||
dependency 'io.jsonwebtoken:jjwt-jackson:0.10.5' | |||
dependency 'io.netty:netty-all:4.0.51.Final' | |||
dependency 'com.sun.mail:javax.mail:1.5.6' | |||
dependency 'javax.annotation:javax.annotation-api:1.3.1' | |||
dependency 'javax.servlet:javax.servlet-api:3.0.1' | |||
dependency 'javax.xml.bind:jaxb-api:2.3.0' | |||
dependency 'junit:junit:4.12' | |||
dependency 'net.jpountz.lz4:lz4:1.3.0' | |||
dependency 'net.lightbody.bmp:littleproxy:1.1.0-beta-bmp-17' | |||
dependency 'org.awaitility:awaitility:3.1.6' | |||
dependency 'org.apache.commons:commons-csv:1.4' | |||
dependency 'org.apache.commons:commons-email:1.5' | |||
@@ -215,8 +217,8 @@ subprojects { | |||
exclude 'org.elasticsearch.plugin:reindex-client' | |||
exclude 'org.elasticsearch.plugin:rank-eval-client' | |||
} | |||
dependency('org.elasticsearch:mocksocket:1.0') | |||
dependency('org.codelibs.elasticsearch.module:analysis-common:6.8.0') | |||
dependency 'org.elasticsearch:mocksocket:1.0' | |||
dependency 'org.codelibs.elasticsearch.module:analysis-common:6.8.0' | |||
dependency 'org.freemarker:freemarker:2.3.20' | |||
dependency 'org.hamcrest:hamcrest-all:1.3' | |||
dependency 'org.jsoup:jsoup:1.11.3' | |||
@@ -239,6 +241,7 @@ subprojects { | |||
dependency 'org.sonarsource.orchestrator:sonar-orchestrator:3.26.0.2111' | |||
dependency 'org.sonarsource.update-center:sonar-update-center-common:1.18.0.487' | |||
dependency 'org.subethamail:subethasmtp:3.1.7' | |||
dependency 'org.yaml:snakeyaml:1.17' | |||
dependency 'xml-apis:xml-apis:1.4.01' | |||
// please keep this list alphabetically ordered |
@@ -7,9 +7,8 @@ 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') | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
runtime project(path: ':sonar-plugin-api', configuration: 'shadow') | |||
compileOnly project(path: ':sonar-plugin-api') | |||
testCompile 'junit:junit' | |||
testCompile 'org.assertj:assertj-core' |
@@ -31,25 +31,29 @@ configurations { | |||
dependencies { | |||
// please keep the list grouped by configuration and ordered by name | |||
compile 'com.google.guava:guava' | |||
compile 'org.slf4j:jul-to-slf4j' | |||
compile 'org.slf4j:slf4j-api' | |||
compile project(':server:sonar-ce-task') | |||
compile project(':server:sonar-db-dao') | |||
compile project(':server:sonar-server-common') | |||
compile project(':sonar-core') | |||
compile project(path: ':sonar-plugin-api', configuration: 'shadow') | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
compileOnly project(':server:sonar-ce-task') | |||
compileOnly project(':server:sonar-server-common') | |||
testCompile 'com.google.code.findbugs:jsr305' | |||
testCompile 'com.h2database:h2' | |||
testCompile 'com.tngtech.java:junit-dataprovider' | |||
testCompile 'commons-lang:commons-lang' | |||
testCompile 'junit:junit' | |||
testCompile 'org.apache.logging.log4j:log4j-api' | |||
testCompile 'org.apache.logging.log4j:log4j-core' | |||
testCompile 'org.assertj:assertj-core' | |||
testCompile 'org.assertj:assertj-guava' | |||
testCompile 'org.mockito:mockito-core' | |||
testCompile project(':sonar-plugin-api') | |||
testCompile project(':sonar-core') | |||
testCompile 'org.hamcrest:hamcrest-all' | |||
testCompile project(':sonar-plugin-api-impl') | |||
testCompile project(':server:sonar-db-testing') | |||
testCompile project(path: ":server:sonar-server-common", configuration: "tests") | |||
testRuntime 'com.h2database:h2' | |||
} |
@@ -25,16 +25,30 @@ dependencies { | |||
compile 'org.slf4j:jul-to-slf4j' | |||
compile 'org.slf4j:slf4j-api' | |||
compile 'commons-codec:commons-codec' | |||
compile 'commons-io:commons-io' | |||
compile 'commons-lang:commons-lang' | |||
compile 'com.google.code.gson:gson' | |||
compile 'com.google.guava:guava' | |||
compile 'com.google.code.findbugs:jsr305' | |||
compile 'com.google.protobuf:protobuf-java' | |||
compile 'com.googlecode.java-diff-utils:diffutils' | |||
compile 'org.mybatis:mybatis' | |||
compile 'org.picocontainer:picocontainer' | |||
compile project(':sonar-core') | |||
compile project(':server:sonar-ce-task') | |||
compile project(':server:sonar-db-core') | |||
compile project(':server:sonar-db-dao') | |||
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') | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
compileOnly 'com.googlecode.java-diff-utils:diffutils' | |||
compileOnly project(':sonar-core') | |||
compileOnly project(':server:sonar-ce-task') | |||
compileOnly project(':server:sonar-db-dao') | |||
compileOnly project(':server:sonar-process') | |||
compileOnly project(':server:sonar-server-common') | |||
compileOnly project(':sonar-plugin-api') | |||
compileOnly project(':sonar-plugin-api-impl') | |||
compileOnly project(':sonar-duplications') | |||
testCompile 'com.google.code.findbugs:jsr305' | |||
testCompile 'com.h2database:h2' | |||
@@ -47,6 +61,7 @@ dependencies { | |||
testCompile 'org.mockito:mockito-core' | |||
testCompile 'org.reflections:reflections' | |||
testCompile project(':server:sonar-db-testing') | |||
testCompile project(':sonar-testing-harness') | |||
testCompile project(path: ":server:sonar-ce-task", configuration: "tests") | |||
testCompile project(path: ":server:sonar-server", configuration: "tests") | |||
testCompile project(path: ":server:sonar-server-common", configuration: "tests") |
@@ -17,14 +17,15 @@ sourceSets { | |||
dependencies { | |||
// please keep the list grouped by configuration and ordered by name | |||
compile 'com.google.guava:guava' | |||
compile 'org.picocontainer:picocontainer' | |||
compile 'org.slf4j:jul-to-slf4j' | |||
compile 'org.slf4j:slf4j-api' | |||
compile project(':server:sonar-process') | |||
compile project(':server:sonar-db-dao') | |||
compile project(':server:sonar-server-common') | |||
compile project(':sonar-core') | |||
compileOnly project(path: ':sonar-plugin-api') | |||
compileOnly project(path: ':sonar-plugin-api', configuration: 'shadow') | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
@@ -8,22 +8,37 @@ sonarqube { | |||
dependencies { | |||
// please keep the list grouped by configuration and ordered by name | |||
compile 'com.google.guava:guava' | |||
compile 'com.google.protobuf:protobuf-java' | |||
compile 'com.hazelcast:hazelcast' | |||
compile 'commons-io:commons-io' | |||
compile 'org.apache.commons:commons-dbcp2' | |||
compile 'org.nanohttpd:nanohttpd' | |||
compile 'org.picocontainer:picocontainer' | |||
compile project(':server:sonar-ce-common') | |||
compile project(':server:sonar-ce-task') | |||
compile project(':server:sonar-ce-task-projectanalysis') | |||
compile project(':server:sonar-db-dao') | |||
compile project(':server:sonar-db-core') | |||
compile project(':server:sonar-process') | |||
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') | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
testCompile 'com.google.code.findbugs:jsr305' | |||
testCompile 'com.h2database:h2' | |||
testCompile 'com.tngtech.java:junit-dataprovider' | |||
testCompile 'junit:junit' | |||
testCompile 'org.assertj:assertj-core' | |||
testCompile 'org.assertj:assertj-guava' | |||
testCompile 'org.mockito:mockito-core' | |||
testCompile 'org.slf4j:slf4j-api' | |||
testCompile project(':server:sonar-db-testing') | |||
testRuntime 'com.h2database:h2' | |||
} |
@@ -9,16 +9,15 @@ dependencies { | |||
compile 'ch.qos.logback:logback-classic' | |||
compile 'ch.qos.logback:logback-core' | |||
compile 'commons-codec:commons-codec' | |||
compile 'org.apache.commons:commons-dbcp2' | |||
compile 'com.google.guava:guava' | |||
compile 'commons-dbutils:commons-dbutils' | |||
compile 'net.jpountz.lz4:lz4' | |||
compile 'org.apache.commons:commons-csv' | |||
compile 'commons-io:commons-io' | |||
compile 'commons-lang:commons-lang' | |||
compile 'org.apache.commons:commons-dbcp2' | |||
compile 'org.mybatis:mybatis' | |||
compile 'org.picocontainer:picocontainer' | |||
compile 'org.slf4j:slf4j-api' | |||
compile project(':server:sonar-process') | |||
compile project(':sonar-core') | |||
compile project(':sonar-scanner-protocol') | |||
compile project(path: ':sonar-plugin-api', configuration: 'shadow') | |||
compile project(':sonar-plugin-api-impl') | |||
@@ -61,9 +60,7 @@ task testJar(type: Jar) { | |||
from sourceSets.test.output | |||
} | |||
configurations { | |||
tests | |||
} | |||
configurations { tests { extendsFrom testRuntime } } | |||
artifacts { | |||
tests testJar |
@@ -7,8 +7,16 @@ sonarqube { | |||
dependencies { | |||
// please keep the list grouped by configuration and ordered by name | |||
compile 'com.google.guava:guava' | |||
compile 'com.google.protobuf:protobuf-java' | |||
compile 'commons-dbutils:commons-dbutils' | |||
compile 'commons-io:commons-io' | |||
compile 'commons-lang:commons-lang' | |||
compile 'net.jpountz.lz4:lz4' | |||
compile 'org.mybatis:mybatis' | |||
compile project(path: ':sonar-plugin-api', configuration: 'shadow') | |||
compile project(':server:sonar-db-core') | |||
compile project(':server:sonar-db-migration') | |||
compile project(':sonar-core') | |||
compileOnly 'com.google.code.findbugs:jsr305' |
@@ -7,7 +7,14 @@ sonarqube { | |||
dependencies { | |||
// please keep the list grouped by configuration and ordered by name | |||
compile 'com.google.guava:guava' | |||
compile 'commons-lang:commons-lang' | |||
compile 'commons-codec:commons-codec' | |||
compile 'org.picocontainer:picocontainer' | |||
compile 'commons-dbutils:commons-dbutils' | |||
compile project(':server:sonar-db-core') | |||
compile project(':server:sonar-process') | |||
compile project(':sonar-core') | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
@@ -17,8 +24,9 @@ dependencies { | |||
testCompile 'junit:junit' | |||
testCompile 'org.assertj:assertj-core' | |||
testCompile 'org.dbunit:dbunit' | |||
testCompile 'org.mockito:mockito-core' | |||
testCompile 'org.mindrot:jbcrypt' | |||
testCompile 'org.mockito:mockito-core' | |||
testCompile project(':sonar-scanner-protocol') | |||
testCompile project(':sonar-testing-harness') | |||
testCompile project(':server:sonar-db-core').sourceSets.test.output | |||
@@ -6,10 +6,8 @@ sonarqube { | |||
dependencies { | |||
// please keep the list grouped by configuration and ordered by name | |||
compile 'org.dbunit:dbunit' | |||
compile project(':server:sonar-db-core').sourceSets.test.output | |||
compile project(':server:sonar-db-dao').sourceSets.test.output | |||
compile project(':sonar-testing-harness') | |||
} |
@@ -8,16 +8,25 @@ dependencies { | |||
// please keep the list grouped by configuration and ordered by name | |||
compile 'ch.qos.logback:logback-classic' | |||
compile 'ch.qos.logback:logback-core' | |||
// Required by our usage of Guava for clustering : CeWorkerFactoryImpl.getClusteredWorkerUUIDs() | |||
compile 'com.google.guava:guava' | |||
compile 'com.hazelcast:hazelcast' | |||
compile 'com.hazelcast:hazelcast-client' | |||
compile 'commons-io:commons-io' | |||
compile 'commons-lang:commons-lang' | |||
compile 'io.netty:netty-common' | |||
compile 'org.apache.logging.log4j:log4j-to-slf4j' | |||
compile 'org.apache.logging.log4j:log4j-api' | |||
compile 'org.elasticsearch.client:transport' | |||
compile 'org.elasticsearch:elasticsearch' | |||
compile 'org.elasticsearch:elasticsearch-core' | |||
compile 'org.elasticsearch.plugin:transport-netty4-client' | |||
compile 'org.slf4j:slf4j-api' | |||
compile 'org.yaml:snakeyaml' | |||
compile project(':server:sonar-process') | |||
compile project(':sonar-core') | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
@@ -8,25 +8,27 @@ dependencies { | |||
// please keep the list grouped by configuration and ordered by name | |||
compile 'ch.qos.logback:logback-classic' | |||
compile 'ch.qos.logback:logback-core' | |||
compile 'commons-codec:commons-codec' | |||
compile 'commons-io:commons-io' | |||
compile 'commons-lang:commons-lang' | |||
compile 'com.google.code.gson:gson' | |||
compile 'com.google.guava:guava' | |||
compile 'com.google.protobuf:protobuf-java' | |||
compile 'com.hazelcast:hazelcast' | |||
compile 'org.slf4j:jul-to-slf4j' | |||
compile 'org.slf4j:slf4j-api' | |||
compile project(':sonar-core') | |||
compile project(path: ':sonar-plugin-api', configuration: 'shadow') | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
compileOnly 'com.google.protobuf:protobuf-java' | |||
compileOnly 'org.nanohttpd:nanohttpd' | |||
testCompile 'com.google.code.findbugs:jsr305' | |||
testCompile 'com.google.protobuf:protobuf-java' | |||
testCompile 'com.tngtech.java:junit-dataprovider' | |||
testCompile 'junit:junit' | |||
testCompile 'org.assertj:assertj-core' | |||
testCompile 'org.eclipse.jetty:jetty-server' | |||
testCompile 'org.hamcrest:hamcrest-core' | |||
testCompile 'org.mockito:mockito-core' | |||
testCompile 'org.awaitility:awaitility' | |||
testCompile project(':sonar-testing-harness') |
@@ -16,18 +16,20 @@ dependencies { | |||
// please keep the list grouped by configuration and ordered by name | |||
compile 'org.apache.commons:commons-email' | |||
compile 'commons-io:commons-io' | |||
compile 'commons-lang:commons-lang' | |||
compile 'com.google.guava:guava' | |||
compile 'org.slf4j:slf4j-api' | |||
compile 'com.squareup.okhttp3:okhttp' | |||
compile 'org.elasticsearch.client:transport' | |||
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 project(':sonar-plugin-api') | |||
compileOnly project(':server:sonar-process') | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
// "tests" dependencies are pulled by other modules which depends on "tests" configuration, "testCompile" are not pulled | |||
@@ -38,15 +40,18 @@ dependencies { | |||
testCompile 'com.google.code.findbugs:jsr305' | |||
testCompile 'com.h2database:h2' | |||
testCompile 'com.squareup.okhttp3:mockwebserver' | |||
testCompile 'com.squareup.okio:okio' | |||
testCompile 'com.tngtech.java:junit-dataprovider' | |||
testCompile 'junit:junit' | |||
testCompile 'org.apache.logging.log4j:log4j-api' | |||
testCompile 'org.apache.logging.log4j:log4j-core' | |||
testCompile 'org.assertj:assertj-core' | |||
testCompile 'org.assertj:assertj-guava' | |||
testCompile 'org.hamcrest:hamcrest-core' | |||
testCompile 'org.mockito:mockito-core' | |||
testCompile project(':server:sonar-db-testing') | |||
testCompile project(path: ':sonar-plugin-api', configuration: 'shadow') | |||
testCompile project(':sonar-plugin-api-impl') | |||
testCompile project(':sonar-testing-harness') | |||
} | |||
task testJar(type: Jar) { |
@@ -20,8 +20,6 @@ | |||
package org.sonar.server.qualityprofile; | |||
import com.google.common.collect.ImmutableSortedSet; | |||
import com.google.gson.JsonObject; | |||
import com.google.gson.JsonParser; | |||
import java.io.StringWriter; | |||
import java.util.Comparator; | |||
import java.util.Map; | |||
@@ -29,6 +27,8 @@ import java.util.SortedSet; | |||
import java.util.stream.Collectors; | |||
import java.util.stream.StreamSupport; | |||
import javax.annotation.concurrent.Immutable; | |||
import org.sonar.api.internal.google.gson.JsonObject; | |||
import org.sonar.api.internal.google.gson.JsonParser; | |||
import org.sonar.api.utils.text.JsonWriter; | |||
import org.sonar.core.util.UtcDateUtils; | |||
@@ -30,17 +30,13 @@ dependencies { | |||
compile 'ch.qos.logback:logback-core' | |||
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-dbutils:commons-dbutils' | |||
compile 'io.jsonwebtoken:jjwt-api' | |||
compile 'io.jsonwebtoken:jjwt-impl' | |||
compile 'javax.xml.bind:jaxb-api' | |||
compile 'org.apache.httpcomponents:httpclient' | |||
compile 'org.apache.logging.log4j:log4j-api' | |||
compile 'org.apache.tomcat.embed:tomcat-embed-core' | |||
compile 'org.apache.commons:commons-dbcp2' | |||
compile 'org.elasticsearch.client:transport' | |||
compile 'org.picocontainer:picocontainer' | |||
compile 'org.slf4j:jul-to-slf4j' | |||
compile 'org.slf4j:slf4j-api' | |||
@@ -55,11 +51,10 @@ dependencies { | |||
compile project(':server:sonar-process') | |||
compile project(':server:sonar-server-common') | |||
compile project(':sonar-core') | |||
compile project(':sonar-duplications') | |||
compile project(':sonar-scanner-protocol') | |||
compile project(':sonar-markdown') | |||
compile project(':sonar-duplications') | |||
runtime project(path: ':sonar-plugin-api', configuration: 'shadow') | |||
compileOnly project(path: ':sonar-plugin-api') | |||
compile project(path: ':sonar-plugin-api', configuration: 'shadow') | |||
compile project(':sonar-plugin-api-impl') | |||
compile project(':sonar-ws') | |||
@@ -84,6 +79,7 @@ dependencies { | |||
testCompile 'org.subethamail:subethasmtp' | |||
testCompile project(':server:sonar-db-testing') | |||
testCompile project(path: ":server:sonar-server-common", configuration: "tests") | |||
testCompile project(':sonar-testing-harness') | |||
runtime 'io.jsonwebtoken:jjwt-jackson' | |||
} |
@@ -33,12 +33,16 @@ ext { | |||
dependencies { | |||
// please keep list ordered | |||
compile 'org.slf4j:slf4j-api' | |||
compile 'org.elasticsearch.client:transport' | |||
compile project(':server:sonar-ce') | |||
compile project(':server:sonar-main') | |||
compile project(':server:sonar-process') | |||
compile project(':server:sonar-server') | |||
compile project(':sonar-core') | |||
compile project(path: ':sonar-plugin-api', configuration: 'shadow') | |||
compile project(':sonar-plugin-api-impl') | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
@@ -73,10 +77,6 @@ dependencies { | |||
bundledPlugin "org.sonarsource.slang:sonar-scala-plugin:${slangVersion}@jar" | |||
bundledPlugin 'org.sonarsource.typescript:sonar-typescript-plugin:1.9.0.3766@jar' | |||
bundledPlugin 'org.sonarsource.xml:sonar-xml-plugin:2.0.1.2020@jar' | |||
testCompile 'junit:junit' | |||
testCompile 'org.assertj:assertj-core' | |||
testCompile 'org.mockito:mockito-core' | |||
} | |||
jar { |
@@ -6,6 +6,4 @@ sonarqube { | |||
dependencies { | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
testCompile 'junit:junit' | |||
} |
@@ -9,9 +9,11 @@ dependencies { | |||
compile 'ch.qos.logback:logback-classic' | |||
compile 'ch.qos.logback:logback-core' | |||
compile 'com.google.guava:guava' | |||
compile 'com.google.protobuf:protobuf-java' | |||
compile 'commons-codec:commons-codec' | |||
compile 'org.apache.commons:commons-csv' | |||
compile 'commons-io:commons-io' | |||
compile 'commons-lang:commons-lang' | |||
compile 'org.codehaus.sonar:sonar-classloader' | |||
compile 'org.picocontainer:picocontainer' | |||
compile 'org.slf4j:slf4j-api' | |||
@@ -24,6 +26,7 @@ dependencies { | |||
testCompile 'com.tngtech.java:junit-dataprovider' | |||
testCompile 'junit:junit' | |||
testCompile 'org.assertj:assertj-core' | |||
testCompile 'org.hamcrest:hamcrest-core' | |||
testCompile 'org.mockito:mockito-core' | |||
testCompile 'org.simpleframework:simple' | |||
testCompile project(':sonar-testing-harness') |
@@ -8,7 +8,7 @@ dependencies { | |||
// please keep list ordered | |||
compile 'org.codehaus.sonar:sonar-channel' | |||
compile project(':sonar-plugin-api') | |||
compile project(path: ':sonar-plugin-api', configuration: 'shadow') | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
@@ -16,6 +16,7 @@ dependencies { | |||
testCompile 'commons-io:commons-io' | |||
testCompile 'junit:junit' | |||
testCompile 'org.assertj:assertj-core' | |||
testCompile 'org.hamcrest:hamcrest-core' | |||
testCompile 'org.mockito:mockito-core' | |||
testCompile 'pmd:pmd:4.3' | |||
} |
@@ -9,7 +9,6 @@ dependencies { | |||
compile 'commons-lang:commons-lang' | |||
compile 'org.codehaus.sonar:sonar-channel' | |||
compile 'org.slf4j:slf4j-api' | |||
testCompile 'ch.qos.logback:logback-classic' | |||
testCompile 'junit:junit' |
@@ -4,72 +4,26 @@ sonarqube { | |||
} | |||
} | |||
apply plugin: 'com.github.johnrengelman.shadow' | |||
dependencies { | |||
// please keep the list grouped by configuration and ordered by name | |||
compile 'commons-codec:commons-codec' | |||
compile 'commons-io:commons-io' | |||
compile 'commons-lang:commons-lang' | |||
compile 'com.google.code.gson:gson' | |||
compile 'org.apache.commons:commons-csv' | |||
// shaded, but not relocated | |||
compile project(':sonar-check-api') | |||
compile project(':sonar-plugin-api') | |||
compile project(':sonar-ws') | |||
compile project(path: ':sonar-plugin-api', configuration: 'shadow') | |||
shadow 'org.codehaus.staxmate:staxmate' | |||
shadow 'org.codehaus.woodstox:stax2-api' | |||
shadow 'org.codehaus.woodstox:woodstox-core-lgpl' | |||
compileOnly 'ch.qos.logback:logback-classic' | |||
compileOnly 'ch.qos.logback:logback-core' | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
compileOnly 'javax.servlet:javax.servlet-api' | |||
compileOnly 'junit:junit' | |||
compileOnly 'org.slf4j:slf4j-api' | |||
testCompile 'com.google.guava:guava' | |||
testCompile 'junit:junit' | |||
testCompile 'com.google.code.findbugs:jsr305' | |||
testCompile 'com.tngtech.java:junit-dataprovider' | |||
testCompile 'org.assertj:assertj-core' | |||
testCompile 'org.mockito:mockito-core' | |||
testCompile project(':sonar-scanner-engine') | |||
testCompile project(':server:sonar-server') | |||
} | |||
sourceSets { | |||
// Make the compileOnly dependencies available when compiling/running tests | |||
test.compileClasspath += configurations.compileOnly + configurations.shadow | |||
test.runtimeClasspath += configurations.compileOnly + configurations.shadow | |||
} | |||
def on3Digits(version) { | |||
def projectversion3digits = version - ~/-\w+/ | |||
projectversion3digits = projectversion3digits.tokenize('.').plus(0).take(3).join('.') | |||
} | |||
import org.apache.tools.ant.filters.ReplaceTokens | |||
processResources { | |||
filter ReplaceTokens, tokens: [ | |||
// The build version is composed of 4 fields, including the semantic version and the build number provided by Travis. | |||
'project.buildVersion': project.version.endsWith('SNAPSHOT') ? project.version : on3Digits(project.version) + '.' + System.getProperty("buildNumber"), | |||
'project.version.3digits': project.version.endsWith('SNAPSHOT') ? project.version : on3Digits(project.version) | |||
] | |||
} | |||
shadowJar { | |||
configurations = [project.configurations.default] | |||
relocate('com.google', 'org.sonar.api.internal.google') | |||
relocate('org.apache.commons', 'org.sonar.api.internal.apachecommons') | |||
dependencies { | |||
exclude(dependency('org.codehaus.woodstox:woodstox-core-lgpl')) | |||
exclude(dependency('org.codehaus.woodstox:stax2-api')) | |||
exclude(dependency('org.codehaus.staxmate:staxmate')) | |||
} | |||
} | |||
artifactoryPublish.skip = false | |||
@@ -77,7 +31,7 @@ artifactoryPublish.skip = false | |||
publishing { | |||
publications { | |||
mavenJava(MavenPublication) { | |||
artifact source: shadowJar, classifier: null | |||
from components.java | |||
if (release) { | |||
artifact sourcesJar | |||
artifact javadocJar |
@@ -13,7 +13,6 @@ dependencies { | |||
compile 'commons-io:commons-io' | |||
compile 'commons-lang:commons-lang' | |||
compile 'com.google.code.gson:gson' | |||
compile 'org.apache.commons:commons-csv' | |||
// shaded, but not relocated | |||
compile project(':sonar-check-api') | |||
@@ -23,7 +22,6 @@ dependencies { | |||
shadow 'org.codehaus.woodstox:woodstox-core-lgpl' | |||
compileOnly 'ch.qos.logback:logback-classic' | |||
compileOnly 'ch.qos.logback:logback-core' | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
compileOnly 'javax.servlet:javax.servlet-api' | |||
compileOnly 'junit:junit' | |||
@@ -34,7 +32,6 @@ dependencies { | |||
testCompile 'org.assertj:assertj-core' | |||
testCompile 'org.mockito:mockito-core' | |||
testCompile project(':sonar-plugin-api-impl') | |||
} | |||
sourceSets { | |||
@@ -61,13 +58,10 @@ shadowJar { | |||
configurations = [project.configurations.default] | |||
relocate('com.google', 'org.sonar.api.internal.google') | |||
relocate('org.apache.commons', 'org.sonar.api.internal.apachecommons') | |||
dependencies { | |||
exclude(dependency('org.codehaus.woodstox:woodstox-core-lgpl')) | |||
exclude(dependency('org.codehaus.woodstox:stax2-api')) | |||
exclude(dependency('org.codehaus.staxmate:staxmate')) | |||
} | |||
} | |||
// only interested in shadowJar | |||
jar.enabled = false | |||
artifactoryPublish.skip = false | |||
publishing { |
@@ -16,32 +16,47 @@ configurations { | |||
dependencies { | |||
// please keep the list ordered | |||
compile 'ch.qos.logback:logback-classic' | |||
compile 'ch.qos.logback:logback-core' | |||
compile 'commons-codec:commons-codec' | |||
compile 'commons-io:commons-io' | |||
compile 'commons-lang:commons-lang' | |||
compile 'com.google.code.gson:gson' | |||
compile 'org.apache.commons:commons-csv' | |||
compile 'org.freemarker:freemarker' | |||
compile 'com.google.protobuf:protobuf-java' | |||
compile 'com.squareup.okhttp3:okhttp' | |||
compile 'org.codehaus.staxmate:staxmate' | |||
compile 'org.codehaus.woodstox:stax2-api' | |||
compile 'org.codehaus.woodstox:woodstox-core-lgpl' | |||
compile 'org.picocontainer:picocontainer' | |||
compile 'org.slf4j:jcl-over-slf4j' | |||
compile 'org.slf4j:jul-to-slf4j' | |||
compile 'org.slf4j:log4j-over-slf4j' | |||
compile 'org.slf4j:slf4j-api' | |||
compile 'org.sonarsource.update-center:sonar-update-center-common' | |||
compile project(':sonar-core') | |||
compile project(':sonar-scanner-protocol') | |||
compile project(':sonar-ws') | |||
compile project(':sonar-duplications') | |||
compile project(':sonar-plugin-api-impl') | |||
runtime project(path: ':sonar-plugin-api', configuration: 'shadow') | |||
compileOnly project(path: ':sonar-plugin-api') | |||
compile project(path: ':sonar-plugin-api', configuration: 'shadow') | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
testCompile 'com.squareup.okhttp3:mockwebserver' | |||
testCompile 'com.squareup.okhttp3:okhttp' | |||
testCompile 'com.squareup.okio:okio' | |||
testCompile 'com.tngtech.java:junit-dataprovider' | |||
testCompile 'javax.servlet:javax.servlet-api' | |||
testCompile 'commons-io:commons-io' | |||
testCompile 'junit:junit' | |||
testCompile 'net.javacrumbs.json-unit:json-unit-assertj:0.0.15' | |||
testCompile 'org.assertj:assertj-core' | |||
testCompile 'org.codehaus.staxmate:staxmate' | |||
testCompile 'org.hamcrest:hamcrest-core' | |||
testCompile 'org.mockito:mockito-core' | |||
testCompile 'stax:stax-api' | |||
testCompile project(':plugins:sonar-xoo-plugin') | |||
testCompile project(':sonar-plugin-api').sourceSets.test.output | |||
@@ -10,16 +10,14 @@ dependencies { | |||
compile 'com.google.code.gson:gson' | |||
compile 'com.google.protobuf:protobuf-java' | |||
compile 'commons-io:commons-io' | |||
compile 'net.jpountz.lz4:lz4' | |||
compile 'commons-lang:commons-lang' | |||
compile project(':sonar-core') | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
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' | |||
} | |||
//create a single Jar with all dependencies |
@@ -19,14 +19,14 @@ | |||
*/ | |||
package org.sonar.scanner.protocol.input; | |||
import com.google.common.collect.Maps; | |||
import java.util.HashMap; | |||
import java.util.Map; | |||
import java.util.Optional; | |||
import javax.annotation.CheckForNull; | |||
import javax.annotation.Nullable; | |||
public class MultiModuleProjectRepository implements ProjectRepositories { | |||
private Map<String, SingleProjectRepository> repositoryPerModule = Maps.newHashMap(); | |||
private Map<String, SingleProjectRepository> repositoryPerModule = new HashMap<>(); | |||
public MultiModuleProjectRepository addFileDataToModule(String moduleKey, @Nullable String path, FileData fileData) { | |||
if (path == null || (fileData.hash() == null && fileData.revision() == null)) { |
@@ -10,7 +10,6 @@ dependencies { | |||
testCompile 'junit:junit' | |||
testCompile 'org.assertj:assertj-core' | |||
testCompile 'org.mockito:mockito-core' | |||
} | |||
jar { |
@@ -13,7 +13,7 @@ dependencies { | |||
compile 'commons-io:commons-io' | |||
compile 'junit:junit' | |||
compile 'org.assertj:assertj-core' | |||
compile 'org.hamcrest:hamcrest-all' | |||
compile 'org.hamcrest:hamcrest-core' | |||
compile 'org.jsoup:jsoup' | |||
compileOnly 'com.google.code.findbugs:jsr305' |
@@ -7,10 +7,10 @@ dependencies { | |||
compile 'com.google.code.gson:gson' | |||
compile 'com.google.guava:guava' | |||
compile 'commons-io:commons-io' | |||
compile 'org.apache.velocity:velocity:1.7' | |||
compile 'org.slf4j:log4j-over-slf4j' | |||
compile 'org.sonarsource.orchestrator:sonar-orchestrator' | |||
compile project(':sonar-ws') | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
} |
@@ -14,15 +14,17 @@ dependencies { | |||
compile 'com.google.protobuf:protobuf-java' | |||
compile 'com.squareup.okhttp3:okhttp' | |||
compileOnly 'javax.annotation:javax.annotation-api' | |||
compileOnly 'com.google.code.findbugs:jsr305' | |||
compileOnly project(path: ':sonar-plugin-api', configuration: 'shadow') | |||
testCompile 'com.squareup.okhttp3:mockwebserver' | |||
testCompile 'com.squareup.okio:okio' | |||
testCompile 'commons-io:commons-io' | |||
testCompile 'commons-lang:commons-lang' | |||
testCompile 'junit:junit' | |||
testCompile 'org.assertj:assertj-core' | |||
testCompile 'org.hamcrest:hamcrest-core' | |||
testCompile 'org.mockito:mockito-core' | |||
testCompile project(':sonar-testing-harness') | |||
} |