Skip to content

Commit eaffcbe

Browse files
committed
Upgrade to Gradle 4.8.1
Includes Kotlin 1.2.50, RxJava 2.1.15 and Protobuf 3.6. Issue: SPR-16475
1 parent 69d8f9d commit eaffcbe

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
// 3rd party plugin repositories can be configured in settings.gradle
1212
plugins {
1313
id "io.spring.dependency-management" version "1.0.5.RELEASE" apply false
14-
id "org.jetbrains.kotlin.jvm" version "1.2.41" apply false
14+
id "org.jetbrains.kotlin.jvm" version "1.2.50" apply false
1515
id "org.jetbrains.dokka" version "0.9.17"
1616
id "org.asciidoctor.convert" version "1.5.7"
1717
}
@@ -37,13 +37,13 @@ ext {
3737
junitPlatformVersion = "1.2.0"
3838
junitJupiterVersion = "5.2.0"
3939
junitVintageVersion = "5.2.0"
40-
kotlinVersion = "1.2.41"
40+
kotlinVersion = "1.2.50"
4141
log4jVersion = "2.11.0"
4242
nettyVersion = "4.1.25.Final"
4343
reactorVersion = "Californium-BUILD-SNAPSHOT"
4444
rxjavaVersion = "1.3.8"
4545
rxjavaAdapterVersion = "1.2.1"
46-
rxjava2Version = "2.1.14"
46+
rxjava2Version = "2.1.15"
4747
slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps
4848
tiles3Version = "3.0.8"
4949
tomcatVersion = "9.0.8"
@@ -283,7 +283,7 @@ configure(rootProject) {
283283

284284
wrapper {
285285
description = "Generates gradlew[.bat] scripts"
286-
gradleVersion = '4.8'
286+
gradleVersion = '4.8.1'
287287

288288
doLast() {
289289
def gradleOpts = "-XX:MaxMetaspaceSize=1024m -Xmx1024m"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

spring-web/spring-web.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ dependencies {
5454
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
5555
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson2Version}")
5656
optional("com.google.code.gson:gson:2.8.5")
57-
optional("com.google.protobuf:protobuf-java-util:3.5.1")
57+
optional("com.google.protobuf:protobuf-java-util:3.6.0")
5858
optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4")
5959
optional("com.rometools:rome:1.10.0")
6060
optional("com.caucho:hessian:4.0.51")

0 commit comments

Comments
 (0)