This is an automated email from the ASF dual-hosted git repository. stack pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hbase-connectors.git
commit 51a27eb6a7d1f512447b3b4d363ac4b15920a30f Author: Michael Stack <[email protected]> AuthorDate: Sun Nov 4 13:31:32 2018 -0800 Revert "HBASE-21430 [hbase-connectors] Move hbase-spark* modules to hbase-connectors repo" This reverts commit 8d5dd9bfa3db0aeeb1a39f248cdc512b8952bb31. Revert prematurely added commit. --- kafka/hbase-kafka-proxy/pom.xml | 15 ++++++++++++ pom.xml | 10 -------- spark/hbase-spark-it/pom.xml | 28 ---------------------- spark/hbase-spark/pom.xml | 10 +++----- .../hadoop/hbase/spark/HBaseConnectionCache.scala | 2 ++ .../hadoop/hbase/spark/datasources/Bound.scala | 1 + .../hadoop/hbase/spark/datasources/SerDes.scala | 2 ++ 7 files changed, 23 insertions(+), 45 deletions(-) diff --git a/kafka/hbase-kafka-proxy/pom.xml b/kafka/hbase-kafka-proxy/pom.xml index 198107d..4fbb817 100755 --- a/kafka/hbase-kafka-proxy/pom.xml +++ b/kafka/hbase-kafka-proxy/pom.xml @@ -79,6 +79,12 @@ </dependency> <dependency> <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> <artifactId>hbase-annotations</artifactId> <type>test-jar</type> <scope>test</scope> @@ -104,6 +110,15 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>${collections.version}</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> </dependencies> <profiles> diff --git a/pom.xml b/pom.xml index 959cdfc..e49c992 100755 --- a/pom.xml +++ b/pom.xml @@ -149,16 +149,6 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.apache.yetus</groupId> - <artifactId>audience-annotations</artifactId> - <version>${audience-annotations.version}</version> - </dependency> - <dependency> - <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> diff --git a/spark/hbase-spark-it/pom.xml b/spark/hbase-spark-it/pom.xml index e0aa23a..465b34f 100644 --- a/spark/hbase-spark-it/pom.xml +++ b/spark/hbase-spark-it/pom.xml @@ -222,34 +222,6 @@ <artifactId>hbase-testing-util</artifactId> </dependency> <dependency> - <groupId>org.apache.hbase.thirdparty</groupId> - <artifactId>hbase-shaded-miscellaneous</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${hadoop-two.version}</version> - <exclusions> - <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${hadoop-two.version}</version> - <type>test-jar</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> diff --git a/spark/hbase-spark/pom.xml b/spark/hbase-spark/pom.xml index 6f7fbf9..4ba2fa5 100644 --- a/spark/hbase-spark/pom.xml +++ b/spark/hbase-spark/pom.xml @@ -238,11 +238,11 @@ </dependency> <dependency> <groupId>org.apache.hbase</groupId> - <artifactId>hbase-annotations</artifactId> + <artifactId>hbase-protocol-shaded</artifactId> </dependency> <dependency> - <groupId>org.apache.yetus</groupId> - <artifactId>audience-annotations</artifactId> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> </dependency> <dependency> <groupId>org.apache.hbase</groupId> @@ -279,10 +279,6 @@ <artifactId>slf4j-log4j12</artifactId> </exclusion> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> <groupId>org.mortbay.jetty</groupId> <artifactId>jsp-2.1</artifactId> </exclusion> diff --git a/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/HBaseConnectionCache.scala b/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/HBaseConnectionCache.scala index 138c224..1fc92c0 100644 --- a/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/HBaseConnectionCache.scala +++ b/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/HBaseConnectionCache.scala @@ -268,3 +268,5 @@ class HBaseConnectionKey(c: Configuration) extends Logging { case class HBaseConnectionCacheStat(var numTotalRequests: Long, var numActualConnectionsCreated: Long, var numActiveConnections: Long) + + diff --git a/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/datasources/Bound.scala b/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/datasources/Bound.scala index af372ea..4602ac8 100644 --- a/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/datasources/Bound.scala +++ b/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/datasources/Bound.scala @@ -118,3 +118,4 @@ object Points { } } } + diff --git a/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/datasources/SerDes.scala b/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/datasources/SerDes.scala index 59e44f3..fc0e4d0 100644 --- a/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/datasources/SerDes.scala +++ b/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/datasources/SerDes.scala @@ -35,3 +35,5 @@ class DoubleSerDes extends SerDes { Bytes.toDouble(bytes, start) } } + +
