From b06ccb0d00feddd7d01998332520350bc0155280 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Sat, 21 Apr 2018 20:01:39 +0200 Subject: [PATCH] update 3rd party libs spring boot to 2.0.1 guava to 24.1-jre jackson to 2.9.5 log4j2 to 2.10.0 (same version as pulled by spring boot) testng to 6.14.3 --- build.gradle | 4 ++-- data-store/build.gradle | 4 ++-- file-utils/build.gradle | 4 ++-- pdb-plotting/build.gradle | 4 ++-- pdb-ui/build.gradle | 10 ++++++---- performanceDb/build.gradle | 8 ++++---- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 9eea8e1..548f5dd 100644 --- a/build.gradle +++ b/build.gradle @@ -46,10 +46,10 @@ subprojects { // dependencies that all sub-projects have dependencies { - testCompile group: 'org.testng', name: 'testng', version: '6.13.1' + testCompile group: 'org.testng', name: 'testng', version: '6.14.3' } } task wrapper(type: Wrapper) { - gradleVersion = '4.6' + gradleVersion = '4.7' } diff --git a/data-store/build.gradle b/data-store/build.gradle index 25a155e..1ea1b4e 100644 --- a/data-store/build.gradle +++ b/data-store/build.gradle @@ -9,8 +9,8 @@ dependencies { compile 'org.lucares:primitiveCollections:0.1.20171228131833' compile 'org.apache.commons:commons-lang3:3.7' - compile 'org.apache.logging.log4j:log4j-core:2.9.1' - compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.1' + compile 'org.apache.logging.log4j:log4j-core:2.10.0' + compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' } diff --git a/file-utils/build.gradle b/file-utils/build.gradle index f428dab..921bb14 100644 --- a/file-utils/build.gradle +++ b/file-utils/build.gradle @@ -1,6 +1,6 @@ dependencies { - compile 'org.apache.logging.log4j:log4j-core:2.9.1' - compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.1' + compile 'org.apache.logging.log4j:log4j-core:2.10.0' + compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' } diff --git a/pdb-plotting/build.gradle b/pdb-plotting/build.gradle index 1fd99c0..a46fd58 100644 --- a/pdb-plotting/build.gradle +++ b/pdb-plotting/build.gradle @@ -2,7 +2,7 @@ dependencies { compile project(':performanceDb') compile 'org.lucares:primitiveCollections:0.1.20171228131833' - compile 'com.fasterxml.jackson.core:jackson-databind:2.9.3' - compile 'com.google.guava:guava:23.6-jre' + compile 'com.fasterxml.jackson.core:jackson-databind:2.9.5' + compile 'com.google.guava:guava:24.1-jre' } diff --git a/pdb-ui/build.gradle b/pdb-ui/build.gradle index b1eccba..16e0fde 100644 --- a/pdb-ui/build.gradle +++ b/pdb-ui/build.gradle @@ -13,15 +13,17 @@ dependencies { compile project(':performanceDb') compile project(':pdb-plotting') - compile('org.springframework.boot:spring-boot-starter-mustache:1.5.10.RELEASE') { + compile('org.springframework.boot:spring-boot-starter-mustache:2.0.1.RELEASE') { exclude module: 'spring-boot-starter-logging' } - compile("org.springframework.boot:spring-boot-starter-web:1.5.10.RELEASE"){ + compile("org.springframework.boot:spring-boot-starter-web:2.0.1.RELEASE"){ exclude module: 'spring-boot-starter-logging' } - compile("org.springframework.boot:spring-boot-starter-log4j2:1.5.10.RELEASE") + compile("org.springframework.boot:spring-boot-starter-log4j2:2.0.1.RELEASE") - testCompile("org.springframework.boot:spring-boot-starter-test:1.5.10.RELEASE") + testCompile("org.springframework.boot:spring-boot-starter-test:2.0.1.RELEASE"){ + exclude module: 'spring-boot-starter-logging' + } } jar { diff --git a/performanceDb/build.gradle b/performanceDb/build.gradle index b1c8e5c..2aebde1 100644 --- a/performanceDb/build.gradle +++ b/performanceDb/build.gradle @@ -3,11 +3,11 @@ dependencies { compile project(':pdb-api') compile project(':data-store') compile project(':file-utils') - compile 'com.fasterxml.jackson.core:jackson-databind:2.9.3' + compile 'com.fasterxml.jackson.core:jackson-databind:2.9.5' compile 'org.apache.commons:commons-collections4:4.1' - compile 'org.apache.logging.log4j:log4j-api:2.9.1' - compile 'org.apache.logging.log4j:log4j-core:2.9.1' - compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.1' + compile 'org.apache.logging.log4j:log4j-api:2.10.0' + compile 'org.apache.logging.log4j:log4j-core:2.10.0' + compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' }