Browse Source

Upgrade to Kotlin 1.3.70

Includes latest dependency updates (Netty 4.1.47, Jetty 9.4.27, Jackson 2.10.3, Log4J 2.13.1, SnakeYAML 1.26, Vavr 0.10.2, Commons Pool 2.8, POI 4.1.2, OkHttp 3.14.7, Jetty Reactive HttpClient 1.1.2, JRuby 9.2.11, AssertJ 3.15)
pull/24679/head
Juergen Hoeller 5 years ago
parent
commit
73e39726cd
  1. 30
      build.gradle

30
build.gradle

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
plugins {
id 'io.spring.dependency-management' version '1.0.8.RELEASE' apply false
id 'org.jetbrains.kotlin.jvm' version '1.3.61' apply false
id 'org.jetbrains.kotlin.jvm' version '1.3.70' apply false
id 'org.jetbrains.dokka' version '0.9.18' apply false
id 'org.asciidoctor.jvm.convert' version '2.4.0'
id 'io.spring.gradle-enterprise-conventions' version '0.0.2'
@ -26,17 +26,17 @@ configure(allprojects) { project -> @@ -26,17 +26,17 @@ configure(allprojects) { project ->
dependencyManagement {
imports {
mavenBom "com.fasterxml.jackson:jackson-bom:2.10.2"
mavenBom "io.netty:netty-bom:4.1.45.Final"
mavenBom "com.fasterxml.jackson:jackson-bom:2.10.3"
mavenBom "io.netty:netty-bom:4.1.47.Final"
mavenBom "io.projectreactor:reactor-bom:Dysprosium-SR5"
mavenBom "io.rsocket:rsocket-bom:1.0.0-RC6"
mavenBom "org.eclipse.jetty:jetty-bom:9.4.26.v20200117"
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.3.61"
mavenBom "org.eclipse.jetty:jetty-bom:9.4.27.v20200227"
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.3.70"
mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.2"
mavenBom "org.junit:junit-bom:5.6.0"
}
dependencies {
dependencySet(group: 'org.apache.logging.log4j', version: '2.13.0') {
dependencySet(group: 'org.apache.logging.log4j', version: '2.13.1') {
entry 'log4j-api'
entry 'log4j-core'
entry 'log4j-slf4j-impl'
@ -52,7 +52,7 @@ configure(allprojects) { project -> @@ -52,7 +52,7 @@ configure(allprojects) { project ->
entry 'aspectjweaver'
}
// If customJavaHome has been set, we assume we need Groovy 3.0 for testing purposes.
dependencySet(group: 'org.codehaus.groovy', version: System.getProperty("customJavaHome") ? '3.0.1' : '2.5.9') {
dependencySet(group: 'org.codehaus.groovy', version: System.getProperty("customJavaHome") ? '3.0.1' : '2.5.9') {
entry 'groovy'
entry 'groovy-jsr223'
entry 'groovy-templates'
@ -86,14 +86,14 @@ configure(allprojects) { project -> @@ -86,14 +86,14 @@ configure(allprojects) { project ->
entry 'jibx-run'
}
dependency "org.ogce:xpp3:1.1.6"
dependency "org.yaml:snakeyaml:1.25"
dependency "org.yaml:snakeyaml:1.26"
dependency "com.h2database:h2:1.4.200"
dependency "com.github.ben-manes.caffeine:caffeine:2.8.1"
dependency "com.github.librepdf:openpdf:1.3.13"
dependency "com.rometools:rome:1.12.2"
dependency "commons-io:commons-io:2.5"
dependency "io.vavr:vavr:0.10.0"
dependency "io.vavr:vavr:0.10.2"
dependency "net.sf.jopt-simple:jopt-simple:5.0.4"
dependencySet(group: 'org.apache.activemq', version: '5.8.0') {
entry 'activemq-broker'
@ -103,12 +103,12 @@ configure(allprojects) { project -> @@ -103,12 +103,12 @@ configure(allprojects) { project ->
entry 'activemq-stomp'
}
dependency "org.apache.bcel:bcel:6.0"
dependency "org.apache.commons:commons-pool2:2.7.0"
dependency "org.apache.commons:commons-pool2:2.8.0"
dependencySet(group: 'org.apache.derby', version: '10.14.2.0') {
entry 'derby'
entry 'derbyclient'
}
dependency "org.apache.poi:poi-ooxml:4.1.1"
dependency "org.apache.poi:poi-ooxml:4.1.2"
dependency "org.beanshell:bsh:2.0b5"
dependency "org.freemarker:freemarker:2.3.29"
dependency "org.hsqldb:hsqldb:2.5.0"
@ -144,7 +144,7 @@ configure(allprojects) { project -> @@ -144,7 +144,7 @@ configure(allprojects) { project ->
}
}
dependencySet(group: 'com.squareup.okhttp3', version: '3.14.6') {
dependencySet(group: 'com.squareup.okhttp3', version: '3.14.7') {
entry 'okhttp'
entry 'mockwebserver'
}
@ -154,9 +154,9 @@ configure(allprojects) { project -> @@ -154,9 +154,9 @@ configure(allprojects) { project ->
dependency("org.apache.httpcomponents:httpasyncclient:4.1.4") {
exclude group: "commons-logging", name: "commons-logging"
}
dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.1"
dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.2"
dependency "org.jruby:jruby:9.2.9.0"
dependency "org.jruby:jruby:9.2.11.0"
dependency "org.python:jython-standalone:2.7.1"
dependency "org.mozilla:rhino:1.7.11"
@ -181,7 +181,7 @@ configure(allprojects) { project -> @@ -181,7 +181,7 @@ configure(allprojects) { project ->
dependency "org.testng:testng:6.14.3"
dependency "org.hamcrest:hamcrest:2.1"
dependency "org.awaitility:awaitility:3.1.6"
dependency "org.assertj:assertj-core:3.14.0"
dependency "org.assertj:assertj-core:3.15.0"
dependencySet(group: 'org.xmlunit', version: '2.6.2') {
entry 'xmlunit-assertj'
entry('xmlunit-matchers') {

Loading…
Cancel
Save