From 331e3519ccedfdf2213368a4139c24554686f9ae Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 4 Jul 2018 16:30:02 +0100 Subject: [PATCH 1/2] update to jackson 2.9.6 due to CVEs --- build.gradle | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 47dd0d21..69f9bbc4 100644 --- a/build.gradle +++ b/build.gradle @@ -33,6 +33,10 @@ subprojects { mavenCentral() } + ext { + jacksonVersion = '2.9.6' + } + apply plugin: 'maven' apply plugin: 'maven-publish' apply plugin: 'java' @@ -43,11 +47,11 @@ subprojects { //noinspection GroovyAssignabilityCheck dependencies { - compile 'com.fasterxml.jackson.core:jackson-core:2.4.2' - compile 'com.fasterxml.jackson.core:jackson-annotations:2.4.2' - compile 'com.fasterxml.jackson.core:jackson-databind:2.4.2' + compile "com.fasterxml.jackson.core:jackson-core:$jacksonVersion" + compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" compile 'com.google.guava:guava:17.0' - compile 'org.slf4j:slf4j-api:1.7.7' + compile 'org.slf4j:slf4j-api:1.7.25' compile 'commons-codec:commons-codec:1.9' testCompile 'junit:junit:4.11' testCompile 'org.powermock:powermock-module-junit4:1.6.6' From 117fefa5b8d1e3f4c4758856e6cbb5a96f746b74 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 11 Jul 2018 11:01:33 +0100 Subject: [PATCH 2/2] use double quotes for dependencies --- build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 69f9bbc4..f06bb10d 100644 --- a/build.gradle +++ b/build.gradle @@ -35,6 +35,7 @@ subprojects { ext { jacksonVersion = '2.9.6' + powermockVersion = '1.6.6' } apply plugin: 'maven' @@ -50,16 +51,15 @@ subprojects { compile "com.fasterxml.jackson.core:jackson-core:$jacksonVersion" compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion" compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" - compile 'com.google.guava:guava:17.0' - compile 'org.slf4j:slf4j-api:1.7.25' - compile 'commons-codec:commons-codec:1.9' - testCompile 'junit:junit:4.11' - testCompile 'org.powermock:powermock-module-junit4:1.6.6' - testCompile 'org.powermock:powermock-api-mockito:1.6.6' + compile "com.google.guava:guava:17.0" + compile "org.slf4j:slf4j-api:1.7.25" + compile "commons-codec:commons-codec:1.9" + testCompile "junit:junit:4.12" + testCompile "org.powermock:powermock-module-junit4:$powermockVersion" + testCompile "org.powermock:powermock-api-mockito:$powermockVersion" } } - task wrapper(type: Wrapper) { gradleVersion = '2.0' }