Skip to content

Commit

Permalink
get the tests work with latest jruby-maven-plugins SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
mkristian committed May 23, 2012
1 parent 4813165 commit 633d9ea
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
5 changes: 5 additions & 0 deletions Gemfile
@@ -1,2 +1,7 @@
source :rubygems
gemspec

group :test do
gem 'minitest', '~> 2.10.0'
gem 'cucumber', '~> 1.1.9'
end
4 changes: 4 additions & 0 deletions Mavenfile
Expand Up @@ -18,6 +18,7 @@ jar 'org.apache.maven.wagon:wagon-http-lightweight', wagon_version
JRUBY_VERSIONS = ['1.5.6','1.6.5.1','1.6.7'].join(',')
plugin(:minitest) do |m|
m.gem(:minitest, '2.10.0')
m.gem(:bundler, '1.1.3')
m.execute_goal(:spec)
m.with :use18and19 => true, :versions => JRUBY_VERSIONS
end
Expand All @@ -29,4 +30,7 @@ plugin(:cucumber) do |m|
m.with :use18and19 => true, :versions => JRUBY_VERSIONS
end

# hack until test profile deps are normal deps with scope 'test'
profile(:test).activation.by_default

# vim: syntax=Ruby
2 changes: 1 addition & 1 deletion lib/jbundler.rb
Expand Up @@ -9,7 +9,7 @@
classpath_file = JBundler::ClasspathFile.new('.jbundler/classpath.rb')
gemfile_lock = JBundler::GemfileLock.new(mavenfile, config.gemfile + '.lock')

if classpath_file.needs_update?(mavenfile, gemfile_lock)
if mavenfile.exists? && classpath_file.needs_update?(mavenfile, gemfile_lock)
aether = JBundler::AetherRuby.new(config)

mavenfile.populate_unlocked(aether)
Expand Down

0 comments on commit 633d9ea

Please sign in to comment.