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

Upgrade to RxJava 2.2 and Kotlin 1.2.60 

Includes latest dependency updates (Mockito 2.21, Log4J 2.11.1, Hibernate ORM 5.3.4, Protobuf 3.6.1, JRuby 9.2, HtmlUnit 2.32, Selenium 3.14) for Spring Framework 5.1.

Issue: SPR-16388
Issue: SPR-16239
This commit is contained in:
Juergen Hoeller 2018-08-03 23:18:10 +02:00
parent c55c9eb029
commit 821ab62492
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@ -11,7 +11,7 @@ buildscript {
// 3rd party plugin repositories can be configured in settings.gradle
plugins {
id "io.spring.dependency-management" version "1.0.5.RELEASE" apply false
id "org.jetbrains.kotlin.jvm" version "1.2.51" apply false
id "org.jetbrains.kotlin.jvm" version "1.2.60" apply false
id "org.jetbrains.dokka" version "0.9.17"
id "org.asciidoctor.convert" version "1.5.7"
}
@ -37,13 +37,13 @@ ext {
junitPlatformVersion = "1.2.0"
junitJupiterVersion = "5.2.0"
junitVintageVersion = "5.2.0"
kotlinVersion = "1.2.51"
log4jVersion = "2.11.0"
kotlinVersion = "1.2.60"
log4jVersion = "2.11.1"
nettyVersion = "4.1.28.Final"
reactorVersion = "Californium-M1"
rxjavaVersion = "1.3.8"
rxjavaAdapterVersion = "1.2.1"
rxjava2Version = "2.1.17"
rxjava2Version = "2.2.0"
slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8"
tomcatVersion = "9.0.10"
@ -157,7 +157,7 @@ configure(allprojects) { project ->
testCompile("junit:junit:4.12") {
exclude group:'org.hamcrest', module:'hamcrest-core'
}
testCompile("org.mockito:mockito-core:2.20.0") {
testCompile("org.mockito:mockito-core:2.21.0") {
exclude group:'org.hamcrest', module:'hamcrest-core'
}
testCompile("com.nhaarman:mockito-kotlin:1.6.0") {

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

@ -9,7 +9,7 @@ dependencies {
optional(project(":spring-context"))
optional(project(":spring-web"))
optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.2")
optional("org.hibernate:hibernate-core:5.3.3.Final")
optional("org.hibernate:hibernate-core:5.3.4.Final")
optional("javax.servlet:javax.servlet-api:3.1.0")
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")

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

@ -36,13 +36,13 @@ 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.31") {
optional("net.sourceforge.htmlunit:htmlunit:2.32") {
exclude group: "commons-logging", module: "commons-logging"
}
optional("org.seleniumhq.selenium:htmlunit-driver:2.31.0") {
optional("org.seleniumhq.selenium:htmlunit-driver:2.32.0") {
exclude group: "commons-logging", module: "commons-logging"
}
optional("org.seleniumhq.selenium:selenium-java:3.13.0") {
optional("org.seleniumhq.selenium:selenium-java:3.14.0") {
exclude group: "commons-logging", module: "commons-logging"
exclude group: "io.netty", module: "netty"
}

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

@ -55,7 +55,7 @@ dependencies {
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson2Version}")
optional("com.google.code.gson:gson:2.8.5")
optional("com.google.protobuf:protobuf-java-util:3.6.0")
optional("com.google.protobuf:protobuf-java-util:3.6.1")
optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4")
optional("com.rometools:rome:1.11.0")
optional("com.caucho:hessian:4.0.51")

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

@ -39,7 +39,7 @@ dependencies {
}
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
optional("com.google.protobuf:protobuf-java-util:3.6.0")
optional("com.google.protobuf:protobuf-java-util:3.6.1")
testCompile("javax.xml.bind:jaxb-api:2.3.0")
testCompile("org.hibernate:hibernate-validator:6.0.11.Final")
testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
@ -55,7 +55,7 @@ dependencies {
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")
testRuntime("org.jruby:jruby:9.1.16.0")
testRuntime("org.jruby:jruby:9.2.0.0")
testRuntime("org.python:jython-standalone:2.7.1")
testRuntime("org.synchronoss.cloud:nio-multipart-parser:1.1.0")
testRuntime("org.webjars:underscorejs:1.8.3")

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

@ -74,7 +74,7 @@ dependencies {
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")
testRuntime("org.jruby:jruby:9.1.16.0")
testRuntime("org.jruby:jruby:9.2.0.0")
testRuntime("org.python:jython-standalone:2.7.1")
testRuntime("org.webjars:underscorejs:1.8.3")
testRuntime("org.glassfish:javax.el:3.0.1-b08")