Merge pull request #7 from saintstack/m.HBASE-21435
HBASE-21435 [hbase-connectors] Cleanup of kafka dependencies; clarify…
diff --git a/kafka/hbase-kafka-proxy/pom.xml b/kafka/hbase-kafka-proxy/pom.xml
index 10ca760..3c5a242 100755
--- a/kafka/hbase-kafka-proxy/pom.xml
+++ b/kafka/hbase-kafka-proxy/pom.xml
@@ -35,6 +35,10 @@
<collections.version>4.1</collections.version>
<commons-lang3.version>3.6</commons-lang3.version>
<kafka-clients.version>2.0.0</kafka-clients.version>
+ <!--This module makes use of curator to write kafka topices. Uses curator that is
+ transitively included from hadoop-common 2.7.x curator so just add it
+ as explicit dependency below.-->
+ <curator.version>2.7.1</curator.version>
</properties>
<build>
<plugins>
@@ -56,17 +60,6 @@
<skipAssembly>true</skipAssembly>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <properties>
- <property>
- <name>listener</name>
- <value>org.apache.hadoop.hbase.ResourceCheckerJUnitListener</value>
- </property>
- </properties>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
@@ -79,10 +72,19 @@
<artifactId>audience-annotations</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-annotations</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.hbase.thirdparty</groupId>
+ <artifactId>hbase-shaded-miscellaneous</artifactId>
+ </dependency>
+ <dependency>
<!--Relying on hadoop2. Not messing with hadoop2/hadoop3 stuff
in here. Its just a proxy. Just needs hadoop-common for
Configuration stuff and some basics -->
@@ -126,19 +128,19 @@
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- </exclusion>
</exclusions>
</dependency>
+ <!--See note on curator.version above for why we include
+ curator here -->
<dependency>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>hbase-shaded-miscellaneous</artifactId>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-client</artifactId>
+ <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
diff --git a/pom.xml b/pom.xml
index 940681a..06a4d62 100755
--- a/pom.xml
+++ b/pom.xml
@@ -150,6 +150,13 @@
<version>${audience-annotations.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-annotations</artifactId>
+ <version>${hbase.version}</version>
+ <type>test-jar</type>
+ <!--Was test scope only but if we want to run hbase-it tests, need the annotations test jar-->
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>