You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by uj...@apache.org on 2014/03/19 17:08:57 UTC
[47/50] [abbrv] 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/master
Commit: 73e321e0e9dfb9cd5efe00cefd0c6f1eb9fa3242
Parents: 49f553a
Author: Sean Busbey <bu...@clouderagovt.com>
Authored: Wed Dec 11 00:28:46 2013 -0600
Committer: Sean Busbey <bu...@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>