You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mm...@apache.org on 2017/02/17 18:30:35 UTC
[2/3] accumulo-wikisearch git commit: Use hadoop-client dep instead
of hadoop-common
Use hadoop-client dep instead of hadoop-common
Project: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/commit/fb4af6c2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/tree/fb4af6c2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/diff/fb4af6c2
Branch: refs/heads/master
Commit: fb4af6c2d50d061f33ae4341d37290b6b56bd1c4
Parents: eb573a5
Author: Mike Miller <mm...@apache.org>
Authored: Thu Feb 16 15:52:21 2017 -0500
Committer: Mike Miller <mm...@apache.org>
Committed: Fri Feb 17 10:38:49 2017 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
query/pom.xml | 14 ++------------
2 files changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/fb4af6c2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 08e9dbb..d62928a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
+ <artifactId>hadoop-client</artifactId>
<version>${version.hadoop}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/fb4af6c2/query/pom.xml
----------------------------------------------------------------------
diff --git a/query/pom.xml b/query/pom.xml
index 76494eb..e022965 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -74,17 +74,7 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>hadoop-client</artifactId>
</dependency>
<dependency>
<groupId>javaee</groupId>
@@ -156,7 +146,7 @@
<configuration>
<outputDirectory>lib</outputDirectory>
<!-- just grab the non-provided runtime dependencies -->
- <includeArtifactIds>commons-io,commons-configuration,commons-lang,commons-codec,protobuf-java,libthrift,zookeeper,hadoop-common,commons-jexl,guava,kryo,asm,minlog,reflectasm,wikisearch-ingest,accumulo-core,accumulo-fate,accumulo-trace,htrace-core</includeArtifactIds>
+ <includeArtifactIds>commons-io,commons-configuration,commons-lang,commons-codec,protobuf-java,libthrift,zookeeper,hadoop-client,commons-jexl,guava,kryo,asm,minlog,reflectasm,wikisearch-ingest,accumulo-core,accumulo-fate,accumulo-trace,htrace-core</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>