[Archive-access-cvs] SF.net SVN: archive-access:[3244] trunk/archive-access/projects/wayback

[<bra...@us...>]

Revision: 3244
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3244&view=rev
Author:   bradtofel
Date:     2010-09-03 22:30:36 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
POM updates, newer version of hadoop, including some httpclient exclusions to prevent jar resolution problem with heritrix htpclient overrides...

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/pom.xml
    trunk/archive-access/projects/wayback/wayback-core/pom.xml
    trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml
    trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml

Modified: trunk/archive-access/projects/wayback/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/pom.xml	2010-08-27 23:35:14 UTC (rev 3243)
+++ trunk/archive-access/projects/wayback/pom.xml	2010-09-03 22:30:36 UTC (rev 3244)
@@ -93,7 +93,7 @@
       </releases>
       <snapshots>
         <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
+        <updatePolicy>daily</updatePolicy>
         <checksumPolicy>fail</checksumPolicy>
       </snapshots>
       <id>internetarchive</id>
@@ -101,6 +101,27 @@
       <url>http://builds.archive.org:8080/maven2</url>
       <layout>default</layout>
     </repository>
+
+<!--
+    <repository>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>daily</updatePolicy>
+        <checksumPolicy>warn</checksumPolicy>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>daily</updatePolicy>
+        <checksumPolicy>fail</checksumPolicy>
+      </snapshots>
+      <id>dspace</id>
+      <name>DSpace Maven Repository</name>
+      <url>http://maven.dspace.org/</url>
+      <layout>default</layout>
+    </repository>
+    -->
+    
+    
   </repositories>
 
   <pluginRepositories>
@@ -181,7 +202,7 @@
       <id>website</id>
       <name>Website</name>
       <!--Pass as command-line system property to maven-->
-      <url>${website.url}/projects/${pom.artifactId}</url>
+      <url>${website.url}/projects/${project.artifactId}</url>
     </site>
   </distributionManagement>
 

Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/pom.xml	2010-08-27 23:35:14 UTC (rev 3243)
+++ trunk/archive-access/projects/wayback/wayback-core/pom.xml	2010-09-03 22:30:36 UTC (rev 3244)
@@ -102,11 +102,11 @@
     <!-- 
       Doh... I'm not sure what package is configuring org.apache.commons-logging
       to use log4j, but it's breaking some command line tools.
-    -->
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <version>1.2.14</version>
     </dependency>
+    -->
   </dependencies>
 </project>

Modified: trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml	2010-08-27 23:35:14 UTC (rev 3243)
+++ trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml	2010-09-03 22:30:36 UTC (rev 3244)
@@ -35,6 +35,18 @@
             <descriptorRef>jar-with-dependencies</descriptorRef>
           </descriptorRefs>
           <finalName>wayback-hadoop</finalName>
+          <archive>
+          	<manifestFile>src/main/archive/MANIFEST.MF</manifestFile>
+<!--
+            <manifest>
+              <mainClass>org.archive.wayback.hadoop.SortDriver</mainClass>
+            </manifest>
+            <manifestEntries>
+              <Class-Path>hadoop-0.19.1-core.jar lib/commons-cli-2.0-SNAPSHOT.jar lib/commons-codec-1.3.jar lib/commons-httpclient-3.0.1.jar lib/commons-logging-1.0.4.jar lib/commons-logging-api-1.0.4.jar lib/commons-net-1.4.1.jar lib/hsqldb-1.8.0.10.jar lib/jets3t-0.6.1.jar lib/jetty-5.1.4.jar lib/junit-3.8.1.jar lib/kfs-0.2.0.jar lib/log4j-1.2.15.jar lib/oro-2.0.8.jar lib/servlet-api.jar lib/slf4j-api-1.4.3.jar lib/slf4j-log4j12-1.4.3.jar lib/xmlenc-0.52.jar lib/jetty-ext/commons-el.jar lib/jetty-ext/jasper-compiler.jar lib/jetty-ext/jasper-runtime.jar lib/jetty-ext/jsp-api.jar</Class-Path>
+            </manifestEntries>
+-->
+          </archive>
+          
         </configuration>
         <executions>
           <execution>

Modified: trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml	2010-08-27 23:35:14 UTC (rev 3243)
+++ trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml	2010-09-03 22:30:36 UTC (rev 3244)
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
   <parent>
     <artifactId>wayback</artifactId>
     <groupId>org.archive</groupId>
@@ -19,11 +20,18 @@
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
+    
     <dependency>
-      <groupId>org.apache.mahout.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
-      <scope>provided</scope>
-      <version>0.19.1</version>
+      <groupId>org.apache.hadoop</groupId>
+      <version>0.20.2</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-httpclient</groupId>
+          <artifactId>commons-httpclient</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.archive.wayback</groupId>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.