Author: lewismc
Date: Mon Oct 27 18:09:18 2014
New Revision: 1634633

URL: http://svn.apache.org/r1634633
Log:
NUTCH-1865 Enable use of SNAPSHOT's with Nutch Ivy dependency management

Modified:
    nutch/trunk/CHANGES.txt
    nutch/trunk/ivy/ivysettings.xml

Modified: nutch/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1634633&r1=1634632&r2=1634633&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Mon Oct 27 18:09:18 2014
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Nutch Current Development 1.10-SNAPSHOT
 
+* NUTCH-NUTCH-1865 Enable use of SNAPSHOT's with Nutch Ivy dependency 
management (lewismc)
+
 * NUTCH-1882 ant eclipse target to add output path to src/test (snagel)
 
 * NUTCH-1876 Upgrade to Crawler Commons 0.5 (jnioche)

Modified: nutch/trunk/ivy/ivysettings.xml
URL: 
http://svn.apache.org/viewvc/nutch/trunk/ivy/ivysettings.xml?rev=1634633&r1=1634632&r2=1634633&view=diff
==============================================================================
--- nutch/trunk/ivy/ivysettings.xml (original)
+++ nutch/trunk/ivy/ivysettings.xml Mon Oct 27 18:09:18 2014
@@ -16,10 +16,6 @@
    See the License for the specific language governing permissions and
    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
@@ -29,11 +25,14 @@
           http://ibiblio.lsu.edu/main/pub/packages/maven2
           http://www.ibiblio.net/pub/packages/maven2
   -->
+  <property name="oss.sonatype.org" 
+    value="http://oss.sonatype.org/content/repositories/releases/"; 
+    override="false"/>
   <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]"/>
@@ -49,13 +48,22 @@
       m2compatible="true"
       />
     <ibiblio name="apache-snapshot"
-      root="${snapshot.apache.org}"
+      root="${repository.apache.org}"
+      m2compatible="true" 
+      changingMatcher="regexp"
+      changingPattern=".*SNAPSHOT.*" 
+      checkmodified="true"
+      />
+    <ibiblio name="sonatype"
+      root="${oss.sonatype.org}"
       pattern="${maven2.pattern.ext}"
       m2compatible="true"
       />
     <chain name="default" dual="true">
       <resolver ref="local"/>
       <resolver ref="maven2"/>
+      <resolver ref="apache-snapshot"/>
+      <resolver ref="sonatype"/>
     </chain>
     <chain name="internal">
       <resolver ref="local"/>
@@ -66,10 +74,10 @@
     <chain name="external-and-snapshots">
       <resolver ref="maven2"/>
       <resolver ref="apache-snapshot"/>
+      <resolver ref="sonatype"/>
     </chain>
   </resolvers>
   <modules>
-
     <!--
     This forces a requirement for other nutch-artifacts to be built locally
     rather than look for them online.


Reply via email to