aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/sonar-process/build.gradle9
-rw-r--r--server/sonar-server/build.gradle1
2 files changed, 2 insertions, 8 deletions
diff --git a/server/sonar-process/build.gradle b/server/sonar-process/build.gradle
index b88b1371edb..3ca3addbcec 100644
--- a/server/sonar-process/build.gradle
+++ b/server/sonar-process/build.gradle
@@ -24,16 +24,9 @@ dependencies {
testCompile 'com.google.protobuf:protobuf-java'
testCompile 'com.tngtech.java:junit-dataprovider'
testCompile 'org.assertj:assertj-core'
+ testCompile 'org.eclipse.jetty:jetty-server'
testCompile 'org.mockito:mockito-core'
testCompile project(':sonar-testing-harness')
- // Workaround to resolve dependencies of eclipse specific packaging: https://issues.gradle.org/browse/GRADLE-2076
- testCompile module('org.eclipse.jetty:jetty-server') {
- dependencies(
- "org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016@jar",
- "org.eclipse.jetty:jetty-continuation:8.1.2.v20120308",
- "org.eclipse.jetty:jetty-http:8.1.2.v20120308"
- )
- }
}
artifactoryPublish.skip = false
diff --git a/server/sonar-server/build.gradle b/server/sonar-server/build.gradle
index 9bb11231e8a..34995b84bf8 100644
--- a/server/sonar-server/build.gradle
+++ b/server/sonar-server/build.gradle
@@ -68,6 +68,7 @@ dependencies {
// should be excluded to avoid ES go into "test mode" and require to run EsTester-based UTs with RandomizedRunner
exclude group: 'com.carrotsearch.randomizedtesting', module: 'randomizedtesting-runner'
exclude group: 'org.elasticsearch', module: 'securemock'
+ exclude group: 'commons-logging', module: 'commons-logging'
}
testCompile 'org.hamcrest:hamcrest-all'
testCompile 'org.mockito:mockito-core'