@@ -14,12 +14,6 @@ sourceSets { | |||
} | |||
} | |||
configurations { | |||
tests | |||
testCompile.extendsFrom tests | |||
} | |||
dependencies { | |||
// please keep the list grouped by configuration and ordered by name | |||
@@ -46,12 +40,3 @@ dependencies { | |||
testCompile project(path: ":server:sonar-server-common", configuration: "tests") | |||
testCompile project(':sonar-testing-harness') | |||
} | |||
task testJar(type: Jar) { | |||
classifier = 'tests' | |||
from sourceSets.test.output | |||
} | |||
artifacts { | |||
tests testJar | |||
} |
@@ -73,7 +73,6 @@ dependencies { | |||
testCompile 'org.subethamail:subethasmtp' | |||
testCompile project(':server:sonar-db-testing') | |||
testCompile project(path: ":server:sonar-server-common", configuration: "tests") | |||
testCompile project(path: ":server:sonar-webserver-api", configuration: "tests") | |||
testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests") | |||
testCompile project(path: ":server:sonar-webserver-es", configuration: "tests") | |||
testCompile project(path: ":server:sonar-webserver-ws", configuration: "tests") |
@@ -35,7 +35,6 @@ dependencies { | |||
testCompile 'org.mockito:mockito-core' | |||
testCompile project(':server:sonar-db-testing') | |||
testCompile project(path: ":server:sonar-server-common", configuration: "tests") | |||
testCompile project(path: ":server:sonar-webserver-api", configuration: "tests") | |||
testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests") | |||
testCompile project(path: ":server:sonar-webserver-es", configuration: "tests") | |||
testCompile project(path: ":server:sonar-webserver-ws", configuration: "tests") |
@@ -17,9 +17,10 @@ | |||
* along with this program; if not, write to the Free Software Foundation, | |||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |||
*/ | |||
package org.sonar.server.branch; | |||
package org.sonar.server.ui.ws; | |||
import org.junit.rules.ExternalResource; | |||
import org.sonar.server.branch.BranchFeatureProxy; | |||
public class BranchFeatureRule extends ExternalResource implements BranchFeatureProxy { | |||
@@ -37,7 +37,6 @@ import org.sonar.core.platform.PluginRepository; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.dialect.H2; | |||
import org.sonar.db.dialect.PostgreSql; | |||
import org.sonar.server.branch.BranchFeatureRule; | |||
import org.sonar.server.organization.DefaultOrganizationProvider; | |||
import org.sonar.server.organization.TestDefaultOrganizationProvider; | |||
import org.sonar.server.organization.TestOrganizationFlags; |
@@ -28,7 +28,6 @@ dependencies { | |||
testCompile 'org.eclipse.jetty:jetty-servlet' | |||
testCompile project(':server:sonar-db-testing') | |||
testCompile project(path: ":server:sonar-server-common", configuration: "tests") | |||
testCompile project(path: ":server:sonar-webserver-api", configuration: "tests") | |||
testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests") | |||
testCompile project(path: ":server:sonar-webserver-es", configuration: "tests") | |||
testCompile project(':sonar-testing-harness') |