From 428f108e2ee03a9ffa2632e5d0c7f334a0146cba Mon Sep 17 00:00:00 2001 From: Jochen Berger Date: Fri, 12 Feb 2016 10:36:57 +0100 Subject: [PATCH 1/3] update Gradle wrapper and shadow plugin --- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.jar | Bin 53646 -> 53638 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew.bat | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 226ed0c6..27a78103 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ 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' } } @@ -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 index 24e087d673b42a25941fb19a08c46f7cd0956bd3..5ccda13e9cb94678ba179b32452cf3d60dc36353 100644 GIT binary patch delta 2359 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index acae6f51..ec299545 100644 --- 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 index aec99730..72d362da 100644 --- 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 From 7d6b825695448d6a574b863873e9e8761855ab68 Mon Sep 17 00:00:00 2001 From: Jochen Berger Date: Fri, 12 Feb 2016 10:38:00 +0100 Subject: [PATCH 2/3] update SLF4J --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 27a78103..53d37147 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { 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', @@ -20,7 +20,7 @@ ext { 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 } From c3431049ad7b1da9c3d4c2ddecd192a8feede1cb Mon Sep 17 00:00:00 2001 From: Jochen Berger Date: Fri, 12 Feb 2016 10:38:06 +0100 Subject: [PATCH 3/3] update tapestry-json --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 53d37147..104d54d9 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ ext { 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',