Skip to content

Commit 8816904

Browse files
committed
bump up Guava version
while we wait on java-json-tools/jackson-coreutils#3
1 parent 4da4d46 commit 8816904

4 files changed

Lines changed: 13 additions & 6 deletions

File tree

libraries.gradle

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ext {
1010
jgroupsVersion = '4.0.16.Final'
1111
jaxrsVersion = '2.0.1'
1212
jsonSchemaVersion = '2.2.10'
13+
guavaVersion = '27.1-jre'
1314
jacksonVersion = '2.9.8'
1415
groovyVersion = '2.4.12'
1516
restAssuredVersion = '2.9.0'
@@ -108,11 +109,17 @@ ext {
108109
// RestAssured
109110
restAssured: "com.jayway.restassured:rest-assured:2.9.0",
110111

111-
jsonSchemaValidator: "com.github.fge:json-schema-validator:${jsonSchemaVersion}",
112-
112+
jsonSchemaValidator: "com.github.java-json-tools:json-schema-validator:${jsonSchemaVersion}",
113+
guava: "com.google.guava:guava:${guavaVersion}",
113114
httpAsyncClient: "org.apache.httpcomponents:httpasyncclient:${httpAsyncClientVersion}"
114115
]
115116

117+
118+
jsonSchemaValidatorLibs = [
119+
libraries.jsonSchemaValidator,
120+
libraries.guava
121+
]
122+
116123
jettyLibs = [
117124
libraries.jetty_server,
118125
libraries.jetty_xml,

modules/eerest/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ dependencies {
44
compile project(':modules:core')
55
compile project(':modules:txn')
66
compile "javax.ws.rs:javax.ws.rs-api:${jaxrsVersion}"
7-
compile libraries.jsonSchemaValidator
8-
compile 'com.google.guava:guava:27.1-jre' // force newer Guava
7+
compile jsonSchemaValidatorLibs
98
compile libraries.commons_lang
109
}
1110

modules/eeresttest/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ dependencies {
66
providedCompile project(':modules:eerest')
77
providedCompile project(':modules:jetty')
88
providedCompile "javax.ws.rs:javax.ws.rs-api:${jaxrsVersion}"
9-
providedCompile "com.github.fge:json-schema-validator:${jsonSchemaVersion}"
9+
providedCompile jsonSchemaValidatorLibs
10+
providedCompile 'com.google.guava:guava:27.1-jre' // force newer Guava
1011
providedCompile "org.glassfish.jersey.media:jersey-media-json-jackson:2.22.1"
1112
providedCompile "org.glassfish.jersey.core:jersey-server:2.22.1"
1213
compile libraries.commons_lang

modules/qrest/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies {
55
compile libraries.jacksonDatabind
66
compile libraries.nettyHandler
77
compile libraries.nettyCodecHttp
8-
compile libraries.jsonSchemaValidator
8+
compile jsonSchemaValidatorLibs
99
testCompile libraries.junit
1010
testCompile libraries.restAssured
1111
}

0 commit comments

Comments
 (0)