Authored by qinchao

hbase配置influx的guava冲突

@@ -53,13 +53,8 @@ @@ -53,13 +53,8 @@
53 <groupId>org.apache.hbase</groupId> 53 <groupId>org.apache.hbase</groupId>
54 <artifactId>hbase-client</artifactId> 54 <artifactId>hbase-client</artifactId>
55 <version>1.2.4</version> 55 <version>1.2.4</version>
56 - <exclusions>  
57 - <exclusion>  
58 - <artifactId>guava</artifactId>  
59 - <groupId>com.google.guava</groupId>  
60 - </exclusion>  
61 - </exclusions>  
62 </dependency> 56 </dependency>
  57 +
63 </dependencies> 58 </dependencies>
64 59
65 </project> 60 </project>
@@ -30,6 +30,12 @@ @@ -30,6 +30,12 @@
30 30
31 <dependencyManagement> 31 <dependencyManagement>
32 <dependencies> 32 <dependencies>
  33 +
  34 + <dependency>
  35 + <groupId>com.google.guava</groupId>
  36 + <artifactId>guava</artifactId>
  37 + <version>16.0</version>
  38 + </dependency>
33 <!-- JOSN --> 39 <!-- JOSN -->
34 <dependency> 40 <dependency>
35 <groupId>net.sf.json-lib</groupId> 41 <groupId>net.sf.json-lib</groupId>