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

20
spring-web/spring-web.gradle
View File

@@ -25,10 +25,10 @@ dependencies {
optional("javax.el:javax.el-api:3.0.1-b04")
optional("javax.faces:javax.faces-api:2.2")
optional("javax.json.bind:javax.json.bind-api:1.0")
optional("javax.mail:javax.mail-api:${javamailVersion}")
optional("javax.mail:javax.mail-api:1.6.0")
optional("javax.validation:validation-api:1.1.0.Final")
optional("javax.xml.bind:jaxb-api:${jaxbVersion}")
optional("javax.xml.ws:jaxws-api:${jaxwsVersion}")
optional("javax.xml.bind:jaxb-api:2.3.0")
optional("javax.xml.ws:jaxws-api:2.3.0")
optional("io.reactivex:rxjava:${rxjavaVersion}")
optional("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")
optional("io.reactivex.rxjava2:rxjava:${rxjava2Version}")
@@ -42,8 +42,8 @@ dependencies {
exclude group: "javax.servlet", module: "javax.servlet-api"
}
optional("io.undertow:undertow-core:${undertowVersion}")
optional("com.squareup.okhttp3:okhttp:${okhttp3Version}")
optional("org.apache.httpcomponents:httpclient:${httpclientVersion}") {
optional("com.squareup.okhttp3:okhttp:3.9.0")
optional("org.apache.httpcomponents:httpclient:4.5.3") {
exclude group: "commons-logging", module: "commons-logging"
}
optional("org.apache.httpcomponents:httpasyncclient:4.1.3") {
@@ -68,7 +68,7 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
testCompile("io.projectreactor:reactor-test")
testCompile("org.apache.taglibs:taglibs-standard-jstlel:1.2.1") {
testCompile("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
}
testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2Version}")
@@ -81,12 +81,12 @@ dependencies {
testCompile("io.reactivex:rxnetty-http:0.5.2") {
exclude group: 'io.reactivex', module: 'rxjava'
}
testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
testCompile("com.squareup.okhttp3:mockwebserver:3.9.0")
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile("org.skyscreamer:jsonassert:1.5.0")
testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
testRuntime("com.sun.mail:javax.mail:1.6.0")
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
testRuntime("javax.json:javax.json-api:1.1")
testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.3")
}