[GitHub] saintstack closed pull request #7: HBASE-21435 [hbase-connectors] Cleanup of kafka dependencies; clarify…

[GitBox <gi...@apache.org>]

saintstack closed pull request #7: HBASE-21435 [hbase-connectors] Cleanup of kafka dependencies; clarify…
URL: https://github.com/apache/hbase-connectors/pull/7
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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>
@@ -78,10 +71,19 @@
       <groupId>org.apache.yetus</groupId>
       <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
@@ -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
@@ -149,6 +149,13 @@
         <artifactId>audience-annotations</artifactId>
         <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>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services