From 7a2a6376751d420545cb2aad8b34cfef3282bbe5 Mon Sep 17 00:00:00 2001 From: Andrey Hihlovskiy Date: Fri, 5 Aug 2016 14:08:57 +0200 Subject: [PATCH] release 1.4.0 --- README.md | 23 +++++---- RELEASE.md | 20 +++++++- changes.md | 47 ++++++++++++------- examples/extraResourceBases/gradle.properties | 4 +- examples/farm/gradle.properties | 4 +- examples/farmJacoco/gradle.properties | 4 +- examples/farmSecure/gradle.properties | 4 +- examples/filterWebapp/gradle.properties | 4 +- .../gretty-taglib-example/gradle.properties | 4 +- .../grettyLogging_logback/gradle.properties | 4 +- examples/helloGretty/gradle.properties | 4 +- examples/helloGrettyOverlay/gradle.properties | 4 +- examples/helloJersey/gradle.properties | 4 +- examples/jacocoExample/gradle.properties | 4 +- .../jacocoInstantiateTasks/gradle.properties | 4 +- examples/multifarm/gradle.properties | 4 +- examples/secureGretty/gradle.properties | 4 +- .../spring-boot-farm-secure/gradle.properties | 4 +- examples/spring-boot-farm/gradle.properties | 4 +- examples/spring-boot-simple/gradle.properties | 4 +- .../springBootWebSocket/gradle.properties | 4 +- examples/testAnnotations/gradle.properties | 4 +- .../testAnnotationsOverlay/gradle.properties | 4 +- examples/testDependency/gradle.properties | 4 +- .../testDuplicatingResources/build.gradle | 2 +- .../gradle.properties | 4 +- examples/testInitParameter/gradle.properties | 4 +- .../testJettyContextConfig/gradle.properties | 4 +- .../testJettyServerConfig/gradle.properties | 4 +- .../testTomcatContextConfig/gradle.properties | 4 +- .../testTomcatServerConfig/gradle.properties | 4 +- examples/testWar/gradle.properties | 4 +- examples/webhost/gradle.properties | 4 +- examples/websocket/gradle.properties | 4 +- gradle.properties | 2 +- libs/build.gradle | 7 ++- libs/common.gradle | 5 +- pluginScripts/gretty-1.4.0.plugin | 16 +++++++ pluginScripts/gretty-SNAPSHOT.plugin | 5 +- pluginScripts/gretty.plugin | 5 +- 40 files changed, 149 insertions(+), 103 deletions(-) create mode 100644 pluginScripts/gretty-1.4.0.plugin diff --git a/README.md b/README.md index c9637cfbd..83fad7dbe 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ ![logo](http://akhikhl.github.io/gretty/media/gretty_logo_1.x.png "gretty logo") -[![Build Status](http://img.shields.io/travis/saladinkzn/gretty.svg)](https://travis-ci.org/saladinkzn/gretty) +[![Build Status](http://img.shields.io/travis/akhikhl/gretty.svg)](https://travis-ci.org/akhikhl/gretty) ![Maintenance Status](http://img.shields.io/maintenance/yes/2016.svg) -[![Latest release](http://img.shields.io/badge/release-1.3.0-47b31f.svg)](https://github.com/saladinkzn/gretty/tags/v1.3.0) -[![Snapshot](http://img.shields.io/badge/current-1.4.0--SNAPSHOT-47b31f.svg)](https://github.com/saladinkzn/gretty/tree/master) +[![Latest release](http://img.shields.io/badge/release-1.4.0-47b31f.svg)](https://github.com/akhikhl/gretty/tags/v1.4.0) +[![Snapshot](http://img.shields.io/badge/current-1.4.1--SNAPSHOT-47b31f.svg)](https://github.com/akhikhl/gretty/tree/master) [![License](http://img.shields.io/badge/license-MIT-47b31f.svg)](#copyright-and-license) Gretty is a feature-rich gradle plugin for running web-apps on embedded servlet containers. @@ -16,23 +16,26 @@ A complete list of Gretty features is available in [feature overview](http://akh [![Join the chat at https://gitter.im/saladinkzn/gretty](https://badges.gitter.im/saladinkzn/gretty.svg)](https://gitter.im/saladinkzn/gretty?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -If you are new with Gretty, try [getting started](http://saladinkzn.github.io/gretty-doc/Getting-started.html) page. +If you are new with Gretty, try [getting started](http://akhikhl.github.io/gretty-doc/Getting-started.html) page. #### :star: What's new -June 14, 2016: Gretty 1.3.0 is out and immediately available at [Bintray](https://bintray.com/akhikhl/maven/gretty/view) and [Maven Central](http://search.maven.org/#search|ga|1|g%3A%22ru.shadam.gretty%22). +Aug 5, 2016: Andrey Hihlovskiy is back to maintaining Gretty! Many thanks to Timur Shakurov for his great work on Gretty maintenance +during the past year! -See [Gretty 1.3.0 release announcement](RELEASE.md#gretty-fork-130-release-announcement) for more information. +Aug 5, 2016: Gretty 1.4.0 is out and immediately available at [Bintray](https://bintray.com/akhikhl/maven/gretty/view) and [Maven Central](http://search.maven.org/#search|ga|1|g%3A%22org.akhikhl.gretty%22). + +See [Gretty 1.4.0 release announcement](RELEASE.md#gretty-140-release-announcement) for more information. See also: [complete list of changes](changes.md) in this and previous versions. #### Documentation -You can learn about all Gretty features in [online documentation](http://saladinkzn.github.io/gretty-doc/). +You can learn about all Gretty features in [online documentation](http://akhikhl.github.io/gretty-doc/). #### System requirements -Gretty requires JDK7 or JDK8 and Gradle 1.10 or newer (Gradle 2.4 is highly recommended!). +Gretty requires JDK7 or JDK8 and Gradle 1.10 or newer (Gradle 2.14.1 is highly recommended!). Gretty also works on JDK6, although Jetty support is limited to versions 7 and 8 in this case. This is due to the fact that Jetty 9 was compiled against JDK7 and it's bytecode is not compatible with JDK6. @@ -40,10 +43,10 @@ Gretty also works on JDK6, although Jetty support is limited to versions 7 and 8 Gretty is an open-source project and is freely available in sources as well as in compiled form. -All releases of Gretty are available at [Bintray](https://bintray.com/saladinkzn/maven/gretty-fork/view) +All releases of Gretty are available at [Bintray](https://bintray.com/akhikhl/maven/gretty/view) #### Copyright and License -Copyright 2013-2016 (c) Timur Shakurov, Andrey Hihlovskiy and [contributors](CONTRIBUTORS). +Copyright 2013-2016 (c) Andrey Hihlovskiy, Timur Shakurov and [contributors](CONTRIBUTORS). All versions, present and past, of Gretty are licensed under [MIT license](LICENSE). diff --git a/RELEASE.md b/RELEASE.md index de2f565d6..83f5f1513 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,3 +1,19 @@ +## Gretty 1.4.0 release announcement + +Aug 5, 2016: Gretty version 1.4.0 is out and available at github, bintray and maven central + +Gretty 1.4.0 introduces the following changes: + +1. All changes by @saladinkzn were merged back to mainstream. + +2. Upgraded gradle wrapper to 2.14.1 (https://github.com/akhikhl/gretty/pull/276) + +2. Component upgrades (https://github.com/akhikhl/gretty/pull/277) + +3. Fixed failing springBootWebSocket example (https://github.com/akhikhl/gretty/pull/278) + +4. Fixed issue #247: Could not find property 'main' on task ':run' (https://github.com/akhikhl/gretty/pull/279) + ## Gretty-Fork 1.3.0 release announcement June 14, 2016: Gretty-Fork version 1.3.0 is out and available at github, bintray and maven central @@ -168,8 +184,8 @@ Also Gretty version 1.1.8 includes upgrades of the following components to their Gretty version 1.1.7 is out and immediately available at github, bintray, maven central and gradle plugin portal! -Gretty version 1.1.7 introduces new feature: [redirect filter](http://akhikhl.github.io/gretty-doc/Redirect-filter.html). -The feature is completely independent from the rest of Gretty and can be deployed as part of WAR-file. +Gretty version 1.1.7 introduces new feature: [redirect filter](http://akhikhl.github.io/gretty-doc/Redirect-filter.html). +The feature is completely independent from the rest of Gretty and can be deployed as part of WAR-file. Charming thing about redirect filter is that it provides groovy-based configuration DSL. ## Gretty 1.1.6 release announcement diff --git a/changes.md b/changes.md index 5175ad962..e1be29edd 100644 --- a/changes.md +++ b/changes.md @@ -1,29 +1,45 @@ -[Project home](https://github.com/saladinkzn/gretty) | [Documentation](http://saladinkzn.github.io/gretty-doc/) | [Feature overview](http://saladinkzn.github.io/gretty-doc/Feature-overview.html) +[Project home](https://github.com/akhikhl/gretty) | [Documentation](http://akhikhl.github.io/gretty-doc/) | [Feature overview](http://akhikhl.github.io/gretty-doc/Feature-overview.html) [![logo](http://akhikhl.github.io/gretty-doc/images/gretty_logo.png "gretty logo")](https://github.com/akhikhl/gretty) ### What's new: +#### Version 1.4.0 + +Aug 5, 2016: Gretty version 1.4.0 is out and available at github, bintray and maven central + +Gretty 1.4.0 introduces the following changes: + +1. All changes by @saladinkzn were merged back to mainstream. + +2. Upgraded gradle wrapper to 2.14.1 (https://github.com/akhikhl/gretty/pull/276) + +2. Component upgrades (https://github.com/akhikhl/gretty/pull/277) + +3. Fixed failing springBootWebSocket example (https://github.com/akhikhl/gretty/pull/278) + +4. Fixed issue #247: Could not find property 'main' on task ':run' (https://github.com/akhikhl/gretty/pull/279) + #### Version 1.3.0 1. New scanner for jdk 7+ - + 2. Fix for: akhikhl#239 (Gretty service port) - + 3. Fix for: akhikhl#195 (Possibility to run multiple gretty builds on different ports) - + 4. Support overlays for war webapps in farms #4 - + 5. Update jetty to 9.3 (by providing separate 'container' because latest jetty 9.3 is compiled with jdk 8) - + 6. Add support for inserting paths before application output folders (will fix #6) - + 7. Add support for dependencies option in farm webapp configuration. #13 - + 8. New feature: akhikhl#262 (Changing product name) - + 9. Fix for duplicate entries in getResources(path) in tomcat 7 and 8 #20 - + #### Version 1.2.5 1. scanDependencies property is working again. @@ -198,15 +214,15 @@ Maintenance release. Fixed bug: "readonly property" exception when trying to gen - Resolved issue #89, "How to configure fastReload?". -- Upgrades: +- Upgrades: - gradle wrapper to version 2.1 - Groovy to version 2.3.7 - SpringBoot to version 1.1.7.RELEASE - Embedded Tomcat 7 to version 7.0.55 - - Embedded Tomcat 8 to version 8.0.14 + - Embedded Tomcat 8 to version 8.0.14 - Embedded Jetty 9 to version 9.2.3.v20140905 - asm to version 5.0.3 - + - Implemented support of Gradle 1.10 (still, using Gradle 2.1 is highly recommended!). - fixed issues with groovy-all versions and logback versions in the webapp classpath @@ -252,7 +268,7 @@ Maintenance release. Fixed bug: "readonly property" exception when trying to gen Gretty 1.1.0 brings one little incompatibility: property jettyEnvXml was renamed to jettyEnvXmlFile. If you are using jettyEnvXml, please adjust your gradle scripts accordingly. #### Version 1.0.0 - + - Unified all Gretty plugins to a single plugin "org.akhikhl.gretty". - Introduced [servlet container selection via servletContainer property](http://akhikhl.github.io/gretty-doc/Switching-between-servlet-containers.html). @@ -277,7 +293,7 @@ Gretty 1.1.0 brings one little incompatibility: property jettyEnvXml was renamed - Upgraded to Jetty 9.2.1.v20140609. See [Jetty Release 9.2.0 announcement](http://dev.eclipse.org/mhonarc/lists/jetty-announce/msg00065.html) and [Jetty 9.2.1.v20140609 release announcement](http://dev.eclipse.org/mhonarc/lists/jetty-announce/msg00066.html) for technical details on new Jetty version. - + - Upgraded to Spring Boot 1.1.1.RELEASE. #### Version 0.0.24 @@ -399,4 +415,3 @@ Gretty 1.1.0 brings one little incompatibility: property jettyEnvXml was renamed #### Version 0.0.4 - Implemented [hot deployment](http://akhikhl.github.io/gretty-doc/Hot-deployment.html). - diff --git a/examples/extraResourceBases/gradle.properties b/examples/extraResourceBases/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/extraResourceBases/gradle.properties +++ b/examples/extraResourceBases/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/farm/gradle.properties b/examples/farm/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/farm/gradle.properties +++ b/examples/farm/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/farmJacoco/gradle.properties b/examples/farmJacoco/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/farmJacoco/gradle.properties +++ b/examples/farmJacoco/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/farmSecure/gradle.properties b/examples/farmSecure/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/farmSecure/gradle.properties +++ b/examples/farmSecure/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/filterWebapp/gradle.properties b/examples/filterWebapp/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/filterWebapp/gradle.properties +++ b/examples/filterWebapp/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/gretty-taglib-example/gradle.properties b/examples/gretty-taglib-example/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/gretty-taglib-example/gradle.properties +++ b/examples/gretty-taglib-example/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/grettyLogging_logback/gradle.properties b/examples/grettyLogging_logback/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/grettyLogging_logback/gradle.properties +++ b/examples/grettyLogging_logback/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/helloGretty/gradle.properties b/examples/helloGretty/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/helloGretty/gradle.properties +++ b/examples/helloGretty/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/helloGrettyOverlay/gradle.properties b/examples/helloGrettyOverlay/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/helloGrettyOverlay/gradle.properties +++ b/examples/helloGrettyOverlay/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/helloJersey/gradle.properties b/examples/helloJersey/gradle.properties index d56a80039..cff207af1 100644 --- a/examples/helloJersey/gradle.properties +++ b/examples/helloJersey/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/jacocoExample/gradle.properties b/examples/jacocoExample/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/jacocoExample/gradle.properties +++ b/examples/jacocoExample/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/jacocoInstantiateTasks/gradle.properties b/examples/jacocoInstantiateTasks/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/jacocoInstantiateTasks/gradle.properties +++ b/examples/jacocoInstantiateTasks/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/multifarm/gradle.properties b/examples/multifarm/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/multifarm/gradle.properties +++ b/examples/multifarm/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/secureGretty/gradle.properties b/examples/secureGretty/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/secureGretty/gradle.properties +++ b/examples/secureGretty/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/spring-boot-farm-secure/gradle.properties b/examples/spring-boot-farm-secure/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/spring-boot-farm-secure/gradle.properties +++ b/examples/spring-boot-farm-secure/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/spring-boot-farm/gradle.properties b/examples/spring-boot-farm/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/spring-boot-farm/gradle.properties +++ b/examples/spring-boot-farm/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/spring-boot-simple/gradle.properties b/examples/spring-boot-simple/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/spring-boot-simple/gradle.properties +++ b/examples/spring-boot-simple/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/springBootWebSocket/gradle.properties b/examples/springBootWebSocket/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/springBootWebSocket/gradle.properties +++ b/examples/springBootWebSocket/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/testAnnotations/gradle.properties b/examples/testAnnotations/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/testAnnotations/gradle.properties +++ b/examples/testAnnotations/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/testAnnotationsOverlay/gradle.properties b/examples/testAnnotationsOverlay/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/testAnnotationsOverlay/gradle.properties +++ b/examples/testAnnotationsOverlay/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/testDependency/gradle.properties b/examples/testDependency/gradle.properties index 0d60a89ac..50b3a119e 100644 --- a/examples/testDependency/gradle.properties +++ b/examples/testDependency/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/testDuplicatingResources/build.gradle b/examples/testDuplicatingResources/build.gradle index 3f40952ed..c69c8eb93 100644 --- a/examples/testDuplicatingResources/build.gradle +++ b/examples/testDuplicatingResources/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'org.akhikhl.gretty:gretty:1.4.0-SNAPSHOT' + classpath 'org.akhikhl.gretty:gretty:1.4.0' } } diff --git a/examples/testDuplicatingResources/gradle.properties b/examples/testDuplicatingResources/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/testDuplicatingResources/gradle.properties +++ b/examples/testDuplicatingResources/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/testInitParameter/gradle.properties b/examples/testInitParameter/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/testInitParameter/gradle.properties +++ b/examples/testInitParameter/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/testJettyContextConfig/gradle.properties b/examples/testJettyContextConfig/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/testJettyContextConfig/gradle.properties +++ b/examples/testJettyContextConfig/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/testJettyServerConfig/gradle.properties b/examples/testJettyServerConfig/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/testJettyServerConfig/gradle.properties +++ b/examples/testJettyServerConfig/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/testTomcatContextConfig/gradle.properties b/examples/testTomcatContextConfig/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/testTomcatContextConfig/gradle.properties +++ b/examples/testTomcatContextConfig/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/testTomcatServerConfig/gradle.properties b/examples/testTomcatServerConfig/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/testTomcatServerConfig/gradle.properties +++ b/examples/testTomcatServerConfig/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/testWar/gradle.properties b/examples/testWar/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/testWar/gradle.properties +++ b/examples/testWar/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/webhost/gradle.properties b/examples/webhost/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/webhost/gradle.properties +++ b/examples/webhost/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/examples/websocket/gradle.properties b/examples/websocket/gradle.properties index 2e14fdf27..c95228268 100644 --- a/examples/websocket/gradle.properties +++ b/examples/websocket/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.4.0-SNAPSHOT -gretty_version=1.4.0-SNAPSHOT +version=1.4.0 +gretty_version=1.4.0 groovy_version=2.4.5 logback_version=1.1.3 spock_version=1.0-groovy-2.4 diff --git a/gradle.properties b/gradle.properties index 36b551ce7..6ef9ee9ed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ developerId=akhikhl developerName=Andrey Hihlovskiy license=The MIT License group=org.akhikhl.gretty -version=1.4.0-SNAPSHOT +version=1.4.0 jetty7_version=7.6.16.v20140903 jetty7_servlet_api_version=2.5 # Cannot upgrade to Jetty 8.1.15 or newer until issue #159 is resolved. diff --git a/libs/build.gradle b/libs/build.gradle index e9fbdcbc2..2c9e9ea0f 100644 --- a/libs/build.gradle +++ b/libs/build.gradle @@ -23,7 +23,7 @@ ext { jetty9_servlet_api = "javax.servlet:javax.servlet-api:$jetty9_servlet_api_version" as String tomcat7_servlet_api = "javax.servlet:javax.servlet-api:$tomcat7_servlet_api_version" as String tomcat8_servlet_api = "javax.servlet:javax.servlet-api:$tomcat8_servlet_api_version" as String - + if(gradle.gradleVersion.startsWith('1.')) { groovy_version = gradle_1x_groovy_version spock_version = gradle_1x_spock_version @@ -37,10 +37,9 @@ if(!bintrayDryRun) task bintraySign(type: RestTask) { description 'Push to bintray and sign it.' httpMethod = 'post' - uri = "https://api.bintray.com/gpg/${project.developerId}/maven/${project.projectId}-fork/versions/${project.version}" + uri = "https://api.bintray.com/gpg/${project.developerId}/maven/${project.projectId}/versions/${project.version}" username = project.bintrayUser password = project.bintrayKey requestBody = [ passphrase: project.bintrayKeyPhrase ] - contentType = ContentType.JSON + contentType = ContentType.JSON } - diff --git a/libs/common.gradle b/libs/common.gradle index 5642b24f2..fc89b5caa 100644 --- a/libs/common.gradle +++ b/libs/common.gradle @@ -11,7 +11,7 @@ repositories { mavenLocal() jcenter() } - + group = rootProject.group version = rootProject.version @@ -114,7 +114,7 @@ bintray { configurations = ['archives'] pkg { repo = 'maven' - name = "${thisProject.projectId}-fork" + name = thisProject.projectId desc = thisProject.description licenses = [ thisProject.license ] labels = thisProject.projectLabels.split(',') @@ -128,4 +128,3 @@ if(!bintrayDryRun) bintrayUpload.finalizedBy parent.tasks.bintraySign } // afterEvaluate - diff --git a/pluginScripts/gretty-1.4.0.plugin b/pluginScripts/gretty-1.4.0.plugin new file mode 100644 index 000000000..45a97e6a6 --- /dev/null +++ b/pluginScripts/gretty-1.4.0.plugin @@ -0,0 +1,16 @@ +buildscript { + repositories { + jcenter() + } + + dependencies { + classpath 'org.akhikhl.gretty:gretty:1.4.0' + } +} + +repositories { + jcenter() +} + +if (!project.plugins.findPlugin(org.akhikhl.gretty.GrettyPlugin)) + project.apply(plugin: org.akhikhl.gretty.GrettyPlugin) diff --git a/pluginScripts/gretty-SNAPSHOT.plugin b/pluginScripts/gretty-SNAPSHOT.plugin index 11c751938..548262dcc 100644 --- a/pluginScripts/gretty-SNAPSHOT.plugin +++ b/pluginScripts/gretty-SNAPSHOT.plugin @@ -3,9 +3,9 @@ buildscript { jcenter() maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' } } - + dependencies { - classpath 'ru.shadam.gretty:gretty:1.4.0-SNAPSHOT' + classpath 'org.akhikhl.gretty:gretty:1.4.1-SNAPSHOT' } } @@ -16,4 +16,3 @@ repositories { if (!project.plugins.findPlugin(org.akhikhl.gretty.GrettyPlugin)) project.apply(plugin: org.akhikhl.gretty.GrettyPlugin) - diff --git a/pluginScripts/gretty.plugin b/pluginScripts/gretty.plugin index ee15c4570..45a97e6a6 100644 --- a/pluginScripts/gretty.plugin +++ b/pluginScripts/gretty.plugin @@ -2,9 +2,9 @@ buildscript { repositories { jcenter() } - + dependencies { - classpath 'ru.shadam.gretty:gretty:1.2.5' + classpath 'org.akhikhl.gretty:gretty:1.4.0' } } @@ -14,4 +14,3 @@ repositories { if (!project.plugins.findPlugin(org.akhikhl.gretty.GrettyPlugin)) project.apply(plugin: org.akhikhl.gretty.GrettyPlugin) -