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

Build against EE 8 API level wherever possible

Browse Source 
Upgrade to JAXB 2.3, JAX-WS 2.3, Annotations 1.3.1, Interceptor 1.2.1.
Also includes Log4J 2.9.1 and Asciidoctor 1.5.6.
This commit is contained in:
Juergen Hoeller
2017-09-24 17:18:21 +02:00
parent 1e87b6dd7d
commit e2882fe1db
14 changed files with 69 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,23 +25,23 @@ dependencies {
optional(project(":spring-webflux"))
optional(project(":spring-webmvc"))
optional(project(":spring-websocket"))
optional("junit:junit:4.12")
optional("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
optional("org.testng:testng:6.12")
optional("javax.activation:activation:1.1.1")
optional("javax.el:javax.el-api:3.0.1-b04")
optional("javax.inject:javax.inject:1")
optional("javax.servlet:javax.servlet-api:4.0.0")
optional("javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02")
optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
optional("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
}
optional("javax.el:javax.el-api:3.0.1-b04")
optional("javax.xml.bind:jaxb-api:2.3.0")
optional("javax.websocket:javax.websocket-api:1.1")
optional("javax.activation:activation:${activationVersion}")
optional("javax.xml.bind:jaxb-api:${jaxbVersion}")
optional("junit:junit:4.12")
optional("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
optional("org.testng:testng:6.12")
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
optional("org.hamcrest:hamcrest-core:1.3")
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.27") {
exclude group: "commons-logging", module: "commons-logging"
}
@@ -60,10 +60,10 @@ dependencies {
optional("io.projectreactor:reactor-test")
testCompile(project(":spring-context-support"))
testCompile(project(":spring-oxm"))
testCompile("javax.mail:javax.mail-api:${javamailVersion}")
testCompile("javax.ejb:javax.ejb-api:3.2")
testCompile("javax.interceptor:javax.interceptor-api:1.2")
testCompile("javax.cache:cache-api:1.0.0")
testCompile("javax.ejb:javax.ejb-api:3.2")
testCompile("javax.interceptor:javax.interceptor-api:1.2.1")
testCompile("javax.mail:javax.mail-api:1.6.0")
testCompile("org.hibernate:hibernate-core:5.2.11.Final")
testCompile("org.hibernate:hibernate-validator:6.0.2.Final")
// Enable use of the JUnitPlatform Runner
@@ -80,7 +80,7 @@ dependencies {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.apache.httpcomponents:httpclient:${httpclientVersion}") {
testCompile("org.apache.httpcomponents:httpclient:4.5.3") {
exclude group: "commons-logging", module: "commons-logging"
}
testCompile('io.projectreactor.ipc:reactor-netty')
@@ -91,10 +91,10 @@ dependencies {
testRuntime("org.junit.vintage:junit-vintage-engine:${junitVintageVersion}")
testCompile('de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1')
testRuntime("org.apache.logging.log4j:log4j-jul:${log4jVersion}") // Java Util Logging for JUnit 5
testRuntime("javax.annotation:javax.annotation-api:1.3")
testRuntime("javax.annotation:javax.annotation-api:1.3.1")
testRuntime("org.glassfish:javax.el:3.0.1-b08")
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
}
task testNG(type: Test) {