From commitslopeztyler@example.org  Wed May 18 15:41:30 2011
Return-Path: <commitslopeztyler@example.org>
X-Original-To: lopeztyler@example.org
Delivered-To: lopeztyler@example.org
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id 7BFBD6EF3
	for <lopeztyler@example.org>; Wed, 18 May 2011 15:41:30 +0000 (UTC)
Received: (qmail 32582 invoked by uid 500); 18 May 2011 15:41:30 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 32559 invoked by uid 500); 18 May 2011 15:41:30 -0000
Mailing-List: contact lopeztyler@example.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lopeztyler@example.org>
List-Unsubscribe: <mailto:lopeztyler@example.org>
List-Post: <mailto:lopeztyler@example.org>
List-Id: <commits.buildr.apache.org>
Reply-To: lopeztyler@example.org
Delivered-To: mailing list lopeztyler@example.org
Received: (qmail 32552 invoked by uid 500); 18 May 2011 15:41:30 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 32547 invoked by uid 99); 18 May 2011 15:41:30 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 May 2011 15:41:30 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_RP_MATCHES_RCVD
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 May 2011 15:41:27 +0000
Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155])
	by hel.zones.apache.org (Postfix) with ESMTP id 7344CCFF08
	for <lopeztyler@example.org>; Wed, 18 May 2011 15:40:47 +0000 (UTC)
Date: Wed, 18 May 2011 15:40:47 +0000 (UTC)
From: "Ryan Fowler (JIRA)" <lopeztyler@example.org>
To: lopeztyler@example.org
Message-ID: <lopeztyler@example.org>
Subject: [jira] [Updated] (BUILDR-251) classifiers are not handled when
 downloading snapshot artifacts
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394
X-Virus-Checked: Checked by ClamAV on apache.org


     [ https://issues.apache.org/jira/browse/BUILDR-251?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Ryan Fowler updated BUILDR-251:
-------------------------------

    Attachment: BUILDR-251.patch

Attached is a patch including a spec demonstrating the problem and a fix that adds the classifier when figuring out the repository url for the file.

> classifiers are not handled when downloading snapshot artifacts
> ---------------------------------------------------------------
>
>                 Key: BUILDR-251
>                 URL: https://issues.apache.org/jira/browse/BUILDR-251
>             Project: Buildr
>          Issue Type: Bug
>          Components: Dependency management
>    Affects Versions: 1.3.4
>            Reporter: Ittay Dror
>         Attachments: BUILDR-251.patch
>
>
> e.g., if i download the sources artifact of an artifact with SNAPSHOT, it will download the file of the artifact, not that of the sources, since it doesn't use the classifiers in the url

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira

From commitslopeztyler@example.org  Fri May 20 00:03:30 2011
Return-Path: <commitslopeztyler@example.org>
X-Original-To: lopeztyler@example.org
Delivered-To: lopeztyler@example.org
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id 6453442D4
	for <lopeztyler@example.org>; Fri, 20 May 2011 00:03:30 +0000 (UTC)
Received: (qmail 82772 invoked by uid 500); 20 May 2011 00:03:30 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 82747 invoked by uid 500); 20 May 2011 00:03:30 -0000
Mailing-List: contact lopeztyler@example.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lopeztyler@example.org>
List-Unsubscribe: <mailto:lopeztyler@example.org>
List-Post: <mailto:lopeztyler@example.org>
List-Id: <commits.buildr.apache.org>
Reply-To: lopeztyler@example.org
Delivered-To: mailing list lopeztyler@example.org
Received: (qmail 82740 invoked by uid 500); 20 May 2011 00:03:30 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 82731 invoked by uid 99); 20 May 2011 00:03:29 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2011 00:03:29 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_RP_MATCHES_RCVD
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2011 00:03:28 +0000
Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155])
	by hel.zones.apache.org (Postfix) with ESMTP id 5422CD2091
	for <lopeztyler@example.org>; Fri, 20 May 2011 00:02:49 +0000 (UTC)
Date: Fri, 20 May 2011 00:02:49 +0000 (UTC)
From: "Alexis Midon (JIRA)" <lopeztyler@example.org>
To: lopeztyler@example.org
Message-ID: <lopeztyler@example.org>
Subject: [jira] [Created] (BUILDR-583) outdated JRuby version in doc and
 script
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394

outdated JRuby version in doc and script
----------------------------------------

                 Key: BUILDR-583
                 URL: https://issues.apache.org/jira/browse/BUILDR-583
             Project: Buildr
          Issue Type: Bug
            Reporter: Alexis Midon


The JRuby install installs JRuby 1.1.6 while the minimum version required is 1.5.1.



--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira

From commitslopeztyler@example.org  Fri May 20 00:09:28 2011
Return-Path: <commitslopeztyler@example.org>
X-Original-To: lopeztyler@example.org
Delivered-To: lopeztyler@example.org
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id CB71F48E5
	for <lopeztyler@example.org>; Fri, 20 May 2011 00:09:28 +0000 (UTC)
Received: (qmail 89820 invoked by uid 500); 20 May 2011 00:09:28 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 89764 invoked by uid 500); 20 May 2011 00:09:28 -0000
Mailing-List: contact lopeztyler@example.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lopeztyler@example.org>
List-Unsubscribe: <mailto:lopeztyler@example.org>
List-Post: <mailto:lopeztyler@example.org>
List-Id: <commits.buildr.apache.org>
Reply-To: lopeztyler@example.org
Delivered-To: mailing list lopeztyler@example.org
Received: (qmail 89659 invoked by uid 500); 20 May 2011 00:09:28 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 89646 invoked by uid 99); 20 May 2011 00:09:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2011 00:09:28 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_RP_MATCHES_RCVD
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2011 00:09:27 +0000
Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155])
	by hel.zones.apache.org (Postfix) with ESMTP id 8B403D2246
	for <lopeztyler@example.org>; Fri, 20 May 2011 00:08:47 +0000 (UTC)
Date: Fri, 20 May 2011 00:08:47 +0000 (UTC)
From: "Alexis Midon (JIRA)" <lopeztyler@example.org>
To: lopeztyler@example.org
Message-ID: <lopeztyler@example.org>
In-Reply-To: <lopeztyler@example.org>
Subject: [jira] [Updated] (BUILDR-583) outdated JRuby version in doc and
 script
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394


     [ https://issues.apache.org/jira/browse/BUILDR-583?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Alexis Midon updated BUILDR-583:
--------------------------------

    Attachment: patch.txt

here is a patch for this.

Also available at https://github.com/alexism/buildr/commits/BUILDR-583

> outdated JRuby version in doc and script
> ----------------------------------------
>
>                 Key: BUILDR-583
>                 URL: https://issues.apache.org/jira/browse/BUILDR-583
>             Project: Buildr
>          Issue Type: Bug
>            Reporter: Alexis Midon
>         Attachments: patch.txt
>
>
> The JRuby install installs JRuby 1.1.6 while the minimum version required is 1.5.1.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira

From commitslopeztyler@example.org  Fri May 20 01:23:53 2011
Return-Path: <commitslopeztyler@example.org>
X-Original-To: lopeztyler@example.org
Delivered-To: lopeztyler@example.org
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id 42FD3483B
	for <lopeztyler@example.org>; Fri, 20 May 2011 01:23:53 +0000 (UTC)
Received: (qmail 65893 invoked by uid 500); 20 May 2011 01:23:53 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 65872 invoked by uid 500); 20 May 2011 01:23:53 -0000
Mailing-List: contact lopeztyler@example.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lopeztyler@example.org>
List-Unsubscribe: <mailto:lopeztyler@example.org>
List-Post: <mailto:lopeztyler@example.org>
List-Id: <commits.buildr.apache.org>
Reply-To: lopeztyler@example.org
Delivered-To: mailing list lopeztyler@example.org
Received: (qmail 65865 invoked by uid 99); 20 May 2011 01:23:53 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2011 01:23:53 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,URI_DOM_OBFU
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2011 01:23:50 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 99F7723889E1; Fri, 20 May 2011 01:23:29 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1125198 - in /buildr/trunk: CHANGELOG doc/installing.textile
 doc/scripts/install-jruby.sh
Date: Fri, 20 May 2011 01:23:29 -0000
To: lopeztyler@example.org
From: lopeztyler@example.org
X-Mailer: svnmailer-1.0.8
Message-Id: <lopeztyler@example.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: donaldp
Date: Fri May 20 01:23:29 2011
New Revision: 1125198

URL: http://svn.apache.org/viewvc?rev=1125198&view=rev
Log:
BUILDR-583 Update jruby install to use jruby version 1.6.1 

Submitted By: Alexis Midon

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/doc/installing.textile
    buildr/trunk/doc/scripts/install-jruby.sh

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1125198&r1=1125197&r2=1125198&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Fri May 20 01:23:29 2011
@@ -1,4 +1,5 @@
 1.4.6 (Pending)
+* Fixed:  BUILDR-583 Update jruby install to use jruby version 1.6.1 (Alexis Midon)
 * Fixed:  BUILDR-582 Revert the name change for the task to generate Intellij
           project files to 'idea'
 * Change: BUILDR-579 Format generated IDEA project files to look more like what

Modified: buildr/trunk/doc/installing.textile
URL: http://svn.apache.org/viewvc/buildr/trunk/doc/installing.textile?rev=1125198&r1=1125197&r2=1125198&view=diff
==============================================================================
--- buildr/trunk/doc/installing.textile (original)
+++ buildr/trunk/doc/installing.textile Fri May 20 01:23:29 2011
@@ -137,11 +137,11 @@ To upgrade to a new version or install a
 
 h2(#jruby).  Installing for JRuby
 
-*The easy way:* Use this bash script to "install Buildr on JRuby":scripts/install-jruby.sh.  This script will install the most recent version of Buildr, or if already installed, upgrade to the most recent version.  If necessary, it will also install JRuby 1.1.6 in @/opt/jruby@ and update the @PATH@ variable in @~/.bash_profile@ or @~/.profile@.
+*The easy way:* Use this bash script to "install Buildr on JRuby":scripts/install-jruby.sh.  This script will install the most recent version of Buildr, or if already installed, upgrade to the most recent version.  If necessary, it will also install JRuby 1.6.1 in @/opt/jruby@ and update the @PATH@ variable in @~/.bash_profile@ or @~/.profile@.
 
 <br>
 
-*In details:* If you don't already have JRuby 1.1.6 or later installed, you can download it from the "JRuby site":http://dist.codehaus.org/jruby/.
+*In details:* If you don't already have JRuby 1.5.1 or later installed, you can download it from the "JRuby site":http://www.jruby.org/download.
 
 After uncompressing JRuby, update your @PATH@ to include both @java@ and @jruby@ executables.
 

Modified: buildr/trunk/doc/scripts/install-jruby.sh
URL: http://svn.apache.org/viewvc/buildr/trunk/doc/scripts/install-jruby.sh?rev=1125198&r1=1125197&r2=1125198&view=diff
==============================================================================
--- buildr/trunk/doc/scripts/install-jruby.sh (original)
+++ buildr/trunk/doc/scripts/install-jruby.sh Fri May 20 01:23:29 2011
@@ -14,11 +14,11 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 if [ -z `which jruby` ] ; then
-  version=1.1.6
+  version=1.6.1
   target=/opt/jruby
   echo "Installing JRuby ${version} in ${target}"
   sudo mkdir -p $(dirname ${target})
-  wget http://dist.codehaus.org/jruby/${version}/jruby-bin-${version}.tar.gz
+  wget http://jruby.org.s3.amazonaws.com/downloads/${version}/jruby-bin-${version}.tar.gz 
   tar -xz < jruby-bin-${version}.tar.gz
   sudo mv jruby-${version} ${target}
   rm jruby-bin-${version}.tar.gz



From commitslopeztyler@example.org  Fri May 20 01:26:28 2011
Return-Path: <commitslopeztyler@example.org>
X-Original-To: lopeztyler@example.org
Delivered-To: lopeztyler@example.org
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id 1F2DF4852
	for <lopeztyler@example.org>; Fri, 20 May 2011 01:26:28 +0000 (UTC)
Received: (qmail 67937 invoked by uid 500); 20 May 2011 01:26:28 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 67913 invoked by uid 500); 20 May 2011 01:26:28 -0000
Mailing-List: contact lopeztyler@example.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lopeztyler@example.org>
List-Unsubscribe: <mailto:lopeztyler@example.org>
List-Post: <mailto:lopeztyler@example.org>
List-Id: <commits.buildr.apache.org>
Reply-To: lopeztyler@example.org
Delivered-To: mailing list lopeztyler@example.org
Received: (qmail 67906 invoked by uid 500); 20 May 2011 01:26:28 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 67903 invoked by uid 99); 20 May 2011 01:26:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2011 01:26:28 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_RP_MATCHES_RCVD
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2011 01:26:27 +0000
Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155])
	by hel.zones.apache.org (Postfix) with ESMTP id 6155AD23E0
	for <lopeztyler@example.org>; Fri, 20 May 2011 01:25:47 +0000 (UTC)
Date: Fri, 20 May 2011 01:25:47 +0000 (UTC)
From: "Peter Donald (JIRA)" <lopeztyler@example.org>
To: lopeztyler@example.org
Message-ID: <lopeztyler@example.org>
In-Reply-To: <lopeztyler@example.org>
Subject: [jira] [Closed] (BUILDR-583) outdated JRuby version in doc and
 script
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394


     [ https://issues.apache.org/jira/browse/BUILDR-583?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Peter Donald closed BUILDR-583.
-------------------------------

       Resolution: Fixed
    Fix Version/s: 1.4.6
         Assignee: Peter Donald

Change applied - thanks!

--------------
Sending        CHANGELOG
Sending        doc\installing.textile
Sending        doc\scripts\install-jruby.sh
Transmitting file data ...
Committed revision 1125198.

> outdated JRuby version in doc and script
> ----------------------------------------
>
>                 Key: BUILDR-583
>                 URL: https://issues.apache.org/jira/browse/BUILDR-583
>             Project: Buildr
>          Issue Type: Bug
>            Reporter: Alexis Midon
>            Assignee: Peter Donald
>             Fix For: 1.4.6
>
>         Attachments: patch.txt
>
>
> The JRuby install installs JRuby 1.1.6 while the minimum version required is 1.5.1.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira

From commitslopeztyler@example.org  Fri May 20 14:56:06 2011
Return-Path: <commitslopeztyler@example.org>
X-Original-To: lopeztyler@example.org
Delivered-To: lopeztyler@example.org
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id 3AE1A6E36
	for <lopeztyler@example.org>; Fri, 20 May 2011 14:56:06 +0000 (UTC)
Received: (qmail 30003 invoked by uid 500); 20 May 2011 14:56:06 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 29979 invoked by uid 500); 20 May 2011 14:56:05 -0000
Mailing-List: contact lopeztyler@example.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lopeztyler@example.org>
List-Unsubscribe: <mailto:lopeztyler@example.org>
List-Post: <mailto:lopeztyler@example.org>
List-Id: <commits.buildr.apache.org>
Reply-To: lopeztyler@example.org
Delivered-To: mailing list lopeztyler@example.org
Received: (qmail 29972 invoked by uid 99); 20 May 2011 14:56:05 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2011 14:56:05 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2011 14:56:04 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6CB1D2388901; Fri, 20 May 2011 14:55:44 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1125423 - in /buildr/trunk: CHANGELOG
 lib/buildr/packaging/artifact.rb spec/packaging/artifact_spec.rb
Date: Fri, 20 May 2011 14:55:44 -0000
To: lopeztyler@example.org
From: lopeztyler@example.org
X-Mailer: svnmailer-1.0.8
Message-Id: <lopeztyler@example.org>

Author: boisvert
Date: Fri May 20 14:55:44 2011
New Revision: 1125423

URL: http://svn.apache.org/viewvc?rev=1125423&view=rev
Log:
BUILDR-251 Classifier not handled when downloading snapshot artifacts (Ryan Fowler)

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/lib/buildr/packaging/artifact.rb
    buildr/trunk/spec/packaging/artifact_spec.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1125423&r1=1125422&r2=1125423&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Fri May 20 14:55:44 2011
@@ -10,6 +10,7 @@
 * Fixed:  BUILDR-571 Generated IDEA projects include resources multiple times (Peter Royal) 
 * Fixed:  BUILDR-573 HTTP upload PUT request with incorrect Content-Type (Mathias Doenitz)
 * Fixed:  BUILDR-578 Tar task does not preserve uid/gid on folders (Jean-Philippe Caruana)
+* Fixed:  BUILDR-251 Classifier not handled when downloading snapshot artifacts (Ryan Fowler)
 
 1.4.5 (2011-02-20)
 * Added:  BUILDR-555 Add support for the jaxb binding compiler (Mark Petrovic)

Modified: buildr/trunk/lib/buildr/packaging/artifact.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/artifact.rb?rev=1125423&r1=1125422&r2=1125423&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/artifact.rb (original)
+++ buildr/trunk/lib/buildr/packaging/artifact.rb Fri May 20 14:55:44 2011
@@ -477,7 +477,8 @@ module Buildr
         error "No build number provided for the snapshot #{to_spec}" if build_number.nil?
         return nil if timestamp.nil? || build_number.nil?
         snapshot_of = version[0, version.size - 9]
-        repo_url + "#{group_path}/#{id}/#{version}/#{id}-#{snapshot_of}-#{timestamp.text}-#{build_number.text}.#{type}"
+        classifier_snippet = (classifier != nil) ? "-#{classifier}" : ""
+        repo_url + "#{group_path}/#{id}/#{version}/#{id}-#{snapshot_of}-#{timestamp.text}-#{build_number.text}#{classifier_snippet}.#{type}"
       rescue URI888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4NotFoundError
         nil
       end

Modified: buildr/trunk/spec/packaging/artifact_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/packaging/artifact_spec.rb?rev=1125423&r1=1125422&r2=1125423&view=diff
==============================================================================
--- buildr/trunk/spec/packaging/artifact_spec.rb (original)
+++ buildr/trunk/spec/packaging/artifact_spec.rb Fri May 20 14:55:44 2011
@@ -300,6 +300,32 @@ describe Repositories, 'remote' do
       should change { File.exist?(File.join(repositories.local, 'com/example/library/2.1-SNAPSHOT/library-2.1-SNAPSHOT.jar')) }.to(true)
   end
 
+  it 'should resolve m2-style deployed snapshots with classifiers' do
+    metadata = <<-XML
+    <?xml version='1.0' encoding='UTF-8'?>
+    <metadata>
+      <groupId>com.example</groupId>
+      <artifactId>library</artifactId>
+      <version>2.1-SNAPSHOT</version>
+      <versioning>
+        <snapshot>
+          <timestamp>20071012.190008</timestamp>
+          <buildNumber>8</buildNumber>
+        </snapshot>
+        <lastUpdated>20071012190008</lastUpdated>
+      </versioning>
+    </metadata>
+    XML
+    repositories.remote = 'http://example.com'
+    URI.should_receive(:download).once.with(uri(/2.1-SNAPSHOT\/library-2.1-20071012.190008-8-classifier.jar$/), anything()).
+      and_return { |uri, target, options| write target }
+    URI.should_receive(:download).once.with(uri(/2.1-SNAPSHOT\/maven-metadata.xml$/), duck_type(:write)).
+      and_return { |uri, target, options| target.write(metadata) }
+    puts repositories.local
+    lambda { artifact('com.example:library:jar:classifier:2.1-SNAPSHOT').invoke}.
+      should change {File.exists?(File.join(repositories.local, 'com/example/library/2.1-SNAPSHOT/library-2.1-SNAPSHOT-classifier.jar')) }.to(true)
+  end
+
   it 'should fail resolving m2-style deployed snapshots if a timestamp is missing' do
     metadata = <<-XML
     <?xml version='1.0' encoding='UTF-8'?>



From commitslopeztyler@example.org  Fri May 20 14:57:28 2011
Return-Path: <commitslopeztyler@example.org>
X-Original-To: lopeztyler@example.org
Delivered-To: lopeztyler@example.org
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id 30AD36E63
	for <lopeztyler@example.org>; Fri, 20 May 2011 14:57:28 +0000 (UTC)
Received: (qmail 30272 invoked by uid 500); 20 May 2011 14:57:28 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 30250 invoked by uid 500); 20 May 2011 14:57:28 -0000
Mailing-List: contact lopeztyler@example.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lopeztyler@example.org>
List-Unsubscribe: <mailto:lopeztyler@example.org>
List-Post: <mailto:lopeztyler@example.org>
List-Id: <commits.buildr.apache.org>
Reply-To: lopeztyler@example.org
Delivered-To: mailing list lopeztyler@example.org
Received: (qmail 30243 invoked by uid 500); 20 May 2011 14:57:28 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 30238 invoked by uid 99); 20 May 2011 14:57:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2011 14:57:28 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_RP_MATCHES_RCVD
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2011 14:57:27 +0000
Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155])
	by hel.zones.apache.org (Postfix) with ESMTP id 65342D3153
	for <lopeztyler@example.org>; Fri, 20 May 2011 14:56:47 +0000 (UTC)
Date: Fri, 20 May 2011 14:56:47 +0000 (UTC)
From: "Alex Boisvert (JIRA)" <lopeztyler@example.org>
To: lopeztyler@example.org
Message-ID: <lopeztyler@example.org>
Subject: [jira] [Reopened] (BUILDR-251) classifiers are not handled when
 downloading snapshot artifacts
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394


     [ https://issues.apache.org/jira/browse/BUILDR-251?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Alex Boisvert reopened BUILDR-251:
----------------------------------


> classifiers are not handled when downloading snapshot artifacts
> ---------------------------------------------------------------
>
>                 Key: BUILDR-251
>                 URL: https://issues.apache.org/jira/browse/BUILDR-251
>             Project: Buildr
>          Issue Type: Bug
>          Components: Dependency management
>    Affects Versions: 1.3.4
>            Reporter: Ittay Dror
>         Attachments: BUILDR-251.patch
>
>
> e.g., if i download the sources artifact of an artifact with SNAPSHOT, it will download the file of the artifact, not that of the sources, since it doesn't use the classifiers in the url

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira

From commitslopeztyler@example.org  Fri May 20 14:59:30 2011
Return-Path: <commitslopeztyler@example.org>
X-Original-To: lopeztyler@example.org
Delivered-To: lopeztyler@example.org
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id 4FFCC6F52
	for <lopeztyler@example.org>; Fri, 20 May 2011 14:59:30 +0000 (UTC)
Received: (qmail 32790 invoked by uid 500); 20 May 2011 14:59:30 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 32767 invoked by uid 500); 20 May 2011 14:59:30 -0000
Mailing-List: contact lopeztyler@example.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lopeztyler@example.org>
List-Unsubscribe: <mailto:lopeztyler@example.org>
List-Post: <mailto:lopeztyler@example.org>
List-Id: <commits.buildr.apache.org>
Reply-To: lopeztyler@example.org
Delivered-To: mailing list lopeztyler@example.org
Received: (qmail 32760 invoked by uid 500); 20 May 2011 14:59:30 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 32757 invoked by uid 99); 20 May 2011 14:59:30 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2011 14:59:30 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_RP_MATCHES_RCVD
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2011 14:59:28 +0000
Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155])
	by hel.zones.apache.org (Postfix) with ESMTP id 741A1D32DA
	for <lopeztyler@example.org>; Fri, 20 May 2011 14:58:47 +0000 (UTC)
Date: Fri, 20 May 2011 14:58:47 +0000 (UTC)
From: "Alex Boisvert (JIRA)" <lopeztyler@example.org>
To: lopeztyler@example.org
Message-ID: <lopeztyler@example.org>
Subject: [jira] [Resolved] (BUILDR-251) classifiers are not handled when
 downloading snapshot artifacts
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394
X-Virus-Checked: Checked by ClamAV on apache.org


     [ https://issues.apache.org/jira/browse/BUILDR-251?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Alex Boisvert resolved BUILDR-251.
----------------------------------

       Resolution: Fixed
    Fix Version/s: 1.4.6

Patch applied.  Thanks Ryan!


boisvert@smudge:~/git/buildr$ git commit -m "BUILDR-251 Classifier not handled when downloading snapshot artifacts (Ryan Fowler)" .
[trunk bad58af] BUILDR-251 Classifier not handled when downloading snapshot artifacts (Ryan Fowler)
 3 files changed, 29 insertions(+), 1 deletions(-)
boisvert@smudge:~/git/buildr$ git svn dcommit
Committed r1125423
	M	CHANGELOG
	M	spec/packaging/artifact_spec.rb
	M	lib/buildr/packaging/artifact.rb
r1125423 = 0dbb8f1ff086846948578ea8171c86a484ff28bc (refs/remotes/origin/trunk)


> classifiers are not handled when downloading snapshot artifacts
> ---------------------------------------------------------------
>
>                 Key: BUILDR-251
>                 URL: https://issues.apache.org/jira/browse/BUILDR-251
>             Project: Buildr
>          Issue Type: Bug
>          Components: Dependency management
>    Affects Versions: 1.3.4
>            Reporter: Ittay Dror
>             Fix For: 1.4.6
>
>         Attachments: BUILDR-251.patch
>
>
> e.g., if i download the sources artifact of an artifact with SNAPSHOT, it will download the file of the artifact, not that of the sources, since it doesn't use the classifiers in the url

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira

From commitslopeztyler@example.org  Tue May 24 23:06:31 2011
Return-Path: <commitslopeztyler@example.org>
X-Original-To: lopeztyler@example.org
Delivered-To: lopeztyler@example.org
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id C6439660C
	for <lopeztyler@example.org>; Tue, 24 May 2011 23:06:31 +0000 (UTC)
Received: (qmail 17916 invoked by uid 500); 24 May 2011 23:06:31 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 17795 invoked by uid 500); 24 May 2011 23:06:30 -0000
Mailing-List: contact lopeztyler@example.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lopeztyler@example.org>
List-Unsubscribe: <mailto:lopeztyler@example.org>
List-Post: <mailto:lopeztyler@example.org>
List-Id: <commits.buildr.apache.org>
Reply-To: lopeztyler@example.org
Delivered-To: mailing list lopeztyler@example.org
Received: (qmail 17536 invoked by uid 500); 24 May 2011 23:06:30 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 17529 invoked by uid 99); 24 May 2011 23:06:30 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 May 2011 23:06:30 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_RP_MATCHES_RCVD
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 May 2011 23:06:28 +0000
Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155])
	by hel.zones.apache.org (Postfix) with ESMTP id 5DA3DDC0D0
	for <lopeztyler@example.org>; Tue, 24 May 2011 23:05:47 +0000 (UTC)
Date: Tue, 24 May 2011 23:05:47 +0000 (UTC)
From: "Alexis Midon (JIRA)" <lopeztyler@example.org>
To: lopeztyler@example.org
Message-ID: <lopeztyler@example.org>
Subject: [jira] [Created] (BUILDR-584) eclipse plugin should use absolute
 path
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394
X-Virus-Checked: Checked by ClamAV on apache.org

eclipse plugin should use absolute path
---------------------------------------

                 Key: BUILDR-584
                 URL: https://issues.apache.org/jira/browse/BUILDR-584
             Project: Buildr
          Issue Type: Bug
            Reporter: Alexis Midon


When a project depends on non-maven artifacts, the Eclipse plugin create a classpathEntry with a relative path. This is wrong. The path should be absolute.

"Returns the path of this classpath entry. The meaning of the path of a classpath entry depends on its entry kind:
Source code in the current project (CPE_SOURCE) - The path associated with this entry is the ABSOLUTE path to the root folder."

See http://publib.boulder.ibm.com/infocenter/iadthelp/v6r0/index.jsp?topic=/org.eclipse.jdt.doc.isv/reference/api/org/eclipse/jdt/core/class-use/IClasspathEntry.html

Also, for some reasons, the directory dependencies are added as sources. This does not make much sense since they are defined as dependencies.




--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira

From commitslopeztyler@example.org  Tue May 24 23:08:28 2011
Return-Path: <commitslopeztyler@example.org>
X-Original-To: lopeztyler@example.org
Delivered-To: lopeztyler@example.org
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id 0FF6E6668
	for <lopeztyler@example.org>; Tue, 24 May 2011 23:08:28 +0000 (UTC)
Received: (qmail 19363 invoked by uid 500); 24 May 2011 23:08:28 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 19342 invoked by uid 500); 24 May 2011 23:08:28 -0000
Mailing-List: contact lopeztyler@example.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lopeztyler@example.org>
List-Unsubscribe: <mailto:lopeztyler@example.org>
List-Post: <mailto:lopeztyler@example.org>
List-Id: <commits.buildr.apache.org>
Reply-To: lopeztyler@example.org
Delivered-To: mailing list lopeztyler@example.org
Received: (qmail 19335 invoked by uid 500); 24 May 2011 23:08:28 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 19331 invoked by uid 99); 24 May 2011 23:08:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 May 2011 23:08:28 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_RP_MATCHES_RCVD
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 May 2011 23:08:27 +0000
Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155])
	by hel.zones.apache.org (Postfix) with ESMTP id 4B8A3DC136
	for <lopeztyler@example.org>; Tue, 24 May 2011 23:07:47 +0000 (UTC)
Date: Tue, 24 May 2011 23:07:47 +0000 (UTC)
From: "Alexis Midon (JIRA)" <lopeztyler@example.org>
To: lopeztyler@example.org
Message-ID: <lopeztyler@example.org>
In-Reply-To: <lopeztyler@example.org>
Subject: [jira] [Updated] (BUILDR-584) eclipse plugin should use absolute
 path
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394


     [ https://issues.apache.org/jira/browse/BUILDR-584?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Alexis Midon updated BUILDR-584:
--------------------------------

    Attachment: BUILDR-584.patch

here is a patch

> eclipse plugin should use absolute path
> ---------------------------------------
>
>                 Key: BUILDR-584
>                 URL: https://issues.apache.org/jira/browse/BUILDR-584
>             Project: Buildr
>          Issue Type: Bug
>            Reporter: Alexis Midon
>         Attachments: BUILDR-584.patch
>
>
> When a project depends on non-maven artifacts, the Eclipse plugin create a classpathEntry with a relative path. This is wrong. The path should be absolute.
> "Returns the path of this classpath entry. The meaning of the path of a classpath entry depends on its entry kind:
> Source code in the current project (CPE_SOURCE) - The path associated with this entry is the ABSOLUTE path to the root folder."
> See http://publib.boulder.ibm.com/infocenter/iadthelp/v6r0/index.jsp?topic=/org.eclipse.jdt.doc.isv/reference/api/org/eclipse/jdt/core/class-use/IClasspathEntry.html
> Also, for some reasons, the directory dependencies are added as sources. This does not make much sense since they are defined as dependencies.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira

From commitslopeztyler@example.org  Fri May 27 17:58:28 2011
Return-Path: <commitslopeztyler@example.org>
X-Original-To: lopeztyler@example.org
Delivered-To: lopeztyler@example.org
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id E65B447C5
	for <lopeztyler@example.org>; Fri, 27 May 2011 17:58:28 +0000 (UTC)
Received: (qmail 53691 invoked by uid 500); 27 May 2011 17:58:28 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 53665 invoked by uid 500); 27 May 2011 17:58:28 -0000
Mailing-List: contact lopeztyler@example.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lopeztyler@example.org>
List-Unsubscribe: <mailto:lopeztyler@example.org>
List-Post: <mailto:lopeztyler@example.org>
List-Id: <commits.buildr.apache.org>
Reply-To: lopeztyler@example.org
Delivered-To: mailing list lopeztyler@example.org
Received: (qmail 53658 invoked by uid 500); 27 May 2011 17:58:28 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 53653 invoked by uid 99); 27 May 2011 17:58:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2011 17:58:28 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_RP_MATCHES_RCVD
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2011 17:58:27 +0000
Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155])
	by hel.zones.apache.org (Postfix) with ESMTP id 8321EE31E7
	for <lopeztyler@example.org>; Fri, 27 May 2011 17:57:47 +0000 (UTC)
Date: Fri, 27 May 2011 17:57:47 +0000 (UTC)
From: "Alex Boisvert (JIRA)" <lopeztyler@example.org>
To: lopeztyler@example.org
Message-ID: <lopeztyler@example.org>
Subject: [jira] [Created] (BUILDR-585) "TypeError : can't dup NilClass" when
 merging jars
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394

"TypeError : can't dup NilClass" when merging jars
--------------------------------------------------

                 Key: BUILDR-585
                 URL: https://issues.apache.org/jira/browse/BUILDR-585
             Project: Buildr
          Issue Type: Bug
          Components: Packaging
    Affects Versions: 1.4.5
            Reporter: Alex Boisvert
            Assignee: Alex Boisvert
            Priority: Minor
             Fix For: 1.4.6


As reported on the mailing list,
http://buildr.markmail.org/thread/mqtzxh6pjfi3vllr

I get this error when trying to merge the apache httpclient jar into a package
(from ibiblio or maven). Other jars merge fine, and it affects at least the last
several versions of httpclient. It seems to have trouble unzipping.

If i manually unzip and merge all my jars, my application works fine (and it was
working this way for months)

Has anyone seen this with other jars before?

Thank you so much your help!

{code}
...
Adding org/codehaus/jackson/schema/JsonSerializableSchema.class
Adding org/codehaus/jackson/schema/SchemaAware.class
Adding org/codehaus/jackson/schema/package-info.class
** Invoke
/Users/ry/.m2/repository/org/apache/httpcomponents/httpclient/4.0.3/httpclient-4.0.3.jar
(not_needed)

Exception while invoking prerequisites of task <Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Packaging888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Jav888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4JarTask
/Users/ry/seqosystem/src/deps/target/dependencies.jar => [sos:deps:build]>
Exception while invoking prerequisites of task <Rak888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Task sos:deps:package =>
[sos:deps:build, /Users/ry/seqosystem/src/deps/target/dependencies.jar]>
Buildr aborted!
TypeError : can't dup NilClass
org/jruby/RubyKernel.java:1873:in `dup'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/rubyzip-0.9.4/lib/zip/zip.rb:1163:in
`dup'
org/jruby/RubyArray.java:2306:in `collect'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/rubyzip-0.9.4/lib/zip/zip.rb:1163:in
`dup'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/rubyzip-0.9.4/lib/zip/zip.rb:1399:in
`initialize'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/rubyzip-0.9.4/lib/zip/zip.rb:1411:in
`open'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/packaging/archive.rb:295:in
`expand'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/packaging/archive.rb:118:in
`merge'
org/jruby/RubyProc.java:268:in `call'
org/jruby/RubyProc.java:228:in `call'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/packaging/archive.rb:138:in
`add_files'
org/jruby/RubyArray.java:1572:in `each'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/packaging/archive.rb:138:in
`add_files'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/packaging/archive.rb:475:in
`invoke_prerequisites'
org/jruby/RubyHash.java:1167:in `each'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/packaging/archive.rb:474:in
`invoke_prerequisites'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:667:in
`invoke_with_call_chain'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/1.8/monitor.rb:191:in
`mon_synchronize'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/1.8/monitor.rb:190:in
`mon_synchronize'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:660:in
`invoke_with_call_chain'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake.rb:607:in
`invoke_prerequisites'
org/jruby/RubyArray.java:1572:in `each'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake.rb:604:in
`invoke_prerequisites'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:667:in
`invoke_with_call_chain'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/1.8/monitor.rb:191:in
`mon_synchronize'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:660:in
`invoke_with_call_chain'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:655:in
`invoke'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake.rb:2051:in
`invoke_task'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:246:in
`top_level'
org/jruby/RubyArray.java:1572:in `each'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:246:in
`top_level'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:535:in
`standard_exception_handling'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:237:in
`top_level'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:138:in
`run'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:535:in
`standard_exception_handling'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:135:in
`run'
/Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/bin/buildr:19:in
`(root)'
org/jruby/RubyKernel.java:1062:in `load'
/Users/ry/Cellar/jruby/1.6.0/jruby/bin/buildr:19:in `(root)'
{code}

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira

From commitslopeztyler@example.org  Fri May 27 17:59:43 2011
Return-Path: <commitslopeztyler@example.org>
X-Original-To: lopeztyler@example.org
Delivered-To: lopeztyler@example.org
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id EE2304869
	for <lopeztyler@example.org>; Fri, 27 May 2011 17:59:42 +0000 (UTC)
Received: (qmail 56117 invoked by uid 500); 27 May 2011 17:59:42 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 56094 invoked by uid 500); 27 May 2011 17:59:42 -0000
Mailing-List: contact lopeztyler@example.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lopeztyler@example.org>
List-Unsubscribe: <mailto:lopeztyler@example.org>
List-Post: <mailto:lopeztyler@example.org>
List-Id: <commits.buildr.apache.org>
Reply-To: lopeztyler@example.org
Delivered-To: mailing list lopeztyler@example.org
Received: (qmail 56087 invoked by uid 99); 27 May 2011 17:59:42 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2011 17:59:42 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2011 17:59:40 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id CE0AE238890A; Fri, 27 May 2011 17:59:19 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1128411 - in /buildr/trunk: CHANGELOG
 lib/buildr/packaging/zip.rb
Date: Fri, 27 May 2011 17:59:19 -0000
To: lopeztyler@example.org
From: lopeztyler@example.org
X-Mailer: svnmailer-1.0.8
Message-Id: <lopeztyler@example.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: boisvert
Date: Fri May 27 17:59:19 2011
New Revision: 1128411

URL: http://svn.apache.org/viewvc?rev=1128411&view=rev
Log:
BUILDR-585 "TypeError : can't dup NilClass" when merging jars

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/lib/buildr/packaging/zip.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1128411&r1=1128410&r2=1128411&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Fri May 27 17:59:19 2011
@@ -11,6 +11,7 @@
 * Fixed:  BUILDR-573 HTTP upload PUT request with incorrect Content-Type (Mathias Doenitz)
 * Fixed:  BUILDR-578 Tar task does not preserve uid/gid on folders (Jean-Philippe Caruana)
 * Fixed:  BUILDR-251 Classifier not handled when downloading snapshot artifacts (Ryan Fowler)
+* Fixed:  BUILDR-585 "TypeError : can't dup NilClass" when merging jars
 
 1.4.5 (2011-02-20)
 * Added:  BUILDR-555 Add support for the jaxb binding compiler (Mark Petrovic)

Modified: buildr/trunk/lib/buildr/packaging/zip.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/zip.rb?rev=1128411&r1=1128410&r2=1128411&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/zip.rb (original)
+++ buildr/trunk/lib/buildr/packaging/zip.rb Fri May 27 17:59:19 2011
@@ -175,4 +175,10 @@ module Zip #:nodoc:
 
     end
   end
+
+  class ZipEntrySet
+    def <<(entry)
+      @entrySet[entry.to_s] = entry if entry != nil
+    end
+  end
 end



From commitslopeztyler@example.org  Fri May 27 18:04:28 2011
Return-Path: <commitslopeztyler@example.org>
X-Original-To: lopeztyler@example.org
Delivered-To: lopeztyler@example.org
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id CF5E34E2F
	for <lopeztyler@example.org>; Fri, 27 May 2011 18:04:28 +0000 (UTC)
Received: (qmail 60546 invoked by uid 500); 27 May 2011 18:04:28 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 60524 invoked by uid 500); 27 May 2011 18:04:28 -0000
Mailing-List: contact lopeztyler@example.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lopeztyler@example.org>
List-Unsubscribe: <mailto:lopeztyler@example.org>
List-Post: <mailto:lopeztyler@example.org>
List-Id: <commits.buildr.apache.org>
Reply-To: lopeztyler@example.org
Delivered-To: mailing list lopeztyler@example.org
Received: (qmail 60517 invoked by uid 500); 27 May 2011 18:04:28 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 60514 invoked by uid 99); 27 May 2011 18:04:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2011 18:04:28 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_RP_MATCHES_RCVD
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2011 18:04:27 +0000
Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155])
	by hel.zones.apache.org (Postfix) with ESMTP id 48E3BE33DE
	for <lopeztyler@example.org>; Fri, 27 May 2011 18:03:47 +0000 (UTC)
Date: Fri, 27 May 2011 18:03:47 +0000 (UTC)
From: "Alex Boisvert (JIRA)" <lopeztyler@example.org>
To: lopeztyler@example.org
Message-ID: <lopeztyler@example.org>
In-Reply-To: <lopeztyler@example.org>
Subject: [jira] [Resolved] (BUILDR-585) "TypeError : can't dup NilClass"
 when merging jars
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394


     [ https://issues.apache.org/jira/browse/BUILDR-585?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Alex Boisvert resolved BUILDR-585.
----------------------------------

    Resolution: Fixed

boisvert@smudge:~/git/buildr$ git svn dcommit
Committed r1128411
	M	CHANGELOG
	M	lib/buildr/packaging/zip.rb
r1128411 = 4f283ada8972a52254d7dc7ecd83b8e1695b2585 (refs/remotes/origin/trunk)


> "TypeError : can't dup NilClass" when merging jars
> --------------------------------------------------
>
>                 Key: BUILDR-585
>                 URL: https://issues.apache.org/jira/browse/BUILDR-585
>             Project: Buildr
>          Issue Type: Bug
>          Components: Packaging
>    Affects Versions: 1.4.5
>            Reporter: Alex Boisvert
>            Assignee: Alex Boisvert
>            Priority: Minor
>             Fix For: 1.4.6
>
>
> As reported on the mailing list,
> http://buildr.markmail.org/thread/mqtzxh6pjfi3vllr
> I get this error when trying to merge the apache httpclient jar into a package
> (from ibiblio or maven). Other jars merge fine, and it affects at least the last
> several versions of httpclient. It seems to have trouble unzipping.
> If i manually unzip and merge all my jars, my application works fine (and it was
> working this way for months)
> Has anyone seen this with other jars before?
> Thank you so much your help!
> {code}
> ...
> Adding org/codehaus/jackson/schema/JsonSerializableSchema.class
> Adding org/codehaus/jackson/schema/SchemaAware.class
> Adding org/codehaus/jackson/schema/package-info.class
> ** Invoke
> /Users/ry/.m2/repository/org/apache/httpcomponents/httpclient/4.0.3/httpclient-4.0.3.jar
> (not_needed)
> Exception while invoking prerequisites of task <Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Packaging888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Jav888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4JarTask
> /Users/ry/seqosystem/src/deps/target/dependencies.jar => [sos:deps:build]>
> Exception while invoking prerequisites of task <Rak888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Task sos:deps:package =>
> [sos:deps:build, /Users/ry/seqosystem/src/deps/target/dependencies.jar]>
> Buildr aborted!
> TypeError : can't dup NilClass
> org/jruby/RubyKernel.java:1873:in `dup'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/rubyzip-0.9.4/lib/zip/zip.rb:1163:in
> `dup'
> org/jruby/RubyArray.java:2306:in `collect'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/rubyzip-0.9.4/lib/zip/zip.rb:1163:in
> `dup'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/rubyzip-0.9.4/lib/zip/zip.rb:1399:in
> `initialize'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/rubyzip-0.9.4/lib/zip/zip.rb:1411:in
> `open'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/packaging/archive.rb:295:in
> `expand'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/packaging/archive.rb:118:in
> `merge'
> org/jruby/RubyProc.java:268:in `call'
> org/jruby/RubyProc.java:228:in `call'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/packaging/archive.rb:138:in
> `add_files'
> org/jruby/RubyArray.java:1572:in `each'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/packaging/archive.rb:138:in
> `add_files'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/packaging/archive.rb:475:in
> `invoke_prerequisites'
> org/jruby/RubyHash.java:1167:in `each'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/packaging/archive.rb:474:in
> `invoke_prerequisites'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:667:in
> `invoke_with_call_chain'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/1.8/monitor.rb:191:in
> `mon_synchronize'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/1.8/monitor.rb:190:in
> `mon_synchronize'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:660:in
> `invoke_with_call_chain'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake.rb:607:in
> `invoke_prerequisites'
> org/jruby/RubyArray.java:1572:in `each'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake.rb:604:in
> `invoke_prerequisites'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:667:in
> `invoke_with_call_chain'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/1.8/monitor.rb:191:in
> `mon_synchronize'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:660:in
> `invoke_with_call_chain'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:655:in
> `invoke'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake.rb:2051:in
> `invoke_task'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:246:in
> `top_level'
> org/jruby/RubyArray.java:1572:in `each'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:246:in
> `top_level'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:535:in
> `standard_exception_handling'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:237:in
> `top_level'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:138:in
> `run'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:535:in
> `standard_exception_handling'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/lib/buildr/core/application.rb:135:in
> `run'
> /Users/ry/Cellar/jruby/1.6.0/jruby/lib/ruby/gems/1.8/gems/buildr-1.4.5-java/bin/buildr:19:in
> `(root)'
> org/jruby/RubyKernel.java:1062:in `load'
> /Users/ry/Cellar/jruby/1.6.0/jruby/bin/buildr:19:in `(root)'
> {code}

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira

From commitslopeztyler@example.org  Fri May 27 21:55:43 2011
Return-Path: <commitslopeztyler@example.org>
X-Original-To: lopeztyler@example.org
Delivered-To: lopeztyler@example.org
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id 628B9471C
	for <lopeztyler@example.org>; Fri, 27 May 2011 21:55:43 +0000 (UTC)
Received: (qmail 2591 invoked by uid 500); 27 May 2011 21:55:43 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 2570 invoked by uid 500); 27 May 2011 21:55:43 -0000
Mailing-List: contact lopeztyler@example.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lopeztyler@example.org>
List-Unsubscribe: <mailto:lopeztyler@example.org>
List-Post: <mailto:lopeztyler@example.org>
List-Id: <commits.buildr.apache.org>
Reply-To: lopeztyler@example.org
Delivered-To: mailing list lopeztyler@example.org
Received: (qmail 2563 invoked by uid 99); 27 May 2011 21:55:43 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2011 21:55:43 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2011 21:55:41 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 685E223889E2; Fri, 27 May 2011 21:55:21 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1128480 - in /buildr/trunk: ./ doc/ lib/buildr/scala/ spec/
 spec/scala/
Date: Fri, 27 May 2011 21:55:21 -0000
To: lopeztyler@example.org
From: lopeztyler@example.org
X-Mailer: svnmailer-1.0.8
Message-Id: <lopeztyler@example.org>

Author: boisvert
Date: Fri May 27 21:55:20 2011
New Revision: 1128480

URL: http://svn.apache.org/viewvc?rev=1128480&view=rev
Log:
* Support for Scala 2.9.0+
* Scala 2.9.0-1 is now default, along with ScalaCheck 1.9, ScalaTest 1.4.1 and Specs 1.6.8.
* ScalaCheck, ScalaTest and Specs now default to sane versions when using older Scala versions.
(with help from Alexis Midon)

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/doc/languages.textile
    buildr/trunk/lib/buildr/scala/bdd.rb
    buildr/trunk/lib/buildr/scala/compiler.rb
    buildr/trunk/lib/buildr/scala/doc.rb
    buildr/trunk/lib/buildr/scala/tests.rb
    buildr/trunk/spec/sandbox.rb
    buildr/trunk/spec/scala/bdd_spec.rb
    buildr/trunk/spec/scala/compiler_spec.rb
    buildr/trunk/spec/scala/doc_spec.rb
    buildr/trunk/spec/scala/scala.rb
    buildr/trunk/spec/scala/tests_spec.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1128480&r1=1128479&r2=1128480&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Fri May 27 21:55:20 2011
@@ -1,4 +1,9 @@
 1.4.6 (Pending)
+* Added:  Support for Scala 2.9.0+ (with help of Alexis Midon)
+* Change: Scala 2.9.0-1 is now default, along with ScalaCheck 1.9, ScalaTest 1.4.1
+          and Specs 1.6.8. 
+* Change: ScalaCheck, ScalaTest and Specs now default to sane versions when using
+          older Scala versions.
 * Fixed:  BUILDR-583 Update jruby install to use jruby version 1.6.1 (Alexis Midon)
 * Fixed:  BUILDR-582 Revert the name change for the task to generate Intellij
           project files to 'idea'

Modified: buildr/trunk/doc/languages.textile
URL: http://svn.apache.org/viewvc/buildr/trunk/doc/languages.textile?rev=1128480&r1=1128479&r2=1128480&view=diff
==============================================================================
--- buildr/trunk/doc/languages.textile (original)
+++ buildr/trunk/doc/languages.textile Fri May 27 21:55:20 2011
@@ -170,7 +170,7 @@ Before using Scala, you must first @requ
 require 'buildr/scala'
 {% endhighlight %}
 
-By default, Buildr will attempt to use the latest stable release of Scala, which is currently Scala 2.8.0 as of July 2010.  Of course you can configure a specific version of Scala for your project by adding the following entry in @build.yaml@:
+By default, Buildr will attempt to use the latest stable release of Scala, which is currently Scala 2.9.0 as of May 2011.  Of course you can configure a specific version of Scala for your project by adding the following entry in @build.yaml@:
 
 {% highlight yaml %}
 scala.version: 2.8.0.Beta1  # Pick your version
@@ -210,11 +210,11 @@ When using the Scala compiler, if you do
 The Scala compiler supports the following options:
 
 |_. Option        |_. Usage |
-| @:debug@        | Generates bytecode with debugging information.  You can also override this by setting the environment variable @debug@ to @off@. |
+| @:debug@        | If true, generates bytecode with debugging information. Scala 2.9 also accepts: none,source,line,vars,notc. |
 | @:deprecation@  | If true, shows deprecation messages.  False by default. |
+| @:make@         | Make strategy to be used by the compiler (e.g. @:make=>'transitive'@). *Scala 2.8 only* |
 | @:optimise@     | Generates faster bytecode by applying optimisations to the program. |
 | @:other@        | Array of options passed to the compiler (e.g. @:other=>'-Xprint-types'@). |
-| @:make@         | Make strategy to be used by the compiler (e.g. @:make=>'transitive'@).  *Scala 2.8 only* |
 | @:target@       | Bytecode compatibility (e.g. '1.4'). |
 | @:warnings@     | Issue warnings when compiling.  True when running in verbose mode. |
 | @:javac@        | A hash of options passed to the @javac@ compiler verbatim. |

Modified: buildr/trunk/lib/buildr/scala/bdd.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/bdd.rb?rev=1128480&r1=1128479&r2=1128480&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/bdd.rb (original)
+++ buildr/trunk/lib/buildr/scala/bdd.rb Fri May 27 21:55:20 2011
@@ -32,21 +32,34 @@ module Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala
     @lang = :scala
     @bdd_dir = :spec
 
-    VERSION = '1.6.6'
+    VERSION = case
+      when Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version?("2.8.0")
+        '1.6.5'
+      when Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version?("2.8.1")
+        '1.6.8'
+      else
+        '1.6.8'
+    end
+
 
     class << self
       def version
-        Buildr.settings.build['scala.specs'] || VERSION
+        custom = Buildr.settings.build['scala.specs']
+        (custom =~ /:/) ? Buildr.artifact(custom).version : VERSION
+      end
+
+      def specs
+        custom = Buildr.settings.build['scala.specs']
+        [ (custom =~ /:/) ? custom : "org.scala-tools.testing:#{artifact}:jar:#{version}" ]
       end
 
       def artifact
-        Buildr.settings.build['scala.specs.artifact'] || "specs_#{Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version}"
+        Buildr.settings.build['scala.specs.artifact'] || "specs_#{Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version_without_build}"
       end
 
       def dependencies
         unless @dependencies
           super
-          specs = (version =~ /:/) ? [version] : ["org.scala-tools.testing:#{artifact}:jar:#{version}"]
           # Add utility classes (e.g. SpecsSingletonRunner) and other dependencies
           @dependencies |= [ File.join(File.dirname(__FILE__)) ] + specs +
                            Check.dependencies + JUnit.dependencies + Scalac.dependencies

Modified: buildr/trunk/lib/buildr/scala/compiler.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/compiler.rb?rev=1128480&r1=1128479&r2=1128480&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/compiler.rb (original)
+++ buildr/trunk/lib/buildr/scala/compiler.rb Fri May 27 21:55:20 2011
@@ -19,7 +19,7 @@ require 'buildr/core/compile'
 require 'buildr/packaging'
 
 module Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala
-  DEFAULT_VERSION = '2.8.1'
+  DEFAULT_VERSION = '2.9.0-1'
 
   class << self
 
@@ -59,13 +59,15 @@ module Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala
       Buildr.settings.build['scala.version'] || installed_version || DEFAULT_VERSION
     end
 
-    def compatible_28?
-      major, minor = version.match(/^(\d)\.(\d)/).to_a[1,2]
-      if major && minor
-        (major.to_i == 2 && minor.to_i >= 8) || (major.to_i > 2)
-      else
-        false
-      end
+    # check if version matches any of the given prefixes
+    def version?(*v)
+      v.any? { |v| version.index(v.to_s) == 0 }
+    end
+
+    # returns Scala version without build number.
+    # e.g.  "2.9.0-1" => "2.9.0"
+    def version_without_build
+      version.split('-')[0]
     end
   end
 
@@ -156,17 +158,17 @@ module Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala
       options[:warnings] = verbose if options[:warnings].nil?
       options[:deprecation] ||= false
       options[:optimise] ||= false
-      options[:make] ||= :transitivenocp if Scala.compatible_28?
+      options[:make] ||= :transitivenocp if Scala.version? 2.8
       options[:javac] ||= {}
 
       @java = Javac.new(project, options[:javac])
     end
 
     def compile(sources, target, dependencies) #:nodoc:
-      check_options(options, OPTIONS + (Scala.compatible_28? ? [:make] : []))
+      check_options(options, OPTIONS + (Scala.version?(2.8) ? [:make] : []))
 
       java_sources = java_sources(sources)
-      enable_dep_tracing = Scala.compatible_28? && java_sources.empty?
+      enable_dep_tracing = Scala.version?(2.8) && java_sources.empty?
 
       dependencies.unshift target if enable_dep_tracing
 
@@ -226,7 +228,11 @@ module Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala
       args = []
       args << "-nowarn" unless options[:warnings]
       args << "-verbose" if trace?(:scalac)
-      args << "-g" if options[:debug]
+      if options[:debug] == true
+        args << (Scala.version?(2.7, 2.8) ? "-g" : "-g:vars")
+      elsif options[:debug]
+        args << "-g:#{options[:debug]}"
+      end
       args << "-deprecation" if options[:deprecation]
       args << "-optimise" if options[:optimise]
       args << "-target:jvm-" + options[:target].to_s if options[:target]

Modified: buildr/trunk/lib/buildr/scala/doc.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/doc.rb?rev=1128480&r1=1128479&r2=1128480&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/doc.rb (original)
+++ buildr/trunk/lib/buildr/scala/doc.rb Fri May 27 21:55:20 2011
@@ -26,7 +26,7 @@ module Buildr
       after_define(:scaladoc => :doc) do |project|
         if project.doc.engine? Scaladoc
           options = project.doc.options
-          key = Scala.compatible_28? ? "doc-title".to_sym : :windowtitle
+          key = Scala.version?(2.7) ? :windowtitle : "doc-title".to_sym
           options[key] = (project.comment || project.name) unless options[key]
         end
       end

Modified: buildr/trunk/lib/buildr/scala/tests.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/tests.rb?rev=1128480&r1=1128479&r2=1128480&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/tests.rb (original)
+++ buildr/trunk/lib/buildr/scala/tests.rb Fri May 27 21:55:20 2011
@@ -23,7 +23,16 @@ require 'buildr/java/tests'
 module Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala
   # Scal888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Check is available when using Scal888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Test or Scal888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Specs
   module Check
-    VERSION = '1.8'
+    VERSION = case
+      when Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version?("2.7")
+        '1.6'
+      when Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version?("2.8.0")
+        '1.7'
+      when Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version?("2.8.1")
+        '1.8'
+      else
+        '1.9'
+    end
 
     class << self
       def version
@@ -31,15 +40,20 @@ module Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala
       end
 
       def classifier
-        Buildr.settings.build['scala.check.classifier'] || ""
+        Buildr.settings.build['scala.check.classifier']
       end
 
       def artifact
-        Buildr.settings.build['scala.check.artifact'] || "scalacheck_#{Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version}"
+        Buildr.settings.build['scala.check.artifact'] || "scalacheck_#{Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version_without_build}"
       end
 
       def dependencies
-        (version =~ /:/) ? [version] : ["org.scala-tools.testing:#{artifact}:jar:#{classifier}:#{version}"]
+        return [version] if (version =~ /:/)
+        if classifier
+          ["org.scala-tools.testing:#{artifact}:jar:#{classifier}:#{version}"]
+        else
+          ["org.scala-tools.testing:#{artifact}:jar:#{version}"]
+        end
       end
 
     private
@@ -60,16 +74,26 @@ module Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala
   # * :java_args   -- Arguments passed as is to the JVM.
   class ScalaTest < Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TestFramework888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Java
 
-    VERSION = '1.3'
+    VERSION = Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version?(2.7, 2.8) ? '1.3' : '1.4.1'
 
     class << self
       def version
-        Buildr.settings.build['scala.test'] || VERSION
+        custom = Buildr.settings.build['scala.test']
+        (custom =~ /:/) ? Buildr.artifact(custom).version : VERSION
+      end
+
+      def specs
+        custom = Buildr.settings.build['scala.test']
+        return custom if (custom =~ /:/)
+        if Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version?(2.7, 2.8)
+          "org.scalatest:scalatest:jar:#{version}"
+        else
+          "org.scalatest:scalatest_#{Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version_without_build}:jar:#{version}"
+        end
       end
 
       def dependencies
-        ["org.scalatest:scalatest:jar:#{version}"] + Check.dependencies +
-          JMock.dependencies + JUnit.dependencies
+        [specs] + Check.dependencies + JMock.dependencies + JUnit.dependencies
       end
 
       def applies_to?(project) #:nodoc:

Modified: buildr/trunk/spec/sandbox.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/sandbox.rb?rev=1128480&r1=1128479&r2=1128480&view=diff
==============================================================================
--- buildr/trunk/spec/sandbox.rb (original)
+++ buildr/trunk/spec/sandbox.rb Fri May 27 21:55:20 2011
@@ -21,8 +21,11 @@ Buildr.application.instance_eval { @rake
 repositories.remote << 'http://repo1.maven.org/maven2'
 repositories.remote << 'http://scala-tools.org/repo-releases'
 
-# Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
-Buildr.settings.build['scala.version'] = "2.8.1"
+# Force Scala version for specs; don't want to rely on SCALA_HOME
+module Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala
+  SCALA_VERSION_FOR_SPECS = ENV["SCALA_VERSION"] || "2.8.1"
+end
+Buildr.settings.build['scala.version'] = Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scal888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4SCALA_VERSION_FOR_SPECS
 
 # Add a 'require' here only for optional extensions, not for extensions that should be loaded by default.
 require 'buildr/clojure'
@@ -48,6 +51,25 @@ end
 ENV['HOME'] = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'home'))
 mkpath ENV['HOME']
 
+# Make Scala.version resilient to sandbox reset
+module Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala
+  DEFAULT_VERSION = SCALA_VERSION_FOR_SPECS
+
+  class << self
+    def version
+      SCALA_VERSION_FOR_SPECS
+    end
+  end
+
+  class Scalac
+    class << self
+      def use_installed?
+        false
+      end
+    end
+  end
+end
+
 # We need to run all tests inside a _sandbox, tacking a snapshot of Buildr before the test,
 # and restoring everything to its previous state after the test. Damn state changes.
 module Sandbox

Modified: buildr/trunk/spec/scala/bdd_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/bdd_spec.rb?rev=1128480&r1=1128479&r2=1128480&view=diff
==============================================================================
--- buildr/trunk/spec/scala/bdd_spec.rb (original)
+++ buildr/trunk/spec/scala/bdd_spec.rb Fri May 27 21:55:20 2011
@@ -17,12 +17,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 describe Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scal888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Specs do
-  
-  before(:each) do
-    # Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
-    Buildr.settings.build['scala.version'] = "2.8.1"
-  end
-    
+
   it 'should be the default when tests in src/spec/scala' do
     write 'src/spec/scala/com/example/MySpecs.scala', <<-SCALA
       package com.example

Modified: buildr/trunk/spec/scala/compiler_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/compiler_spec.rb?rev=1128480&r1=1128479&r2=1128480&view=diff
==============================================================================
--- buildr/trunk/spec/scala/compiler_spec.rb (original)
+++ buildr/trunk/spec/scala/compiler_spec.rb Fri May 27 21:55:20 2011
@@ -19,11 +19,6 @@ require File.expand_path(File.join(File.
 # need to test both with and without SCALA_HOME
 share_as :ScalacCompiler do
 
-  before(:each) do
-    # Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
-    Buildr.settings.build['scala.version'] = "2.8.1"
-  end
-
   it 'should identify itself from source directories' do
     write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
     define('foo').compile.compiler.should eql(:scalac)
@@ -143,15 +138,7 @@ describe 'scala compiler (downloaded fro
   end
 end
 
-
-describe 'scalac compiler options' do
-  def compile_task
-    @compile_task ||= define('foo').compile.using(:scalac)
-  end
-
-  def scalac_args
-    compile_task.instance_eval { @compiler }.send(:scalac_args)
-  end
+share_as :ScalacCompiler_CommonOptions do
 
   it 'should set warnings option to false by default' do
     compile_task.options.warnings.should be_false
@@ -200,16 +187,6 @@ describe 'scalac compiler options' do
     compile_task.options.debug.should be_false
   end
 
-  it 'should use -g argument when debug option is true' do
-    compile_task.using(:debug=>true)
-    scalac_args.should include('-g')
-  end
-
-  it 'should not use -g argument when debug option is false' do
-    compile_task.using(:debug=>false)
-    scalac_args.should_not include('-g')
-  end
-
   it 'should set deprecation option to false by default' do
     compile_task.options.deprecation.should be_false
   end
@@ -287,3 +264,58 @@ describe 'scalac compiler options' do
     ENV.delete "DEBUG"
   end
 end
+
+
+describe 'scala compiler 2.8 options' do
+
+  it_should_behave_like ScalacCompiler_CommonOptions
+
+  def compile_task
+    @compile_task ||= define('foo').compile.using(:scalac)
+  end
+
+  def scalac_args
+    compile_task.instance_eval { @compiler }.send(:scalac_args)
+  end
+
+  it 'should use -g argument when debug option is true' do
+    compile_task.using(:debug=>true)
+    scalac_args.should include('-g')
+  end
+
+  it 'should not use -g argument when debug option is false' do
+    compile_task.using(:debug=>false)
+    scalac_args.should_not include('-g')
+  end
+end if Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version?(2.8)
+
+describe 'scala compiler 2.9 options' do
+
+  it_should_behave_like ScalacCompiler_CommonOptions
+
+  def compile_task
+    @compile_task ||= define('foo').compile.using(:scalac)
+  end
+
+  def scalac_args
+    compile_task.instance_eval { @compiler }.send(:scalac_args)
+  end
+
+  # these specs fail. Somehow the compiler is still in version 2.8
+  it 'should use -g:vars argument when debug option is true' do
+    compile_task.using(:debug=>true)
+    scalac_args.should include('-g:vars')
+  end
+
+  it 'should use -g:whatever argument when debug option is \'whatever\'' do
+    compile_task.using(:debug=>:whatever)
+    scalac_args.should include('-g:whatever')
+  end
+
+  it 'should not use -g argument when debug option is false' do
+    compile_task.using(:debug=>false)
+    scalac_args.should_not include('-g')
+  end
+
+end if Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version?(2.9)
+

Modified: buildr/trunk/spec/scala/doc_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/doc_spec.rb?rev=1128480&r1=1128479&r2=1128480&view=diff
==============================================================================
--- buildr/trunk/spec/scala/doc_spec.rb (original)
+++ buildr/trunk/spec/scala/doc_spec.rb Fri May 27 21:55:20 2011
@@ -18,11 +18,6 @@ require File.expand_path(File.join(File.
 
 describe "Scaladoc" do
 
-  before(:each) do
-    # Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
-    Buildr.settings.build['scala.version'] = "2.8.1"
-  end
-
   it 'should pick -doc-title from project name by default' do
     define 'foo' do
       compile.using(:scalac)
@@ -52,7 +47,7 @@ describe "Scaladoc" do
     project('foo').doc.options[:"doc-title"].should eql('explicit')
   end
 
-  it 'should convert :windowtitle to -doc-title for Scala 2.8.1' do
+  it 'should convert :windowtitle to -doc-title for Scala 2.8.1 and later' do
     write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
     define('foo') do
       doc.using :windowtitle => "foo"
@@ -63,7 +58,7 @@ describe "Scaladoc" do
       0 # normal return
     end
     project('foo').doc.invoke
-  end
+  end unless Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version?(2.7, "2.8.0")
 end
 
 describe "package(:scaladoc)" do

Modified: buildr/trunk/spec/scala/scala.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/scala.rb?rev=1128480&r1=1128479&r2=1128480&view=diff
==============================================================================
--- buildr/trunk/spec/scala/scala.rb (original)
+++ buildr/trunk/spec/scala/scala.rb Fri May 27 21:55:20 2011
@@ -17,9 +17,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 describe 'scala' do
-  # Specific version of Scala required for specs
-  required_version = '2.8.1'
-  scala_version_str = "2.8.1.final"
 
   it 'should automatically add the remote scala-tools.org repository' do
     # NOTE: the sandbox environment clears "repositories.remote" so we can't
@@ -28,11 +25,7 @@ describe 'scala' do
     # repositories.remote.should include('http://scala-tools.org/repo-releases')
   end
 
-  it "specifications require Scala #{required_version}" do
-    Scala.version.should eql(required_version)
-  end
-
   it "should provide the Scala version string" do
-    Scala.version_str.should eql(scala_version_str)
+    Scala.version_str.should eql(Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scal888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4SCALA_VERSION_FOR_SPECS)
   end
 end

Modified: buildr/trunk/spec/scala/tests_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/scala/tests_spec.rb?rev=1128480&r1=1128479&r2=1128480&view=diff
==============================================================================
--- buildr/trunk/spec/scala/tests_spec.rb (original)
+++ buildr/trunk/spec/scala/tests_spec.rb Fri May 27 21:55:20 2011
@@ -22,15 +22,23 @@ require File.expand_path(File.join(File.
 #  -test exclude group
 #  -test include Suite's
 #  -test exclude Suite's
+#
+describe "scalatest version" do
 
+  case
+  when Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version?(2.8)
+    it 'should be 1.3 for scala 2.8' do
+      Scal888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ScalaTest.dependencies.should include("org.scalatest:scalatest:jar:1.3")
+    end
+  when Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scala.version?(2.9)
+    it 'should be 1.4.1 for scala 2.9' do
+      Scal888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ScalaTest.dependencies.should include("org.scalatest:scalatest_2.9.0:jar:1.4.1")
+    end
+  end
+end
 
 describe Buildr888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Scal888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ScalaTest do
-  
-  before(:each) do
-    # Force Scala 2.8.1 for specs; don't want to rely on SCALA_HOME
-    Buildr.settings.build['scala.version'] = "2.8.1"
-  end
-    
+
   it 'should be the default test framework when test cases are in Scala' do
     write 'src/test/scala/com/example/MySuite.scala', <<-SCALA
       package com.example



From commitslopeztyler@example.org  Fri May 27 22:41:32 2011
Return-Path: <commitslopeztyler@example.org>
X-Original-To: lopeztyler@example.org
Delivered-To: lopeztyler@example.org
Received: from mail.apache.org (hermes.apache.org [83.161.120.155])
	by minotaur.apache.org (Postfix) with SMTP id 80E644F22
	for <lopeztyler@example.org>; Fri, 27 May 2011 22:41:32 +0000 (UTC)
Received: (qmail 38790 invoked by uid 500); 27 May 2011 22:41:32 -0000
Delivered-To: lopeztyler@example.org
Received: (qmail 38765 invoked by uid 500); 27 May 2011 22:41:32 -0000
Mailing-List: contact lopeztyler@example.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lopeztyler@example.org>
List-Unsubscribe: <mailto:lopeztyler@example.org>
List-Post: <mailto:lopeztyler@example.org>
List-Id: <commits.buildr.apache.org>
Reply-To: lopeztyler@example.org
Delivered-To: mailing list lopeztyler@example.org
Received: (qmail 38758 invoked by uid 99); 27 May 2011 22:41:32 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2011 22:41:32 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,URI_DOM_OBFU
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2011 22:41:31 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0F1C62388A3D; Fri, 27 May 2011 22:41:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1128497 - in /buildr/trunk: CHANGELOG
 doc/scripts/install-jruby.sh lib/buildr/core/shell.rb
Date: Fri, 27 May 2011 22:41:10 -0000
To: lopeztyler@example.org
From: lopeztyler@example.org
X-Mailer: svnmailer-1.0.8
Message-Id: <lopeztyler@example.org>

Author: boisvert
Date: Fri May 27 22:41:10 2011
New Revision: 1128497

URL: http://svn.apache.org/viewvc?rev=1128497&view=rev
Log:
Upgrade to JRuby 1.6.2

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/doc/scripts/install-jruby.sh
    buildr/trunk/lib/buildr/core/shell.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1128497&r1=1128496&r2=1128497&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Fri May 27 22:41:10 2011
@@ -12,6 +12,7 @@
 * Change: BUILDR-574 Enhance idea task to generate test resources with test scope
           (Jean-Philippe Caruana)
 * Change: BUILDR-576 Upgrade to JUnit 4.8.2
+* Chnage: Upgrade to JRuby 1.6.2
 * Fixed:  BUILDR-571 Generated IDEA projects include resources multiple times (Peter Royal) 
 * Fixed:  BUILDR-573 HTTP upload PUT request with incorrect Content-Type (Mathias Doenitz)
 * Fixed:  BUILDR-578 Tar task does not preserve uid/gid on folders (Jean-Philippe Caruana)

Modified: buildr/trunk/doc/scripts/install-jruby.sh
URL: http://svn.apache.org/viewvc/buildr/trunk/doc/scripts/install-jruby.sh?rev=1128497&r1=1128496&r2=1128497&view=diff
==============================================================================
--- buildr/trunk/doc/scripts/install-jruby.sh (original)
+++ buildr/trunk/doc/scripts/install-jruby.sh Fri May 27 22:41:10 2011
@@ -14,11 +14,11 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 if [ -z `which jruby` ] ; then
-  version=1.6.1
+  version=1.6.2
   target=/opt/jruby
   echo "Installing JRuby ${version} in ${target}"
   sudo mkdir -p $(dirname ${target})
-  wget http://jruby.org.s3.amazonaws.com/downloads/${version}/jruby-bin-${version}.tar.gz 
+  wget http://jruby.org.s3.amazonaws.com/downloads/${version}/jruby-bin-${version}.tar.gz
   tar -xz < jruby-bin-${version}.tar.gz
   sudo mv jruby-${version} ${target}
   rm jruby-bin-${version}.tar.gz

Modified: buildr/trunk/lib/buildr/core/shell.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/shell.rb?rev=1128497&r1=1128496&r2=1128497&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/shell.rb (original)
+++ buildr/trunk/lib/buildr/core/shell.rb Fri May 27 22:41:10 2011
@@ -56,7 +56,7 @@ module Buildr
     class JIRB < Base
       include JRebel
 
-      JRUBY_VERSION = '1.4.0'
+      JRUBY_VERSION = '1.6.2'
 
       def launch(task)
         if jruby_home     # if JRuby is installed, use it




{'source': 'Apache Software Foundation Public Mail Archives'}