Skip to content

Commit

Permalink
manage conflict dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jetoile committed Jan 5, 2016
1 parent 9727b4d commit eb49c51
Showing 1 changed file with 63 additions and 5 deletions.
68 changes: 63 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<version>3.0.0</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -47,11 +53,33 @@
<version>3.0.0</version>
</dependency>

<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
<version>5.2.1</version>
</dependency>
<!--<dependency>-->
<!--<groupId>org.apache.solr</groupId>-->
<!--<artifactId>solr-core</artifactId>-->
<!--<version>5.2.1</version>-->
<!--<exclusions>-->
<!--<exclusion>-->
<!--<groupId>org.apache.hadoop</groupId>-->
<!--<artifactId>hadoop-core</artifactId>-->
<!--</exclusion>-->
<!--<exclusion>-->
<!--<groupId>org.apache.hadoop</groupId>-->
<!--<artifactId>hadoop-common</artifactId>-->
<!--</exclusion>-->
<!--<exclusion>-->
<!--<groupId>org.apache.hadoop</groupId>-->
<!--<artifactId>hadoop-auth</artifactId>-->
<!--</exclusion>-->
<!--<exclusion>-->
<!--<groupId>org.apache.hadoop</groupId>-->
<!--<artifactId>hadoop-hdfs</artifactId>-->
<!--</exclusion>-->
<!--<exclusion>-->
<!--<groupId>org.apache.hadoop</groupId>-->
<!--<artifactId>hadoop-annotations</artifactId>-->
<!--</exclusion>-->
<!--</exclusions>-->
<!--</dependency>-->

<dependency>
<groupId>org.apache.solr</groupId>
Expand All @@ -63,6 +91,36 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-test-framework</artifactId>
<version>5.2.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down

0 comments on commit eb49c51

Please sign in to comment.