Browse Source

Merge pull request #68 from jochenberger/update-dependencies

Update dependencies and Gradle wrapper
pull/60/merge
kallestenflo 10 years ago
parent
commit
32ab2b8f37
  1. 12
      build.gradle
  2. BIN
      gradle/wrapper/gradle-wrapper.jar
  3. 4
      gradle/wrapper/gradle-wrapper.properties
  4. 14
      json-path-web-test/build.gradle

12
build.gradle

@ -4,21 +4,21 @@ buildscript {
} }
dependencies { dependencies {
classpath 'me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1' classpath 'me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1'
classpath 'com.github.jengelman.gradle.plugins:shadow:0.8' classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.1'
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.0' classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.0'
} }
} }
ext { ext {
libs = [ libs = [
slf4jApi: 'org.slf4j:slf4j-api:1.7.7', slf4jApi: 'org.slf4j:slf4j-api:1.7.10',
jsonSmart: 'net.minidev:json-smart:2.1.1', jsonSmart: 'net.minidev:json-smart:2.1.1',
jacksonDatabind: 'com.fasterxml.jackson.core:jackson-databind:2.3.4', jacksonDatabind: 'com.fasterxml.jackson.core:jackson-databind:2.4.5',
gson: 'com.google.code.gson:gson:2.3', gson: 'com.google.code.gson:gson:2.3.1',
hamcrestCore: 'org.hamcrest:hamcrest-core:1.3', hamcrestCore: 'org.hamcrest:hamcrest-core:1.3',
hamcrestLibrary: 'org.hamcrest:hamcrest-library:1.3', hamcrestLibrary: 'org.hamcrest:hamcrest-library:1.3',
test: ['org.slf4j:slf4j-simple:1.7.7', 'org.assertj:assertj-core:1.6.1', 'commons-io:commons-io:2.4', 'org.hamcrest:hamcrest-core:1.3', 'org.hamcrest:hamcrest-library:1.3', 'junit:junit:4.10'] test: ['org.slf4j:slf4j-simple:1.7.10', 'org.assertj:assertj-core:1.7.1', 'commons-io:commons-io:2.4', 'org.hamcrest:hamcrest-core:1.3', 'org.hamcrest:hamcrest-library:1.3', 'junit:junit:4.12']
] ]
snapshotVersion = true snapshotVersion = true
} }
@ -70,7 +70,7 @@ subprojects {
} }
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '2.0' gradleVersion = '2.3'
} }
//Task used by Heroku for staging //Task used by Heroku for staging

BIN
gradle/wrapper/gradle-wrapper.jar vendored

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored

@ -1,6 +1,6 @@
#Fri Oct 03 12:04:58 CEST 2014 #Fri Mar 06 09:51:17 CET 2015
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip

14
json-path-web-test/build.gradle

@ -1,4 +1,4 @@
apply plugin: 'shadow' apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'application' apply plugin: 'application'
displayName = "JsonPath Test Bench" displayName = "JsonPath Test Bench"
@ -30,13 +30,13 @@ dependencies {
compile project(':json-path') compile project(':json-path')
compile 'commons-io:commons-io:2.4' compile 'commons-io:commons-io:2.4'
compile libs.jacksonDatabind compile libs.jacksonDatabind
compile 'io.fastjson:boon:0.25' compile 'io.fastjson:boon:0.32'
compile 'com.nebhale.jsonpath:jsonpath:1.2' compile 'com.nebhale.jsonpath:jsonpath:1.2'
compile 'io.gatling:jsonpath_2.10:0.4.0' compile 'io.gatling:jsonpath_2.10:0.6.2'
compile 'org.eclipse.jetty:jetty-server:9.2.2.v20140723' compile 'org.eclipse.jetty:jetty-server:9.3.0.M1'
compile 'org.eclipse.jetty:jetty-webapp:9.2.2.v20140723' compile 'org.eclipse.jetty:jetty-webapp:9.3.0.M1'
compile 'org.glassfish.jersey.containers:jersey-container-servlet:2.9.1' compile 'org.glassfish.jersey.containers:jersey-container-servlet:2.16'
compile('org.glassfish.jersey.media:jersey-media-json-jackson:2.9.1'){ compile('org.glassfish.jersey.media:jersey-media-json-jackson:2.16'){
exclude module: 'jackson-annotations:com.fasterxml.jackson.core' exclude module: 'jackson-annotations:com.fasterxml.jackson.core'
exclude module: 'jackson-core:com.fasterxml.jackson.core' exclude module: 'jackson-core:com.fasterxml.jackson.core'
} }

Loading…
Cancel
Save