Update to jruby 1.7.4

README.md

@@ -54,8 +54,8 @@ Next, we're going to setup the servers with all the necessary software:
     ulimit -n 8192
     # Most software is installed autormatically by the script, but running the mongo command below from 
     # the install script was causing some errors. For now this needs to be run manually.
-    cd installs/jruby-rack && rvm jruby-1.7.3 do jruby -S bundle exec rake clean gem SKIP_SPECS=true
-    cd target && rvm jruby-1.7.3 do gem install jruby-rack-1.2.0.SNAPSHOT.gem
+    cd installs/jruby-rack && rvm jruby-1.7.4 do jruby -S bundle exec rake clean gem SKIP_SPECS=true
+    cd target && rvm jruby-1.7.4 do gem install jruby-rack-1.2.0.SNAPSHOT.gem
     cd ../../..
     cd installs && curl -sS https://getcomposer.org/installer | php -- --install-dir=bin
     cd ..
@@ -108,8 +108,8 @@ Next, we're going to setup the servers with all the necessary software:
     # For your first time through the tests, set the ulimit for open files
     # Most software is installed autormatically by the script, but running the mongo command below from
     # the install script was causing some errors. For now this needs to be run manually.
-    cd installs/jruby-rack && rvm jruby-1.7.3 do jruby -S bundle exec rake clean gem SKIP_SPECS=true
-    cd target && rvm jruby-1.7.3 do gem install jruby-rack-1.2.0.SNAPSHOT.gem
+    cd installs/jruby-rack && rvm jruby-1.7.4 do jruby -S bundle exec rake clean gem SKIP_SPECS=true
+    cd target && rvm jruby-1.7.4 do gem install jruby-rack-1.2.0.SNAPSHOT.gem
     cd ../../..
     cd installs && curl -sS https://getcomposer.org/installer | php -- --install-dir=bin
     cd ..

installer.py

@@ -91,14 +91,14 @@ class Installer:
     self.__run_command("echo rvm_auto_reload_flag=2 >> ~/.rvmrc")
     subprocess.call(["bash", "-c", "source ~/.rvm/scripts/'rvm' && rvm install 2.0.0-p0"])
     subprocess.call(["bash", "-c", "source ~/.rvm/scripts/'rvm' && rvm 2.0.0-p0 do gem install bundler"])
-    subprocess.call(["bash", "-c", "source ~/.rvm/scripts/'rvm' && rvm install jruby-1.7.3"])
-    subprocess.call(["bash", "-c", "source ~/.rvm/scripts/'rvm' && rvm jruby-1.7.3 do gem install bundler"])
+    subprocess.call(["bash", "-c", "source ~/.rvm/scripts/'rvm' && rvm install jruby-1.7.4"])
+    subprocess.call(["bash", "-c", "source ~/.rvm/scripts/'rvm' && rvm jruby-1.7.4 do gem install bundler"])
 
     # We need a newer version of jruby-rack
     self.__run_command("git clone git://github.com/jruby/jruby-rack.git")
-    subprocess.call(["bash", "-c", "cd installs/jruby-rack && source ~/.rvm/scripts/'rvm' && rvm jruby-1.7.3 do bundle install"])
-    subprocess.call(["bash", "-c", "cd installs/jruby-rack && source ~/.rvm/scripts/'rvm' && rvm jruby-1.7.3 do jruby -S bundle exec rake clean gem SKIP_SPECS=true"])
-    subprocess.call(["bash", "-c", "cd installs/jruby-rack/target && source ~/.rvm/scripts/'rvm' && rvm jruby-1.7.3 do gem install jruby-rack-1.2.0.SNAPSHOT.gem"])
+    subprocess.call(["bash", "-c", "cd installs/jruby-rack && source ~/.rvm/scripts/'rvm' && rvm jruby-1.7.4 do bundle install"])
+    subprocess.call(["bash", "-c", "cd installs/jruby-rack && source ~/.rvm/scripts/'rvm' && rvm jruby-1.7.4 do jruby -S bundle exec rake clean gem SKIP_SPECS=true"])
+    subprocess.call(["bash", "-c", "cd installs/jruby-rack/target && source ~/.rvm/scripts/'rvm' && rvm jruby-1.7.4 do gem install jruby-rack-1.2.0.SNAPSHOT.gem"])
 
     #
     # go

rack/Gemfile-jruby

@@ -2,5 +2,5 @@ source 'http://rubygems.org'
 
 gem 'jruby-rack', '1.2.0.SNAPSHOT'
 gem 'warbler', '1.3.6'
-gem 'jruby-jars', '1.7.3'
+gem 'jruby-jars', '1.7.4'
 gem 'json', '1.7.6'

rack/README.md

@@ -10,7 +10,7 @@ This is the Ruby Rack portion of a [benchmarking test suite](../) comparing a va
 The tests were run with:
 
 * [Ruby 2.0.0-p0](http://www.ruby-lang.org/)
-* [JRuby 1.7.3](http://jruby.org/)
+* [JRuby 1.7.4](http://jruby.org/)
 * [Rack 1.5.1](http://rack.github.com/)
 * [Unicorn 4.6.2](http://unicorn.bogomips.org/)
 * [Resin 4.0.34](http://www.caucho.com/)

rack/setup_jruby.py

@@ -6,10 +6,10 @@ import re
 def start(args):
 
   try:
-    subprocess.check_call("rvm jruby-1.7.3 do bundle install --gemfile=Gemfile-jruby", shell=True, cwd="rack")
+    subprocess.check_call("rvm jruby-1.7.4 do bundle install --gemfile=Gemfile-jruby", shell=True, cwd="rack")
     subprocess.check_call("cp Gemfile-jruby Gemfile", shell=True, cwd="rack")
     subprocess.check_call("cp Gemfile-jruby.lock Gemfile.lock", shell=True, cwd="rack")
-    subprocess.check_call("rvm jruby-1.7.3 do warble war", shell=True, cwd="rack")
+    subprocess.check_call("rvm jruby-1.7.4 do warble war", shell=True, cwd="rack")
     subprocess.check_call("rm -rf $RESIN_HOME/webapps/*", shell=True)
     subprocess.check_call("cp rack.war $RESIN_HOME/webapps/rack.war", shell=True, cwd="rack")
     subprocess.check_call("$RESIN_HOME/bin/resinctl start", shell=True)

rails-stripped/Gemfile-jruby

@@ -4,5 +4,5 @@ gem 'jruby-openssl', '0.8.5'
 gem 'rails', '3.2.13'
 gem 'jruby-rack', '1.2.0.SNAPSHOT'
 gem 'warbler', '1.3.6'
-gem 'jruby-jars', '1.7.3'
+gem 'jruby-jars', '1.7.4'
 gem 'activerecord-jdbcmysql-adapter', '1.2.6'

rails-stripped/README.md

@@ -13,7 +13,7 @@ This is the Ruby on Rails portion of a [benchmarking test suite](../) comparing
 ## Infrastructure Software Versions
 The tests were run with:
 * [Ruby 2.0.0-p0](http://www.ruby-lang.org/)
-* [JRuby 1.7.3](http://jruby.org/)
+* [JRuby 1.7.4](http://jruby.org/)
 * [Rails 3.2.11](http://rubyonrails.org/)
 * [Unicorn 4.6.2](http://unicorn.bogomips.org/)
 * [Resin 4.0.34](http://www.caucho.com/)

rails-stripped/setup_jruby.py

@@ -8,11 +8,11 @@ def start(args):
   setup_util.replace_text("rails-stripped/resin-web.xml", "mysql:\/\/.*:3306", "mysql://" + args.database_host + ":3306")
 
   try:
-    subprocess.check_call("rvm jruby-1.7.3 do bundle install --gemfile=Gemfile-jruby", shell=True, cwd="rails-stripped")
+    subprocess.check_call("rvm jruby-1.7.4 do bundle install --gemfile=Gemfile-jruby", shell=True, cwd="rails-stripped")
     subprocess.check_call("cp Gemfile-jruby Gemfile", shell=True, cwd="rails-stripped")
     subprocess.check_call("cp Gemfile-jruby.lock Gemfile.lock", shell=True, cwd="rails-stripped")
     subprocess.check_call("cp config/database-jruby.yml config/database.yml", shell=True, cwd="rails-stripped")
-    subprocess.check_call("rvm jruby-1.7.3 do warble war", shell=True, cwd="rails-stripped")
+    subprocess.check_call("rvm jruby-1.7.4 do warble war", shell=True, cwd="rails-stripped")
     subprocess.check_call("rm -rf $RESIN_HOME/webapps/*", shell=True)
     subprocess.check_call("cp rails-stripped.war $RESIN_HOME/webapps/rails.war", shell=True, cwd="rails-stripped")
     subprocess.check_call("$RESIN_HOME/bin/resinctl start", shell=True)

rails/Gemfile-jruby

@@ -4,5 +4,5 @@ gem 'jruby-openssl', '0.8.5'
 gem 'rails', '3.2.13'
 gem 'jruby-rack', '1.2.0.SNAPSHOT'
 gem 'warbler', '1.3.6'
-gem 'jruby-jars', '1.7.3'
+gem 'jruby-jars', '1.7.4'
 gem 'activerecord-jdbcmysql-adapter', '1.2.6'

rails/README.md

@@ -13,7 +13,7 @@ This is the Ruby on Rails portion of a [benchmarking test suite](../) comparing
 ## Infrastructure Software Versions
 The tests were run with:
 * [Ruby 2.0.0-p0](http://www.ruby-lang.org/)
-* [JRuby 1.7.3](http://jruby.org/)
+* [JRuby 1.7.4](http://jruby.org/)
 * [Rails 3.2.11](http://rubyonrails.org/)
 * [Unicorn 4.6.2](http://unicorn.bogomips.org/)
 * [Resin 4.0.34](http://www.caucho.com/)

rails/setup_jruby.py

@@ -8,11 +8,11 @@ def start(args):
   setup_util.replace_text("rails/resin-web.xml", "mysql:\/\/.*:3306", "mysql://" + args.database_host + ":3306")
 
   try:
-    subprocess.check_call("rvm jruby-1.7.3 do bundle install --gemfile=Gemfile-jruby", shell=True, cwd="rails")
+    subprocess.check_call("rvm jruby-1.7.4 do bundle install --gemfile=Gemfile-jruby", shell=True, cwd="rails")
     subprocess.check_call("cp Gemfile-jruby Gemfile", shell=True, cwd="rails")
     subprocess.check_call("cp Gemfile-jruby.lock Gemfile.lock", shell=True, cwd="rails")
     subprocess.check_call("cp config/database-jruby.yml config/database.yml", shell=True, cwd="rails")
-    subprocess.check_call("rvm jruby-1.7.3 do warble war", shell=True, cwd="rails")
+    subprocess.check_call("rvm jruby-1.7.4 do warble war", shell=True, cwd="rails")
     subprocess.check_call("rm -rf $RESIN_HOME/webapps/*", shell=True)
     subprocess.check_call("cp rails.war $RESIN_HOME/webapps/rails.war", shell=True, cwd="rails")
     subprocess.check_call("$RESIN_HOME/bin/resinctl start", shell=True)

sinatra/Gemfile-jruby

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 gem 'sinatra', '1.3.4'
 gem 'sinatra-contrib', '1.3.2'
 gem 'warbler', '1.3.6'
-gem 'jruby-jars', '1.7.3'
+gem 'jruby-jars', '1.7.4'
 gem 'jruby-rack', '1.2.0.SNAPSHOT'
 gem 'activerecord-jdbcmysql-adapter', '1.2.6'
 gem "sinatra-activerecord", "1.2.2"

sinatra/README.md

@@ -12,7 +12,7 @@ This is the Ruby Sinatra portion of a [benchmarking test suite](../) comparing a
 ## Infrastructure Software Versions
 The tests were run with:
 * [Ruby 2.0.0-p0](http://www.ruby-lang.org/)
-* [JRuby 1.7.3](http://jruby.org/)
+* [JRuby 1.7.4](http://jruby.org/)
 * [Sinatra 1.3.4](http://www.sinatrarb.com/)
 * [Unicorn 4.6.2](http://unicorn.bogomips.org/)
 * [Resin 4.0.34](http://www.caucho.com/)

sinatra/setup_jruby.py

@@ -7,10 +7,10 @@ def start(args):
   setup_util.replace_text("sinatra/resin-web.xml", "mysql:\/\/.*:3306", "mysql://" + args.database_host + ":3306")
 
   try:
-    subprocess.check_call("rvm jruby-1.7.3 do bundle install --gemfile=Gemfile-jruby", shell=True, cwd="sinatra")
+    subprocess.check_call("rvm jruby-1.7.4 do bundle install --gemfile=Gemfile-jruby", shell=True, cwd="sinatra")
     subprocess.check_call("cp Gemfile-jruby Gemfile", shell=True, cwd="sinatra")
     subprocess.check_call("cp Gemfile-jruby.lock Gemfile.lock", shell=True, cwd="sinatra")
-    subprocess.check_call("rvm jruby-1.7.3 do warble war", shell=True, cwd="sinatra")
+    subprocess.check_call("rvm jruby-1.7.4 do warble war", shell=True, cwd="sinatra")
     subprocess.check_call("rm -rf $RESIN_HOME/webapps/*", shell=True)
     subprocess.check_call("cp sinatra.war $RESIN_HOME/webapps/sinatra.war", shell=True, cwd="sinatra")
     subprocess.check_call("$RESIN_HOME/bin/resinctl start", shell=True)