HBASE-21431 Fix build and test issues 5/head
authorPeter Somogyi <psomogyi@apache.org>
Sun, 4 Nov 2018 11:21:09 +0000 (12:21 +0100)
committerPeter Somogyi <psomogyi@apache.org>
Sun, 4 Nov 2018 11:21:09 +0000 (12:21 +0100)
merge conflict in hbase-spark pom.xml
can't resolve org.apache.directory.jdbm:apacheds-jdbm1 dependency (pulled in via org.apache.hadoop:hadoop-minikdc
jackson-databind collision on classpath
missing hbase-zookeeper test-jar
multiple declaration of hbase-annotations inside dependencyManagement
missing hbase-common test-jar

kafka/hbase-kafka-proxy/pom.xml
pom.xml
spark/hbase-spark-it/pom.xml
spark/hbase-spark/pom.xml
spark/pom.xml

index 4a45ed7..198107d 100755 (executable)
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-common</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-clients</artifactId>
       <version>${kafka-clients.version}</version>
diff --git a/pom.xml b/pom.xml
index 072a549..959cdfc 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
         <groupId>org.apache.hbase</groupId>
         <artifactId>hbase-annotations</artifactId>
         <version>${hbase.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.hbase</groupId>
-        <artifactId>hbase-annotations</artifactId>
-        <version>${hbase.version}</version>
-        <type>test-jar</type>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.hbase</groupId>
-        <artifactId>hbase-annotations</artifactId>
-        <version>${hbase.version}</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
index 4be3daa..e0aa23a 100644 (file)
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-zookeeper</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.hbase.connectors.spark</groupId>
       <artifactId>hbase-spark</artifactId>
       <version>${project.version}</version>
           <groupId>com.google.code.findbugs</groupId>
           <artifactId>jsr305</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
index cda6c7b..6f7fbf9 100644 (file)
           <groupId>xerces</groupId>
           <artifactId>xercesImpl</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <artifactId>spark-sql_${scala.binary.version}</artifactId>
       <version>${spark.version}</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
         <exclusion>
-<<<<<<< HEAD
-=======
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-api</artifactId>
         </exclusion>
         <exclusion>
->>>>>>> HBASE-21430 [hbase-connectors] Move hbase-spark* modules to hbase-connectors repo
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>jsp-2.1</artifactId>
         </exclusion>
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-zookeeper</artifactId>
-<<<<<<< HEAD
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-zookeeper</artifactId>
-=======
->>>>>>> HBASE-21430 [hbase-connectors] Move hbase-spark* modules to hbase-connectors repo
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
       <plugin>
         <groupId>net.revelc.code</groupId>
         <artifactId>warbucks-maven-plugin</artifactId>
-<<<<<<< HEAD
-=======
-        <version>1.1.0</version>
->>>>>>> HBASE-21430 [hbase-connectors] Move hbase-spark* modules to hbase-connectors repo
         <!-- TODO: remove the following config if https://issues.scala-lang.org/browse/SI-3600 is resolved -->
         <!-- override the root config to add more filter -->
         <configuration>
           <artifactId>hadoop-minikdc</artifactId>
           <version>${hadoop-two.version}</version>
           <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>org.apache.directory.jdbm</groupId>
+              <artifactId>apacheds-jdbm1</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
       </dependencies>
     </profile>
index fd61fd0..daf8874 100644 (file)
             <checkStaleness>true</checkStaleness>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>net.revelc.code</groupId>
+          <artifactId>warbucks-maven-plugin</artifactId>
+          <version>1.1.0</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>