aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2019-08-29 17:15:15 +0200
committerSonarTech <sonartech@sonarsource.com>2019-09-02 20:21:04 +0200
commit08cfcdeffd89a33032b35545ad8583de63f28a53 (patch)
tree531739a5f7777b6f55a8a5105277699cc079089b
parent2b029d9b127be48da51a65a66103becbc5ab6fa9 (diff)
downloadsonarqube-08cfcdeffd89a33032b35545ad8583de63f28a53.tar.gz
sonarqube-08cfcdeffd89a33032b35545ad8583de63f28a53.zip
drop now useless module sonar-db-testing
-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.gradle2
-rw-r--r--server/sonar-ce/build.gradle2
-rw-r--r--server/sonar-db-testing/build.gradle13
-rw-r--r--server/sonar-server-common/build.gradle2
-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.gradle3
-rw-r--r--server/sonar-webserver-es/build.gradle2
-rw-r--r--server/sonar-webserver-webapi/build.gradle2
-rw-r--r--server/sonar-webserver/build.gradle2
-rw-r--r--settings.gradle1
13 files changed, 12 insertions, 25 deletions
diff --git a/server/sonar-ce-common/build.gradle b/server/sonar-ce-common/build.gradle
index f346ac18aa1..c10f7b688e0 100644
--- a/server/sonar-ce-common/build.gradle
+++ b/server/sonar-ce-common/build.gradle
@@ -51,6 +51,6 @@ dependencies {
testCompile 'org.assertj:assertj-guava'
testCompile 'org.hamcrest:hamcrest-all'
testCompile project(':sonar-plugin-api-impl')
- testCompile project(':server:sonar-db-testing')
+ testCompile testFixtures(project(':server:sonar-db-dao'))
testCompile project(path: ":server:sonar-server-common", configuration: "tests")
}
diff --git a/server/sonar-ce-task-projectanalysis/build.gradle b/server/sonar-ce-task-projectanalysis/build.gradle
index 1052d12965a..47e0a9999dd 100644
--- a/server/sonar-ce-task-projectanalysis/build.gradle
+++ b/server/sonar-ce-task-projectanalysis/build.gradle
@@ -57,7 +57,7 @@ dependencies {
testCompile 'org.assertj:assertj-guava'
testCompile 'org.mockito:mockito-core'
testCompile 'org.reflections:reflections'
- testCompile project(':server:sonar-db-testing')
+ testCompile testFixtures(project(':server:sonar-db-dao'))
testCompile project(':sonar-testing-harness')
testCompile project(path: ":server:sonar-ce-task", configuration: "tests")
testCompile project(path: ":server:sonar-server-common", configuration: "tests")
diff --git a/server/sonar-ce-task/build.gradle b/server/sonar-ce-task/build.gradle
index 4cf16892980..7509cd5dbb5 100644
--- a/server/sonar-ce-task/build.gradle
+++ b/server/sonar-ce-task/build.gradle
@@ -40,7 +40,7 @@ dependencies {
testCompile 'org.assertj:assertj-guava'
testCompile 'org.mockito:mockito-core'
testCompile 'org.reflections:reflections'
- testCompile project(':server:sonar-db-testing')
+ testCompile testFixtures(project(':server:sonar-db-dao'))
}
task testJar(type: Jar) {
diff --git a/server/sonar-ce/build.gradle b/server/sonar-ce/build.gradle
index 6ce9decb822..7590ef78620 100644
--- a/server/sonar-ce/build.gradle
+++ b/server/sonar-ce/build.gradle
@@ -35,6 +35,6 @@ dependencies {
testCompile 'org.mockito:mockito-core'
testCompile 'org.slf4j:slf4j-api'
- testCompile project(':server:sonar-db-testing')
+ testCompile testFixtures(project(':server:sonar-db-dao'))
}
diff --git a/server/sonar-db-testing/build.gradle b/server/sonar-db-testing/build.gradle
deleted file mode 100644
index 73ce5f115a4..00000000000
--- a/server/sonar-db-testing/build.gradle
+++ /dev/null
@@ -1,13 +0,0 @@
-sonarqube {
- properties {
- property 'sonar.projectName', "${projectTitle} :: DB testing"
- }
-}
-
-dependencies {
- // please keep the list grouped by configuration and ordered by name
-
- compile 'com.h2database:h2'
- compile testFixtures(project(':server:sonar-db-core'))
- compile testFixtures(project(':server:sonar-db-dao'))
-}
diff --git a/server/sonar-server-common/build.gradle b/server/sonar-server-common/build.gradle
index a9eda73ead8..284828db542 100644
--- a/server/sonar-server-common/build.gradle
+++ b/server/sonar-server-common/build.gradle
@@ -47,7 +47,7 @@ dependencies {
testCompile 'org.assertj:assertj-core'
testCompile 'org.hamcrest:hamcrest-core'
testCompile 'org.mockito:mockito-core'
- testCompile project(':server:sonar-db-testing')
+ 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 966bc42daf6..93b373805f7 100644
--- a/server/sonar-webserver-api/build.gradle
+++ b/server/sonar-webserver-api/build.gradle
@@ -35,7 +35,7 @@ dependencies {
testCompile 'com.tngtech.java:junit-dataprovider'
testCompile 'javax.servlet:javax.servlet-api'
testCompile 'org.mockito:mockito-core'
- testCompile project(':server:sonar-db-testing')
+ testCompile testFixtures(project(':server:sonar-db-dao'))
testCompile project(path: ":server:sonar-server-common", configuration: "tests")
testCompile project(':sonar-testing-harness')
}
diff --git a/server/sonar-webserver-auth/build.gradle b/server/sonar-webserver-auth/build.gradle
index 1a61303a9f6..cba572bb3ba 100644
--- a/server/sonar-webserver-auth/build.gradle
+++ b/server/sonar-webserver-auth/build.gradle
@@ -35,7 +35,7 @@ dependencies {
testCompile 'org.apache.logging.log4j:log4j-core'
testCompile 'org.assertj:assertj-guava'
testCompile 'org.mockito:mockito-core'
- testCompile project(':server:sonar-db-testing')
+ testCompile testFixtures(project(':server:sonar-db-dao'))
testCompile project(path: ":server:sonar-server-common", configuration: "tests")
testCompile project(':sonar-testing-harness')
diff --git a/server/sonar-webserver-core/build.gradle b/server/sonar-webserver-core/build.gradle
index 618d5cfebc3..46fd497fa9f 100644
--- a/server/sonar-webserver-core/build.gradle
+++ b/server/sonar-webserver-core/build.gradle
@@ -58,6 +58,7 @@ dependencies {
testCompile 'com.github.kevinsawicki:http-request'
testCompile 'com.google.code.findbugs:jsr305'
+ testCompile 'com.h2database:h2'
testCompile 'com.squareup.okhttp3:mockwebserver'
testCompile 'com.tngtech.java:junit-dataprovider'
testCompile 'junit:junit'
@@ -70,7 +71,7 @@ dependencies {
testCompile 'org.hamcrest:hamcrest-all'
testCompile 'org.mockito:mockito-core'
testCompile 'org.subethamail:subethasmtp'
- testCompile project(':server:sonar-db-testing')
+ testCompile testFixtures(project(':server:sonar-db-dao'))
testCompile project(path: ":server:sonar-server-common", configuration: "tests")
testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
testCompile project(path: ":server:sonar-webserver-es", configuration: "tests")
diff --git a/server/sonar-webserver-es/build.gradle b/server/sonar-webserver-es/build.gradle
index 4a2130bb3a3..cea503301be 100644
--- a/server/sonar-webserver-es/build.gradle
+++ b/server/sonar-webserver-es/build.gradle
@@ -27,7 +27,7 @@ dependencies {
testCompile 'com.google.code.findbugs:jsr305'
testCompile 'com.tngtech.java:junit-dataprovider'
testCompile 'org.mockito:mockito-core'
- testCompile project(':server:sonar-db-testing')
+ testCompile testFixtures(project(':server:sonar-db-dao'))
testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
testCompile project(path: ":server:sonar-server-common", configuration: "tests")
testCompile project(':sonar-testing-harness')
diff --git a/server/sonar-webserver-webapi/build.gradle b/server/sonar-webserver-webapi/build.gradle
index 58b5f8e7064..2d3a2c1772f 100644
--- a/server/sonar-webserver-webapi/build.gradle
+++ b/server/sonar-webserver-webapi/build.gradle
@@ -33,7 +33,7 @@ dependencies {
testCompile 'com.squareup.okhttp3:mockwebserver'
testCompile 'javax.servlet:javax.servlet-api'
testCompile 'org.mockito:mockito-core'
- testCompile project(':server:sonar-db-testing')
+ testCompile testFixtures(project(':server:sonar-db-dao'))
testCompile project(path: ":server:sonar-server-common", configuration: "tests")
testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
testCompile project(path: ":server:sonar-webserver-es", configuration: "tests")
diff --git a/server/sonar-webserver/build.gradle b/server/sonar-webserver/build.gradle
index 4096c8a8f11..cd4e3185417 100644
--- a/server/sonar-webserver/build.gradle
+++ b/server/sonar-webserver/build.gradle
@@ -26,7 +26,7 @@ dependencies {
testCompile 'org.mockito:mockito-core'
testCompile 'org.eclipse.jetty:jetty-server'
testCompile 'org.eclipse.jetty:jetty-servlet'
- testCompile project(':server:sonar-db-testing')
+ testCompile testFixtures(project(':server:sonar-db-dao'))
testCompile project(path: ":server:sonar-server-common", configuration: "tests")
testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
testCompile project(path: ":server:sonar-webserver-es", configuration: "tests")
diff --git a/settings.gradle b/settings.gradle
index 7ea694bb170..004ecd0149f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,6 @@ include 'server:sonar-ce'
include 'server:sonar-ce-common'
include 'server:sonar-ce-task'
include 'server:sonar-ce-task-projectanalysis'
-include 'server:sonar-db-testing'
include 'server:sonar-db-core'
include 'server:sonar-db-dao'
include 'server:sonar-db-migration'