lib/maven/tools/dsl.rb in maven-tools-1.0.1 vs lib/maven/tools/dsl.rb in maven-tools-1.0.2

- old
+ new

@@ -11,11 +11,11 @@ def tesla( &block ) @model = Model.new @model.model_version = '4.0.0' @model.name = ::File.basename( basedir ) - @model.group_id = 'dummy' + @model.group_id = 'no_group_id_given' @model.artifact_id = model.name @model.version = '0.0.0' @context = :project nested_block( :project, @model, block ) if block if @needs_torquebox @@ -85,11 +85,11 @@ def git( *args ) warn 'git block not implemented' end def is_jruby_platform( *args ) - args.detect { |a| :jruby == a.to_sym } + args.flatten.detect { |a| :jruby == a.to_sym } end private :is_jruby_platform def platforms( *args ) if is_jruby_platform( *args ) @@ -1275,11 +1275,11 @@ if options.key?( :git ) @has_git = true elsif options.key?( :path ) @has_path = true else - platform = options.delete( :platform ) || options.delete( 'platform' ) - group = options.delete( :group ) || options.delete( 'group' ) || @group + platform = options.delete( :platform ) || options.delete( 'platform' ) || options.delete( :platforms ) || options.delete( 'platforms' ) + group = options.delete( :groups ) || options.delete( 'groups' ) || options.delete( :group ) || options.delete( 'group' ) || @group if group group = [ group ].flatten.each { |g| g.to_sym } if group.member? :development options[ :scope ] = :provided elsif group.member? :test