Browse Source

Upgrade to RxJava 2.2.17, OkHttp 3.14.6, Hibernate ORM 5.3.15

pull/27217/head
Juergen Hoeller 6 years ago
parent
commit
170adccf80
  1. 2
      build.gradle
  2. 2
      spring-orm/spring-orm.gradle
  3. 2
      spring-test/spring-test.gradle
  4. 4
      spring-web/spring-web.gradle
  5. 2
      spring-webflux/spring-webflux.gradle

2
build.gradle

@ -41,7 +41,7 @@ ext { @@ -41,7 +41,7 @@ ext {
reactorVersion = "Californium-SR14"
rxjavaVersion = "1.3.8"
rxjavaAdapterVersion = "1.2.1"
rxjava2Version = "2.2.16"
rxjava2Version = "2.2.17"
slf4jVersion = "1.7.30" // spring-jcl + consistent 3rd party deps
tiles3Version = "3.0.8"
tomcatVersion = "9.0.30"

2
spring-orm/spring-orm.gradle

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

2
spring-test/spring-test.gradle

@ -60,7 +60,7 @@ dependencies { @@ -60,7 +60,7 @@ dependencies {
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.2")
testCompile("org.hibernate:hibernate-core:5.3.12.Final")
testCompile("org.hibernate:hibernate-core:5.3.15.Final")
testCompile("org.hibernate:hibernate-validator:6.0.18.Final")
// Enable use of the JUnit Platform Runner
testCompile("org.junit.platform:junit-platform-runner")

4
spring-web/spring-web.gradle

@ -38,7 +38,7 @@ dependencies { @@ -38,7 +38,7 @@ dependencies {
exclude group: "javax.servlet", module: "javax.servlet-api"
}
optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3")
optional("com.squareup.okhttp3:okhttp:3.14.5")
optional("com.squareup.okhttp3:okhttp:3.14.6")
optional("org.apache.httpcomponents:httpclient:4.5.10") {
exclude group: "commons-logging", module: "commons-logging"
}
@ -75,7 +75,7 @@ dependencies { @@ -75,7 +75,7 @@ dependencies {
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
testCompile("org.eclipse.jetty:jetty-server")
testCompile("org.eclipse.jetty:jetty-servlet")
testCompile("com.squareup.okhttp3:mockwebserver:3.14.5")
testCompile("com.squareup.okhttp3:mockwebserver:3.14.6")
testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile("org.skyscreamer:jsonassert:1.5.0")
testCompile("org.xmlunit:xmlunit-matchers:2.6.2")

2
spring-webflux/spring-webflux.gradle

@ -51,7 +51,7 @@ dependencies { @@ -51,7 +51,7 @@ dependencies {
testCompile("org.eclipse.jetty:jetty-server")
testCompile("org.eclipse.jetty:jetty-servlet")
testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3")
testCompile("com.squareup.okhttp3:mockwebserver:3.14.5")
testCompile("com.squareup.okhttp3:mockwebserver:3.14.6")
testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")

Loading…
Cancel
Save