root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Upgrade to Mockito 2.22, XMLUnit 2.6.2, JavaMail 1.6.2 

Also includes Apache Johnzon 1.1.9.
This commit is contained in:
Juergen Hoeller 2018-09-10 10:52:24 +02:00
parent 6c487f7799
commit e49896d95f
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -155,7 +155,7 @@ configure(allprojects) { project ->
testCompile("junit:junit:4.12") {
exclude group: "org.hamcrest", module: "hamcrest-core"
}
testCompile("org.mockito:mockito-core:2.21.0") {
testCompile("org.mockito:mockito-core:2.22.0") {
exclude group: "org.hamcrest", module: "hamcrest-core"
}
testCompile("com.nhaarman:mockito-kotlin:1.6.0") {

2
spring-aspects/spring-aspects.gradle
View File

@ -93,7 +93,7 @@ dependencies {
optional("javax.transaction:javax.transaction-api:1.3") // for @javax.transaction.Transactional support
testCompile(project(":spring-core")) // for CodeStyleAspect
testCompile(project(":spring-test"))
testCompile("javax.mail:javax.mail-api:1.6.1")
testCompile("javax.mail:javax.mail-api:1.6.2")
}
eclipse.project {

4
spring-context-support/spring-context-support.gradle
View File

@ -7,7 +7,7 @@ dependencies {
optional(project(":spring-jdbc")) // for Quartz support
optional(project(":spring-tx")) // for Quartz support
optional("javax.activation:javax.activation-api:1.2.0")
optional("javax.mail:javax.mail-api:1.6.1")
optional("javax.mail:javax.mail-api:1.6.2")
optional("javax.cache:cache-api:1.1.0")
optional("com.github.ben-manes.caffeine:caffeine:2.6.2")
optional("net.sf.ehcache:ehcache:2.10.4")
@ -21,5 +21,5 @@ dependencies {
testRuntime("org.ehcache:jcache:1.0.1")
testRuntime("org.ehcache:ehcache:3.4.0")
testRuntime("org.glassfish:javax.el:3.0.1-b08")
testRuntime("com.sun.mail:javax.mail:1.6.1")
testRuntime("com.sun.mail:javax.mail:1.6.2")
}

2
spring-core/spring-core.gradle
View File

@ -81,7 +81,7 @@ dependencies {
optional("io.netty:netty-buffer")
testCompile("io.projectreactor:reactor-test")
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
testCompile("javax.xml.bind:jaxb-api:2.3.0")
testCompile("com.fasterxml.woodstox:woodstox-core:5.1.0") {
exclude group: "stax", module: "stax-api"

2
spring-messaging/spring-messaging.gradle
View File

@ -36,7 +36,7 @@ dependencies {
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")
testRuntime("com.sun.activation:javax.activation:1.2.0")

2
spring-oxm/spring-oxm.gradle
View File

@ -117,7 +117,7 @@ dependencies {
}
testCompile(files(genCastor.classesDir).builtBy(genCastor))
testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
testRuntime("xerces:xercesImpl:2.11.0") // for Castor
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")

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

@ -47,7 +47,7 @@ dependencies {
exclude group: "commons-logging", module: "commons-logging"
exclude group: "io.netty", module: "netty"
}
optional("org.xmlunit:xmlunit-matchers:2.6.1")
optional("org.xmlunit:xmlunit-matchers:2.6.2")
optional("org.skyscreamer:jsonassert:1.5.0")
optional("com.jayway.jsonpath:json-path:2.4.0")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
@ -59,7 +59,7 @@ dependencies {
testCompile("javax.cache:cache-api:1.1.0")
testCompile("javax.ejb:javax.ejb-api:3.2")
testCompile("javax.interceptor:javax.interceptor-api:1.2.2")
testCompile("javax.mail:javax.mail-api:1.6.1")
testCompile("javax.mail:javax.mail-api:1.6.2")
testCompile("org.hibernate:hibernate-core:5.2.17.Final")
testCompile("org.hibernate:hibernate-validator:6.0.12.Final")
// Enable use of the JUnit Platform Runner

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

@ -19,7 +19,7 @@ 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:1.6.1")
optional("javax.mail:javax.mail-api:1.6.2")
optional("javax.validation:validation-api:1.1.0.Final")
optional("javax.xml.bind:jaxb-api:2.3.0")
optional("javax.xml.ws:jaxws-api:2.3.0")
@ -77,10 +77,10 @@ dependencies {
testCompile("com.squareup.okhttp3:mockwebserver:3.11.0")
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile("org.skyscreamer:jsonassert:1.5.0")
testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
testRuntime("com.sun.mail:javax.mail:1.6.1")
testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
testRuntime("com.sun.mail:javax.mail:1.6.2")
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")
testRuntime("javax.json:javax.json-api:1.1.2")
testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.8")
testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.9")
}

2
spring-webmvc/spring-webmvc.gradle
View File

@ -66,7 +66,7 @@ dependencies {
exclude group: "xom", module: "xom"
exclude group: "xerces", module: "xercesImpl"
}
testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
testCompile("io.projectreactor:reactor-core")
testCompile("io.reactivex:rxjava:${rxjavaVersion}")
testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")