release 1.2.3

akhikhl · May 18, 2015 · ea7cccf · ea7cccf
1 parent a497bbf
commit ea7cccf
Show file tree

Hide file tree

Showing 36 changed files with 124 additions and 64 deletions.
diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 
 [![Build Status](http://img.shields.io/travis/akhikhl/gretty.svg)](https://travis-ci.org/akhikhl/gretty)
 [![Maintainer Status](http://stillmaintained.com/akhikhl/gretty.png)](http://stillmaintained.com/akhikhl/gretty) 
-[![Release](http://img.shields.io/badge/release-1.2.2-47b31f.svg)](https://github.com/akhikhl/gretty/releases/latest)
-[![Snapshot](http://img.shields.io/badge/current-1.2.3--SNAPSHOT-47b31f.svg)](https://github.com/akhikhl/gretty/tree/master)
+[![Release](http://img.shields.io/badge/release-1.2.3-47b31f.svg)](https://github.com/akhikhl/gretty/releases/latest)
+[![Snapshot](http://img.shields.io/badge/current-1.2.4--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.
@@ -18,10 +18,10 @@ If you are new with Gretty, try [getting started](http://akhikhl.github.io/grett
 
 #### :star: What's new
 
-Apr 20, 2015: Gretty 1.2.2 is out and immediately available at [Gradle plugin portal](http://plugins.gradle.org/plugin/org.akhikhl.gretty), 
+May 18, 2015: Gretty 1.2.3 is out and immediately available at [Gradle plugin portal](http://plugins.gradle.org/plugin/org.akhikhl.gretty), 
 [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.2.2 release announcement](RELEASE.md#gretty-122-release-announcement) for more information.
+See [Gretty 1.2.3 release announcement](RELEASE.md#gretty-123-release-announcement) for more information.
 
 See also: [complete list of changes](changes.md) in this and previous versions.
 
@@ -31,7 +31,7 @@ You can learn about all Gretty features in [online documentation](http://akhikhl
 
 #### System requirements
 
-Gretty requires JDK7 or JDK8 and Gradle 1.10 or newer (Gradle 2.3 is highly recommended!).
+Gretty requires JDK7 or JDK8 and Gradle 1.10 or newer (Gradle 2.4 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.
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -1,3 +1,17 @@
+## Gretty 1.2.3 release announcement
+
+May 18, 2015: Gretty version 1.2.3 is out and immediately available at github, bintray, maven central and gradle plugin portal!
+
+Gretty version 1.2.3 introduces the following changes:
+
+1. Resolved issue #175 "SpringBoot applications are not isolated from one another in farm and product runs"
+
+2. Resolved issues with logging: #164, #145, #133
+
+3. Upgraded to Tomcat 7.0.61 and Tomcat 8.0.22
+
+4. Upgrade and tests on Gradle 2.4 (Gradle versions >= 1.10 are still supported)
+
 ## Gretty 1.2.2 release announcement
 
 Apr 20, 2015: Gretty version 1.2.2 is out and immediately available at github, bintray, maven central and gradle plugin portal!

diff --git a/changes.md b/changes.md
@@ -4,6 +4,16 @@
 
 ### What's new:
 
+#### Version 1.2.3
+
+1. Resolved issue #175 "SpringBoot applications are not isolated from one another in farm and product runs"
+
+2. Resolved issues with logging: #164, #145, #133
+
+3. Upgraded to Tomcat 7.0.61 and Tomcat 8.0.22
+
+4. Upgrade and tests on Gradle 2.4 (Gradle versions >= 1.10 are still supported)
+
 #### Version 1.2.2
 
 Gretty version 1.2.2 fixes [issue #163](https://github.com/akhikhl/gretty/issues/152): MissingPropertyException when running Tomcat with HTTPS.

diff --git a/examples/extraResourceBases/gradle.properties b/examples/extraResourceBases/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.2.3-SNAPSHOT
-gretty_version=1.2.3-SNAPSHOT
+version=1.2.3
+gretty_version=1.2.3
 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
@@ -5,7 +5,7 @@ developerId=akhikhl
 developerName=Andrey Hihlovskiy
 license=The MIT License
 group=org.akhikhl.gretty
-version=1.2.3-SNAPSHOT
+version=1.2.3
 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.2.3.plugin b/pluginScripts/gretty-1.2.3.plugin
@@ -0,0 +1,17 @@
+buildscript {
+  repositories {
+    jcenter()
+  }
+
+  dependencies {
+    classpath 'org.akhikhl.gretty:gretty:1.2.3'
+  }
+}
+
+repositories {
+  jcenter()
+}
+
+if (!project.plugins.findPlugin(org.akhikhl.gretty.GrettyPlugin))
+  project.apply(plugin: org.akhikhl.gretty.GrettyPlugin)
+
diff --git a/pluginScripts/gretty-1.2.4-SNAPSHOT.plugin b/pluginScripts/gretty-1.2.4-SNAPSHOT.plugin
@@ -0,0 +1,19 @@
+buildscript {
+  repositories {
+    jcenter()
+    maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' }
+  }
+
+  dependencies {
+    classpath 'org.akhikhl.gretty:gretty:1.2.4-SNAPSHOT'
+  }
+}
+
+repositories {
+  jcenter()
+  maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' }
+}
+
+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
@@ -5,7 +5,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'org.akhikhl.gretty:gretty:1.2.3-SNAPSHOT'
+    classpath 'org.akhikhl.gretty:gretty:1.2.4-SNAPSHOT'
   }
 }
 

diff --git a/pluginScripts/gretty.plugin b/pluginScripts/gretty.plugin
@@ -4,7 +4,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'org.akhikhl.gretty:gretty:1.2.2'
+    classpath 'org.akhikhl.gretty:gretty:1.2.3'
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ buildscript { @@
       }
       dependencies {
-        classpath 'org.akhikhl.gretty:gretty:1.2.3-SNAPSHOT'
+        classpath 'org.akhikhl.gretty:gretty:1.2.4-SNAPSHOT'
       }
     }
@@ Expand Down @@