Revert "revert"

This reverts commit f60ac15.
ExpediaGroup · Nov 12, 2024 · 7eb19db · 7eb19db
1 parent f60ac15
commit 7eb19db
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 8 deletions.
diff --git a/...egration-tests/src/test/java/com/expediagroup/beekeeper/integration/model/SqsMessage.java b/...egration-tests/src/test/java/com/expediagroup/beekeeper/integration/model/SqsMessage.java
@@ -107,5 +107,4 @@ public final String getFormattedString() {
   public JsonObject getApiaryEventMessageJsonObject() {
     return apiaryEventMessageJsonObject;
   }
-}
-
+}
diff --git a/...tion-tests/src/test/java/com/expediagroup/beekeeper/integration/model/SqsMessageTest.java b/...tion-tests/src/test/java/com/expediagroup/beekeeper/integration/model/SqsMessageTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2019-2020 Expedia, Inc.
+ * Copyright (C) 2019-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.
@@ -107,5 +107,4 @@ private void assertKeys(SqsMessage sqsMessage, Set<String> specificKeys, String
     assertThat(object.get("eventType").getAsString()).isEqualTo(eventType);
     assertThat(object.keySet()).isEqualTo(mergedSet);
   }
-}
-
+}
diff --git a/...rc/test/java/com/expediagroup/beekeeper/scheduler/apiary/service/SchedulerApiaryTest.java b/...rc/test/java/com/expediagroup/beekeeper/scheduler/apiary/service/SchedulerApiaryTest.java
@@ -152,5 +152,4 @@ private BeekeeperEvent newHousekeepingEvent(HousekeepingEntity housekeepingEntit
     when(housekeepingEntity.getLifecycleType()).thenReturn(lifecycleEventType.name());
     return new BeekeeperEvent(List.of(housekeepingEntity), Mockito.mock(MessageEvent.class));
   }
-}
-
+}
diff --git a/beekeeper-scheduler/pom.xml b/beekeeper-scheduler/pom.xml
@@ -10,13 +10,66 @@
 
   <artifactId>beekeeper-scheduler</artifactId>
 
+  <properties>
+    <hive.version>2.3.7</hive.version>
+    <hcommon-hive-metastore.version>1.4.2</hcommon-hive-metastore.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.expediagroup</groupId>
       <artifactId>beekeeper-core</artifactId>
       <version>${project.version}</version>
     </dependency>
 
+    <!-- Hive -->
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-metastore</artifactId>
+      <version>${hive.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-client</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+        <exclusion>
+          <artifactId>log4j-slf4j-impl</artifactId>
+          <groupId>org.apache.logging.log4j</groupId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.jetty.aggregate</groupId>
+          <artifactId>jetty-all</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.jetty.orbit</groupId>
+          <artifactId>javax.servlet</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.hotels</groupId>
+      <artifactId>hcommon-hive-metastore</artifactId>
+      <version>${hcommon-hive-metastore.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>net.java.dev.jna</groupId>
+          <artifactId>jna</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-core</artifactId>
@@ -29,5 +82,12 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>${lombok.version}</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
-</project>
+</project>
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,5 +107,4 @@ public final String getFormattedString() { @@
       public JsonObject getApiaryEventMessageJsonObject() {
         return apiaryEventMessageJsonObject;
       }
-    }
+    }