Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C58BC911F for ; Thu, 19 Jan 2012 17:07:06 +0000 (UTC) Received: (qmail 74140 invoked by uid 500); 19 Jan 2012 17:07:06 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 74113 invoked by uid 500); 19 Jan 2012 17:07:06 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 74106 invoked by uid 99); 19 Jan 2012 17:07:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jan 2012 17:07:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 19 Jan 2012 17:07:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 39BC823888D2; Thu, 19 Jan 2012 17:06:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1233469 - in /jackrabbit/branches/2.4: ./ jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/ jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/ jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/com... Date: Thu, 19 Jan 2012 17:06:39 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120119170640.39BC823888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Thu Jan 19 17:06:38 2012 New Revision: 1233469 URL: http://svn.apache.org/viewvc?rev=1233469&view=rev Log: 2.4: Merged revision 1233468 from trunk Removed: jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/security/ Modified: jackrabbit/branches/2.4/ (props changed) jackrabbit/branches/2.4/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/package-info.java jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/package-info.java jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/package-info.java jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/package-info.java jackrabbit/branches/2.4/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/package-info.java jackrabbit/branches/2.4/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/package-info.java jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/io/package-info.java jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/package-info.java jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/util/package-info.java jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/package-info.java Propchange: jackrabbit/branches/2.4/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 19 17:06:38 2012 @@ -1,3 +1,3 @@ /jackrabbit/branches/JCR-2272:1173165-1176545 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038 -/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1226863,1227171,1227240,1227590,1227593,1227615,1228058,1228149,1228155,1228160,1230507,1230681,1230688,1231204,1232035,1232100,1232404,1232831,1232920,1233344 +/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1226863,1227171,1227240,1227590,1227593,1227615,1228058,1228149,1228155,1228160,1230507,1230681,1230688,1231204,1232035,1232100,1232404,1232831,1232920,1233344,1233468 Modified: jackrabbit/branches/2.4/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/package-info.java?rev=1233469&r1=1233468&r2=1233469&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/package-info.java (original) +++ jackrabbit/branches/2.4/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/package-info.java Thu Jan 19 17:06:38 2012 @@ -18,5 +18,5 @@ /** * Interfaces for managing a Jackrabbit repository. */ -@aQute.bnd.annotation.Version("2.3") +@aQute.bnd.annotation.Version("2.3.1") package org.apache.jackrabbit.api.management; Modified: jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/package-info.java?rev=1233469&r1=1233468&r2=1233469&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/package-info.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/package-info.java Thu Jan 19 17:06:38 2012 @@ -14,5 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@aQute.bnd.annotation.Version("2.3.2") +@aQute.bnd.annotation.Version("2.4.0") package org.apache.jackrabbit.commons; Modified: jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/package-info.java?rev=1233469&r1=1233468&r2=1233469&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/package-info.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/packaging/package-info.java Thu Jan 19 17:06:38 2012 @@ -14,5 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@aQute.bnd.annotation.Version("2.2") +@aQute.bnd.annotation.Version("2.2.1") package org.apache.jackrabbit.commons.packaging; Modified: jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/package-info.java?rev=1233469&r1=1233468&r2=1233469&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/package-info.java (original) +++ jackrabbit/branches/2.4/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/webdav/package-info.java Thu Jan 19 17:06:38 2012 @@ -14,5 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@aQute.bnd.annotation.Version("2.4.0") +@aQute.bnd.annotation.Version("2.5.0") package org.apache.jackrabbit.commons.webdav; Modified: jackrabbit/branches/2.4/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/package-info.java?rev=1233469&r1=1233468&r2=1233469&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/package-info.java (original) +++ jackrabbit/branches/2.4/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/package-info.java Thu Jan 19 17:06:38 2012 @@ -14,5 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@aQute.bnd.annotation.Version("2.4.0") +@aQute.bnd.annotation.Version("2.4.1") package org.apache.jackrabbit.spi.commons; Modified: jackrabbit/branches/2.4/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/package-info.java?rev=1233469&r1=1233468&r2=1233469&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/package-info.java (original) +++ jackrabbit/branches/2.4/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/package-info.java Thu Jan 19 17:06:38 2012 @@ -53,5 +53,5 @@ * RepositoryService.getEvents() will always throw an * {@link javax.jcr.UnsupportedRepositoryOperationException}. */ -@aQute.bnd.annotation.Version("2.4.0") +@aQute.bnd.annotation.Version("3.0.0") package org.apache.jackrabbit.spi; Modified: jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/io/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/io/package-info.java?rev=1233469&r1=1233468&r2=1233469&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/io/package-info.java (original) +++ jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/io/package-info.java Thu Jan 19 17:06:38 2012 @@ -14,5 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@aQute.bnd.annotation.Version("1.0.0") +@aQute.bnd.annotation.Version("1.0.1") package org.apache.jackrabbit.webdav.io; Modified: jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/package-info.java?rev=1233469&r1=1233468&r2=1233469&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/package-info.java (original) +++ jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/package-info.java Thu Jan 19 17:06:38 2012 @@ -14,5 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@aQute.bnd.annotation.Version("1.0.0") +@aQute.bnd.annotation.Version("1.0.1") package org.apache.jackrabbit.webdav; Modified: jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/util/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/util/package-info.java?rev=1233469&r1=1233468&r2=1233469&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/util/package-info.java (original) +++ jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/util/package-info.java Thu Jan 19 17:06:38 2012 @@ -14,5 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@aQute.bnd.annotation.Version("1.0.0") +@aQute.bnd.annotation.Version("1.0.1") package org.apache.jackrabbit.webdav.util; Modified: jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/package-info.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/package-info.java?rev=1233469&r1=1233468&r2=1233469&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/package-info.java (original) +++ jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/package-info.java Thu Jan 19 17:06:38 2012 @@ -14,5 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@aQute.bnd.annotation.Version("1.0.0") +@aQute.bnd.annotation.Version("1.1.0") package org.apache.jackrabbit.webdav.xml;