From cbe947694d394e3ac76a1ec06e2077029d2f5956 Mon Sep 17 00:00:00 2001
From: Mike Hearn <mike@r3.com>
Date: Wed, 7 Feb 2018 12:16:16 +0000
Subject: [PATCH] Minor: upgrade some Spring Boot deps and tweak the Jackson
version it uses to avoid a conflict with Kotlin 1.2.20
---
client/jackson/build.gradle | 4 ++--
samples/irs-demo/build.gradle | 6 ++++--
samples/irs-demo/web/build.gradle | 6 ++++--
samples/network-visualiser/build.gradle | 4 +++-
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/client/jackson/build.gradle b/client/jackson/build.gradle
index fadfdf9975..2fd7eb9dc7 100644
--- a/client/jackson/build.gradle
+++ b/client/jackson/build.gradle
@@ -8,11 +8,11 @@ dependencies {
compile project(':core')
testCompile project(':test-utils')
- compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+ compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
// Jackson and its plugins: parsing to/from JSON and other textual formats.
- compile "com.fasterxml.jackson.module:jackson-module-kotlin:${jackson_version}"
+ compile "com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_version"
// Yaml is useful for parsing strings to method calls.
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jackson_version"
// This adds support for java.time types.
diff --git a/samples/irs-demo/build.gradle b/samples/irs-demo/build.gradle
index c738eb6c48..e781ba6d81 100644
--- a/samples/irs-demo/build.gradle
+++ b/samples/irs-demo/build.gradle
@@ -1,12 +1,13 @@
buildscript {
ext {
- springBootVersion = '1.5.7.RELEASE'
+ springBootVersion = '1.5.10.RELEASE'
}
repositories {
mavenCentral()
}
dependencies {
- classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
+ classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
+ classpath "io.spring.gradle:dependency-management-plugin:1.0.4.RELEASE"
}
}
@@ -16,6 +17,7 @@ buildscript {
ext['artemis.version'] = "$artemis_version"
ext['hibernate.version'] = "$hibernate_version"
ext['selenium.version'] = "$selenium_version"
+ext['jackson.version'] = "$jackson_version"
apply plugin: 'java'
apply plugin: 'kotlin'
diff --git a/samples/irs-demo/web/build.gradle b/samples/irs-demo/web/build.gradle
index 573433b3e9..9f92026c58 100644
--- a/samples/irs-demo/web/build.gradle
+++ b/samples/irs-demo/web/build.gradle
@@ -7,8 +7,9 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
- classpath("org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}")
+ classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
+ classpath "io.spring.gradle:dependency-management-plugin:1.0.4.RELEASE"
+ classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
classpath 'com.bmuschko:gradle-docker-plugin:3.2.1'
classpath "org.yaml:snakeyaml:1.19"
}
@@ -47,6 +48,7 @@ clientDependencies {
// See https://github.com/spring-gradle-plugins/dependency-management-plugin/blob/master/README.md#changing-the-value-of-a-version-property
ext['artemis.version'] = "$artemis_version"
ext['hibernate.version'] = "$hibernate_version"
+ext['jackson.version'] = "$jackson_version"
apply plugin: 'kotlin'
apply plugin: 'kotlin-spring'
diff --git a/samples/network-visualiser/build.gradle b/samples/network-visualiser/build.gradle
index 9767030c79..543f5dbf92 100644
--- a/samples/network-visualiser/build.gradle
+++ b/samples/network-visualiser/build.gradle
@@ -6,7 +6,8 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
+ classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
+ classpath "io.spring.gradle:dependency-management-plugin:1.0.4.RELEASE"
}
}
@@ -16,6 +17,7 @@ buildscript {
// This has to be repeated here as otherwise the order of files does matter
ext['artemis.version'] = "$artemis_version"
ext['hibernate.version'] = "$hibernate_version"
+ext['jackson.version'] = "$jackson_version"
apply plugin: 'java'