jruby-rummager.diff

diff --git a/Gemfile b/Gemfile
index f56d45c..8c3b2ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,9 @@
 source :rubygems
 source "https://[email protected]/govuk/"
 
-gem "unicorn", "4.3.1"
 gem "sinatra", "1.3.4"
 gem "rake", "0.9.2", :require => false
 gem "multi_json", "1.3.6"
-gem "yajl-ruby", "1.1.0"
 gem "activesupport", "3.2.12"
 gem "rack", "1.5.2"
 gem "aws-ses", "0.4.4"
@@ -24,8 +22,4 @@ group :test do
   gem 'nokogiri', :require => false
 end
 
-group :development do
-  gem "shotgun"
-  # Use thin because WEBrick sometimes segfaults
-  gem "thin"
-end
+gem "puma"
diff --git a/Gemfile.lock b/Gemfile.lock
index 26c6131..3bcafbd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,41 +11,37 @@ GEM
       mail (> 2.2.5)
       mime-types
       xml-simple
-    builder (3.1.3)
+    builder (3.2.0)
     ci_reporter (1.7.1)
       builder (>= 2.1.2)
     crack (0.3.2)
-    daemons (1.1.9)
-    eventmachine (1.0.0)
-    i18n (0.6.0)
-    kgio (2.7.4)
+    i18n (0.6.4)
     little-plugger (1.1.3)
     logging (1.8.1)
       little-plugger (>= 1.1.3)
       multi_json (>= 1.3.6)
-    mail (2.4.4)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.19)
+    mime-types (1.22)
     minitest (4.6.1)
-    mocha (0.13.2)
+    mocha (0.13.3)
       metaclass (~> 0.0.1)
     multi_json (1.3.6)
-    nokogiri (1.5.5)
+    nokogiri (1.5.9-java)
     polyglot (0.3.3)
+    puma (1.6.3-java)
+      rack (~> 1.2)
     rack (1.5.2)
-    rack-protection (1.3.2)
+    rack-protection (1.5.0)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    raindrops (0.10.0)
     rake (0.9.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    shotgun (0.9)
-      rack (>= 1.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -57,26 +53,17 @@ GEM
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
     statsd-ruby (1.0.0)
-    thin (1.5.0)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    tilt (1.3.6)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    unicorn (4.3.1)
-      kgio (~> 2.6)
-      rack
-      raindrops (~> 0.7)
     webmock (1.9.3)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    xml-simple (1.1.1)
-    yajl-ruby (1.1.0)
+    xml-simple (1.1.2)
 
 PLATFORMS
-  ruby
+  java
 
 DEPENDENCIES
   activesupport (= 3.2.12)
@@ -87,16 +74,13 @@ DEPENDENCIES
   mocha
   multi_json (= 1.3.6)
   nokogiri
+  puma
   rack (= 1.5.2)
   rack-test
   rake (= 0.9.2)
   rest-client (= 1.6.7)
-  shotgun
   simplecov
   simplecov-rcov
   sinatra (= 1.3.4)
   statsd-ruby (= 1.0.0)
-  thin
-  unicorn (= 4.3.1)
   webmock (= 1.9.3)
-  yajl-ruby (= 1.1.0)
diff --git a/app.rb b/app.rb
index 1abbed7..5f585c8 100644
--- a/app.rb
+++ b/app.rb
@@ -3,7 +3,6 @@
 end
 
 require "sinatra"
-require 'yajl/json_gem'
 require "multi_json"
 require "csv"
 require "statsd"