upgrade Gradle wrapper
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/d528181b Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/d528181b Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/d528181b Branch: refs/heads/master Commit: d528181bb55d0e9322f1a632a12e773306b7ecbe Parents: e4d4382 Author: Jochen Kemnade <jochen.kemn...@eddyson.de> Authored: Tue Oct 10 09:24:40 2017 +0200 Committer: Jochen Kemnade <jochen.kemn...@eddyson.de> Committed: Tue Oct 10 09:24:40 2017 +0200 ---------------------------------------------------------------------- build.gradle | 6 ++---- gradle/wrapper/gradle-wrapper.jar | Bin 54708 -> 54708 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- quickstart/build.gradle | 4 ++-- .../filtered/archetype-resources/build.gradle | 4 ++-- tapestry-test/build.gradle | 1 + 6 files changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 603ad17..601b973 100755 --- a/build.gradle +++ b/build.gradle @@ -397,15 +397,13 @@ task combinedJacocoReport(type:JacocoReport){ reports { html { enabled = true - destination = "$buildDir/reports/jacoco" + destination = file("$buildDir/reports/jacoco") } xml { enabled = false - destination = "unused" } csv { enabled = false - destination = "unused" } } onlyIf = { @@ -424,7 +422,7 @@ task continuousIntegration { } task wrapper(type: Wrapper) { - gradleVersion = '3.5.1' + gradleVersion = '4.2' description "Regenerates the Gradle Wrapper files" } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/gradle/wrapper/gradle-wrapper.jar ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7a3265e..736fb7d 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 651f764..52dd1f0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/quickstart/build.gradle ---------------------------------------------------------------------- diff --git a/quickstart/build.gradle b/quickstart/build.gradle index 5c215d3..a499357 100644 --- a/quickstart/build.gradle +++ b/quickstart/build.gradle @@ -17,10 +17,10 @@ task processFiltered(type: Copy) { inputs.file srcDir inputs.file file("${rootDir}/build.gradle") - outputs.dir sourceSets.main.output.classesDir + outputs.dir sourceSets.main.java.outputDir from srcDir - into sourceSets.main.output.classesDir + into sourceSets.main.java.outputDir // Use some of the filters provided by Ant filter(FixCrLfFilter) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/quickstart/filtered/archetype-resources/build.gradle ---------------------------------------------------------------------- diff --git a/quickstart/filtered/archetype-resources/build.gradle b/quickstart/filtered/archetype-resources/build.gradle index f3dca79..eeed246 100644 --- a/quickstart/filtered/archetype-resources/build.gradle +++ b/quickstart/filtered/archetype-resources/build.gradle @@ -2,7 +2,7 @@ description = "${artifactId} application" apply plugin: "war" apply plugin: "java" -apply plugin: "jetty" +apply plugin: "gretty" sourceCompatibility = "1.8" targetCompatibility = "1.8" @@ -87,7 +87,7 @@ test { } task wrapper(type: Wrapper) { - gradleVersion = '2.3' + gradleVersion = '4.2' } // TODO: Configure execution mode for jettyRun task http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d528181b/tapestry-test/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-test/build.gradle b/tapestry-test/build.gradle index f0dc96d..f46ecc0 100644 --- a/tapestry-test/build.gradle +++ b/tapestry-test/build.gradle @@ -10,6 +10,7 @@ dependencies { compile "org.seleniumhq.selenium:selenium-leg-rc:${versions.selenium}", { exclude group: "org.seleniumhq.selenium", module: "jetty-repacked" exclude group: "org.testng", module: "testng" + exclude group: "javax.servlet", module: "javax.servlet-api" } compile "org.seleniumhq.selenium:selenium-support:${versions.selenium}"