Return-Path: 
 <commits-return-9390-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id CF3F1CAC4
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Mon, 10 Mar 2014 16:08:08 +0000 (UTC)
Received: (qmail 66024 invoked by uid 500); 10 Mar 2014 16:08:07 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 66003 invoked by uid 500); 10 Mar 2014 16:08:06 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 65989 invoked by uid 99); 10 Mar 2014 16:08:05 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Mar 2014 16:08:05 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 3FF3A93C617; Mon, 10 Mar 2014 16:08:05 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: busbey@apache.org
To: commits@accumulo.apache.org
Date: Mon, 10 Mar 2014 16:08:06 -0000
Message-Id: <85929bdad4084ac68268119b5ef55357@git.apache.org>
In-Reply-To: <879807a4d05f4bd2ad9af5611cce8515@git.apache.org>
References: <879807a4d05f4bd2ad9af5611cce8515@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/2] git commit: ACCUMULO-2020 Wikisearch should manage dependency
 conflicts.

ACCUMULO-2020 Wikisearch should manage dependency conflicts.

 Update enforcer plugin to require dependency convergence, fix conflicts.


Project: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/commit/73e321e0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/tree/73e321e0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/diff/73e321e0

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 73e321e0e9dfb9cd5efe00cefd0c6f1eb9fa3242
Parents: 49f553a
Author: Sean Busbey <busbey@clouderagovt.com>
Authored: Wed Dec 11 00:28:46 2013 -0600
Committer: Sean Busbey <busbey@cloudera.com>
Committed: Mon Mar 10 11:04:46 2014 -0500

----------------------------------------------------------------------
 pom.xml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/73e321e0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 69b85db..6be16f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,11 @@
         <executions>
           <execution>
             <id>enforce-mvn</id>
+            <configuration>
+              <rules>
+                <DependencyConvergence/>
+              </rules>
+            </configuration>
             <goals>
               <goal>enforce</goal>
             </goals>
@@ -226,6 +231,12 @@
         <groupId>org.apache.lucene</groupId>
         <artifactId>lucene-wikipedia</artifactId>
         <version>${version.lucene-wikipedia}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>com.google.protobuf</groupId>
@@ -246,6 +257,24 @@
       	<groupId>com.sun.jersey</groupId>
       	<artifactId>jersey-server</artifactId>
       	<version>1.11</version>
+        <exclusions>
+          <exclusion>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <!-- XXX This is just to fix the dependency conflict in Hadoop 1 -->
+      <dependency>
+        <groupId>net.java.dev.jets3t</groupId>
+        <artifactId>jets3t</artifactId>
+        <version>0.7.1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
     </dependencies>
   </dependencyManagement>