Index: ivy/ivy.xml
===================================================================
--- ivy/ivy.xml	(revision 1224920)
+++ ivy/ivy.xml	(working copy)
@@ -58,8 +58,6 @@
 		  <dependency org="org.apache.tika" name="tika-parsers" rev="0.10" />
 		-->
 		
-		<dependency org="org.apache.gora" name="gora-core" rev="0.1.1-incubating" conf="*->compile"/>
-
 		<dependency org="log4j" name="log4j" rev="1.2.15" conf="*->master" />
 
 		<dependency org="xerces" name="xercesImpl" rev="2.9.1" />
@@ -69,9 +67,35 @@
     		<dependency org="com.healthmarketscience.sqlbuilder" name="sqlbuilder" rev="2.0.6"
 			conf="*->default"/>
 		<dependency org="org.jdom" name="jdom" rev="1.1" conf="*->default"/>
+		
+		<!--Gora artifacts: -->
+		
+		<dependency org="org.apache.gora" name="gora-core" rev="0.2-incubating" conf="*->compile"/>
+		
+		<dependency org="org.apache.gora" name="gora-sql" rev="0.2-incubating" conf="*->compile"/>		
+		
+		<!--
+       		Uncomment this to use MySQL as database with SQL as Gora store.
+		<dependency org="mysql" name="mysql-connector-java" rev="5.1.13" conf="*->default"/>
+		-->
 
-		<!--Configuration: test -->
+		<!--
+       		Uncomment this to use HBase as Gora backend. Then manually add hbase-0.20.6 jar to the lib directory.
+		-->
+		<!--
+       		<dependency org="org.apache.gora" name="gora-hbase" rev="0.2-incubating" conf="*->compile" />
+       		<dependency org="org.apache.zookeeper" name="zookeeper" rev="3.3.2" conf="*->default" />
+		-->
 
+		<!--
+    		Uncomment this to use Cassandra as Gora backend. 
+		-->
+		<!--
+		<dependency org="org.apache.gora" name="gora-cassandra" rev="0.2-incubating" conf="*->compile" />
+		-->
+		
+		<!-- Configuration: test -->
+
 		<!--artifacts needed for testing -->
 		<dependency org="junit" name="junit" rev="3.8.1" conf="test->default" />
 
@@ -92,38 +116,10 @@
 
 		<dependency org="org.hsqldb" name="hsqldb" rev="2.0.0" conf="*->default"/>
 		<dependency org="org.jdom" name="jdom" rev="1.1" conf="test->default"/>
-
-		<dependency org="org.apache.gora" name="gora-sql" rev="0.1.1-incubating" conf="*->default"/>				
+		
                 <dependency org="org.restlet.jse" name="org.restlet" rev="2.0.5" conf="*->default"/>
                 <dependency org="org.restlet.jse" name="org.restlet.ext.jackson" rev="2.0.5" conf="*->default"/>
 
-<!--
-       Uncomment this to use MySQL as database with SQL as Gora store.
--->
-<!--
-       <dependency org="mysql" name="mysql-connector-java" rev="5.1.13" conf="*->default"/>
--->
-
-<!--
-       Uncomment this to use HBase as Gora backend. Then manually add hbase-0.20.6 jar to the lib directory.
--->
-<!--
-       <dependency org="org.apache.gora" name="gora-hbase" rev="0.1.1-incubating" conf="*->compile">
-       </dependency>
-       <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.3.2" conf="*->default">
-       </dependency>
--->
-
-<!--
-    	Uncomment this to use Cassandra as Gora backend. 
--->
-<!--
-		<dependency org="org.apache.gora" name="gora-cassandra" rev="0.1.1-incubating" conf="*->compile">
-		</dependency>
-		// Should be another dependency here???
-		</dependency>
--->
-
              <!--global exclusion-->
              <exclude module="ant" />
              <exclude module="jmxtools" />