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 spring-projectsgh-23282
DoitwithFun · Aug 19, 2019 · 998f6af · 998f6af
1 parent 6008c61
commit 998f6af
Show file tree

Hide file tree

Showing 41 changed files with 25 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ classes/
 /build
 buildSrc/build
 /spring-*/build
+/integration-tests/build
 /src/asciidoc/build
 target/
 

diff --git a/build.gradle b/build.gradle
@@ -179,7 +179,8 @@ configure(allprojects) { project ->
  ] 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"
 
  jar {
@@ -260,23 +261,7 @@ configure(rootProject) {
  // Don't publish the default jar for the root project
  configurations.archives.artifacts.clear()
 
- dependencies { // for integration tests
- 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")
+ dependencies {
  asciidoctor("io.spring.asciidoctor:spring-asciidoctor-extensions:0.1.3.RELEASE")
  }
 

diff --git a/integration-tests/integration-tests.gradle b/integration-tests/integration-tests.gradle
@@ -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")
+}
diff --git a/src/test/java/.gitignore → integration-tests/src/test/java/.gitignore b/src/test/java/.gitignore → integration-tests/src/test/java/.gitignore
diff --git a/src/test/java/com/foo/Component.java → ...ests/src/test/java/com/foo/Component.java b/src/test/java/com/foo/Component.java → ...ests/src/test/java/com/foo/Component.java
diff --git a/...om/foo/ComponentBeanDefinitionParser.java → ...om/foo/ComponentBeanDefinitionParser.java b/...om/foo/ComponentBeanDefinitionParser.java → ...om/foo/ComponentBeanDefinitionParser.java
diff --git a/...o/ComponentBeanDefinitionParserTests.java → ...o/ComponentBeanDefinitionParserTests.java b/...o/ComponentBeanDefinitionParserTests.java → ...o/ComponentBeanDefinitionParserTests.java
diff --git a/...st/java/com/foo/ComponentFactoryBean.java → ...st/java/com/foo/ComponentFactoryBean.java b/...st/java/com/foo/ComponentFactoryBean.java → ...st/java/com/foo/ComponentFactoryBean.java
diff --git a/...va/com/foo/ComponentNamespaceHandler.java → ...va/com/foo/ComponentNamespaceHandler.java b/...va/com/foo/ComponentNamespaceHandler.java → ...va/com/foo/ComponentNamespaceHandler.java
diff --git a/...amespaceHandlerScopeIntegrationTests.java → ...amespaceHandlerScopeIntegrationTests.java b/...amespaceHandlerScopeIntegrationTests.java → ...amespaceHandlerScopeIntegrationTests.java
diff --git a/...isorAutoProxyCreatorIntegrationTests.java → ...isorAutoProxyCreatorIntegrationTests.java b/...isorAutoProxyCreatorIntegrationTests.java → ...isorAutoProxyCreatorIntegrationTests.java
diff --git a/...tation/EnableCachingIntegrationTests.java → ...tation/EnableCachingIntegrationTests.java b/...tation/EnableCachingIntegrationTests.java → ...tation/EnableCachingIntegrationTests.java
diff --git a/...onScannerJsr330ScopeIntegrationTests.java → ...onScannerJsr330ScopeIntegrationTests.java b/...onScannerJsr330ScopeIntegrationTests.java → ...onScannerJsr330ScopeIntegrationTests.java
diff --git a/...finitionScannerScopeIntegrationTests.java → ...finitionScannerScopeIntegrationTests.java b/...finitionScannerScopeIntegrationTests.java → ...finitionScannerScopeIntegrationTests.java
diff --git a/...nv/EnvironmentSystemIntegrationTests.java → ...nv/EnvironmentSystemIntegrationTests.java b/...nv/EnvironmentSystemIntegrationTests.java → ...nv/EnvironmentSystemIntegrationTests.java
diff --git a/...onfigurerEnvironmentIntegrationTests.java → ...onfigurerEnvironmentIntegrationTests.java b/...onfigurerEnvironmentIntegrationTests.java → ...onfigurerEnvironmentIntegrationTests.java
diff --git a/...pringframework/core/env/scan1/Config.java → ...pringframework/core/env/scan1/Config.java b/...pringframework/core/env/scan1/Config.java → ...pringframework/core/env/scan1/Config.java
diff --git a/...ngframework/core/env/scan1/DevConfig.java → ...ngframework/core/env/scan1/DevConfig.java b/...ngframework/core/env/scan1/DevConfig.java → ...ngframework/core/env/scan1/DevConfig.java
diff --git a/...gframework/core/env/scan1/ProdConfig.java → ...gframework/core/env/scan1/ProdConfig.java b/...gframework/core/env/scan1/ProdConfig.java → ...gframework/core/env/scan1/ProdConfig.java
diff --git a/...ringframework/core/env/scan2/DevBean.java → ...ringframework/core/env/scan2/DevBean.java b/...ringframework/core/env/scan2/DevBean.java → ...ringframework/core/env/scan2/DevBean.java
diff --git a/...ingframework/core/env/scan2/ProdBean.java → ...ingframework/core/env/scan2/ProdBean.java b/...ingframework/core/env/scan2/ProdBean.java → ...ingframework/core/env/scan2/ProdBean.java
diff --git a/...pel/support/BeanFactoryTypeConverter.java → ...pel/support/BeanFactoryTypeConverter.java b/...pel/support/BeanFactoryTypeConverter.java → ...pel/support/BeanFactoryTypeConverter.java
diff --git a/...expression/spel/support/Spr7538Tests.java → ...expression/spel/support/Spr7538Tests.java b/...expression/spel/support/Spr7538Tests.java → ...expression/spel/support/Spr7538Tests.java
diff --git a/...nsactionalAnnotationIntegrationTests.java → ...nsactionalAnnotationIntegrationTests.java b/...nsactionalAnnotationIntegrationTests.java → ...nsactionalAnnotationIntegrationTests.java
diff --git a/...ransactionManagementIntegrationTests.java → ...ransactionManagementIntegrationTests.java b/...ransactionManagementIntegrationTests.java → ...ransactionManagementIntegrationTests.java
diff --git a/...tation/ProxyAnnotationDiscoveryTests.java → ...tation/ProxyAnnotationDiscoveryTests.java b/...tation/ProxyAnnotationDiscoveryTests.java → ...tation/ProxyAnnotationDiscoveryTests.java
diff --git a/src/test/resources/META-INF/spring.handlers → ...c/test/resources/META-INF/spring.handlers b/src/test/resources/META-INF/spring.handlers → ...c/test/resources/META-INF/spring.handlers
diff --git a/src/test/resources/META-INF/spring.schemas → ...rc/test/resources/META-INF/spring.schemas b/src/test/resources/META-INF/spring.schemas → ...rc/test/resources/META-INF/spring.schemas
diff --git a/...st/resources/com/foo/component-config.xml → ...st/resources/com/foo/component-config.xml b/...st/resources/com/foo/component-config.xml → ...st/resources/com/foo/component-config.xml
diff --git a/src/test/resources/com/foo/component.xsd → .../src/test/resources/com/foo/component.xsd b/src/test/resources/com/foo/component.xsd → .../src/test/resources/com/foo/component.xsd
diff --git a/src/test/resources/log4j2-test.xml → ...-tests/src/test/resources/log4j2-test.xml b/src/test/resources/log4j2-test.xml → ...-tests/src/test/resources/log4j2-test.xml
diff --git a/...eHandlerScopeIntegrationTests-context.xml → ...eHandlerScopeIntegrationTests-context.xml b/...eHandlerScopeIntegrationTests-context.xml → ...eHandlerScopeIntegrationTests-context.xml
diff --git a/...oProxyCreatorIntegrationTests-context.xml → ...oProxyCreatorIntegrationTests-context.xml b/...oProxyCreatorIntegrationTests-context.xml → ...oProxyCreatorIntegrationTests-context.xml
diff --git a/...ion/ltw/ComponentScanningWithLTWTests.xml → ...ion/ltw/ComponentScanningWithLTWTests.xml b/...ion/ltw/ComponentScanningWithLTWTests.xml → ...ion/ltw/ComponentScanningWithLTWTests.xml
diff --git a/...entSystemIntegrationTests-context-dev.xml → ...entSystemIntegrationTests-context-dev.xml b/...entSystemIntegrationTests-context-dev.xml → ...entSystemIntegrationTests-context-dev.xml
diff --git a/...ntSystemIntegrationTests-context-prod.xml → ...ntSystemIntegrationTests-context-prod.xml b/...ntSystemIntegrationTests-context-prod.xml → ...ntSystemIntegrationTests-context-prod.xml
diff --git a/...ronmentSystemIntegrationTests-context.xml → ...ronmentSystemIntegrationTests-context.xml b/...ronmentSystemIntegrationTests-context.xml → ...ronmentSystemIntegrationTests-context.xml
diff --git a/...transaction/annotation/enable-caching.xml → ...transaction/annotation/enable-caching.xml b/...transaction/annotation/enable-caching.xml → ...transaction/annotation/enable-caching.xml
diff --git a/...springframework/util/testlog4j.properties → ...springframework/util/testlog4j.properties b/...springframework/util/testlog4j.properties → ...springframework/util/testlog4j.properties
diff --git a/...ngframework/web/util/testlog4j.properties → ...ngframework/web/util/testlog4j.properties b/...ngframework/web/util/testlog4j.properties → ...ngframework/web/util/testlog4j.properties
diff --git a/settings.gradle b/settings.gradle
@@ -21,6 +21,7 @@ include "spring-webmvc"
 include "spring-webflux"
 include "spring-websocket"
 include "spring-framework-bom"
+include "integration-tests"
 
 rootProject.name = "spring"
 rootProject.children.each {project ->