From d02433fd1f6c16b6ba7922fe2e952641fa453d01 Mon Sep 17 00:00:00 2001
From: Kenji Nagahashi <kenji@archive.org>
Date: Tue, 1 Jul 2014 15:55:16 -0700
Subject: [PATCH] mv pom-cdxh5.xml to pom.xml, include cdh5 in version number.

---
 pom-cdh5.xml | 279 ---------------------------------------------------
 pom.xml      |  23 ++++-
 2 files changed, 20 insertions(+), 282 deletions(-)
 delete mode 100644 pom-cdh5.xml

diff --git a/pom-cdh5.xml b/pom-cdh5.xml
deleted file mode 100644
index 19ed2868..00000000
--- a/pom-cdh5.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>7</version>
-  </parent>
-
-  <groupId>org.netpreserve.commons</groupId>
-  <artifactId>webarchive-commons</artifactId>
-  <version>1.1.1-${build.tag}SNAPSHOT</version>
-  <packaging>jar</packaging>
-
-  <name>webarchive-commons</name>
-  <url>https://github.com/iipc/webarchive-commons</url>
-
-   <organization>
-      <name>The International Internet Preservation Consortium</name>
-      <url>http://netpreserve.org/</url>
-   </organization>
-   <licenses>
-      <license>
-         <name>The Apache Software License, Version 2.0</name>
-         <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-         <distribution>repo</distribution>
-      </license>
-    </licenses>
-   <developers>
-      <developer>
-         <id>many-devs</id>
-         <name>Many Others Developers Proceed Me</name>
-         <email>many@dev.org</email>
-      </developer>
-      <developer>
-         <id>anjackson</id>
-         <name>Andrew Jackson</name>
-         <email>Andrew.Jackson@bl.uk</email>
-      </developer>
-   </developers>
-   <issueManagement>
-      <system>GitHub Issues</system>
-      <url>https://github.com/iipc/webarchive-commons/issues</url>
-   </issueManagement>
-   <scm>
-      <connection>scm:git:git@github.com:iipc/webarchive-commons.git</connection>
-      <developerConnection>scm:git:git@github.com:iipc/webarchive-commons.git</developerConnection>
-      <url>git@github.com:iipc/webarchive-commons.git</url>
-   </scm>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <build.time>${maven.build.timestamp}</build.time>
-    <maven.build.timestamp.format>yyyyMMddhhmmss</maven.build.timestamp.format>
-    <build.tag></build.tag>
-    <!-- sonatype repositories are defaults for distributionManagement -->
-    <repository.url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</repository.url>
-    <snapshotRepository.url>https://oss.sonatype.org/content/repositories/snapshots/</snapshotRepository.url>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>14.0.1</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-      <version>20131018</version>
-    </dependency>
-    <dependency>
-      <groupId>org.htmlparser</groupId>
-      <artifactId>htmlparser</artifactId>
-      <version>1.6</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-      <version>3.1</version>
-    </dependency>    
-
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-core</artifactId>
-      <version>2.3.0-mr1-cdh5.0.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-httpclient</groupId>
-          <artifactId>commons-httpclient</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.servlet.jsp</groupId>
-          <artifactId>jsp-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>jetty</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>jetty-util</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>tomcat</groupId>
-          <artifactId>jasper-runtime</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>tomcat</groupId>
-          <artifactId>jasper-compiler</artifactId>
-        </exclusion>                
-        <exclusion>
-          <groupId>hsqldb</groupId>
-          <artifactId>hsqldb</artifactId>
-        </exclusion>                
-      </exclusions> 
-    </dependency>
-
-
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <version>2.3.0-cdh5.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-mapreduce-client-common</artifactId>
-      <version>2.3.0-cdh5.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-mapreduce-client-core</artifactId>
-      <version>2.3.0-cdh5.0.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.pig</groupId>
-      <artifactId>pig</artifactId>
-      <version>0.12.0</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.5</version>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.gnu.inet</groupId>
-      <artifactId>libidn</artifactId>
-      <version>1.15</version>
-    </dependency>
-    <dependency>                        
-      <groupId>it.unimi.dsi</groupId>
-      <artifactId>dsiutils</artifactId>
-      <version>2.0.12</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpcore</artifactId>
-        <version>4.3</version>
-    </dependency>                       
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>1.6</version>
-    </dependency>
-    <dependency>
-      <groupId>fastutil</groupId>
-      <artifactId>fastutil</artifactId>
-      <version>5.0.7</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-          <finalName>webarchive-commons</finalName>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-
-  </build>
-  <repositories>
-    <repository>
-      <id>cloudera</id>
-      <name>Cloudera Hadoop</name>
-      <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
-      <layout>default</layout>
-
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>daily</updatePolicy>
-        <checksumPolicy>warn</checksumPolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>daily</updatePolicy>
-        <checksumPolicy>warn</checksumPolicy>
-      </snapshots>
-    </repository>
-
-  </repositories>
-
-  <distributionManagement>
-    <repository>
-      <id>repository</id>
-      <url>${repository.url}</url>
-    </repository>
-    <snapshotRepository>
-      <id>snapshotRepository</id>
-      <url>${snapshotRepository.url}</url>
-    </snapshotRepository>
-  </distributionManagement>
-
-</project>
diff --git a/pom.xml b/pom.xml
index 4e635475..bbe42a89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>org.netpreserve.commons</groupId>
   <artifactId>webarchive-commons</artifactId>
-  <version>1.1.1-${build.tag}SNAPSHOT</version>
+  <version>1.1.1-cdh5-${build.tag}SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>webarchive-commons</name>
@@ -98,7 +98,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
-      <version>0.20.2-cdh3u4</version>
+      <version>2.3.0-mr1-cdh5.0.1</version>
       <exclusions>
         <exclusion>
           <groupId>commons-httpclient</groupId>
@@ -135,10 +135,27 @@
       </exclusions> 
     </dependency>
 
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <version>2.3.0-cdh5.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-mapreduce-client-common</artifactId>
+      <version>2.3.0-cdh5.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-mapreduce-client-core</artifactId>
+      <version>2.3.0-cdh5.0.1</version>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.pig</groupId>
       <artifactId>pig</artifactId>
-      <version>0.10.0</version>
+      <version>0.12.0</version>
       <scope>provided</scope>
     </dependency>