mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-09-17 16:39:29 +00:00
Move integration tests to dedicated module
This commit moves the dependency management and test source files related to integration tests to a dedicated module. This allows us to focus the root project on building the Spring Framework. See gh-23282
This commit is contained in:
@@ -21,6 +21,7 @@ classes/
|
|||||||
/build
|
/build
|
||||||
buildSrc/build
|
buildSrc/build
|
||||||
/spring-*/build
|
/spring-*/build
|
||||||
|
/integration-tests/build
|
||||||
/src/asciidoc/build
|
/src/asciidoc/build
|
||||||
target/
|
target/
|
||||||
|
|
||||||
|
|||||||
+3
-18
@@ -179,7 +179,8 @@ configure(allprojects) { project ->
|
|||||||
] as String[]
|
] as String[]
|
||||||
}
|
}
|
||||||
|
|
||||||
configure(subprojects.findAll { (it.name != "spring-core-coroutines") } ) { subproject ->
|
configure(subprojects.findAll { (it.name != "spring-core-coroutines"
|
||||||
|
&& it.name != "spring-integration-tests") } ) { subproject ->
|
||||||
apply from: "${gradleScriptDir}/publish-maven.gradle"
|
apply from: "${gradleScriptDir}/publish-maven.gradle"
|
||||||
|
|
||||||
jar {
|
jar {
|
||||||
@@ -260,23 +261,7 @@ configure(rootProject) {
|
|||||||
// Don't publish the default jar for the root project
|
// Don't publish the default jar for the root project
|
||||||
configurations.archives.artifacts.clear()
|
configurations.archives.artifacts.clear()
|
||||||
|
|
||||||
dependencies { // for integration tests
|
dependencies {
|
||||||
testCompile(project(":spring-aop"))
|
|
||||||
testCompile(project(":spring-beans"))
|
|
||||||
testCompile(project(":spring-context"))
|
|
||||||
testCompile(project(":spring-core"))
|
|
||||||
testCompile(project(":spring-expression"))
|
|
||||||
testCompile(project(":spring-jdbc"))
|
|
||||||
testCompile(project(":spring-orm"))
|
|
||||||
testCompile(project(":spring-test"))
|
|
||||||
testCompile(project(":spring-tx"))
|
|
||||||
testCompile(project(":spring-web"))
|
|
||||||
testCompile("javax.inject:javax.inject:1")
|
|
||||||
testCompile("javax.resource:javax.resource-api:1.7.1")
|
|
||||||
testCompile("javax.servlet:javax.servlet-api:3.1.0")
|
|
||||||
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
|
|
||||||
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
|
|
||||||
testCompile("org.hibernate:hibernate-core:5.1.17.Final")
|
|
||||||
asciidoctor("io.spring.asciidoctor:spring-asciidoctor-extensions:0.1.3.RELEASE")
|
asciidoctor("io.spring.asciidoctor:spring-asciidoctor-extensions:0.1.3.RELEASE")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
description = "Spring Integration Tests"
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
testCompile(project(":spring-aop"))
|
||||||
|
testCompile(project(":spring-beans"))
|
||||||
|
testCompile(project(":spring-context"))
|
||||||
|
testCompile(project(":spring-core"))
|
||||||
|
testCompile(project(":spring-expression"))
|
||||||
|
testCompile(project(":spring-jdbc"))
|
||||||
|
testCompile(project(":spring-orm"))
|
||||||
|
testCompile(project(":spring-test"))
|
||||||
|
testCompile(project(":spring-tx"))
|
||||||
|
testCompile(project(":spring-web"))
|
||||||
|
testCompile("javax.inject:javax.inject:1")
|
||||||
|
testCompile("javax.resource:javax.resource-api:1.7.1")
|
||||||
|
testCompile("javax.servlet:javax.servlet-api:4.0.1")
|
||||||
|
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
|
||||||
|
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
|
||||||
|
testCompile("org.hibernate:hibernate-core:5.1.17.Final")
|
||||||
|
}
|
||||||
@@ -21,6 +21,7 @@ include "spring-webmvc"
|
|||||||
include "spring-webflux"
|
include "spring-webflux"
|
||||||
include "spring-websocket"
|
include "spring-websocket"
|
||||||
include "spring-framework-bom"
|
include "spring-framework-bom"
|
||||||
|
include "integration-tests"
|
||||||
|
|
||||||
rootProject.name = "spring"
|
rootProject.name = "spring"
|
||||||
rootProject.children.each {project ->
|
rootProject.children.each {project ->
|
||||||
|
|||||||
Reference in New Issue
Block a user