You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2015/04/18 12:18:33 UTC

svn commit: r1674478 - in /sling/trunk/bundles/jcr/oak-server: pom.xml src/main/java/org/apache/sling/oak/server/OakSlingRepositoryManager.java

Author: olli
Date: Sat Apr 18 10:18:32 2015
New Revision: 1674478

URL: http://svn.apache.org/r1674478
Log:
SLING-4528 Moving to Oak

* upgrade Oak to 1.2.0
* use released dependencies only

Modified:
    sling/trunk/bundles/jcr/oak-server/pom.xml
    sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepositoryManager.java

Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1674478&r1=1674477&r2=1674478&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Sat Apr 18 10:18:32 2015
@@ -43,7 +43,7 @@
             WARNING make sure oak.version and sling.oak.server.version 
             are in sync with bundles/jcr/it-jackrabbit-oak
         -->
-        <oak.version>1.0.12</oak.version>
+        <oak.version>1.2.0</oak.version>
     </properties>
 
     <build>
@@ -120,7 +120,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.base</artifactId>
-            <version>2.2.3-SNAPSHOT</version>
+            <version>2.2.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepositoryManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepositoryManager.java?rev=1674478&r1=1674477&r2=1674478&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepositoryManager.java (original)
+++ sling/trunk/bundles/jcr/oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepositoryManager.java Sat Apr 18 10:18:32 2015
@@ -226,7 +226,7 @@ public class OakSlingRepositoryManager e
         .with(new InitialContent())
         .with(new ExtraSlingContent())
 
-        .with(JcrConflictHandler.JCR_CONFLICT_HANDLER)
+        .with(JcrConflictHandler.createJcrConflictHandler())
         .with(new EditorHook(new VersionEditorProvider()))
 
         .with(securityProvider)