From bb511796ec658ed07f69ca9895ce2e1994569826 Mon Sep 17 00:00:00 2001
From: Kenji Nagahashi <kenji@archive.org>
Date: Mon, 25 Aug 2014 16:44:48 -0700
Subject: [PATCH] =?UTF-8?q?Update=20POMs=20for=20newly=20imported=20Waybac?=
 =?UTF-8?q?k-dedup=20module.=20=09lock=20httpclient=20version=20to=204.3.3?=
 =?UTF-8?q?=20stated=20by=20=09heritrix-commons.=20have=20to=20exclude=20h?=
 =?UTF-8?q?adoop=E2=80=99s=20=09dependency=20on=20jets3t=200.9.0=20as=20it?=
 =?UTF-8?q?=20pulls=20in=09=09httpcore=204.1.2.=20=09add=20easy=20mock=203?=
 =?UTF-8?q?.1=20to=20heritrix-contrib.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commons/pom.xml |  1 -
 contrib/pom.xml | 12 ++++++++++++
 pom.xml         |  6 ++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/commons/pom.xml b/commons/pom.xml
index 66b60e88..b4d2244c 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -26,7 +26,6 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.3.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sleepycat</groupId>
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 23e02519..9ecbdffd 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -18,6 +18,12 @@
 			<groupId>org.apache.hbase</groupId>
 			<artifactId>hbase-client</artifactId>
 			<version>0.96.1.1-cdh5.0.2</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>jets3t</artifactId>
+					<groupId>net.java.dev.jets3t</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.archive.heritrix</groupId>
@@ -41,6 +47,12 @@
 			<artifactId>itextpdf</artifactId>
 			<version>5.5.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.easymock</groupId>
+			<artifactId>easymock</artifactId>
+			<version>3.1</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<repositories>
 		<repository>
diff --git a/pom.xml b/pom.xml
index e67d61b1..ddb2f121 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,12 @@ http://maven.apache.org/guides/mini/guide-m1-m2.html
 				<artifactId>engine</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<!-- lock httpclient version -->
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpclient</artifactId>
+				<version>4.3.3</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>