Return-Path: 
 <commits-return-9534-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org>
Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org
Received: (qmail 68787 invoked from network); 20 Jan 2010 17:12:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 20 Jan 2010 17:12:30 -0000
Received: (qmail 56972 invoked by uid 500); 20 Jan 2010 17:12:29 -0000
Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org
Received: (qmail 56920 invoked by uid 500); 20 Jan 2010 17:12:29 -0000
Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jackrabbit.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jackrabbit.apache.org>
List-Post: <mailto:commits@jackrabbit.apache.org>
List-Id: <commits.jackrabbit.apache.org>
Reply-To: dev@jackrabbit.apache.org
Delivered-To: mailing list commits@jackrabbit.apache.org
Received: (qmail 56911 invoked by uid 99); 20 Jan 2010 17:12:29 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jan 2010 17:12:29 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jan 2010 17:12:27 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id D25E023888D1; Wed, 20 Jan 2010 17:12:06 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r901286 - in /jackrabbit/branches/2.0: ./ pom.xml
Date: Wed, 20 Jan 2010 17:12:06 -0000
To: commits@jackrabbit.apache.org
From: jukka@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100120171206.D25E023888D1@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jukka
Date: Wed Jan 20 17:12:06 2010
New Revision: 901286

URL: http://svn.apache.org/viewvc?rev=901286&view=rev
Log:
2.0: Merged revision 901285

Modified:
    jackrabbit/branches/2.0/   (props changed)
    jackrabbit/branches/2.0/pom.xml

Propchange: jackrabbit/branches/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 20 17:12:06 2010
@@ -2,4 +2,4 @@
 /jackrabbit/sandbox/JCR-1456:774917-886178
 /jackrabbit/sandbox/JCR-2170:812417-816332
 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942-896943,896969,896977,897071,897836,897842,897858,897935,897983,897992-897993,897996,898002,898042,898267,898325,898540,898677,898699,898701,898715,898872,899102,899181,899391,899393-899394,899583,899594,899643,900305,900310,900314,900453,900702,900736,900762-900763,900767,900782,901095,901122,901139,901144,901170,901176,901191,901193,901196,901216,901228
+/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942-896943,896969,896977,897071,897836,897842,897858,897935,897983,897992-897993,897996,898002,898042,898267,898325,898540,898677,898699,898701,898715,898872,899102,899181,899391,899393-899394,899583,899594,899643,900305,900310,900314,900453,900702,900736,900762-900763,900767,900782,901095,901122,901139,901144,901170,901176,901191,901193,901196,901216,901228,901285

Modified: jackrabbit/branches/2.0/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/pom.xml?rev=901286&r1=901285&r2=901286&view=diff
==============================================================================
--- jackrabbit/branches/2.0/pom.xml (original)
+++ jackrabbit/branches/2.0/pom.xml Wed Jan 20 17:12:06 2010
@@ -179,6 +179,11 @@
             <dependencies>
               <dependency>
                  <groupId>org.apache.ant</groupId>
+                 <artifactId>ant-optional</artifactId>
+                 <version>1.7.1</version>
+               </dependency>
+              <dependency>
+                 <groupId>org.apache.ant</groupId>
                  <artifactId>ant-jsch</artifactId>
                  <version>1.7.1</version>
                </dependency>