You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2012/01/17 17:33:41 UTC

svn commit: r1232465 - in /jackrabbit/branches/2.4: ./ jackrabbit-jcr2dav/pom.xml jackrabbit-spi2dav/pom.xml

Author: jukka
Date: Tue Jan 17 16:33:41 2012
New Revision: 1232465

URL: http://svn.apache.org/viewvc?rev=1232465&view=rev
Log:
2.4: Merged revision 1226750 (JCR-2543)

Modified:
    jackrabbit/branches/2.4/   (props changed)
    jackrabbit/branches/2.4/jackrabbit-jcr2dav/pom.xml
    jackrabbit/branches/2.4/jackrabbit-spi2dav/pom.xml

Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 17 16:33:41 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,1227240
+/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1227240

Modified: jackrabbit/branches/2.4/jackrabbit-jcr2dav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr2dav/pom.xml?rev=1232465&r1=1232464&r2=1232465&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-jcr2dav/pom.xml (original)
+++ jackrabbit/branches/2.4/jackrabbit-jcr2dav/pom.xml Tue Jan 17 16:33:41 2012
@@ -78,8 +78,6 @@
                       org.apache.jackrabbit.jcr2spi.lock.OpenScopedLockTest#testLogoutHasNoEffect 
                       <!-- JCR-2533 : missing impl of checkQueryStatement -->                      
                       org.apache.jackrabbit.test.api.query.CreateQueryTest#testUnknownQueryLanguage
-                      <!-- JCR-2543 : query offset -->
-                      org.apache.jackrabbit.test.api.query.SetOffsetTest#testSetOffset
                       <!-- JCR-2533 : missing impl of checkQueryStatement -->
                       org.apache.jackrabbit.test.api.query.qom.BindVariableValueTest
                       <!-- JCR-2112 : simple versioning not implemented -->

Modified: jackrabbit/branches/2.4/jackrabbit-spi2dav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-spi2dav/pom.xml?rev=1232465&r1=1232464&r2=1232465&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-spi2dav/pom.xml (original)
+++ jackrabbit/branches/2.4/jackrabbit-spi2dav/pom.xml Tue Jan 17 16:33:41 2012
@@ -75,8 +75,6 @@
                   org.apache.jackrabbit.test.api.lock.LockManagerTest#testLockTransfer2
                   <!-- JCR-2533 : missing impl of checkQueryStatement -->
                   org.apache.jackrabbit.test.api.query.CreateQueryTest#testUnknownQueryLanguage
-                  <!-- JCR-2543 : query offset -->
-                  org.apache.jackrabbit.test.api.query.SetOffsetTest#testSetOffset
                   <!-- JCR-2533 : missing impl of checkQueryStatement -->
                   org.apache.jackrabbit.test.api.query.qom.BindVariableValueTest
                   <!-- JCR-2112 : simple versioning not implemented -->