increased version to 1.1.7

akhikhl · Nov 5, 2014 · 8b4cd28 · 8b4cd28
1 parent 926ca0f
commit 8b4cd28
Show file tree

Hide file tree

Showing 30 changed files with 88 additions and 54 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.1.6-47b31f.svg)](https://github.com/akhikhl/gretty/releases/latest)
-[![Snapshot](http://img.shields.io/badge/current-1.1.7--SNAPSHOT-47b31f.svg)](https://github.com/akhikhl/gretty/tree/master)
+[![Release](http://img.shields.io/badge/release-1.1.7-47b31f.svg)](https://github.com/akhikhl/gretty/releases/latest)
+[![Snapshot](http://img.shields.io/badge/current-1.1.8--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,7 +18,8 @@ If you are new with Gretty, good starting point would be [getting started](http:
 
 #### :star: What's new
 
-- Gretty 1.1.6 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).
+- Gretty 1.1.7 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 also: [complete list of changes](changes.md) in this and previous versions.
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -1,3 +1,11 @@
+## Gretty 1.1.7 release announcement
+
+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. 
+Charming thing about redirect filter is that it provides groovy-based configuration DSL.
+
 ## Gretty 1.1.6 release announcement
 
 Gretty version 1.1.5 brings new bug, preventing Gretty product generation.
@@ -6,8 +14,6 @@ please switch to Gretty 1.1.6 - it fixes the problem.
 
 ## Gretty 1.1.5 release announcement
 
-Hello colleagues,
-
 Gretty version 1.1.5 is out and immediately available at github, bintray, maven central and gradle plugin portal!
 
 Gretty is a feature-rich gradle plugin for running webapps on Jetty and Tomcat. Sources are available here:

diff --git a/changes.md b/changes.md
@@ -4,10 +4,18 @@
 
 ### What's new:
 
+#### Version 1.1.7
+
+New feature: [redirect filter](http://akhikhl.github.io/gretty-doc/Redirect-filter.html).
+
 #### Version 1.1.6
 
 Maintenance release. Fixed bug: "readonly property" exception when trying to generate Gretty product.
 
+Resolved issue #102: [How to do integration test in a multi-project setup](https://github.com/akhikhl/gretty/issues/102).
+
+Resolved issue with host name in generated certificates, when gretty config does not define sslHost property.
+
 #### Version 1.1.5
 
 - New feature: [composite farms](http://akhikhl.github.io/gretty-doc/Composite-farms.html).

diff --git a/examples/extraResourceBases/gradle.properties b/examples/extraResourceBases/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/farm/gradle.properties b/examples/farm/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/farmJacoco/gradle.properties b/examples/farmJacoco/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/farmSecure/gradle.properties b/examples/farmSecure/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/filterWebapp/gradle.properties b/examples/filterWebapp/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

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.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/helloGretty/gradle.properties b/examples/helloGretty/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/helloGrettyOverlay/gradle.properties b/examples/helloGrettyOverlay/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/jacocoExample/gradle.properties b/examples/jacocoExample/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/jacocoInstantiateTasks/gradle.properties b/examples/jacocoInstantiateTasks/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/multifarm/gradle.properties b/examples/multifarm/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/secureGretty/gradle.properties b/examples/secureGretty/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

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.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

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.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

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.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/testAnnotations/gradle.properties b/examples/testAnnotations/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/testAnnotationsOverlay/gradle.properties b/examples/testAnnotationsOverlay/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/testJettyContextConfig/gradle.properties b/examples/testJettyContextConfig/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/testJettyServerConfig/gradle.properties b/examples/testJettyServerConfig/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/testTomcatContextConfig/gradle.properties b/examples/testTomcatContextConfig/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/testTomcatServerConfig/gradle.properties b/examples/testTomcatServerConfig/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/testWar/gradle.properties b/examples/testWar/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

diff --git a/examples/webhost/gradle.properties b/examples/webhost/gradle.properties
@@ -1,6 +1,6 @@
 group=org.akhikhl.gretty.examples
-version=1.1.7-SNAPSHOT
-gretty_version=1.1.7-SNAPSHOT
+version=1.1.7
+gretty_version=1.1.7
 groovy_version=2.3.7
 logback_version=1.1.2
 spock_version=0.7-groovy-2.0

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.1.7-SNAPSHOT
+version=1.1.7
 jetty7_version=7.6.15.v20140411
 jetty7_servlet_api_version=2.5
 # Gretty farm throws exception 'This context is immutable' when running on Jetty 8.1.15.v20140411 and spring-boot.

diff --git a/pluginScripts/gretty-1.1.8-SNAPSHOT.plugin b/pluginScripts/gretty-1.1.8-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.1.8-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.1.7-SNAPSHOT'
+    classpath 'org.akhikhl.gretty:gretty:1.1.8-SNAPSHOT'
   }
 }
 

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