From b6888fe6f9a4c29c4f85e57d0e0fc82f89ebb2ad Mon Sep 17 00:00:00 2001
From: Dhrubajyoti Sadhu <dhsadhu@expediagroup.com>
Date: Thu, 2 May 2024 14:24:57 +0100
Subject: [PATCH] Test cases failing

---
 ...ue-datacatalog-client-common-1.10.0-WD.pom |  5 ---
 pom.xml                                       | 43 ++++++++++++-------
 waggle-dance-api/pom.xml                      |  2 +-
 .../api/model/AbstractMetaStoreTest.java      |  6 +--
 .../api/model/FederatedMetaStoreTest.java     |  4 +-
 .../api/model/PrimaryMetaStoreTest.java       |  4 +-
 6 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/lib/aws-glue-datacatalog-client-common-1.10.0-WD.pom b/lib/aws-glue-datacatalog-client-common-1.10.0-WD.pom
index a50c30c0a..efd93ceb5 100644
--- a/lib/aws-glue-datacatalog-client-common-1.10.0-WD.pom
+++ b/lib/aws-glue-datacatalog-client-common-1.10.0-WD.pom
@@ -87,11 +87,6 @@
             <artifactId>shims-loader</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index bfdbbb025..373c1640f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,29 +34,30 @@
   </modules>
 
   <properties>
-    <jdk.version>11</jdk.version>
+    <jdk.version>17</jdk.version>
     <maven.release.plugin.version>3.0.1</maven.release.plugin.version>
-    <maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version>
-    <spring-boot.version>2.7.11</spring-boot.version>
-    <hadoop.version>2.10.1</hadoop.version>
+    <maven.surefire.plugin.version>3.0.0-M7</maven.surefire.plugin.version>
+    <spring-boot.version>3.0.4</spring-boot.version>
+    <hadoop.version>3.3.4</hadoop.version>
     <hamcrest.version>2.2</hamcrest.version>
-    <hive.version>2.3.7</hive.version>
-    <junit.version>4.13.1</junit.version>
-    <mockito.version>3.5.15</mockito.version>
+    <hive.version>3.1.3</hive.version>
+    <junit.version>4.13.2</junit.version>
+    <mockito.version>4.11.0</mockito.version>
     <aspectj-maven-plugin.version>1.14.0</aspectj-maven-plugin.version>
-    <aspectj.version>1.9.2</aspectj.version>
+    <aspectj.version>1.9.9.1</aspectj.version>
     <beeju.version>4.0.0</beeju.version>
-    <guava.version>23.0</guava.version>
-    <guice.version>4.0</guice.version>
-    <log4j2.version>2.17.1</log4j2.version>
+    <guava.version>31.1-jre</guava.version>
+    <guice.version>5.1.0</guice.version>
+    <log4j2.version>2.19.0</log4j2.version>
     <hcommon-hive-metastore.version>1.2.3</hcommon-hive-metastore.version>
-    <jackson.version>2.9.8</jackson.version>
-    <jackson.databind.version>2.9.10.8</jackson.databind.version>
-    <curator.version>2.13.0</curator.version>
-    <joda-time.version>2.9.9</joda-time.version>
-    <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
+    <jackson.version>2.14.2</jackson.version>
+    <jackson.databind.version>2.14.2</jackson.databind.version>
+    <curator.version>5.4.0</curator.version>
+    <joda-time.version>2.10.14</joda-time.version>
+    <maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
     <maven.compiler.source>${jdk.version}</maven.compiler.source>
     <maven.compiler.target>${jdk.version}</maven.compiler.target>
+    <spotless.maven.plugin.version>2.43.0</spotless.maven.plugin.version>
   </properties>
 
   <dependencyManagement>
@@ -314,6 +315,16 @@
         <artifactId>joda-time</artifactId>
         <version>${joda-time.version}</version>
       </dependency>
+      <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>2.0.1.Final</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>4.0.1</version>
+    </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/waggle-dance-api/pom.xml b/waggle-dance-api/pom.xml
index 6357e9cb2..b21183e68 100644
--- a/waggle-dance-api/pom.xml
+++ b/waggle-dance-api/pom.xml
@@ -120,4 +120,4 @@
     </dependency>
   </dependencies>
 
-</project>
+  </project>
diff --git a/waggle-dance-api/src/test/java/com/hotels/bdp/waggledance/api/model/AbstractMetaStoreTest.java b/waggle-dance-api/src/test/java/com/hotels/bdp/waggledance/api/model/AbstractMetaStoreTest.java
index f93d3b31a..bf1e55263 100644
--- a/waggle-dance-api/src/test/java/com/hotels/bdp/waggledance/api/model/AbstractMetaStoreTest.java
+++ b/waggle-dance-api/src/test/java/com/hotels/bdp/waggledance/api/model/AbstractMetaStoreTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2022 Expedia, Inc.
+ * Copyright (C) 2016-2024 Expedia, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,13 +27,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-
 import org.hibernate.validator.HibernateValidator;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 
+import jakarta.validation.ConstraintViolation;
+
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.Lists;
 
diff --git a/waggle-dance-api/src/test/java/com/hotels/bdp/waggledance/api/model/FederatedMetaStoreTest.java b/waggle-dance-api/src/test/java/com/hotels/bdp/waggledance/api/model/FederatedMetaStoreTest.java
index 4df11f6eb..b776c94dd 100644
--- a/waggle-dance-api/src/test/java/com/hotels/bdp/waggledance/api/model/FederatedMetaStoreTest.java
+++ b/waggle-dance-api/src/test/java/com/hotels/bdp/waggledance/api/model/FederatedMetaStoreTest.java
@@ -20,10 +20,10 @@
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-
 import org.junit.Test;
 
+import jakarta.validation.ConstraintViolation;
+
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
diff --git a/waggle-dance-api/src/test/java/com/hotels/bdp/waggledance/api/model/PrimaryMetaStoreTest.java b/waggle-dance-api/src/test/java/com/hotels/bdp/waggledance/api/model/PrimaryMetaStoreTest.java
index 212787d45..f12cafe40 100644
--- a/waggle-dance-api/src/test/java/com/hotels/bdp/waggledance/api/model/PrimaryMetaStoreTest.java
+++ b/waggle-dance-api/src/test/java/com/hotels/bdp/waggledance/api/model/PrimaryMetaStoreTest.java
@@ -23,10 +23,10 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-
 import org.junit.Test;
 
+import jakarta.validation.ConstraintViolation;
+
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;