Repository: zest-java Updated Branches: refs/heads/develop ef0c40c0c -> e4f991c80
build: remove use of now deprecated Gradle Jetty plugin in favor of gretty Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/e4f991c8 Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/e4f991c8 Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/e4f991c8 Branch: refs/heads/develop Commit: e4f991c808285fc25129e5a132bfbae834dfc738 Parents: ef0c40c Author: Paul Merlin <[email protected]> Authored: Mon Nov 7 15:20:29 2016 +0100 Committer: Paul Merlin <[email protected]> Committed: Mon Nov 7 15:20:29 2016 +0100 ---------------------------------------------------------------------- build.gradle | 3 +++ samples/rental/build.gradle | 10 ++++++---- .../app/templates/buildtool/gradle-app.tmpl | 6 ++++-- .../dist/etc/templates/default/files/app/build.gradle_ | 6 ++++-- .../dist/etc/templates/ng2-heroes/files/app/build.gradle_ | 6 ++++-- .../dist/etc/templates/restapp/files/app/build.gradle_ | 6 ++++-- 6 files changed, 25 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/e4f991c8/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 5b4401b..7615651 100644 --- a/build.gradle +++ b/build.gradle @@ -243,6 +243,9 @@ allprojects { if( candidate.group == 'asm' || candidate.module == 'prefuse-core' ) { candidate.license = 'BSD 3-Clause' } + if( candidate.group == 'javax.websocket' ) { + candidate.license = 'CDDL' + } if( candidate.group == 'org.apache.httpcomponents' || candidate.group == 'net.java.dev.jna' || candidate.group == 'lucene' http://git-wip-us.apache.org/repos/asf/zest-java/blob/e4f991c8/samples/rental/build.gradle ---------------------------------------------------------------------- diff --git a/samples/rental/build.gradle b/samples/rental/build.gradle index a80f357..13e32e7 100644 --- a/samples/rental/build.gradle +++ b/samples/rental/build.gradle @@ -18,13 +18,15 @@ * */ -description = "Sample of implementation of a Car Rental application." +plugins { + id 'war' + id "org.akhikhl.gretty" version "1.4.0" +} -apply plugin: 'war' -apply plugin: 'jetty' +description = "Sample of implementation of a Car Rental application." // To run in an embedded Jetty use: -// ../../gradlew jettyRun +// ../../gradlew appRun // And then go to: // http://localhost:8080/org.apache.zest.sample.rental/rental/main http://git-wip-us.apache.org/repos/asf/zest-java/blob/e4f991c8/tools/generator-zest/app/templates/buildtool/gradle-app.tmpl ---------------------------------------------------------------------- diff --git a/tools/generator-zest/app/templates/buildtool/gradle-app.tmpl b/tools/generator-zest/app/templates/buildtool/gradle-app.tmpl index 5907da1..7e0c2d8 100644 --- a/tools/generator-zest/app/templates/buildtool/gradle-app.tmpl +++ b/tools/generator-zest/app/templates/buildtool/gradle-app.tmpl @@ -18,8 +18,10 @@ * -%> -apply plugin: 'war' -apply plugin: 'jetty' +plugins { + id 'war' + id "org.akhikhl.gretty" version "1.4.0" +} dependencies { compile project( ":bootstrap" ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/e4f991c8/tools/shell/src/dist/etc/templates/default/files/app/build.gradle_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/dist/etc/templates/default/files/app/build.gradle_ b/tools/shell/src/dist/etc/templates/default/files/app/build.gradle_ index 5a19653..07d5372 100644 --- a/tools/shell/src/dist/etc/templates/default/files/app/build.gradle_ +++ b/tools/shell/src/dist/etc/templates/default/files/app/build.gradle_ @@ -1,6 +1,8 @@ -apply plugin: 'war' -apply plugin: 'jetty' +plugins { + id 'war' + id "org.akhikhl.gretty" version "1.4.0" +} dependencies { compile project( ":bootstrap" ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/e4f991c8/tools/shell/src/dist/etc/templates/ng2-heroes/files/app/build.gradle_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/dist/etc/templates/ng2-heroes/files/app/build.gradle_ b/tools/shell/src/dist/etc/templates/ng2-heroes/files/app/build.gradle_ index 5a19653..07d5372 100644 --- a/tools/shell/src/dist/etc/templates/ng2-heroes/files/app/build.gradle_ +++ b/tools/shell/src/dist/etc/templates/ng2-heroes/files/app/build.gradle_ @@ -1,6 +1,8 @@ -apply plugin: 'war' -apply plugin: 'jetty' +plugins { + id 'war' + id "org.akhikhl.gretty" version "1.4.0" +} dependencies { compile project( ":bootstrap" ) http://git-wip-us.apache.org/repos/asf/zest-java/blob/e4f991c8/tools/shell/src/dist/etc/templates/restapp/files/app/build.gradle_ ---------------------------------------------------------------------- diff --git a/tools/shell/src/dist/etc/templates/restapp/files/app/build.gradle_ b/tools/shell/src/dist/etc/templates/restapp/files/app/build.gradle_ index 5a19653..07d5372 100644 --- a/tools/shell/src/dist/etc/templates/restapp/files/app/build.gradle_ +++ b/tools/shell/src/dist/etc/templates/restapp/files/app/build.gradle_ @@ -1,6 +1,8 @@ -apply plugin: 'war' -apply plugin: 'jetty' +plugins { + id 'war' + id "org.akhikhl.gretty" version "1.4.0" +} dependencies { compile project( ":bootstrap" )
