[GitHub] saintstack closed pull request #9: HBASE-21446 [hbase-connectors] Update spark and scala versions;

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

saintstack closed pull request #9: HBASE-21446 [hbase-connectors] Update spark and scala versions;
URL: https://github.com/apache/hbase-connectors/pull/9
 
 
   

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/spark/README.md b/spark/README.md
index dcd11c7..acb46bc 100755
--- a/spark/README.md
+++ b/spark/README.md
@@ -1 +1,11 @@
 # Apache HBase™ Spark Connector
+
+## Scala and Spark Versions
+
+To generate an artifact for a different [spark version](https://mvnrepository.com/artifact/org.apache.spark/spark-core) and/or [scala version](https://www.scala-lang.org/download/all.html), pass command-line options as follows (changing version numbers appropriately):
+
+```
+$ mvn -Dspark.version=2.2.2 -Dscala.version=2.11.7 -Dscala.binary.version=2.11 clean install
+```
+
+Spark 2.1.x, 2.2.x, 2.3.x, and 2.4.0 work as does scala 2.11.x. Scala 2.12.x and 2.10.x need work.
diff --git a/spark/hbase-spark/pom.xml b/spark/hbase-spark/pom.xml
index aed7da0..4554ceb 100644
--- a/spark/hbase-spark/pom.xml
+++ b/spark/hbase-spark/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!--
-
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
  distributed with this work for additional information
@@ -127,7 +126,7 @@
     <dependency>
       <groupId>org.scalatest</groupId>
       <artifactId>scalatest_${scala.binary.version}</artifactId>
-      <version>2.2.4</version>
+      <version>3.0.5</version>
       <scope>test</scope>
       <exclusions>
        <exclusion>
@@ -737,7 +736,10 @@
           <scalaVersion>${scala.version}</scalaVersion>
           <args>
             <arg>-feature</arg>
+            <arg>-target:jvm-1.8</arg>
           </args>
+          <source>${compileSource}</source>
+          <target>${compileSource}</target>
         </configuration>
         <executions>
           <execution>
diff --git a/spark/pom.xml b/spark/pom.xml
index dcbc4da..a5dcaaf 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -41,10 +41,10 @@
     <protobuf.plugin.version>0.6.1</protobuf.plugin.version>
     <hbase-thirdparty.version>2.1.0</hbase-thirdparty.version>
     <jackson.version>2.9.2</jackson.version>
-    <spark.version>2.1.1</spark.version>
+    <spark.version>2.4.0</spark.version>
     <!-- The following version is in sync with Spark's choice
          Please take caution when this version is modified -->
-    <scala.version>2.11.8</scala.version>
+    <scala.version>2.11.12</scala.version>
     <scala.binary.version>2.11</scala.binary.version>
     <json4s.version>3.2.11</json4s.version>
   </properties>


 

----------------------------------------------------------------
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