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 Kotlin 1.3.30, Mockito 2.27, MockK 1.9.3, AssertJ 3.12.2 

This commit removes quartzVersion since it is only used once.
This commit is contained in:
Juergen Hoeller 2019-04-12 10:28:15 +02:00
parent 07738b9529
commit f9903bbf69
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.gradle
View File

@ -11,7 +11,7 @@ buildscript {
// 3rd party plugin repositories can be configured in settings.gradle // 3rd party plugin repositories can be configured in settings.gradle
plugins { plugins {
id "io.spring.dependency-management" version "1.0.5.RELEASE" apply false id "io.spring.dependency-management" version "1.0.5.RELEASE" apply false
id "org.jetbrains.kotlin.jvm" version "1.3.21" apply false id "org.jetbrains.kotlin.jvm" version "1.3.30" apply false
id "org.jetbrains.dokka" version "0.9.18" id "org.jetbrains.dokka" version "0.9.18"
id "org.asciidoctor.convert" version "1.5.8" id "org.asciidoctor.convert" version "1.5.8"
} }
@ -36,10 +36,9 @@ ext {
jackson2Version = "2.9.8" jackson2Version = "2.9.8"
jettyVersion = "9.4.15.v20190215" jettyVersion = "9.4.15.v20190215"
junit5Version = "5.4.2" junit5Version = "5.4.2"
kotlinVersion = "1.3.21" kotlinVersion = "1.3.30"
log4jVersion = "2.11.2" log4jVersion = "2.11.2"
nettyVersion = "4.1.34.Final" nettyVersion = "4.1.34.Final"
quartzVersion = "2.3.1"
reactorVersion = "Californium-BUILD-SNAPSHOT" reactorVersion = "Californium-BUILD-SNAPSHOT"
rxjavaVersion = "1.3.8" rxjavaVersion = "1.3.8"
rxjavaAdapterVersion = "1.2.1" rxjavaAdapterVersion = "1.2.1"
@ -158,12 +157,12 @@ configure(allprojects) { project ->
testCompile("junit:junit:4.12") { testCompile("junit:junit:4.12") {
exclude group: "org.hamcrest", module: "hamcrest-core" exclude group: "org.hamcrest", module: "hamcrest-core"
} }
testCompile("org.mockito:mockito-core:2.26.0") { testCompile("org.mockito:mockito-core:2.27.0") {
exclude group: "org.hamcrest", module: "hamcrest-core" exclude group: "org.hamcrest", module: "hamcrest-core"
} }
testCompile("io.mockk:mockk:1.9.1") testCompile("io.mockk:mockk:1.9.3")
testCompile("org.hamcrest:hamcrest-all:1.3") testCompile("org.hamcrest:hamcrest-all:1.3")
testCompile("org.assertj:assertj-core:3.11.0") testCompile("org.assertj:assertj-core:3.12.2")
testRuntime("org.apache.logging.log4j:log4j-core:${log4jVersion}") testRuntime("org.apache.logging.log4j:log4j-core:${log4jVersion}")
testRuntime("org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}") testRuntime("org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}")
testRuntime("org.apache.logging.log4j:log4j-jul:${log4jVersion}") testRuntime("org.apache.logging.log4j:log4j-jul:${log4jVersion}")

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

@ -11,7 +11,7 @@ dependencies {
optional("javax.cache:cache-api:1.1.0") optional("javax.cache:cache-api:1.1.0")
optional("com.github.ben-manes.caffeine:caffeine:2.7.0") optional("com.github.ben-manes.caffeine:caffeine:2.7.0")
optional("net.sf.ehcache:ehcache:2.10.4") optional("net.sf.ehcache:ehcache:2.10.4")
optional("org.quartz-scheduler:quartz:${quartzVersion}") optional("org.quartz-scheduler:quartz:2.3.1")
optional("org.codehaus.fabric3.api:commonj:1.1.0") optional("org.codehaus.fabric3.api:commonj:1.1.0")
optional("org.freemarker:freemarker:${freemarkerVersion}") optional("org.freemarker:freemarker:${freemarkerVersion}")
testCompile(project(":spring-context")) testCompile(project(":spring-context"))