Return-Path: 
 <commits-return-9864-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org>
Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org
Received: (qmail 57889 invoked from network); 16 Apr 2010 14:09:47 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 16 Apr 2010 14:09:47 -0000
Received: (qmail 52377 invoked by uid 500); 16 Apr 2010 14:09:47 -0000
Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org
Received: (qmail 52338 invoked by uid 500); 16 Apr 2010 14:09:47 -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 52325 invoked by uid 99); 16 Apr 2010 14:09:47 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Apr 2010 14:09:47 +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; Fri, 16 Apr 2010 14:09:44 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 09B6D23888E8; Fri, 16 Apr 2010 14:09:23 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r934890 - in /jackrabbit/branches/2.1: ./ pom.xml
Date: Fri, 16 Apr 2010 14:09:22 -0000
To: commits@jackrabbit.apache.org
From: jukka@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100416140923.09B6D23888E8@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jukka
Date: Fri Apr 16 14:09:22 2010
New Revision: 934890

URL: http://svn.apache.org/viewvc?rev=934890&view=rev
Log:
2.1: Merged revision 934849 (JCR-2455)

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

Propchange: jackrabbit/branches/2.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 16 14:09:22 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:931121,931479,931483-931484,931504,931609,931613,931838,931919,932318-932319,933144,933197,933203,933213,933216,933554,933646,933694,934405,934412
+/jackrabbit/trunk:931121,931479,931483-931484,931504,931609,931613,931838,931919,932318-932319,933144,933197,933203,933213,933216,933554,933646,933694,934405,934412,934849

Modified: jackrabbit/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.1/pom.xml?rev=934890&r1=934889&r2=934890&view=diff
==============================================================================
--- jackrabbit/branches/2.1/pom.xml (original)
+++ jackrabbit/branches/2.1/pom.xml Fri Apr 16 14:09:22 2010
@@ -134,13 +134,6 @@
                         <include name="*.?ar"/>
                       </fileset>
                     </checksum>
-                    <scp todir="${username}@people.apache.org:public_html/jackrabbit"
-                         keyfile="${keyfile}" passphrase="${passphrase}"
-                         sftp="true" verbose="true">
-                      <fileset dir="${basedir}/target">
-                        <include name="${project.version}/*"/>
-                      </fileset>
-                    </scp>
                     <checksum file="${basedir}/target/${project.version}/jackrabbit-${project.version}-src.zip"
                               algorithm="SHA1" property="checksum"/>
                     <echo file="${basedir}/target/vote.txt">
@@ -167,9 +160,13 @@ least three +1 Jackrabbit PMC votes are 
                     </echo>
                     <echo/>
                     <echo>
-The release candidate has been deployed to:
+The release candidate has been prepared in:
 
-    http://people.apache.org/~${username}/jackrabbit/${project.version}/
+    ${basedir}/target/{$project.version}
+
+Please deploy it to people.apache.org like this:
+
+    scp -r ${basedir}/target/${project.version} people.apache.org:public_html/jackrabbit/
 
 A release vote template has been generated for you: