drop now useless module sonar-db-testing

diff --git a/server/sonar-ce-common/build.gradle b/server/sonar-ce-common/build.gradle
index f346ac18aa1d2ba5245a782e14a1b21184cb5a67..c10f7b688e090b73d1c0463834d0456869237159 100644 (file)
--- 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 1052d12965ab19421020268aeec9e549a15b40e0..47e0a9999dd2a0f143d6a3d8ad751370449fe8a8 100644 (file)
--- 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 4cf168929803b3f08603381223ced0931e87448d..7509cd5dbb532cfd40d9408bfc7d71490b21a452 100644 (file)
--- 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 6ce9decb8222d52ce3896ab18238c6b80c3ad0c7..7590ef786200590295b0e98a7e314da383c96e61 100644 (file)
--- 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 (file)
index 73ce5f1..0000000
--- 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 a9eda73ead8199663d6c434b01e28c493413a91f..284828db542006b51bae11680db2633ce225778d 100644 (file)
--- 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 966bc42daf6fcb8b501e2a68da854f125e814b5c..93b373805f75f2602f8c6edfad79d8f91ae09788 100644 (file)
--- 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 1a61303a9f6f847feb99ef261cdbf02ace4fca02..cba572bb3ba980f745ad41520640c7c7b058dab6 100644 (file)
--- 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 618d5cfebc311e48b35ee253f440f6cd71ea9038..46fd497fa9fbbad7e5cdf1f96361201a71ed13cf 100644 (file)
--- 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 4a2130bb3a3764b4e3cd2be82dd1208e1999d00b..cea503301be8e71ce08045e6314396280b93fe38 100644 (file)
--- 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 58b5f8e7064ac4112508f52f59ca0f556e127ea4..2d3a2c1772f8c19e36969ec1f633bff37a9298fb 100644 (file)
--- 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 4096c8a8f11eeeb5ba156a80cfc451ac48f8a14a..cd4e3185417217534794fd22e0204acd74e3d45b 100644 (file)
--- 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 7ea694bb170d463c58bc59ff2455dbfb82760e9d..004ecd0149f5e7a8cfd7820fde4b41e0444b75e2 100644 (file)
--- 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'