Skip to content

Commit 7bc2168

Browse files
committed
Default use of target 1.8 for Spring test compilation
Issue: SPR-11699
1 parent 637ad20 commit 7bc2168

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

build.gradle

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ configure(allprojects) { project ->
5757
}
5858

5959
compileTestJava {
60-
sourceCompatibility=1.7
61-
targetCompatibility=1.7
60+
sourceCompatibility=1.8
61+
targetCompatibility=1.8
62+
options.compilerArgs += "-parameters"
6263
}
6364

6465
sourceSets.test.resources.srcDirs = ["src/test/resources", "src/test/java"]
@@ -76,7 +77,7 @@ configure(allprojects) { project ->
7677

7778
repositories {
7879
maven { url "http://repo.spring.io/libs-release" }
79-
maven { url "http://repo.spring.io/milestone" } // for AspectJ 1.8.0.RC2
80+
maven { url "http://repo.spring.io/milestone" } // for AspectJ 1.8.0.RC3
8081
maven { url "http://repo.spring.io/snapshot" } // temporarily until Reactor 1.1.0.M4
8182
}
8283

@@ -264,12 +265,6 @@ project("spring-core") {
264265
include "org/springframework/objenesis/**"
265266
}
266267
}
267-
268-
compileTestJava {
269-
sourceCompatibility=1.8
270-
targetCompatibility=1.8
271-
compileTestJava.options.compilerArgs += "-parameters"
272-
}
273268
}
274269

275270
project("spring-beans") {
@@ -864,6 +859,7 @@ project("spring-test") {
864859

865860
task testNG(type: Test) {
866861
useTestNG()
862+
scanForTestClasses = false
867863
include(["**/testng/**/*Tests.class", "**/testng/**/*Test.class"])
868864
// Show STD_OUT & STD_ERR of the test JVM(s) on the console:
869865
// testLogging.showStandardStreams = true
@@ -890,8 +886,8 @@ project("spring-aspects") {
890886

891887
dependencies {
892888
aspects(project(":spring-orm"))
893-
ajc("org.aspectj:aspectjtools:1.8.0.RC2") // needed for ajc on JDK 8 only
894-
rt("org.aspectj:aspectjrt:1.8.0.RC2") // needed for ajc on JDK 8 only
889+
ajc("org.aspectj:aspectjtools:1.8.0.RC3") // needed for ajc on JDK 8 only
890+
rt("org.aspectj:aspectjrt:1.8.0.RC3") // needed for ajc on JDK 8 only
895891
compile("org.aspectj:aspectjweaver:${aspectjVersion}") // exposing regular AspectJ version to users
896892
provided("org.eclipse.persistence:javax.persistence:2.0.0")
897893
optional(project(":spring-aop")) // for @Async support

0 commit comments

Comments
 (0)