From e0770502bf3f9a71d0bd035aed7ec94e96caad0a Mon Sep 17 00:00:00 2001
From: Dhrubajyoti Sadhu <dhsadhu@expediagroup.com>
Date: Thu, 4 Apr 2024 00:33:36 +0100
Subject: [PATCH] feat: Updated the java version to 11

---
 pom.xml                                         | 17 +++++++++++------
 waggle-dance-core/pom.xml                       |  1 +
 .../manifest/ManifestAttributes.java            |  4 ++--
 .../waggledance/server/FederatedHMSHandler.java |  2 +-
 .../manifest/ManifestAttributesTest.java        |  4 ++--
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5bf15c14b..bfdbbb025 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,16 +34,17 @@
   </modules>
 
   <properties>
-    <maven.release.plugin.version>2.5.3</maven.release.plugin.version>
-    <maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>
+    <jdk.version>11</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>
     <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>
-    <aspectj-maven-plugin.version>1.9</aspectj-maven-plugin.version>
-    <aspectj.version>1.8.9</aspectj.version>
+    <aspectj-maven-plugin.version>1.14.0</aspectj-maven-plugin.version>
+    <aspectj.version>1.9.2</aspectj.version>
     <beeju.version>4.0.0</beeju.version>
     <guava.version>23.0</guava.version>
     <guice.version>4.0</guice.version>
@@ -53,6 +54,9 @@
     <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>
+    <maven.compiler.source>${jdk.version}</maven.compiler.source>
+    <maven.compiler.target>${jdk.version}</maven.compiler.target>
   </properties>
 
   <dependencyManagement>
@@ -335,7 +339,7 @@
         </plugin>
         <plugin>
           <!-- NOTE: we are blocked on building waggle dance using Java 11
-            on the below, need to wait for https://github.com/mojohaus/aspectj-maven-plugin/pull/45 -->
+      on the below, need to wait for https://github.com/mojohaus/aspectj-maven-plugin/pull/45 -->
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>aspectj-maven-plugin</artifactId>
           <version>${aspectj-maven-plugin.version}</version>
@@ -374,7 +378,7 @@
           </executions>
         </plugin>
         <!--This plugin's configuration is used to store Eclipse m2e settings
-          only. It has no influence on the Maven build itself. -->
+      only. It has no influence on the Maven build itself. -->
         <plugin>
           <groupId>org.eclipse.m2e</groupId>
           <artifactId>lifecycle-mapping</artifactId>
@@ -414,4 +418,5 @@
       </plugins>
     </pluginManagement>
   </build>
+
 </project>
diff --git a/waggle-dance-core/pom.xml b/waggle-dance-core/pom.xml
index 3e51ad06e..cc1b855bf 100644
--- a/waggle-dance-core/pom.xml
+++ b/waggle-dance-core/pom.xml
@@ -1,6 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+
   <parent>
     <groupId>com.hotels</groupId>
     <artifactId>waggle-dance-parent</artifactId>
diff --git a/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/manifest/ManifestAttributes.java b/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/manifest/ManifestAttributes.java
index bc8d98c9a..6e3688542 100644
--- a/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/manifest/ManifestAttributes.java
+++ b/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/manifest/ManifestAttributes.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2019 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.
@@ -38,7 +38,7 @@
  * </p>
  */
 public class ManifestAttributes {
-  private static final Logger LOG = LoggerFactory.getLogger(ManifestAttributes.class);
+  private static Logger LOG = LoggerFactory.getLogger(ManifestAttributes.class);
 
   static final String META_INF_MANIFEST_MF = "META-INF/MANIFEST.MF";
   private static final String JAR_PROTOCOL = "jar:";
diff --git a/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/server/FederatedHMSHandler.java b/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/server/FederatedHMSHandler.java
index 46acabacd..c200dc54c 100644
--- a/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/server/FederatedHMSHandler.java
+++ b/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/server/FederatedHMSHandler.java
@@ -44,7 +44,7 @@
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 class FederatedHMSHandler extends FacebookBase implements CloseableIHMSHandler {
 
-  private static final Logger LOG = LoggerFactory.getLogger(FederatedHMSHandler.class);
+  private static  Logger LOG = LoggerFactory.getLogger(FederatedHMSHandler.class);
 
   private static final String INVOCATION_LOG_NAME = "com.hotels.bdp.waggledance.server.invocation-log";
   private final MappingEventListener databaseMappingService;
diff --git a/waggle-dance-core/src/test/java/com/hotels/bdp/waggledance/manifest/ManifestAttributesTest.java b/waggle-dance-core/src/test/java/com/hotels/bdp/waggledance/manifest/ManifestAttributesTest.java
index 54998fdb3..9df8b4540 100644
--- a/waggle-dance-core/src/test/java/com/hotels/bdp/waggledance/manifest/ManifestAttributesTest.java
+++ b/waggle-dance-core/src/test/java/com/hotels/bdp/waggledance/manifest/ManifestAttributesTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2020 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.
@@ -39,7 +39,7 @@
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ ManifestAttributes.class })
-@PowerMockIgnore("javax.management.*")
+@PowerMockIgnore({"javax.management.*", "com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "org.w3c.*"})
 public class ManifestAttributesTest {
 
   private @Rule ClassDataFolder dataFolder = new ClassDataFolder();