svn commit: r1388529 - in /nutch/branches/2.x: CHANGES.txt conf/nutch-default.xml default.properties ivy/ivy.xml

[le...@apache.org]

Author: lewismc
Date: Fri Sep 21 14:37:07 2012
New Revision: 1388529

URL: http://svn.apache.org/viewvc?rev=1388529&view=rev
Log:
revert gora-cassandra to v0.2, prepare for 2.2 development

Modified:
    nutch/branches/2.x/CHANGES.txt
    nutch/branches/2.x/conf/nutch-default.xml
    nutch/branches/2.x/default.properties
    nutch/branches/2.x/ivy/ivy.xml

Modified: nutch/branches/2.x/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1388529&r1=1388528&r2=1388529&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Fri Sep 21 14:37:07 2012
@@ -1,6 +1,11 @@
 Nutch Change Log
 
-Release 2.1 - Current Development
+Release 2.2 - Current Development
+
+* NUTCH-
+
+Release 2.1 (19/09/2012) ddmmyyyy
+Full Jira Report - https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10680&version=12321040
 
 * NUTCH-1415 release packages to contain top level folder apache-nutch-x.x (snagel)
 
@@ -34,7 +39,7 @@ Release 2.1 - Current Development
 
 * NUTCH-1442 indexingfilter.order is property is misread in code (ferdy via lewismc)
 
-* NUTCH-1450 Upgrade to gora deps to 0.2.1 (lewismc)
+* NUTCH-1450 Upgrade to gora deps to 0.2.1 except gora-cassandra (lewismc)
 
 * NUTCH-1159 Write JUnit test for index-anchor (ferdy + lewismc)
 

Modified: nutch/branches/2.x/conf/nutch-default.xml
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/conf/nutch-default.xml?rev=1388529&r1=1388528&r2=1388529&view=diff
==============================================================================
--- nutch/branches/2.x/conf/nutch-default.xml (original)
+++ nutch/branches/2.x/conf/nutch-default.xml Fri Sep 21 14:37:07 2012
@@ -125,7 +125,7 @@
 
 <property>
   <name>http.agent.version</name>
-  <value>Nutch-2.1-SNAPSHOT</value>
+  <value>Nutch-2.2-SNAPSHOT</value>
   <description>A version string to advertise in the User-Agent 
    header.</description>
 </property>

Modified: nutch/branches/2.x/default.properties
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/default.properties?rev=1388529&r1=1388528&r2=1388529&view=diff
==============================================================================
--- nutch/branches/2.x/default.properties (original)
+++ nutch/branches/2.x/default.properties Fri Sep 21 14:37:07 2012
@@ -15,7 +15,7 @@
 
 
 name=apache-nutch
-version=2.1-SNAPSHOT
+version=2.2-SNAPSHOT
 final.name=${name}-${version}
 year=2012
 

Modified: nutch/branches/2.x/ivy/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/ivy/ivy.xml?rev=1388529&r1=1388528&r2=1388529&view=diff
==============================================================================
--- nutch/branches/2.x/ivy/ivy.xml (original)
+++ nutch/branches/2.x/ivy/ivy.xml Fri Sep 21 14:37:07 2012
@@ -119,7 +119,7 @@
 
     <!-- Uncomment this to use Cassandra as Gora backend. -->
     <!-- 
-    <dependency org="org.apache.gora" name="gora-cassandra" rev="0.2.1" conf="*->default" />
+    <dependency org="org.apache.gora" name="gora-cassandra" rev="0.2" conf="*->default" />
     -->
 
     <!--global exclusion -->