prepare for 1.1.18

jruby · Jan 13, 2015 · c801c8e · c801c8e
1 parent 01fbc0f
commit c801c8e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,14 @@
+## 1.1.18 (13/01/15)
+
+- back-port Rack::ShowStatus to be used with out ErrorApp (contains XSS fix #190)
+- search rackup (config.ru) on context-classloader if not found elsewhere
+- introduce a new ClassPathLayout where the whole app + gems are on CP (#191)
+- update to (vendored) rack ~> 1.5.2 (for JRuby-Rack 1.1.x)
+- use Rack::Utils.best_q_match in ErrorApp if available
+- improved rack-compatibility for our "pure" servlet-env request env parsing
+  * raise a TypeError just like rack does when it detects invalid parameters
+  * compatibility with rack's parse_nested_query logic
+
 ## 1.1.17 (30/12/14)
 
 This release changes deployment from codehaus.org to oss.sonatype.org for artifacts.

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.jruby.rack</groupId>
   <artifactId>jruby-rack</artifactId>
-  <version>1.1.18-SNAPSHOT</version>
+  <version>1.1.18</version>
   <name>JRuby-Rack</name>
   <url>http://github.com/jruby/jruby-rack/</url>
   <description>

diff --git a/src/main/ruby/jruby/rack/version.rb b/src/main/ruby/jruby/rack/version.rb
@@ -7,6 +7,6 @@
 
 module JRuby
   module Rack
-    VERSION = '1.1.18.SNAPSHOT'
+    VERSION = '1.1.18'
   end
 end