Index: D:/projects/mvdb/apache-jackrabbit/contrib/orm-persistence/project.xml
===================================================================
--- D:/projects/mvdb/apache-jackrabbit/contrib/orm-persistence/project.xml	(revision 279070)
+++ D:/projects/mvdb/apache-jackrabbit/contrib/orm-persistence/project.xml	(working copy)
@@ -51,10 +51,15 @@
   <dependencies>
     <dependency>
         <groupId>jackrabbit</groupId>
-        <artifactId>jackrabbit</artifactId>
-        <version>0.16.4.1-dev</version>
+        <artifactId>jackrabbit-core</artifactId>
+        <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
+        <groupId>jackrabbit</groupId>
+        <artifactId>jackrabbit-commons</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
       <id>concurrent</id>
       <version>1.3.4</version>
     </dependency>
@@ -78,7 +83,7 @@
     <dependency>
       <groupId>jsr170</groupId>
       <artifactId>jcr</artifactId>
-      <version>0.16.4.1</version>
+      <version>1.0</version>
       <url>http://www.day.com/maven/jsr170/jars/jcr-0.16.4.1.jar</url>
     </dependency>
     <dependency>
@@ -109,7 +114,7 @@
     <dependency>
       <groupId>ojb</groupId>
       <artifactId>db-ojb</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.3</version>
     </dependency>
     <dependency>
       <groupId>hsqldb</groupId>
Index: D:/projects/mvdb/apache-jackrabbit/contrib/orm-persistence/src/java/org/apache/jackrabbit/core/state/orm/hibernate/HibernatePersistenceManager.java
===================================================================
--- D:/projects/mvdb/apache-jackrabbit/contrib/orm-persistence/src/java/org/apache/jackrabbit/core/state/orm/hibernate/HibernatePersistenceManager.java	(revision 279070)
+++ D:/projects/mvdb/apache-jackrabbit/contrib/orm-persistence/src/java/org/apache/jackrabbit/core/state/orm/hibernate/HibernatePersistenceManager.java	(working copy)
@@ -27,7 +27,7 @@
 import org.apache.jackrabbit.core.value.InternalValue;
 import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.PropertyId;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
 import org.apache.jackrabbit.core.state.AbstractPersistenceManager;
 import org.apache.jackrabbit.core.state.ItemState;
 import org.apache.jackrabbit.core.state.ItemStateException;
Index: D:/projects/mvdb/apache-jackrabbit/contrib/orm-persistence/src/java/org/apache/jackrabbit/core/state/orm/ORMNodeState.java
===================================================================
--- D:/projects/mvdb/apache-jackrabbit/contrib/orm-persistence/src/java/org/apache/jackrabbit/core/state/orm/ORMNodeState.java	(revision 279070)
+++ D:/projects/mvdb/apache-jackrabbit/contrib/orm-persistence/src/java/org/apache/jackrabbit/core/state/orm/ORMNodeState.java	(working copy)
@@ -25,7 +25,7 @@
 import java.util.Set;
 
 import org.apache.jackrabbit.core.ItemId;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
 import org.apache.jackrabbit.core.nodetype.NodeDefId;
 import org.apache.jackrabbit.core.state.NodeState;
 import org.apache.jackrabbit.core.state.NodeState.ChildNodeEntry;
Index: D:/projects/mvdb/apache-jackrabbit/contrib/orm-persistence/src/java/org/apache/jackrabbit/core/state/orm/ORMPropertyEntry.java
===================================================================
--- D:/projects/mvdb/apache-jackrabbit/contrib/orm-persistence/src/java/org/apache/jackrabbit/core/state/orm/ORMPropertyEntry.java	(revision 279070)
+++ D:/projects/mvdb/apache-jackrabbit/contrib/orm-persistence/src/java/org/apache/jackrabbit/core/state/orm/ORMPropertyEntry.java	(working copy)
@@ -17,7 +17,7 @@
 package org.apache.jackrabbit.core.state.orm;
 
 import java.io.Serializable;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
 
 /**
  * <p>This class represents a single entry of a property in a node. This
Index: D:/projects/mvdb/apache-jackrabbit/contrib/orm-persistence/src/java/org/apache/jackrabbit/core/state/orm/ojb/OJBPersistenceManager.java
===================================================================
--- D:/projects/mvdb/apache-jackrabbit/contrib/orm-persistence/src/java/org/apache/jackrabbit/core/state/orm/ojb/OJBPersistenceManager.java	(revision 279070)
+++ D:/projects/mvdb/apache-jackrabbit/contrib/orm-persistence/src/java/org/apache/jackrabbit/core/state/orm/ojb/OJBPersistenceManager.java	(working copy)
@@ -27,7 +27,7 @@
 import org.apache.jackrabbit.core.value.InternalValue;
 import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.PropertyId;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
 import org.apache.jackrabbit.core.state.ChangeLog;
 import org.apache.jackrabbit.core.state.ItemState;
 import org.apache.jackrabbit.core.state.ItemStateException;