Mailing-List: contact buildr-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: buildr-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r643246 - in /incubator/buildr/trunk: CHANGELOG
 lib/buildr/core/generate.rb
Date: Tue, 01 Apr 2008 02:51:20 -0000
To: buildr-commits@incubator.apache.org
From: assaf@apache.org
Message-Id: <20080401025121.00D571A9832@eris.apache.org>

Author: assaf
Date: Mon Mar 31 19:51:18 2008
New Revision: 643246

URL: http://svn.apache.org/viewvc?rev=643246&view=rev
Log:
Fixed: POM generation now applies JAR as default packaging if unspecified.

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=643246&r1=643245&r2=643246&view=diff
==============================================================================
--- incubator/buildr/trunk/CHANGELOG (original)
+++ incubator/buildr/trunk/CHANGELOG Mon Mar 31 19:51:18 2008
@@ -53,6 +53,12 @@
 (http://blog.evanweaver.com/files/doc/fauna/allison).
 * Changed: Resource tasks no longer generate target directory if there are no
 resources to copy over.
+* Changed: To prevent collissions with required files, the source layout now
+places everything under lib/buildr, so require 'core/compile' is now require
+'buildr/core/compile'.
+* Changed: The various Java tasks (JavaCC, XMLBeans, JDepends, etc) are now
+located in the extra directory, and may at some point relocate to an addon
+Gem.
 * Removed: Prepare tasks removed.
 * Removed: All deprecated features since 1.1.  If you've seen warnings before,
 except the build to break.
@@ -69,6 +75,8 @@
 Marek).
 * Fixed: When compiling Scala only include scala-library and scala-compiler
 JARs (John Layton).
+* Fixed: POM generation now applies JAR as default packaging if unspecified
+(Maarten Billemont).
 
 1.2.10 (2007-11-26)
 * Changed: Resources sets permission on copied files to make them

Modified: incubator/buildr/trunk/lib/buildr/core/generate.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/generate.rb?rev=643246&r1=643245&r2=643246&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/generate.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/generate.rb Mon Mar 31 19:51:18 2008
@@ -174,7 +174,7 @@
         test_dependencies = test_dependencies.sort.map{|d| "'#{d}'"}.join(', ')
         script <<  "  test.with #{test_dependencies}" unless test_dependencies.empty?
 
-        packaging = project['packaging'].first
+        packaging = project['packaging'] ? project['packaging'].first : 'jar'
         if %w(jar war).include?(packaging)
           script <<  "  package :#{packaging}, :id => '#{artifactId}'"
         end