From f7e1ffa2ad7a6e4eb65e2d1bb2712fc876af4320 Mon Sep 17 00:00:00 2001
From: Felipe Melo <felipesmmelo@gmail.com>
Date: Tue, 1 Oct 2019 17:40:25 +0200
Subject: [PATCH 1/3] Bumping up ABRiS and Spark versions.

---
 .../avro/confluent/ConfluentAvroKafkaStreamDecoder.scala    | 5 ++++-
 parent-conf/pom.xml                                         | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ingestor-default/src/main/scala/za/co/absa/hyperdrive/ingestor/implementation/decoder/avro/confluent/ConfluentAvroKafkaStreamDecoder.scala b/ingestor-default/src/main/scala/za/co/absa/hyperdrive/ingestor/implementation/decoder/avro/confluent/ConfluentAvroKafkaStreamDecoder.scala
index a15b5530..e9d3bac1 100644
--- a/ingestor-default/src/main/scala/za/co/absa/hyperdrive/ingestor/implementation/decoder/avro/confluent/ConfluentAvroKafkaStreamDecoder.scala
+++ b/ingestor-default/src/main/scala/za/co/absa/hyperdrive/ingestor/implementation/decoder/avro/confluent/ConfluentAvroKafkaStreamDecoder.scala
@@ -57,7 +57,10 @@ private[decoder] class ConfluentAvroKafkaStreamDecoder(val topic: String, val sc
 
     import za.co.absa.abris.avro.functions.from_confluent_avro
     import org.apache.spark.sql.functions.col
-    streamReader.load().select(from_confluent_avro(col("value"), schemaRegistryFullSettings) as 'data).select("data.*")
+    streamReader
+      .load()
+      .select(from_confluent_avro(col("value"), schemaRegistryFullSettings) as 'data)
+      .select("data.*")
   }
 }
 
diff --git a/parent-conf/pom.xml b/parent-conf/pom.xml
index ced1c386..806ca583 100644
--- a/parent-conf/pom.xml
+++ b/parent-conf/pom.xml
@@ -43,7 +43,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!--ABRiS-->
-        <abris.version>3.0.1</abris.version>
+        <abris.version>3.0.2</abris.version>
 
         <!--Scala-->
         <scala.version>2.11.8</scala.version>
@@ -64,7 +64,7 @@
         <spark.sql.kafka.version>2.4.2</spark.sql.kafka.version>
 
         <!--Spark-->
-        <spark.version>2.4.0</spark.version>
+        <spark.version>2.4.4</spark.version>
 
         <!--Mockito-->
         <mockito.version>2.25.0</mockito.version>
@@ -148,7 +148,7 @@
             <!--ABRiS-->
             <dependency>
                 <groupId>za.co.absa</groupId>
-                <artifactId>abris_2.11</artifactId>
+                <artifactId>abris_${scala.compat.version}</artifactId>
                 <version>${abris.version}</version>
                 <exclusions>
                     <exclusion>

From 2186cb8825f205d7ce565e14157900b85128b262 Mon Sep 17 00:00:00 2001
From: Felipe Melo <felipesmmelo@gmail.com>
Date: Wed, 2 Oct 2019 10:33:14 +0200
Subject: [PATCH 2/3] Bumping Spark Kafka version.

---
 parent-conf/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent-conf/pom.xml b/parent-conf/pom.xml
index 806ca583..10748d11 100644
--- a/parent-conf/pom.xml
+++ b/parent-conf/pom.xml
@@ -61,7 +61,7 @@
         <kafka.version>2.1.1</kafka.version>
         <spring.kafka.test.version>2.2.4.RELEASE</spring.kafka.test.version>
         <kafka.spark.version>0-10</kafka.spark.version>
-        <spark.sql.kafka.version>2.4.2</spark.sql.kafka.version>
+        <spark.sql.kafka.version>2.4.4</spark.sql.kafka.version>
 
         <!--Spark-->
         <spark.version>2.4.4</spark.version>

From 10d497e93523771f3b6e569b8eb4a7fe7109c0c7 Mon Sep 17 00:00:00 2001
From: Kevin Wallimann <kevin.wallimann@absa.africa>
Date: Wed, 2 Oct 2019 13:50:23 +0200
Subject: [PATCH 3/3] Only upgrade to 2.4.3 because no spark-shell for 2.4.4 is
 available on jedi

---
 parent-conf/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent-conf/pom.xml b/parent-conf/pom.xml
index 10748d11..ae1116ab 100644
--- a/parent-conf/pom.xml
+++ b/parent-conf/pom.xml
@@ -61,10 +61,10 @@
         <kafka.version>2.1.1</kafka.version>
         <spring.kafka.test.version>2.2.4.RELEASE</spring.kafka.test.version>
         <kafka.spark.version>0-10</kafka.spark.version>
-        <spark.sql.kafka.version>2.4.4</spark.sql.kafka.version>
+        <spark.sql.kafka.version>2.4.3</spark.sql.kafka.version>
 
         <!--Spark-->
-        <spark.version>2.4.4</spark.version>
+        <spark.version>2.4.3</spark.version>
 
         <!--Mockito-->
         <mockito.version>2.25.0</mockito.version>