From 662e1a60ac82a1c6a811cbb257661b66169d6cd5 Mon Sep 17 00:00:00 2001
From: Tianzi Cai <anguillanneuf@gmail.com>
Date: Wed, 20 Oct 2021 18:41:40 -0400
Subject: [PATCH 1/4] chore(deps): update Spark version+nits

---
 java/pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index dde84d9..05f25c3 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -81,12 +81,13 @@
 		<maven.shade.plugin.version>3.2.0</maven.shade.plugin.version>
 		<maven.site.plugin>3.5.1</maven.site.plugin>
 		<maven.taglist.plugin>2.4</maven.taglist.plugin>
+		<maven.findbugs.plugin>4.4.2</maven.findbugs.plugin>
 		<maven.versions.plugin>2.2</maven.versions.plugin>
 		<apache.maven.rat.version>0.12</apache.maven.rat.version>
 
-		<spark.version>2.3.2</spark.version>
+		<spark.version>2.4.7</spark.version>
 		<scala.binary.version>2.11</scala.binary.version>
-		<gcloud.pubsub.version>v1-rev403-1.25.0</gcloud.pubsub.version>
+		<gcloud.pubsub.version>v1-rev452-1.25.0</gcloud.pubsub.version>
 		<jackson.databind.version>2.9.7</jackson.databind.version>
 		<apache.commons.lang3.version>3.8.1</apache.commons.lang3.version>
 		<apache.commons.collections4.version>4.2</apache.commons.collections4.version>
@@ -355,7 +356,7 @@
 						<plugin>
 							<groupId>org.apache.rat</groupId>
 							<artifactId>apache-rat-plugin</artifactId>
-							<version>${apapache.maven.rat.version}</version>
+							<version>${apache.maven.rat.version}</version>
 						</plugin>
 					</reportPlugins>
 					<locales>en</locales>
@@ -453,4 +454,4 @@
 			<url>s3://maven.signifai.io/release</url>
 		</repository>
 	</distributionManagement>
-</project>
\ No newline at end of file
+</project>

From 0a468b2893d907ae5792add35efe7bd4d49c95eb Mon Sep 17 00:00:00 2001
From: Tianzi Cai <anguillanneuf@gmail.com>
Date: Wed, 20 Oct 2021 18:42:38 -0400
Subject: [PATCH 2/4] docs: set decodeData to true in message receiver

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5bbd738..bacc982 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ import org.apache.spark.rdd._
 val SUBSCRIPTION = "<My SUBSCRIPTION>"
 
 var ssc = new StreamingContext(sc,Seconds(5))
-var pubsubReceiver = new PubsubReceiver(SUBSCRIPTION, 10)
+var pubsubReceiver = new PubsubReceiver(SUBSCRIPTION, 10, true)
 val customReceiverStream = ssc.receiverStream(pubsubReceiver)
 customReceiverStream.map(x => x).foreachRDD((x: RDD[String]) => println(x.count))
 customReceiverStream.map(x => x).foreachRDD((x: RDD[String]) => println(x))
@@ -85,7 +85,7 @@ from signifai.pubsub import PubsubUtils
 SUBSCRIPTION = "<MY SUBSCRIPTION>"
 
 ssc = StreamingContext(sc, 1)
-pubsubStream = PubsubUtils.createStream(ssc, SUBSCRIPTION, 5)
+pubsubStream = PubsubUtils.createStream(ssc, SUBSCRIPTION, 5, True)
 pubsubStream.flatMap(lambda x: x).pprint()
 ssc.start()
 ```

From 398be83a99e4ad5110ecd840bc7822fb1387d192 Mon Sep 17 00:00:00 2001
From: Tianzi Cai <tianzi@google.com>
Date: Thu, 21 Oct 2021 11:17:42 -0700
Subject: [PATCH 3/4] update Spark to 2.4.8

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

diff --git a/java/pom.xml b/java/pom.xml
index 05f25c3..36966af 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -85,7 +85,7 @@
 		<maven.versions.plugin>2.2</maven.versions.plugin>
 		<apache.maven.rat.version>0.12</apache.maven.rat.version>
 
-		<spark.version>2.4.7</spark.version>
+		<spark.version>2.4.8</spark.version>
 		<scala.binary.version>2.11</scala.binary.version>
 		<gcloud.pubsub.version>v1-rev452-1.25.0</gcloud.pubsub.version>
 		<jackson.databind.version>2.9.7</jackson.databind.version>

From ee7284d15fbb665c7902f36f5fb5e183b6db10b6 Mon Sep 17 00:00:00 2001
From: Tianzi Cai <tianzi@google.com>
Date: Thu, 21 Oct 2021 16:38:01 -0700
Subject: [PATCH 4/4] chore(deps): update scala to 2.12

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

diff --git a/java/pom.xml b/java/pom.xml
index 36966af..a62e255 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -86,7 +86,7 @@
 		<apache.maven.rat.version>0.12</apache.maven.rat.version>
 
 		<spark.version>2.4.8</spark.version>
-		<scala.binary.version>2.11</scala.binary.version>
+		<scala.binary.version>2.12</scala.binary.version>
 		<gcloud.pubsub.version>v1-rev452-1.25.0</gcloud.pubsub.version>
 		<jackson.databind.version>2.9.7</jackson.databind.version>
 		<apache.commons.lang3.version>3.8.1</apache.commons.lang3.version>