Updated Branches: refs/heads/master 7c2054768 -> fe436b7ad
Core: Added JRuby target for Travis * Disable installation of thin when on jruby * Added jruby-openssl dependency when on jruby Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/fe436b7a Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/fe436b7a Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/fe436b7a Branch: refs/heads/master Commit: fe436b7ad6fb173c66e551979bf1a4d2896814de Parents: 4591286 Author: Michal Fojtik <mfoj...@redhat.com> Authored: Fri Aug 3 10:59:45 2012 +0200 Committer: Michal fojtik <mfoj...@redhat.com> Committed: Fri Aug 3 10:59:45 2012 +0200 ---------------------------------------------------------------------- .travis.yml | 1 + server/Gemfile | 4 ++++ server/deltacloud-core.gemspec | 2 +- 3 files changed, 6 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltacloud/blob/fe436b7a/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 5d9813a..7f55ce4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: ruby rvm: - 1.8.7 - 1.9.3 + - jruby-19mode gemfile: server/Gemfile install: - cd server http://git-wip-us.apache.org/repos/asf/deltacloud/blob/fe436b7a/server/Gemfile ---------------------------------------------------------------------- diff --git a/server/Gemfile b/server/Gemfile index 369e8b9..395e39d 100644 --- a/server/Gemfile +++ b/server/Gemfile @@ -2,6 +2,10 @@ source "http://rubygems.org"; gemspec +platforms :jruby do + gem 'jruby-openssl' +end + group :development do gem "rack-test" gem "minitest" http://git-wip-us.apache.org/repos/asf/deltacloud/blob/fe436b7a/server/deltacloud-core.gemspec ---------------------------------------------------------------------- diff --git a/server/deltacloud-core.gemspec b/server/deltacloud-core.gemspec index 1a95db2..3fdf532 100644 --- a/server/deltacloud-core.gemspec +++ b/server/deltacloud-core.gemspec @@ -74,7 +74,7 @@ Gem::Specification.new do |s| s.add_dependency('rack-accept') s.add_dependency('json', '>= 1.1.9') s.add_dependency('net-ssh', '>= 2.0.0') - s.add_dependency('thin', '>= 1.2.5') + s.add_dependency('thin', '>= 1.2.5') unless RUBY_PLATFORM == 'java' s.add_dependency('nokogiri', '>= 1.4.3') s.add_dependency('require_relative')
