From 3d00a76810b0cbe74597e7ca8afd3b6d879572b0 Mon Sep 17 00:00:00 2001
From: Ruchir Vani <32844383+ruchirvaninasdaq@users.noreply.github.com>
Date: Mon, 7 Mar 2022 14:45:22 -0500
Subject: [PATCH] Release 0.7.x release

1. Updated Strimzi Oauth common version to 0.8.1
2. Updated kafka version to 2.8.0
3. Fixing vulnerabilities highlighted by github scan
---
 ncds-sdk/pom.xml                              | 30 ++++---------------
 .../core/controlevent/StreamInitiated.java    |  6 ----
 ncdssdk-client/pom.xml                        |  3 +-
 pom.xml                                       |  8 ++---
 4 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/ncds-sdk/pom.xml b/ncds-sdk/pom.xml
index b0671e0..8af6ffe 100644
--- a/ncds-sdk/pom.xml
+++ b/ncds-sdk/pom.xml
@@ -7,37 +7,25 @@
     <parent>
         <groupId>com.nasdaq.ncds</groupId>
         <artifactId>ncds</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
     </parent>
 
     <artifactId>ncds-sdk</artifactId>
     <packaging>jar</packaging>
     <properties>
         <kafkaScalaVersion>kafka_2.12</kafkaScalaVersion>
-        <junit5.version>5.6.2</junit5.version>
+        <junit5.version>5.7.2</junit5.version>
         <junit5PlatformProvider.version>1.3.2</junit5PlatformProvider.version>
         <curatorTestVersion>2.12.0</curatorTestVersion>
         <slf4jVersion>1.7.30</slf4jVersion>
         <surefire.version>2.22.2</surefire.version>
+        <strimzi.oauth.version>0.8.1</strimzi.oauth.version>
     </properties>
 
     <name>SDK</name>
     <description>Provide Development Kit to connect with Kafka</description>
 
     <dependencies>
-        <!-- Apache https for getting certificate -->
-
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.10</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.5</version>
-        </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.json/json -->
         <dependency>
@@ -50,8 +38,7 @@
         <dependency>
             <groupId>io.strimzi</groupId>
             <artifactId>kafka-oauth-common</artifactId>
-            <version>0.6.0</version>
-            <scope>compile</scope>
+            <version>${strimzi.oauth.version}</version>
         </dependency>
 
         <!--  Testing -->
@@ -78,7 +65,7 @@
         <dependency>
             <groupId>com.salesforce.kafka.test</groupId>
             <artifactId>kafka-junit-core</artifactId>
-            <version>3.2.2</version>
+            <version>3.2.3</version>
             <scope>test</scope>
         </dependency>
 
@@ -135,13 +122,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.3.176</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
     <build>
diff --git a/ncds-sdk/src/test/java/com/nasdaq/ncdsclient/core/controlevent/StreamInitiated.java b/ncds-sdk/src/test/java/com/nasdaq/ncdsclient/core/controlevent/StreamInitiated.java
index 483580f..1e75246 100644
--- a/ncds-sdk/src/test/java/com/nasdaq/ncdsclient/core/controlevent/StreamInitiated.java
+++ b/ncds-sdk/src/test/java/com/nasdaq/ncdsclient/core/controlevent/StreamInitiated.java
@@ -1,7 +1,6 @@
 package com.nasdaq.ncdsclient.core.controlevent;
 
 import org.apache.avro.Schema;
-import org.h2.util.StringUtils;
 
 import java.time.LocalDate;
 import java.util.Date;
@@ -61,11 +60,6 @@ public Schema getMessageSchema() {
         return messageSchema;
     }
 
-    public boolean isSameStreamForDate(final StreamInitiated other) {
-        return StringUtils.equals(this.name, other.name)
-                && this.referenceDate.equals(other.referenceDate);
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/ncdssdk-client/pom.xml b/ncdssdk-client/pom.xml
index 8cf7847..c4ac94b 100644
--- a/ncdssdk-client/pom.xml
+++ b/ncdssdk-client/pom.xml
@@ -7,11 +7,12 @@
     <parent>
         <groupId>com.nasdaq.ncds</groupId>
         <artifactId>ncds</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
     </parent>
 
     <artifactId>ncdssdk-client</artifactId>
     <packaging>jar</packaging>
+
     <name>Client</name>
     <description>Provide example client to interact with data</description>
 
diff --git a/pom.xml b/pom.xml
index 43d6833..bc6da82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.nasdaq.ncds</groupId>
     <artifactId>ncds</artifactId>
-    <version>0.6.0</version>
+    <version>0.7.0</version>
     <packaging>pom</packaging>
     <name>Nasdaq Cloud Data Service </name>
 
@@ -16,7 +16,8 @@
 
     <properties>
         <avro.version>1.8.2</avro.version>
-        <kafka.version>2.6.0</kafka.version>
+        <kafka.version>2.8.0</kafka.version>
+        <strimzi.oauth.version>0.8.1</strimzi.oauth.version>
         <checkstyle.skip>true</checkstyle.skip>
     </properties>
 
@@ -40,10 +41,9 @@
         <dependency>
             <groupId>io.strimzi</groupId>
             <artifactId>kafka-oauth-client</artifactId>
-            <version>0.6.0</version>
+            <version>${strimzi.oauth.version}</version>
         </dependency>
 
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>