From 219fc00c4ab8cf4157c59bab97f588e6efd90ef3 Mon Sep 17 00:00:00 2001
From: Dee-Pac <mcdeepak@gmail.com>
Date: Sat, 7 Nov 2020 19:49:38 -0800
Subject: [PATCH] [#247] [spark] Bump Spark Version to 2.4.7 | Bump Spark
 Version to 2.4.7 along with other stack to align with gcp_dataproc_1.5.x

---
 .../pom.xml                                        | 14 +++++++-------
 .../scala/com/paypal/gimel/cassandra/DataSet.scala |  0
 .../conf/CassandraClientConfiguration.scala        |  0
 .../gimel/cassandra/conf/CassandraConfigs.scala    |  0
 .../gimel/cassandra/reader/CassandraReader.scala   |  0
 .../gimel/cassandra/writer/CassandraWriter.scala   |  0
 gimel-dataapi/pom.xml                              |  6 +++---
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename gimel-dataapi/gimel-connectors/{gimel-cassandra-2.0 => gimel-cassandra}/pom.xml (91%)
 rename gimel-dataapi/gimel-connectors/{gimel-cassandra-2.0 => gimel-cassandra}/src/main/scala/com/paypal/gimel/cassandra/DataSet.scala (100%)
 rename gimel-dataapi/gimel-connectors/{gimel-cassandra-2.0 => gimel-cassandra}/src/main/scala/com/paypal/gimel/cassandra/conf/CassandraClientConfiguration.scala (100%)
 rename gimel-dataapi/gimel-connectors/{gimel-cassandra-2.0 => gimel-cassandra}/src/main/scala/com/paypal/gimel/cassandra/conf/CassandraConfigs.scala (100%)
 rename gimel-dataapi/gimel-connectors/{gimel-cassandra-2.0 => gimel-cassandra}/src/main/scala/com/paypal/gimel/cassandra/reader/CassandraReader.scala (100%)
 rename gimel-dataapi/gimel-connectors/{gimel-cassandra-2.0 => gimel-cassandra}/src/main/scala/com/paypal/gimel/cassandra/writer/CassandraWriter.scala (100%)

diff --git a/gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/pom.xml b/gimel-dataapi/gimel-connectors/gimel-cassandra/pom.xml
similarity index 91%
rename from gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/pom.xml
rename to gimel-dataapi/gimel-connectors/gimel-cassandra/pom.xml
index 6e275bd0..ca83e106 100644
--- a/gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/pom.xml
+++ b/gimel-dataapi/gimel-connectors/gimel-cassandra/pom.xml
@@ -28,7 +28,7 @@ under the License.
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>gimel-cassandra-2.0</artifactId>
+  <artifactId>gimel-cassandra</artifactId>
   <version>2.4.7-SNAPSHOT</version>
 
   <dependencies>
@@ -42,11 +42,11 @@ under the License.
       <artifactId>spark-cassandra-connector_${scala.binary.version}</artifactId>
       <version>${cassandra.spark.version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.datastax.spark</groupId>
-      <artifactId>spark-cassandra-connector-java_${scala.binary.version}</artifactId>
-      <version>1.5.2</version>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>com.datastax.spark</groupId>-->
+<!--      <artifactId>spark-cassandra-connector-java_${scala.binary.version}</artifactId>-->
+<!--      <version>1.5.2</version>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>org.scalatest</groupId>
       <artifactId>scalatest_${scala.binary.version}</artifactId>
@@ -62,7 +62,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>${maven.shade.plugin.version}</version>
         <configuration>
           <relocations>
             <relocation>
diff --git a/gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/src/main/scala/com/paypal/gimel/cassandra/DataSet.scala b/gimel-dataapi/gimel-connectors/gimel-cassandra/src/main/scala/com/paypal/gimel/cassandra/DataSet.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/src/main/scala/com/paypal/gimel/cassandra/DataSet.scala
rename to gimel-dataapi/gimel-connectors/gimel-cassandra/src/main/scala/com/paypal/gimel/cassandra/DataSet.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/src/main/scala/com/paypal/gimel/cassandra/conf/CassandraClientConfiguration.scala b/gimel-dataapi/gimel-connectors/gimel-cassandra/src/main/scala/com/paypal/gimel/cassandra/conf/CassandraClientConfiguration.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/src/main/scala/com/paypal/gimel/cassandra/conf/CassandraClientConfiguration.scala
rename to gimel-dataapi/gimel-connectors/gimel-cassandra/src/main/scala/com/paypal/gimel/cassandra/conf/CassandraClientConfiguration.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/src/main/scala/com/paypal/gimel/cassandra/conf/CassandraConfigs.scala b/gimel-dataapi/gimel-connectors/gimel-cassandra/src/main/scala/com/paypal/gimel/cassandra/conf/CassandraConfigs.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/src/main/scala/com/paypal/gimel/cassandra/conf/CassandraConfigs.scala
rename to gimel-dataapi/gimel-connectors/gimel-cassandra/src/main/scala/com/paypal/gimel/cassandra/conf/CassandraConfigs.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/src/main/scala/com/paypal/gimel/cassandra/reader/CassandraReader.scala b/gimel-dataapi/gimel-connectors/gimel-cassandra/src/main/scala/com/paypal/gimel/cassandra/reader/CassandraReader.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/src/main/scala/com/paypal/gimel/cassandra/reader/CassandraReader.scala
rename to gimel-dataapi/gimel-connectors/gimel-cassandra/src/main/scala/com/paypal/gimel/cassandra/reader/CassandraReader.scala
diff --git a/gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/src/main/scala/com/paypal/gimel/cassandra/writer/CassandraWriter.scala b/gimel-dataapi/gimel-connectors/gimel-cassandra/src/main/scala/com/paypal/gimel/cassandra/writer/CassandraWriter.scala
similarity index 100%
rename from gimel-dataapi/gimel-connectors/gimel-cassandra-2.0/src/main/scala/com/paypal/gimel/cassandra/writer/CassandraWriter.scala
rename to gimel-dataapi/gimel-connectors/gimel-cassandra/src/main/scala/com/paypal/gimel/cassandra/writer/CassandraWriter.scala
diff --git a/gimel-dataapi/pom.xml b/gimel-dataapi/pom.xml
index a26fadf1..83be5226 100644
--- a/gimel-dataapi/pom.xml
+++ b/gimel-dataapi/pom.xml
@@ -45,8 +45,8 @@ under the License.
         <module>gimel-connectors/gimel-s3</module>
         <module>gimel-connectors/gimel-kafka</module>
         <module>gimel-connectors/gimel-jdbc</module>
+        <module>gimel-connectors/gimel-cassandra</module>
         <module>gimel-connectors/gimel-hbase</module>
-        <module>gimel-connectors/gimel-cassandra-2.0</module>
         <module>gimel-connectors/gimel-aerospike-3.14</module>
         <module>gimel-connectors/gimel-druid-0.82</module>
         <module>gimel-core</module>
@@ -57,7 +57,7 @@ under the License.
 
     <properties>
         <aerospike.version>3.1.5</aerospike.version>
-        <cassandra.spark.version>2.0.6</cassandra.spark.version>
+        <cassandra.spark.version>2.4.3</cassandra.spark.version>
         <confluent.version>3.3.0</confluent.version>
         <elasticsearch.version>6.2.1</elasticsearch.version>
         <guava.version>16.0</guava.version>
@@ -214,7 +214,7 @@ under the License.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>${maven.shade.plugin.version}</version>
                 <configuration>
                     <relocations>
                         <!--<relocation>-->