diff --git a/README.md b/README.md index e3630c541..f64b3ac3f 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ [![Build Status](http://img.shields.io/travis/saladinkzn/gretty.svg)](https://travis-ci.org/saladinkzn/gretty) ![Maintenance Status](http://img.shields.io/maintenance/yes/2016.svg) -[![Latest release](http://img.shields.io/badge/release-1.2.5-47b31f.svg)](https://github.com/saladinkzn/gretty/tags/v1.2.5) -[![Snapshot](http://img.shields.io/badge/current-1.2.6--SNAPSHOT-47b31f.svg)](https://github.com/saladinkzn/gretty/tree/master) +[![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.3.0--SNAPSHOT-47b31f.svg)](https://github.com/saladinkzn/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. @@ -20,16 +20,15 @@ If you are new with Gretty, try [getting started](http://saladinkzn.github.io/gr #### :star: What's new -March 28, 2016: Gretty 1.2.5 is out and immediately available at [Bintray](http://bintray.com/saladinkzn/maven/gretty-fork/view) +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). -See [Gretty 1.2.5 release announcement](RELEASE.md#gretty-125-release-announcement) for more information. +See [Gretty 1.3.0 release announcement](RELEASE.md#gretty-fork-130-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 (pre-fork) features in [online documentation](http://akhikhl.github.io/gretty-doc/). -Docs for new features will be available soon. +You can learn about all Gretty features in [online documentation](http://saladinkzn.github.io/gretty-doc/). #### System requirements diff --git a/RELEASE.md b/RELEASE.md index dbdf69efa..de2f565d6 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,3 +1,27 @@ +## 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 + +Gretty 1.3.0 introduces the following changes: + +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 + ## Gretty-Fork 1.2.5 release announcement March 28, 2016: Gretty-Fork version 1.2.5 is out and available at bintray. diff --git a/changes.md b/changes.md index 4183f24cd..5175ad962 100644 --- a/changes.md +++ b/changes.md @@ -1,9 +1,29 @@ -[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) +[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) [![logo](http://akhikhl.github.io/gretty-doc/images/gretty_logo.png "gretty logo")](https://github.com/akhikhl/gretty) ### What's new: +#### 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. diff --git a/examples/extraResourceBases/gradle.properties b/examples/extraResourceBases/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/extraResourceBases/gradle.properties +++ b/examples/extraResourceBases/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/farm/gradle.properties b/examples/farm/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/farm/gradle.properties +++ b/examples/farm/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/farmJacoco/gradle.properties b/examples/farmJacoco/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/farmJacoco/gradle.properties +++ b/examples/farmJacoco/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/farmSecure/gradle.properties b/examples/farmSecure/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/farmSecure/gradle.properties +++ b/examples/farmSecure/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/filterWebapp/gradle.properties b/examples/filterWebapp/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/filterWebapp/gradle.properties +++ b/examples/filterWebapp/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/gretty-taglib-example/gradle.properties b/examples/gretty-taglib-example/gradle.properties index 40aeacc30..0a986201d 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.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/grettyLogging_logback/gradle.properties b/examples/grettyLogging_logback/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/grettyLogging_logback/gradle.properties +++ b/examples/grettyLogging_logback/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/helloGretty/gradle.properties b/examples/helloGretty/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/helloGretty/gradle.properties +++ b/examples/helloGretty/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/helloGrettyOverlay/gradle.properties b/examples/helloGrettyOverlay/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/helloGrettyOverlay/gradle.properties +++ b/examples/helloGrettyOverlay/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/helloJersey/gradle.properties b/examples/helloJersey/gradle.properties index 0df43132a..63b61cb98 100644 --- a/examples/helloJersey/gradle.properties +++ b/examples/helloJersey/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/jacocoExample/gradle.properties b/examples/jacocoExample/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/jacocoExample/gradle.properties +++ b/examples/jacocoExample/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/jacocoInstantiateTasks/gradle.properties b/examples/jacocoInstantiateTasks/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/jacocoInstantiateTasks/gradle.properties +++ b/examples/jacocoInstantiateTasks/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/multifarm/gradle.properties b/examples/multifarm/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/multifarm/gradle.properties +++ b/examples/multifarm/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/secureGretty/gradle.properties b/examples/secureGretty/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/secureGretty/gradle.properties +++ b/examples/secureGretty/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/spring-boot-farm-secure/gradle.properties b/examples/spring-boot-farm-secure/gradle.properties index 40aeacc30..0a986201d 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.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/spring-boot-farm/gradle.properties b/examples/spring-boot-farm/gradle.properties index 40aeacc30..0a986201d 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.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/spring-boot-simple/gradle.properties b/examples/spring-boot-simple/gradle.properties index 40aeacc30..0a986201d 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.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/springBootWebSocket/gradle.properties b/examples/springBootWebSocket/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/springBootWebSocket/gradle.properties +++ b/examples/springBootWebSocket/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/testAnnotations/gradle.properties b/examples/testAnnotations/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/testAnnotations/gradle.properties +++ b/examples/testAnnotations/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/testAnnotationsOverlay/gradle.properties b/examples/testAnnotationsOverlay/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/testAnnotationsOverlay/gradle.properties +++ b/examples/testAnnotationsOverlay/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/testDependency/gradle.properties b/examples/testDependency/gradle.properties index 06aeb0f45..c68fff53f 100644 --- a/examples/testDependency/gradle.properties +++ b/examples/testDependency/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/testDuplicatingResources/build.gradle b/examples/testDuplicatingResources/build.gradle index 57cfb5c36..2b588060e 100644 --- a/examples/testDuplicatingResources/build.gradle +++ b/examples/testDuplicatingResources/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'ru.shadam.gretty:gretty:1.2.6-SNAPSHOT' + classpath 'ru.shadam.gretty:gretty:1.3.0' } } diff --git a/examples/testDuplicatingResources/gradle.properties b/examples/testDuplicatingResources/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/testDuplicatingResources/gradle.properties +++ b/examples/testDuplicatingResources/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/testInitParameter/gradle.properties b/examples/testInitParameter/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/testInitParameter/gradle.properties +++ b/examples/testInitParameter/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/testJettyContextConfig/gradle.properties b/examples/testJettyContextConfig/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/testJettyContextConfig/gradle.properties +++ b/examples/testJettyContextConfig/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/testJettyServerConfig/gradle.properties b/examples/testJettyServerConfig/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/testJettyServerConfig/gradle.properties +++ b/examples/testJettyServerConfig/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/testTomcatContextConfig/gradle.properties b/examples/testTomcatContextConfig/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/testTomcatContextConfig/gradle.properties +++ b/examples/testTomcatContextConfig/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/testTomcatServerConfig/gradle.properties b/examples/testTomcatServerConfig/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/testTomcatServerConfig/gradle.properties +++ b/examples/testTomcatServerConfig/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/testWar/gradle.properties b/examples/testWar/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/testWar/gradle.properties +++ b/examples/testWar/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/webhost/gradle.properties b/examples/webhost/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/webhost/gradle.properties +++ b/examples/webhost/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/examples/websocket/gradle.properties b/examples/websocket/gradle.properties index 40aeacc30..0a986201d 100644 --- a/examples/websocket/gradle.properties +++ b/examples/websocket/gradle.properties @@ -1,6 +1,6 @@ group=org.akhikhl.gretty.examples -version=1.2.6-SNAPSHOT -gretty_version=1.2.6-SNAPSHOT +version=1.3.0 +gretty_version=1.3.0 groovy_version=2.3.10 logback_version=1.1.3 spock_version=1.0-groovy-2.3 diff --git a/gradle.properties b/gradle.properties index 1c9fb6edb..71f66c5a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ developerId=saladinkzn developerName=Timur Shakurov license=The MIT License group=ru.shadam.gretty -version=1.2.6-SNAPSHOT +version=1.3.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/pluginScripts/gretty-1.3.0.plugin b/pluginScripts/gretty-1.3.0.plugin new file mode 100644 index 000000000..508f8d6b0 --- /dev/null +++ b/pluginScripts/gretty-1.3.0.plugin @@ -0,0 +1,17 @@ +buildscript { + repositories { + jcenter() + } + + dependencies { + classpath 'ru.shadam.gretty:gretty:1.3.0' + } +} + +repositories { + jcenter() +} + +if (!project.plugins.findPlugin(org.akhikhl.gretty.GrettyPlugin)) + project.apply(plugin: org.akhikhl.gretty.GrettyPlugin) +