Merge pull request json-path#189 from jochenberger/update-dependencies

Update dependencies
NeverMind2014 · Feb 12, 2016 · 82723a9 · 82723a9
2 parents c4de630 + c343104
commit 82723a9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,23 +4,23 @@ buildscript {
     }
     dependencies {
         classpath 'me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1'
-        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.2'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
         classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.0'
     }
 }
 
 ext {
     libs = [
-            slf4jApi: 'org.slf4j:slf4j-api:1.7.13',
+            slf4jApi: 'org.slf4j:slf4j-api:1.7.16',
             jsonSmart: 'net.minidev:json-smart:2.2.1',
             jacksonDatabind: 'com.fasterxml.jackson.core:jackson-databind:2.6.3',
             gson: 'com.google.code.gson:gson:2.3.1',
             jsonOrg: 'org.json:json:20140107',
-            tapestryJson: 'org.apache.tapestry:tapestry-json:5.4-rc-1',
+            tapestryJson: 'org.apache.tapestry:tapestry-json:5.4.0',
             hamcrestCore: 'org.hamcrest:hamcrest-core:1.3',
             hamcrestLibrary: 'org.hamcrest:hamcrest-library:1.3',
 
-            test: ['org.slf4j:slf4j-simple:1.7.13', 'org.assertj:assertj-core:2.1.0', 'commons-io:commons-io:2.4','org.hamcrest:hamcrest-core:1.3', 'org.hamcrest:hamcrest-library:1.3', 'junit:junit:4.12']
+            test: ['org.slf4j:slf4j-simple:1.7.16', 'org.assertj:assertj-core:2.1.0', 'commons-io:commons-io:2.4','org.hamcrest:hamcrest-core:1.3', 'org.hamcrest:hamcrest-library:1.3', 'junit:junit:4.12']
     ]
     snapshotVersion = true
 }
@@ -72,7 +72,7 @@ subprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.9'
+    gradleVersion = '2.11'
 }
 
 //Task used by Heroku for staging

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 14 13:19:40 CET 2015
+#Fri Feb 12 10:36:51 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
diff --git a/gradlew.bat b/gradlew.bat
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args