Skip to content

Commit

Permalink
bump up Guava version
Browse files Browse the repository at this point in the history
  • Loading branch information
ar committed Mar 13, 2019
1 parent 4da4d46 commit 8816904
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
11 changes: 9 additions & 2 deletions libraries.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ext {
jgroupsVersion = '4.0.16.Final'
jaxrsVersion = '2.0.1'
jsonSchemaVersion = '2.2.10'
guavaVersion = '27.1-jre'
jacksonVersion = '2.9.8'
groovyVersion = '2.4.12'
restAssuredVersion = '2.9.0'
Expand Down Expand Up @@ -108,11 +109,17 @@ ext {
// RestAssured
restAssured: "com.jayway.restassured:rest-assured:2.9.0",

jsonSchemaValidator: "com.github.fge:json-schema-validator:${jsonSchemaVersion}",

jsonSchemaValidator: "com.github.java-json-tools:json-schema-validator:${jsonSchemaVersion}",
guava: "com.google.guava:guava:${guavaVersion}",
httpAsyncClient: "org.apache.httpcomponents:httpasyncclient:${httpAsyncClientVersion}"
]


jsonSchemaValidatorLibs = [
libraries.jsonSchemaValidator,
libraries.guava
]

jettyLibs = [
libraries.jetty_server,
libraries.jetty_xml,
Expand Down
3 changes: 1 addition & 2 deletions modules/eerest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ dependencies {
compile project(':modules:core')
compile project(':modules:txn')
compile "javax.ws.rs:javax.ws.rs-api:${jaxrsVersion}"
compile libraries.jsonSchemaValidator
compile 'com.google.guava:guava:27.1-jre' // force newer Guava
compile jsonSchemaValidatorLibs
compile libraries.commons_lang
}

Expand Down
3 changes: 2 additions & 1 deletion modules/eeresttest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ dependencies {
providedCompile project(':modules:eerest')
providedCompile project(':modules:jetty')
providedCompile "javax.ws.rs:javax.ws.rs-api:${jaxrsVersion}"
providedCompile "com.github.fge:json-schema-validator:${jsonSchemaVersion}"
providedCompile jsonSchemaValidatorLibs
providedCompile 'com.google.guava:guava:27.1-jre' // force newer Guava
providedCompile "org.glassfish.jersey.media:jersey-media-json-jackson:2.22.1"
providedCompile "org.glassfish.jersey.core:jersey-server:2.22.1"
compile libraries.commons_lang
Expand Down
2 changes: 1 addition & 1 deletion modules/qrest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies {
compile libraries.jacksonDatabind
compile libraries.nettyHandler
compile libraries.nettyCodecHttp
compile libraries.jsonSchemaValidator
compile jsonSchemaValidatorLibs
testCompile libraries.junit
testCompile libraries.restAssured
}
Expand Down

0 comments on commit 8816904

Please # to comment.