svn commit: r1556497 - in /nutch/branches/2.x: CHANGES.txt ivy/ivy.xml ivy/ivysettings.xml

[lewismc]

Author: lewismc
Date: Wed Jan  8 11:23:22 2014
New Revision: 1556497

URL: http://svn.apache.org/r1556497
Log:
GORA-1696 Enable use of (Gora) SNAPSHOT dependencies

Modified:
    nutch/branches/2.x/CHANGES.txt
    nutch/branches/2.x/ivy/ivy.xml
    nutch/branches/2.x/ivy/ivysettings.xml

Modified: nutch/branches/2.x/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1556497&r1=1556496&r2=1556497&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Wed Jan  8 11:23:22 2014
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Current Development
 
+* NUTCH-1696 Enable use of (Gora) SNAPSHOT dependencies (lewismc)
+
 * NUTCH-1681 In URLUtil.java, toUNICODE method does not work correctly 
(Ä°lhami KALKAN, snagel, markus via lewismc) 
 
 * NUTCH-1673 Title isn't reset in MoreIndexingFilter (Nguyen Manh Tien via 
lewismc)

Modified: nutch/branches/2.x/ivy/ivy.xml
URL: 
http://svn.apache.org/viewvc/nutch/branches/2.x/ivy/ivy.xml?rev=1556497&r1=1556496&r2=1556497&view=diff
==============================================================================
--- nutch/branches/2.x/ivy/ivy.xml (original)
+++ nutch/branches/2.x/ivy/ivy.xml Wed Jan  8 11:23:22 2014
@@ -99,7 +99,12 @@
     <!--================-->
     <!-- Gora artifacts -->
     <!--================-->
+    <!-- N.B. To use Gora SNAPSHOT's merely replace the 'ref' value with the 
SNAPSHOT version 
+    and add changing="true" alongside the dependency declaration. An example 
has been
+    provided for the gora-core dependency as below -->
     <dependency org="org.apache.gora" name="gora-core" rev="0.3" 
conf="*->default"/>
+    <!--dependency org="org.apache.gora" name="gora-core" rev="0.4-SNAPSHOT" 
conf="*->default" changing="true"/-->
+    
     <!-- Uncomment this to use SQL as Gora backend. It should be noted that 
the 
     gora-sql 0.1.1-incubating artifact is NOT compatable with gora-core 0.3. 
Users should 
     downgrade to gora-core 0.2.1 in order to use SQL as a backend. -->
@@ -107,7 +112,7 @@
     <dependency org="org.apache.gora" name="gora-sql" rev="0.1.1-incubating" 
conf="*->default" />
     -->
     <!-- Uncomment this to use MySQL as database with SQL as Gora store. -->
-    <!-- 
+    <!--
     <dependency org="mysql" name="mysql-connector-java" rev="5.1.18" 
conf="*->default"/> 
     -->
     <!-- Uncomment this to use HBase as Gora backend. -->
@@ -115,7 +120,7 @@
     <dependency org="org.apache.gora" name="gora-hbase" rev="0.3" 
conf="*->default" />
     -->
     <!-- Uncomment this to use Accumulo as Gora backend. -->
-    <!-- 
+    <!--
     <dependency org="org.apache.gora" name="gora-accumulo" rev="0.3" 
conf="*->default" />
     -->
     <!-- Uncomment this to use Cassandra as Gora backend. -->

Modified: nutch/branches/2.x/ivy/ivysettings.xml
URL: 
http://svn.apache.org/viewvc/nutch/branches/2.x/ivy/ivysettings.xml?rev=1556497&r1=1556496&r2=1556497&view=diff
==============================================================================
--- nutch/branches/2.x/ivy/ivysettings.xml (original)
+++ nutch/branches/2.x/ivy/ivysettings.xml Wed Jan  8 11:23:22 2014
@@ -17,9 +17,6 @@
    limitations under the License.
 -->
 
- <!--
-  see http://www.jayasoft.org/ivy/doc/configuration
-  -->
   <!-- you can override this property to use mirrors
           http://repo1.maven.org/maven2/
           http://mirrors.dotsrc.org/maven2
@@ -35,8 +32,8 @@
   <property name="repo.maven.org"
     value="http://repo1.maven.org/maven2/";
     override="false"/>
-  <property name="snapshot.apache.org"
-    value="http://people.apache.org/repo/m2-snapshot-repository/";
+  <property name="repository.apache.org"
+    value="https://repository.apache.org/content/repositories/snapshots/";
     override="false"/>
   <property name="maven2.pattern"
     value="[organisation]/[module]/[revision]/[module]-[revision]"/>
@@ -52,8 +49,8 @@
       m2compatible="true"
       />
     <ibiblio name="apache-snapshot"
-      root="${snapshot.apache.org}"
-      pattern="${maven2.pattern.ext}"
+      root="${repository.apache.org}"
+      changingPattern=".*-SNAPSHOT"
       m2compatible="true"
       />
     <ibiblio name="restlet"
@@ -71,6 +68,7 @@
       <resolver ref="local"/>
       <resolver ref="maven2"/>
       <resolver ref="sonatype"/>
+      <resolver ref="apache-snapshot"/>
     </chain>
     <chain name="internal">
       <resolver ref="local"/>