lib/ruby/ruby_maven.rb in ruby-maven-3.0.3.0.28.4.1 vs lib/ruby/ruby_maven.rb in ruby-maven-3.0.3.0.28.5
- old
+ new
@@ -14,11 +14,11 @@
:rails2 => [:new, :generate, :rake, :server, :console],
:rails3 => [:new, :generate, :rake, :server, :console, :dbconsole, :pom, :initialize],
:cucumber => [:test],
:rspec => [:test],
:runit => [:test],
- :bundler => [:install]
+ :bundler => [:install, :update]
}
ALIASES = {
:ruby => :jruby,
:spec => :rspec,
:rails => :rails3,
@@ -69,14 +69,15 @@
end
# determine the version and delete from args if given
version = args.detect do |a|
a =~ /^-Dplugin.version=/
end
+ version ||= options['-Dplugin.version']
if version
args.delete(version)
- version = version.sub(/^-Dplugin.version=/, ':')
+ version = ":" + version.sub(/^-Dplugin.version=/, '')
end
aa = if index = args.index("--")
args[(index + 1)..-1]
else
[]
@@ -191,10 +192,11 @@
a << options_array
a.flatten!
a = generate_pom(*a)
puts a.join ' '
if defined? JRUBY_VERSION
- launch_jruby(a)
+ # TODO use a setup like maven_gemify from jruby to launch maven
+ launch_java(a)
else
launch_java(a)
end
end