Browse Source

[ruby/sinatra] Remove java dependencies (#8442)

Since 908ddc539604e700ef49a823b7ea4842034a55bc, the Sinatra benchmarks
no longer run with JRuby, so the java dependencies can be removed.
Petrik de Heus 1 year ago
parent
commit
af2ba69b66

+ 0 - 4
frameworks/Ruby/sinatra/Gemfile

@@ -1,20 +1,16 @@
 source 'https://rubygems.org'
 
 gem 'activerecord', '~> 5.0.0', :require=>'active_record'
-gem 'activerecord-jdbc-adapter', '>= 5.0.pre1', '< 6.0', :platforms=>:jruby
 gem 'json', '~> 2.0'
 gem 'passenger', '~> 5.1', :platforms=>[:ruby, :mswin], :require=>false
 gem 'puma', '~> 3.9', :require=>false
 gem 'sinatra', '~> 2.0', :require=>'sinatra/base'
-gem 'torquebox-web', '>= 4.0.0.beta3', '< 5', :platforms=>:jruby, :require=>false
 gem 'unicorn', '~> 5.2', :platforms=>[:ruby, :mswin], :require=>false
 
 group :mysql do
-  gem 'jdbc-mysql', '~> 5.1', :platforms=>:jruby, :require=>'jdbc/mysql'
   gem 'mysql2', '~> 0.4', :platforms=>[:ruby, :mswin]
 end
 
 group :postgresql do
-  gem 'jdbc-postgres', '~> 9.4', :platforms=>:jruby, :require=>'jdbc/postgres'
   gem 'pg', '1.2.3', :platforms=>[:ruby, :mswin]
 end

+ 0 - 3
frameworks/Ruby/sinatra/README.md

@@ -13,12 +13,9 @@ comparing a variety of web platforms.
 The tests will be run with:
 
 * [Ruby 2.4](http://www.ruby-lang.org)
-* [JRuby 9.1](http://jruby.org)\*
-* [Rubinius 3](https://rubinius.com)\*
 * [Puma 3](http://puma.io)
 * [Passenger 5](https://www.phusionpassenger.com)
 * [Unicorn 5](https://bogomips.org/unicorn/)
-* [TorqueBox 4.0](http://torquebox.org)\*
 * [Sinatra 2](http://www.sinatrarb.com)
 * [ActiveRecord 5](https://github.com/rails/rails/tree/master/activerecord)
 * [MySQL 5.5](https://www.mysql.com)

+ 0 - 18
frameworks/Ruby/sinatra/config/java_tune.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-stack_size=1
-cache_size=240
-meta_size=192
-avail_mem=$(awk '/^MemAvailable/ { print int(0.6 * $2 / 1024); exit }' /proc/meminfo)
-heap_size=$(( avail_mem - meta_size - cache_size - (stack_size * MAX_CONCURRENCY * THREAD_FACTOR) ))
-
-JRUBY_OPTS="-J-server -J-XX:+AggressiveOpts -J-Djava.net.preferIPv4Stack=true"
-#JRUBY_OPTS="$JRUBY_OPTS -J-XX:+UseSerialGC"
-JRUBY_OPTS="$JRUBY_OPTS -J-XX:+CMSClassUnloadingEnabled -J-XX:+UseConcMarkSweepGC"
-#JRUBY_OPTS="$JRUBY_OPTS -J-XX:+UseG1GC -J-XX:+UseStringDeduplication"
-JRUBY_OPTS="$JRUBY_OPTS -J-Xms${heap_size}m -J-Xmx${heap_size}m"
-JRUBY_OPTS="$JRUBY_OPTS -J-Xss${stack_size}m"
-JRUBY_OPTS="$JRUBY_OPTS -J-XX:MaxMetaspaceSize=${meta_size}m"
-JRUBY_OPTS="$JRUBY_OPTS -J-XX:ReservedCodeCacheSize=${cache_size}m"
-JRUBY_OPTS="$JRUBY_OPTS -Xcompile.invokedynamic=true -J-XX:+UseNUMA -J-XX:+AlwaysPreTouch"
-
-export JRUBY_OPTS