Author: assaf
Date: Mon Jul 28 17:39:01 2008
New Revision: 680586
URL: http://svn.apache.org/viewvc?rev=680586&view=rev
Log:
Fixed: BUILDR-110 Error creating buildfile from POM when missing plugin
configuration (Geoffrey Ruscoe),
Modified:
incubator/buildr/trunk/CHANGELOG
incubator/buildr/trunk/lib/buildr/core/generate.rb
Modified: incubator/buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/CHANGELOG?rev=680586&r1=680585&r2=680586&view=diff
==============================================================================
--- incubator/buildr/trunk/CHANGELOG (original)
+++ incubator/buildr/trunk/CHANGELOG Mon Jul 28 17:39:01 2008
@@ -11,6 +11,8 @@
* Fixed: BUILDR-108 Trace to explain why a compile is done (Lacton).
* Fixed: BUILDR-109 Failure of "Buildr::Filter should respond to :include and
use these inclusion patterns" (Lacton).
+* Fixed: BUILDR-110 Error creating buildfile from POM when missing plugin
+configuration (Geoffrey Ruscoe),
1.3.2 (2008-07-18)
* Added: --prereqs command line argument to show all tasks and their
Modified: incubator/buildr/trunk/lib/buildr/core/generate.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/generate.rb?rev=680586&r1=680585&r2=680586&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/generate.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/generate.rb Mon Jul 28 17:39:01 2008
@@ -150,13 +150,15 @@
#get plugins configurations
plugins = project['build'].first['plugins'].first['plugin'] rescue {}
- compile_plugin = plugins.find{|pl| (pl['groupId'].nil? or
pl['groupId'].first == 'org.apache.maven.plugins') and pl['artifactId'].first
== 'maven-compiler-plugin'}
- if compile_plugin
- source = compile_plugin.first['configuration'].first['source']
rescue nil
- target = compile_plugin.first['configuration'].first['target']
rescue nil
+ if plugin
+ compile_plugin = plugins.find{|pl| (pl['groupId'].nil? or
pl['groupId'].first == 'org.apache.maven.plugins') and pl['artifactId'].first
== 'maven-compiler-plugin'}
+ if compile_plugin
+ source = compile_plugin.first['configuration'].first['source']
rescue nil
+ target = compile_plugin.first['configuration'].first['target']
rescue nil
- script << " compile.options.source = '#{source}'" if source
- script << " compile.options.target = '#{target}'" if target
+ script << " compile.options.source = '#{source}'" if source
+ script << " compile.options.target = '#{target}'" if target
+ end
end
compile_dependencies = pom.dependencies
