Skip to content

Commit 82723a9

Browse files
committed
Merge pull request #189 from jochenberger/update-dependencies
Update dependencies
2 parents c4de630 + c343104 commit 82723a9

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ buildscript {
44
}
55
dependencies {
66
classpath 'me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1'
7-
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.2'
7+
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
88
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.0'
99
}
1010
}
1111

1212
ext {
1313
libs = [
14-
slf4jApi: 'org.slf4j:slf4j-api:1.7.13',
14+
slf4jApi: 'org.slf4j:slf4j-api:1.7.16',
1515
jsonSmart: 'net.minidev:json-smart:2.2.1',
1616
jacksonDatabind: 'com.fasterxml.jackson.core:jackson-databind:2.6.3',
1717
gson: 'com.google.code.gson:gson:2.3.1',
1818
jsonOrg: 'org.json:json:20140107',
19-
tapestryJson: 'org.apache.tapestry:tapestry-json:5.4-rc-1',
19+
tapestryJson: 'org.apache.tapestry:tapestry-json:5.4.0',
2020
hamcrestCore: 'org.hamcrest:hamcrest-core:1.3',
2121
hamcrestLibrary: 'org.hamcrest:hamcrest-library:1.3',
2222

23-
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']
23+
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']
2424
]
2525
snapshotVersion = true
2626
}
@@ -72,7 +72,7 @@ subprojects {
7272
}
7373

7474
task wrapper(type: Wrapper) {
75-
gradleVersion = '2.9'
75+
gradleVersion = '2.11'
7676
}
7777

7878
//Task used by Heroku for staging

gradle/wrapper/gradle-wrapper.jar

-8 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Dec 14 13:19:40 CET 2015
1+
#Fri Feb 12 10:36:51 CET 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip

gradlew.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ echo location of your Java installation.
4646
goto fail
4747

4848
:init
49-
@rem Get command-line arguments, handling Windowz variants
49+
@rem Get command-line arguments, handling Windows variants
5050

5151
if not "%OS%" == "Windows_NT" goto win9xME_args
5252
if "%@eval[2+2]" == "4" goto 4NT_args

0 commit comments

Comments
 (0)