From aa64b8c990666c0f1d90c4d73f2d1a411ab58a49 Mon Sep 17 00:00:00 2001
From: Suresh Srinivas <srini30005@gmail.com>
Date: Thu, 17 Feb 2022 23:37:50 -0800
Subject: [PATCH] Fixes #2841 - Upgrade maven dependencies for release 0.9
 (#2842)

---
 catalog-rest-service/pom.xml                  |  8 +++---
 .../ElasticSearchEventPublisher.java          |  4 ++-
 .../ElasticSearchIndexDefinition.java         |  2 +-
 .../resources/search/SearchResource.java      |  2 +-
 common/pom.xml                                |  8 +++---
 openmetadata-ui/pom.xml                       |  6 ++---
 pom.xml                                       | 26 +++++++++----------
 7 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/catalog-rest-service/pom.xml b/catalog-rest-service/pom.xml
index c195d87982b..b72abe16d53 100644
--- a/catalog-rest-service/pom.xml
+++ b/catalog-rest-service/pom.xml
@@ -13,8 +13,8 @@
 
   <properties>
     <dropwizard.swagger.version>2.0.12-1</dropwizard.swagger.version>
-    <testng.version>7.4.0</testng.version>
-    <selenium.version>4.0.0</selenium.version>
+    <testng.version>7.5</testng.version>
+    <selenium.version>4.1.2</selenium.version>
 
     <sonar.junit.reportPaths>${project.basedir}/target/surefire-reports</sonar.junit.reportPaths>
     <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
@@ -285,14 +285,14 @@
     <dependency>
       <groupId>com.auth0</groupId>
       <artifactId>java-jwt</artifactId>
-      <version>3.18.2</version>
+      <version>3.18.3</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/com.auth0/jwks-rsa -->
     <dependency>
       <groupId>com.auth0</groupId>
       <artifactId>jwks-rsa</artifactId>
-      <version>0.20.0</version>
+      <version>0.20.2</version>
     </dependency>
 
 
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchEventPublisher.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchEventPublisher.java
index b2da938bf22..7ff2f21dee5 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchEventPublisher.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchEventPublisher.java
@@ -27,10 +27,10 @@ import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptType;
+import org.elasticsearch.xcontent.XContentType;
 import org.openmetadata.catalog.Entity;
 import org.openmetadata.catalog.elasticsearch.ElasticSearchIndexDefinition.ElasticSearchIndexType;
 import org.openmetadata.catalog.entity.data.Dashboard;
@@ -146,6 +146,7 @@ public class ElasticSearchEventPublisher extends AbstractEventPublisher {
     scriptTxt.append("ctx._source.last_updated_timestamp=params.last_updated_timestamp;");
     for (FieldChange fieldChange : fieldsAdded) {
       if (fieldChange.getName().equalsIgnoreCase("followers")) {
+        @SuppressWarnings("unchecked")
         List<EntityReference> entityReferences = (List<EntityReference>) fieldChange.getNewValue();
         List<String> newFollowers = new ArrayList<>();
         for (EntityReference follower : entityReferences) {
@@ -158,6 +159,7 @@ public class ElasticSearchEventPublisher extends AbstractEventPublisher {
 
     for (FieldChange fieldChange : changeDescription.getFieldsDeleted()) {
       if (fieldChange.getName().equalsIgnoreCase("followers")) {
+        @SuppressWarnings("unchecked")
         List<EntityReference> entityReferences = (List<EntityReference>) fieldChange.getOldValue();
         for (EntityReference follower : entityReferences) {
           fieldAddParams.put(fieldChange.getName(), follower.getId().toString());
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchIndexDefinition.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchIndexDefinition.java
index 7d6d2eb4a5c..f54044ff65e 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchIndexDefinition.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchIndexDefinition.java
@@ -28,7 +28,7 @@ import org.elasticsearch.client.indices.CreateIndexRequest;
 import org.elasticsearch.client.indices.CreateIndexResponse;
 import org.elasticsearch.client.indices.GetIndexRequest;
 import org.elasticsearch.client.indices.PutMappingRequest;
-import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.xcontent.XContentType;
 import org.openmetadata.catalog.Entity;
 import org.openmetadata.catalog.entity.data.Dashboard;
 import org.openmetadata.catalog.entity.data.Pipeline;
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/search/SearchResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/search/SearchResource.java
index c353c1d8165..a8bec38416f 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/search/SearchResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/search/SearchResource.java
@@ -38,7 +38,7 @@ import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
diff --git a/common/pom.xml b/common/pom.xml
index ce7b292542f..bd07e517036 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -22,7 +22,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <properties>
-    <dropwizard.swagger.version>1.2.4-2</dropwizard.swagger.version>
+    <dropwizard.swagger.version>2.0.12-1</dropwizard.swagger.version>
   </properties>
 
   <artifactId>common</artifactId>
@@ -83,14 +83,14 @@
     <dependency>
       <groupId>com.auth0</groupId>
       <artifactId>java-jwt</artifactId>
-      <version>3.18.2</version>
+      <version>3.18.3</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/com.auth0/jwks-rsa -->
     <dependency>
       <groupId>com.auth0</groupId>
       <artifactId>jwks-rsa</artifactId>
-      <version>0.20.0</version>
+      <version>0.20.2</version>
     </dependency>
 
     <!--test dependencies-->
@@ -107,7 +107,7 @@
     <dependency>
       <groupId>com.networknt</groupId>
       <artifactId>json-schema-validator</artifactId>
-      <version>1.0.64</version>
+      <version>1.0.66</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
diff --git a/openmetadata-ui/pom.xml b/openmetadata-ui/pom.xml
index 0422c4bf300..5ab0fbceb71 100644
--- a/openmetadata-ui/pom.xml
+++ b/openmetadata-ui/pom.xml
@@ -13,8 +13,8 @@
 
   <properties>
     <dropwizard.swagger.version>2.0.12-1</dropwizard.swagger.version>
-    <testng.version>7.4.0</testng.version>
-    <selenium.version>4.1.1</selenium.version>
+    <testng.version>7.5</testng.version>
+    <selenium.version>4.1.2</selenium.version>
   </properties>
 
   <dependencies>
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.rest-assured</groupId>
       <artifactId>rest-assured</artifactId>
-      <version>4.4.0</version>
+      <version>4.5.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index e0092efaba0..3b0f900993f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <mockito.version>4.2.0</mockito.version>
-    <slf4j.version>1.7.31</slf4j.version>
+    <mockito.version>4.3.1</mockito.version>
+    <slf4j.version>1.7.36</slf4j.version>
     <jackson.version>2.13.1</jackson.version>
     <dropwizard.version>2.0.28</dropwizard.version>
     <dropwizard-jdbi3.version>2.0.28</dropwizard-jdbi3.version>
@@ -56,29 +56,29 @@
     <jaxb.version>3.0.2</jaxb.version>
     <wiremock-standalone.version>2.15.0</wiremock-standalone.version>
     <jacoco-plugin.version>0.8.6</jacoco-plugin.version>
-    <jdbi3.version>3.26.0</jdbi3.version>
+    <jdbi3.version>3.27.1</jdbi3.version>
     <jeasy.version>4.1.0</jeasy.version>
     <commons-cli.version>1.5.0</commons-cli.version>
     <commons-io.version>2.11.0</commons-io.version>
-    <flyway.version>8.0.4</flyway.version>
-    <redshift-jdbc.version>2.1.0.3</redshift-jdbc.version>
-    <gson.version>2.8.9</gson.version>
-    <mysql.connector.version>8.0.27</mysql.connector.version>
+    <flyway.version>8.1.0</flyway.version>
+    <redshift-jdbc.version>2.1.0.4</redshift-jdbc.version>
+    <gson.version>2.9.0</gson.version>
+    <mysql.connector.version>8.0.28</mysql.connector.version>
     <jsonschema2pojo.version>1.1.1</jsonschema2pojo.version>
     <commons-lang.version>2.6</commons-lang.version>
     <lombok.version>1.18.22</lombok.version>
     <tomcat-jdbc.version>10.0.8</tomcat-jdbc.version>
-    <elasticsearch.version>7.13.2</elasticsearch.version>
+    <elasticsearch.version>7.17.0</elasticsearch.version>
     <httpasyncclient.version>4.1.5</httpasyncclient.version>
-    <openapiswagger.version>2.1.12</openapiswagger.version>
+    <openapiswagger.version>2.1.13</openapiswagger.version>
     <nimbus-jose-jwt.version>7.9</nimbus-jose-jwt.version>
     <spring-security-kerberos-core.version>1.0.1.RELEASE</spring-security-kerberos-core.version>
     <httpclient.version>4.5.13</httpclient.version>
-    <spring.version>5.3.14</spring.version>
+    <spring.version>5.3.16</spring.version>
     <log4j.version>2.17.0</log4j.version>
     <org.junit.jupiter.version>5.8.2</org.junit.jupiter.version>
     <dropwizard-health.version>1.7.1</dropwizard-health.version>
-    <fernet.version>1.4.2</fernet.version>
+    <fernet.version>1.5.0</fernet.version>
 
     <!--   sonar   -Dsonar.login=XXX  -->
     <sonar.projectKey>open-metadata_OpenMetadata</sonar.projectKey>
@@ -393,7 +393,7 @@
       <dependency>
         <groupId>org.apache.johnzon</groupId>
         <artifactId>johnzon-core</artifactId>
-        <version>1.2.15</version>
+        <version>1.2.16</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -538,7 +538,7 @@
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>9.2.1</version>
+              <version>9.3</version>
             </dependency>
           </dependencies>
         </plugin>