diff --git a/Gemfile b/Gemfile index 59a93e1c..1434347b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,11 +2,6 @@ source "https://rubygems.org/" gemspec -# override default maven-tools used by bundler -gem 'maven-tools', '1.2.3' -# add bigdecimal missing from transitive dependency of maven-tools -gem 'bigdecimal' - group :development, :test do gem 'rdoc', '~> 7.0', :require => nil diff --git a/warbler.gemspec b/warbler.gemspec index d44e2396..f31966c8 100644 --- a/warbler.gemspec +++ b/warbler.gemspec @@ -39,4 +39,5 @@ bundle up all of your application files for deployment to a Java environment.} gem.add_development_dependency 'rspec', '~> 3.0' gem.add_development_dependency 'drb', ['~> 2.2', '>= 2.2.3'] gem.add_development_dependency 'jbundler', '~> 0.9.5' + gem.add_development_dependency 'bigdecimal', '< 5' # Needed workaround jbundler > maven-tools > vertus > axiom-types lack of explicit bigdecimal dependency for for JRuby 10 end