From e29b31b85ff314acd3aa8418a9df8330f4ae586c Mon Sep 17 00:00:00 2001
From: Pandiyan Appavu <pandi@google.com>
Date: Tue, 6 Dec 2022 16:29:06 -0800
Subject: [PATCH] Bump up CDAP and Hadoop version to fix the log4j
 vulnerability

Disable cdap-explore
---
 pom.xml                                                | 10 +++++-----
 .../cdap/plugin/sendgrid/etl/SendGridSourceTest.java   |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index b9af23b..c026699 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,9 +27,9 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <cdap.version>6.1.1</cdap.version>
-        <hadoop.version>2.8.0</hadoop.version>
-        <hydrator.version>2.3.0-SNAPSHOT</hydrator.version>
+        <cdap.version>6.8.0</cdap.version>
+        <hadoop.version>2.10.2</hadoop.version>
+        <hydrator.version>2.10.0</hydrator.version>
         <gson.version>2.2.4</gson.version>
         <common.logging.version>1.2</common.logging.version>
         <junit.version>4.11</junit.version>
@@ -266,7 +266,7 @@
         </dependency>
         <dependency>
             <groupId>io.cdap.cdap</groupId>
-            <artifactId>cdap-data-pipeline</artifactId>
+            <artifactId>cdap-data-pipeline2_2.11</artifactId>
             <version>${cdap.version}</version>
             <scope>test</scope>
         </dependency>
@@ -319,7 +319,7 @@
                <version>1.1.0</version>
                <configuration>
                    <cdapArtifacts>
-                       <parent>system:cdap-data-pipeline[6.1.1,7.0.0-SNAPSHOT)</parent>
+                       <parent>system:cdap-data-pipeline[6.8.0,7.0.0-SNAPSHOT)</parent>
                    </cdapArtifacts>
                </configuration>
                <executions>
diff --git a/src/test/java/io/cdap/plugin/sendgrid/etl/SendGridSourceTest.java b/src/test/java/io/cdap/plugin/sendgrid/etl/SendGridSourceTest.java
index d498923..a7ea8ee 100644
--- a/src/test/java/io/cdap/plugin/sendgrid/etl/SendGridSourceTest.java
+++ b/src/test/java/io/cdap/plugin/sendgrid/etl/SendGridSourceTest.java
@@ -34,6 +34,7 @@
 import io.cdap.cdap.proto.id.NamespaceId;
 import io.cdap.cdap.test.ApplicationManager;
 import io.cdap.cdap.test.DataSetManager;
+import io.cdap.cdap.test.TestConfiguration;
 import io.cdap.cdap.test.WorkflowManager;
 import io.cdap.plugin.sendgrid.BaseTest;
 import io.cdap.plugin.sendgrid.batch.source.SendGridSource;
@@ -46,6 +47,7 @@
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
+import org.junit.ClassRule;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -56,6 +58,9 @@
 import java.util.stream.Stream;
 
 public class SendGridSourceTest extends HydratorTestBase {
+  @ClassRule
+  public static final TestConfiguration CONFIG = new TestConfiguration("explore.enabled", false);
+
   private static final ArtifactSummary APP_ARTIFACT = new ArtifactSummary("data-pipeline", "3.2.0");
   private static final String LAST_NAME_FIELD = "last_name";
   private static final String ID_FIELD = "id";