Skip to content

Commit babbf6e

Browse files
committed
Harmonize resources location
Issue: SPR-12766
1 parent 23d52d5 commit babbf6e

545 files changed

Lines changed: 5 additions & 21 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build.gradle

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ configure(allprojects) { project ->
9797
options.compilerArgs += "-parameters"
9898
}
9999

100-
sourceSets.test.resources.srcDirs = ["src/test/resources", "src/test/java"]
101-
102100
test {
103101
systemProperty("java.awt.headless", "true")
104102
systemProperty("testGroups", project.properties.get("testGroups"))
@@ -468,9 +466,6 @@ project("spring-context") {
468466
testCompile("org.apache.commons:commons-pool2:2.2")
469467
testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
470468
}
471-
472-
// pick up RmiInvocationWrapperRTD.xml in src/main
473-
sourceSets.main.resources.srcDirs += "src/main/java"
474469
}
475470

476471
project("spring-messaging") {
@@ -639,9 +634,6 @@ project("spring-context-support") {
639634
testCompile("org.ehcache:jcache:${ehcacheJCacheVersion}")
640635
testRuntime("com.sun.mail:javax.mail:1.5.2")
641636
}
642-
643-
// pick up **/mime.types files in src/main
644-
sourceSets.main.resources.srcDirs += "src/main/java"
645637
}
646638

647639
project("spring-web") {
@@ -704,9 +696,6 @@ project("spring-web") {
704696
testCompile("com.fasterxml.jackson.datatype:jackson-datatype-joda:${jackson2Version}")
705697
testRuntime("com.sun.mail:javax.mail:1.5.2")
706698
}
707-
708-
// pick up ContextLoader.properties in src/main
709-
sourceSets.main.resources.srcDirs += "src/main/java"
710699
}
711700

712701
project("spring-websocket") {
@@ -891,9 +880,6 @@ project("spring-webmvc") {
891880
testCompile("joda-time:joda-time:${jodaVersion}")
892881
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
893882
}
894-
895-
// pick up DispatcherServlet.properties in src/main
896-
sourceSets.main.resources.srcDirs += "src/main/java"
897883
}
898884

899885
project("spring-webmvc-tiles2") {
@@ -941,9 +927,6 @@ project("spring-webmvc-portlet") {
941927
provided("javax.portlet:portlet-api:2.0")
942928
optional("commons-fileupload:commons-fileupload:1.3.1")
943929
}
944-
945-
// pick up DispatcherPortlet.properties in src/main
946-
sourceSets.main.resources.srcDirs += "src/main/java"
947930
}
948931

949932
project("spring-test") {

spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml renamed to spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml

File renamed without changes.

spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml renamed to spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml

File renamed without changes.

spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml renamed to spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml

File renamed without changes.

spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml renamed to spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml

File renamed without changes.

spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml renamed to spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml

File renamed without changes.

spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml renamed to spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml

File renamed without changes.

spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests-context.xml renamed to spring-aop/src/test/resources/org/springframework/aop/config/TopLevelAopTagTests-context.xml

File renamed without changes.

spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests-context.xml renamed to spring-aop/src/test/resources/org/springframework/aop/framework/PrototypeTargetTests-context.xml

File renamed without changes.

spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml renamed to spring-aop/src/test/resources/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml

File renamed without changes.

0 commit comments

Comments
 (0)