Permalink
Browse files

configure plugin version independetly from maven-tools

  • Loading branch information...
1 parent 8becc9a commit 0cda34c6c056463dcd4d7aef10e213f3c27a5167 @mkristian committed Jan 27, 2013
Showing with 8 additions and 2 deletions.
  1. +1 −0 lib/ruby/maven/ruby/cli.rb
  2. +2 −1 lib/ruby/maven/ruby/pom_magic.rb
  3. +5 −1 lib/ruby/maven/ruby/version.rb
@@ -79,6 +79,7 @@ def log(args)
def maybe_print_help(args)
if args.size == 0 || args[0] == "--help"
+ puts "ruby-maven version #{VERSION} using jruby-maven-plugins version #{JRUBY_MAVEN_PLUGINS_VERSION}"
puts "usage: rmvn [<plugin-name> [<args>] [-- <maven-options>]] | [<maven-goal>|<maven-phase> <maven-options>] | --help"
PLUGINS.each do |name, goals|
puts
@@ -1,5 +1,6 @@
require 'fileutils'
require 'maven/tools/rails_project'
+require 'maven/ruby/version'
module Maven
module Ruby
@@ -55,7 +56,7 @@ def generate_pom(dir = '.', *args)
if proj
proj.load_jarfile(File.join(File.dirname(filename), 'Jarfile'))
proj.load_gemfile(File.join(File.dirname(filename), 'Mavenfile'))
- proj.add_defaults
+ proj.add_defaults( :jruby_plugins => JRUBY_MAVEN_PLUGINS_VERSION )
pom = pom_xml(dir)
File.open(pom, 'w') do |f|
f.puts proj.to_xml
@@ -1,5 +1,9 @@
module Maven
module Ruby
- VERSION = '3.0.4.1.2'
+ VERSION = '3.0.4.1.3'
+ # allow to overwrite the default from maven-tools
+ # since jruby-maven-plugins depend on maven-tools and
+ # default version in maven-tools is often behind
+ JRUBY_MAVEN_PLUGINS_VERSION = '0.29.3'
end
end

0 comments on commit 0cda34c

Please sign in to comment.