[paypal#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
Dee-Pac · Nov 6, 2020 · e957499 · e957499
1 parent 295fedb
commit e957499
Show file tree

Hide file tree

Showing 46 changed files with 5 additions and 5 deletions.
diff --git a/...onnectors/gimel-elasticsearch-6.2/pom.xml → ...el-connectors/gimel-elasticsearch/pom.xml b/...onnectors/gimel-elasticsearch-6.2/pom.xml → ...el-connectors/gimel-elasticsearch/pom.xml
@@ -28,7 +28,7 @@ under the License.
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>gimel-elasticsearch-6.2</artifactId>
+  <artifactId>gimel-elasticsearch</artifactId>
   <version>2.4.7-SNAPSHOT</version>
 
   <dependencies>

diff --git a/.../paypal/gimel/elasticsearch/DataSet.scala → .../paypal/gimel/elasticsearch/DataSet.scala b/.../paypal/gimel/elasticsearch/DataSet.scala → .../paypal/gimel/elasticsearch/DataSet.scala
diff --git a/...ticsearch/conf/ElasticSearchConfigs.scala → ...ticsearch/conf/ElasticSearchConfigs.scala b/...ticsearch/conf/ElasticSearchConfigs.scala → ...ticsearch/conf/ElasticSearchConfigs.scala
diff --git a/...csearch/conf/ElasticSearchConstants.scala → ...csearch/conf/ElasticSearchConstants.scala b/...csearch/conf/ElasticSearchConstants.scala → ...csearch/conf/ElasticSearchConstants.scala
diff --git a/...ch/utilities/ElasticSearchUtilities.scala → ...ch/utilities/ElasticSearchUtilities.scala b/...ch/utilities/ElasticSearchUtilities.scala → ...ch/utilities/ElasticSearchUtilities.scala
diff --git a/.../gimel-connectors/gimel-hbase-1.2/pom.xml → ...aapi/gimel-connectors/gimel-hbase/pom.xml b/.../gimel-connectors/gimel-hbase-1.2/pom.xml → ...aapi/gimel-connectors/gimel-hbase/pom.xml
diff --git a/...cala/com/paypal/gimel/hbase/DataSet.scala → ...cala/com/paypal/gimel/hbase/DataSet.scala b/...cala/com/paypal/gimel/hbase/DataSet.scala → ...cala/com/paypal/gimel/hbase/DataSet.scala
diff --git a/...hbase/conf/HbaseClientConfiguration.scala → ...hbase/conf/HbaseClientConfiguration.scala b/...hbase/conf/HbaseClientConfiguration.scala → ...hbase/conf/HbaseClientConfiguration.scala
diff --git a/...aypal/gimel/hbase/conf/HbaseConfigs.scala → ...aypal/gimel/hbase/conf/HbaseConfigs.scala b/...aypal/gimel/hbase/conf/HbaseConfigs.scala → ...aypal/gimel/hbase/conf/HbaseConfigs.scala
diff --git a/...pal/gimel/hbase/conf/HbaseConstants.scala → ...pal/gimel/hbase/conf/HbaseConstants.scala b/...pal/gimel/hbase/conf/HbaseConstants.scala → ...pal/gimel/hbase/conf/HbaseConstants.scala
diff --git a/.../gimel/hbase/utilities/HBaseCatalog.scala → .../gimel/hbase/utilities/HBaseCatalog.scala b/.../gimel/hbase/utilities/HBaseCatalog.scala → .../gimel/hbase/utilities/HBaseCatalog.scala
diff --git a/...l/gimel/hbase/utilities/HBaseLookUp.scala → ...l/gimel/hbase/utilities/HBaseLookUp.scala b/...l/gimel/hbase/utilities/HBaseLookUp.scala → ...l/gimel/hbase/utilities/HBaseLookUp.scala
diff --git a/...ypal/gimel/hbase/utilities/HBasePut.scala → ...ypal/gimel/hbase/utilities/HBasePut.scala b/...ypal/gimel/hbase/utilities/HBasePut.scala → ...ypal/gimel/hbase/utilities/HBasePut.scala
diff --git a/.../gimel/hbase/utilities/HBaseScanner.scala → .../gimel/hbase/utilities/HBaseScanner.scala b/.../gimel/hbase/utilities/HBaseScanner.scala → .../gimel/hbase/utilities/HBaseScanner.scala
diff --git a/...hbase/utilities/HBaseSparkConnector.scala → ...hbase/utilities/HBaseSparkConnector.scala b/...hbase/utilities/HBaseSparkConnector.scala → ...hbase/utilities/HBaseSparkConnector.scala
diff --git a/...imel/hbase/utilities/HBaseUtilities.scala → ...imel/hbase/utilities/HBaseUtilities.scala b/...imel/hbase/utilities/HBaseUtilities.scala → ...imel/hbase/utilities/HBaseUtilities.scala
diff --git a/.../com/paypal/gimel/hbase/DataSetTest.scala → .../com/paypal/gimel/hbase/DataSetTest.scala b/.../com/paypal/gimel/hbase/DataSetTest.scala → .../com/paypal/gimel/hbase/DataSetTest.scala
diff --git a/...el/hbase/utilities/HBaseCatalogTest.scala → ...el/hbase/utilities/HBaseCatalogTest.scala b/...el/hbase/utilities/HBaseCatalogTest.scala → ...el/hbase/utilities/HBaseCatalogTest.scala
diff --git a/...el/hbase/utilities/HBaseLocalClient.scala → ...el/hbase/utilities/HBaseLocalClient.scala b/...el/hbase/utilities/HBaseLocalClient.scala → ...el/hbase/utilities/HBaseLocalClient.scala
diff --git a/...mel/hbase/utilities/HBaseLookUpTest.scala → ...mel/hbase/utilities/HBaseLookUpTest.scala b/...mel/hbase/utilities/HBaseLookUpTest.scala → ...mel/hbase/utilities/HBaseLookUpTest.scala
diff --git a/.../gimel/hbase/utilities/HBasePutTest.scala → .../gimel/hbase/utilities/HBasePutTest.scala b/.../gimel/hbase/utilities/HBasePutTest.scala → .../gimel/hbase/utilities/HBasePutTest.scala
diff --git a/...el/hbase/utilities/HBaseScannerTest.scala → ...el/hbase/utilities/HBaseScannerTest.scala b/...el/hbase/utilities/HBaseScannerTest.scala → ...el/hbase/utilities/HBaseScannerTest.scala
diff --git a/...e/utilities/HBaseSparkConnectorTest.scala → ...e/utilities/HBaseSparkConnectorTest.scala b/...e/utilities/HBaseSparkConnectorTest.scala → ...e/utilities/HBaseSparkConnectorTest.scala
diff --git a/.../hbase/utilities/HBaseUtilitiesTest.scala → .../hbase/utilities/HBaseUtilitiesTest.scala b/.../hbase/utilities/HBaseUtilitiesTest.scala → .../hbase/utilities/HBaseUtilitiesTest.scala
diff --git a/...i/gimel-connectors/gimel-hive-1.2/pom.xml → ...taapi/gimel-connectors/gimel-hive/pom.xml b/...i/gimel-connectors/gimel-hive-1.2/pom.xml → ...taapi/gimel-connectors/gimel-hive/pom.xml
@@ -28,7 +28,7 @@ under the License.
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>gimel-hive-1.2</artifactId>
+  <artifactId>gimel-hive</artifactId>
   <version>2.4.7-SNAPSHOT</version>
 
   <dependencies>

diff --git a/...scala/com/paypal/gimel/hdfs/DataSet.scala → ...scala/com/paypal/gimel/hdfs/DataSet.scala b/...scala/com/paypal/gimel/hdfs/DataSet.scala → ...scala/com/paypal/gimel/hdfs/DataSet.scala
diff --git a/...l/hdfs/conf/HdfsClientConfiguration.scala → ...l/hdfs/conf/HdfsClientConfiguration.scala b/...l/hdfs/conf/HdfsClientConfiguration.scala → ...l/hdfs/conf/HdfsClientConfiguration.scala
diff --git a/.../paypal/gimel/hdfs/conf/HdfsConfigs.scala → .../paypal/gimel/hdfs/conf/HdfsConfigs.scala b/.../paypal/gimel/hdfs/conf/HdfsConfigs.scala → .../paypal/gimel/hdfs/conf/HdfsConfigs.scala
diff --git a/...aypal/gimel/hdfs/conf/HdfsConstants.scala → ...aypal/gimel/hdfs/conf/HdfsConstants.scala b/...aypal/gimel/hdfs/conf/HdfsConstants.scala → ...aypal/gimel/hdfs/conf/HdfsConstants.scala
diff --git a/.../gimel/hdfs/utilities/HDFSUtilities.scala → .../gimel/hdfs/utilities/HDFSUtilities.scala b/.../gimel/hdfs/utilities/HDFSUtilities.scala → .../gimel/hdfs/utilities/HDFSUtilities.scala
diff --git a/...scala/com/paypal/gimel/hive/DataSet.scala → ...scala/com/paypal/gimel/hive/DataSet.scala b/...scala/com/paypal/gimel/hive/DataSet.scala → ...scala/com/paypal/gimel/hive/DataSet.scala
diff --git a/.../paypal/gimel/hive/conf/HiveConfigs.scala → .../paypal/gimel/hive/conf/HiveConfigs.scala b/.../paypal/gimel/hive/conf/HiveConfigs.scala → .../paypal/gimel/hive/conf/HiveConfigs.scala
diff --git a/...aypal/gimel/hive/conf/HiveConstants.scala → ...aypal/gimel/hive/conf/HiveConstants.scala b/...aypal/gimel/hive/conf/HiveConstants.scala → ...aypal/gimel/hive/conf/HiveConstants.scala
diff --git a/.../gimel/hive/utilities/HiveJDBCUtils.scala → .../gimel/hive/utilities/HiveJDBCUtils.scala b/.../gimel/hive/utilities/HiveJDBCUtils.scala → .../gimel/hive/utilities/HiveJDBCUtils.scala
diff --git a/.../hive/utilities/HiveSchemaTemplates.scala → .../hive/utilities/HiveSchemaTemplates.scala b/.../hive/utilities/HiveSchemaTemplates.scala → .../hive/utilities/HiveSchemaTemplates.scala
diff --git a/...imel/hive/utilities/HiveSchemaUtils.scala → ...imel/hive/utilities/HiveSchemaUtils.scala b/...imel/hive/utilities/HiveSchemaUtils.scala → ...imel/hive/utilities/HiveSchemaUtils.scala
diff --git a/...ypal/gimel/hive/utilities/HiveUtils.scala → ...ypal/gimel/hive/utilities/HiveUtils.scala b/...ypal/gimel/hive/utilities/HiveUtils.scala → ...ypal/gimel/hive/utilities/HiveUtils.scala
diff --git a/...ive-1.2/src/test/resources/hdfs_test.avro → ...el-hive/src/test/resources/hdfs_test.avro b/...ive-1.2/src/test/resources/hdfs_test.avro → ...el-hive/src/test/resources/hdfs_test.avro
diff --git a/...hive-1.2/src/test/resources/hdfs_test.csv → ...mel-hive/src/test/resources/hdfs_test.csv b/...hive-1.2/src/test/resources/hdfs_test.csv → ...mel-hive/src/test/resources/hdfs_test.csv
diff --git a/...ive-1.2/src/test/resources/hdfs_test.json → ...el-hive/src/test/resources/hdfs_test.json b/...ive-1.2/src/test/resources/hdfs_test.json → ...el-hive/src/test/resources/hdfs_test.json
diff --git a/...-1.2/src/test/resources/hdfs_test.parquet → ...hive/src/test/resources/hdfs_test.parquet b/...-1.2/src/test/resources/hdfs_test.parquet → ...hive/src/test/resources/hdfs_test.parquet
diff --git a/...hive-1.2/src/test/resources/hdfs_test.seq → ...mel-hive/src/test/resources/hdfs_test.seq b/...hive-1.2/src/test/resources/hdfs_test.seq → ...mel-hive/src/test/resources/hdfs_test.seq
diff --git a/...hive-1.2/src/test/resources/hdfs_test.txt → ...mel-hive/src/test/resources/hdfs_test.txt b/...hive-1.2/src/test/resources/hdfs_test.txt → ...mel-hive/src/test/resources/hdfs_test.txt
diff --git a/...e-1.2/src/test/resources/hdfs_test.txt.gz → ...-hive/src/test/resources/hdfs_test.txt.gz b/...e-1.2/src/test/resources/hdfs_test.txt.gz → ...-hive/src/test/resources/hdfs_test.txt.gz
diff --git a/...a/com/paypal/gimel/hdfs/DataSetTest.scala → ...a/com/paypal/gimel/hdfs/DataSetTest.scala b/...a/com/paypal/gimel/hdfs/DataSetTest.scala → ...a/com/paypal/gimel/hdfs/DataSetTest.scala
diff --git a/gimel-dataapi/pom.xml b/gimel-dataapi/pom.xml
@@ -39,10 +39,10 @@ under the License.
         <module>gimel-logger</module>
         <module>gimel-common</module>
         <module>gimel-connectors/gimel-sftp</module>
-        <module>gimel-connectors/gimel-elasticsearch-6.2</module>
+        <module>gimel-connectors/gimel-elasticsearch</module>
+        <module>gimel-connectors/gimel-hive</module>
         <module>gimel-connectors/gimel-jdbc</module>
-        <module>gimel-connectors/gimel-hive-1.2</module>
-        <module>gimel-connectors/gimel-hbase-1.2</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-kafka-2.2</module>