lib/maven/tools/dsl.rb in maven-tools-1.1.2 vs lib/maven/tools/dsl.rb in maven-tools-1.1.3
- old
+ new
@@ -408,15 +408,22 @@
alias :mailing_lists :licenses
alias :notifiers :licenses
alias :dependencies :licenses
alias :repositories :licenses
alias :plugin_repositories :licenses
- alias :extensions :licenses
alias :resources :licenses
alias :testResources :licenses
alias :plugins :licenses
+ def extensions(*args)
+ if @context == :plugin || @context == :report_plugin
+ @current.extensions = args[0]
+ else
+ yield
+ end
+ end
+
def build( &block )
build = @current.build ||= Build.new
nested_block( :build, build, block ) if block
build
end
@@ -1215,13 +1222,16 @@
when Hash
options = reports.last
reports = reports[ 0..-2 ]
id = options.delete( :id ) || options.delete( 'id' )
set.id = id if id
- inherited = options.delete( :inherited ) ||
- options.delete( 'inherited' )
- set.inherited = inherited if inherited
+ inherited = options.delete( :inherited )
+ inherited = options.delete( 'inherited' ) if inherited.nil?
+ set.inherited = inherited unless inherited.nil?
+ extensions = options.delete( :extensions )
+ extensions = options.delete( 'extensions' ) if extensions.nil?
+ set.extensions = extensions unless extensions.nil?
end
set_config( set, options )
set.reports = reports#.to_java
@current.report_sets << set
end
@@ -1371,11 +1381,15 @@
xml
end
def prepare_config( receiver, options )
return unless options
- inherited = options.delete( 'inherited' ) || options.delete( :inherited )
- receiver.inherited = inherited if inherited
+ inh = options.delete( 'inherited' )
+ inh = options.delete( :inherited ) if inh.nil?
+ receiver.inherited = inh unless inh.nil?
+ ext = options.delete( 'extensions' )
+ ext = options.delete( :extensions ) if ext.nil?
+ receiver.extensions = ext unless ext.nil?
end
def set_config( receiver, options )
prepare_config( receiver, options )
receiver.configuration = options