Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build setup allows for JDK 10 as source/test target compatibility

Browse Source 
Includes upgrade to Groovy 2.4.15 and HtmlUnit 2.30.

Issue: SPR-16390
This commit is contained in:
Juergen Hoeller
2018-03-31 23:17:31 +02:00
parent bc07a54075
commit 28ea718d2d
5 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-test/spring-test.gradle
View File

@@ -42,10 +42,10 @@ dependencies {
optional("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
}
optional("net.sourceforge.htmlunit:htmlunit:2.29") {
optional("net.sourceforge.htmlunit:htmlunit:2.30") {
exclude group: "commons-logging", module: "commons-logging"
}
optional("org.seleniumhq.selenium:htmlunit-driver:2.29.3") {
optional("org.seleniumhq.selenium:htmlunit-driver:2.30.0") {
exclude group: "commons-logging", module: "commons-logging"
}
optional("org.seleniumhq.selenium:selenium-java:3.11.0") {
@@ -60,6 +60,7 @@ dependencies {
optional("io.projectreactor:reactor-test")
testCompile(project(":spring-context-support"))
testCompile(project(":spring-oxm"))
testCompile("javax.annotation:javax.annotation-api:1.3.2")
testCompile("javax.cache:cache-api:1.1.0")
testCompile("javax.ejb:javax.ejb-api:3.2")
testCompile("javax.interceptor:javax.interceptor-api:1.2.1")
@@ -82,11 +83,10 @@ dependencies {
testCompile('io.projectreactor.ipc:reactor-netty')
// Pull in the latest JUnit 5 Launcher API and the Vintage engine as well
// so that we can run JUnit 4 tests in IntelliJ IDEA.
testCompile('de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1')
testRuntime("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")
testRuntime("org.junit.platform:junit-platform-launcher:${junitPlatformVersion}")
testRuntime("org.junit.vintage:junit-vintage-engine:${junitVintageVersion}")
testCompile('de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1')
testRuntime("javax.annotation:javax.annotation-api:1.3.2")
testRuntime("org.glassfish:javax.el:3.0.1-b08")
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")