From b0731ba9957687d0085e378baaa7d8922ed8737e Mon Sep 17 00:00:00 2001
From: shrechak <shreya.chakraborty@justeattakeaway.com>
Date: Mon, 15 Nov 2021 16:45:45 +0100
Subject: [PATCH 1/9] Update package version for eirslett

Else we geta 404 server timed out
---
 thirdeye-frontend/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/thirdeye-frontend/pom.xml b/thirdeye-frontend/pom.xml
index 9c4e3bb404..98963dfd5d 100644
--- a/thirdeye-frontend/pom.xml
+++ b/thirdeye-frontend/pom.xml
@@ -20,7 +20,7 @@
       <plugin>
         <groupId>com.github.eirslett</groupId>
         <artifactId>frontend-maven-plugin</artifactId>
-        <version>1.9.1</version>
+        <version>1.12.0</version>
         <executions>
           <execution>
             <id>install node and npm</id>

From f951b933188577650475edc727f94dce62143c8b Mon Sep 17 00:00:00 2001
From: shrechak <shreya.chakraborty@justeattakeaway.com>
Date: Mon, 15 Nov 2021 18:59:34 +0100
Subject: [PATCH 2/9] Update dependency for sprinkframework

---
 thirdeye-pinot/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/thirdeye-pinot/pom.xml b/thirdeye-pinot/pom.xml
index f48adb5356..f4f73a8d76 100644
--- a/thirdeye-pinot/pom.xml
+++ b/thirdeye-pinot/pom.xml
@@ -19,6 +19,11 @@
       <groupId>org.apache.pinot.thirdeye</groupId>
       <artifactId>thirdeye-spi</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>5.3.13</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>

From f18cd05d52e59184f43d5898983da6f266879299 Mon Sep 17 00:00:00 2001
From: shrechak <shreya.chakraborty@justeattakeaway.com>
Date: Tue, 16 Nov 2021 09:45:38 +0100
Subject: [PATCH 3/9] Update dependency and move main class from being exported

---
 thirdeye-dashboard/pom.xml                    | 64 +++++++++++++++----
 .../ThirdEyeDashboardApplication.java         | 14 ++--
 2 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/thirdeye-dashboard/pom.xml b/thirdeye-dashboard/pom.xml
index 6f82d39840..5cceb0b331 100644
--- a/thirdeye-dashboard/pom.xml
+++ b/thirdeye-dashboard/pom.xml
@@ -58,6 +58,11 @@
       <artifactId>hsqldb</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.12</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -69,19 +74,50 @@
         <directory>../thirdeye-pinot/src/main/resources</directory>
       </testResource>
     </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <addClasspath>true</addClasspath>
-              <mainClass>${mainClass}</mainClass>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.6.0</version>
+          <configuration>
+            <source>1.8</source>
+            <target>1.8</target>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.19.1</version>
+          <configuration>
+            <suiteXmlFiles>
+              <suiteXmlFile>testng.xml</suiteXmlFile>
+            </suiteXmlFiles>
+            <skipTests>true</skipTests>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.3.2</version>
+          <!--Notice I have removed the configs here. Not required to generate the jar-->
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.0.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.shared</groupId>
+          <artifactId>maven-invoker</artifactId>
+          <version>2.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>2.4.3</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 </project>
\ No newline at end of file
diff --git a/thirdeye-dashboard/src/main/java/org/apache/pinot/thirdeye/dashboard/ThirdEyeDashboardApplication.java b/thirdeye-dashboard/src/main/java/org/apache/pinot/thirdeye/dashboard/ThirdEyeDashboardApplication.java
index a58fa0e395..b918d8a137 100644
--- a/thirdeye-dashboard/src/main/java/org/apache/pinot/thirdeye/dashboard/ThirdEyeDashboardApplication.java
+++ b/thirdeye-dashboard/src/main/java/org/apache/pinot/thirdeye/dashboard/ThirdEyeDashboardApplication.java
@@ -64,9 +64,9 @@
 /**
  * The type Third eye dashboard application.
  */
-public class ThirdEyeDashboardApplication
+class ThirdEyeDashboardBaseApplication
     extends BaseThirdEyeApplication<ThirdEyeDashboardConfiguration> {
-  private static final Logger LOG = LoggerFactory.getLogger(ThirdEyeDashboardApplication.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ThirdEyeDashboardBaseApplication.class);
 
   private RequestStatisticsLogger requestStatisticsLogger;
   private ModelDownloaderManager modelDownloaderManager;
@@ -185,7 +185,12 @@ public void stop() {
     };
   }
 
+}
+
 
+public class ThirdEyeDashboardApplication {
+
+  private static final Logger LOG = LoggerFactory.getLogger(ThirdEyeDashboardApplication.class);
   /**
    * The entry point of application.
    *
@@ -193,7 +198,7 @@ public void stop() {
    * @throws Exception the exception
    */
   public static void main(String[] args) throws Exception {
-    String thirdEyeConfigDir = "./config";
+    String thirdEyeConfigDir = "thirdeye-dashboard/config";
     if (args.length >= 1) {
       thirdEyeConfigDir = args[0];
     }
@@ -201,7 +206,6 @@ public static void main(String[] args) throws Exception {
 
     System.setProperty("dw.rootDir", thirdEyeConfigDir);
     String dashboardApplicationConfigFile = thirdEyeConfigDir + "/" + "dashboard.yml";
-    new ThirdEyeDashboardApplication().run("server", dashboardApplicationConfigFile);
+    new ThirdEyeDashboardBaseApplication().run("server", dashboardApplicationConfigFile);
   }
-
 }

From 4773739f8e450fdb9c30762fce7021cce51b8aab Mon Sep 17 00:00:00 2001
From: "angelina.teneva" <angelina.teneva@gmail.com>
Date: Tue, 16 Nov 2021 16:27:01 +0100
Subject: [PATCH 4/9] add slf4j logger dependency

---
 thirdeye-dashboard/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/thirdeye-dashboard/pom.xml b/thirdeye-dashboard/pom.xml
index 5cceb0b331..9166ccc159 100644
--- a/thirdeye-dashboard/pom.xml
+++ b/thirdeye-dashboard/pom.xml
@@ -63,6 +63,12 @@
       <artifactId>slf4j-api</artifactId>
       <version>1.7.12</version>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>1.7.32</version>
+    </dependency>
   </dependencies>
 
   <build>

From 848c4aed002273403eb5dbab212774248933d03a Mon Sep 17 00:00:00 2001
From: "angelina.teneva" <angelina.teneva@gmail.com>
Date: Tue, 16 Nov 2021 16:30:54 +0100
Subject: [PATCH 5/9] update slf4j-api-version

---
 thirdeye-dashboard/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/thirdeye-dashboard/pom.xml b/thirdeye-dashboard/pom.xml
index 9166ccc159..5837161b67 100644
--- a/thirdeye-dashboard/pom.xml
+++ b/thirdeye-dashboard/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.12</version>
+      <version>1.7.32</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
     <dependency>

From 9ccd8bc65ed33c6c11837761539d6a31eff84394 Mon Sep 17 00:00:00 2001
From: shrechak <shreya.chakraborty@justeattakeaway.com>
Date: Tue, 16 Nov 2021 17:05:26 +0100
Subject: [PATCH 6/9] Move block away from test dependencies block

---
 thirdeye-dashboard/pom.xml | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/thirdeye-dashboard/pom.xml b/thirdeye-dashboard/pom.xml
index 5837161b67..7968d225d6 100644
--- a/thirdeye-dashboard/pom.xml
+++ b/thirdeye-dashboard/pom.xml
@@ -23,24 +23,37 @@
   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">
   <parent>
-    <artifactId>thirdeye</artifactId>
     <groupId>org.apache.pinot.thirdeye</groupId>
+    <artifactId>thirdeye</artifactId>
     <version>${revision}${sha1}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>thirdeye-dashboard</artifactId>
-
   <properties>
     <mainClass>org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication</mainClass>
   </properties>
+  <packaging>jar</packaging>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.pinot.thirdeye</groupId>
       <artifactId>thirdeye-pinot</artifactId>
+      <version>${revision}${sha1}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.12</version>
       <scope>compile</scope>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12 -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.7.12</version>
+      <scope>runtime</scope>
+    </dependency>
 
     <!-- test dependencies -->
     <dependency>
@@ -123,6 +136,25 @@
           <artifactId>maven-shade-plugin</artifactId>
           <version>2.4.3</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.3.0</version>
+          <configuration>
+            <descriptorRefs>
+              <descriptorRef>jar-with-dependencies</descriptorRef>
+            </descriptorRefs>
+          </configuration>
+          <executions>
+            <execution>
+              <id>assemble-all</id>
+              <phase>package</phase>
+              <goals>
+                <goal>single</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>

From 2aaf8348f6d6f671170c0e6c9ce5f128d215b397 Mon Sep 17 00:00:00 2001
From: shrechak <shreya.chakraborty@justeattakeaway.com>
Date: Tue, 16 Nov 2021 17:37:35 +0100
Subject: [PATCH 7/9] Update script to run thirdeye application

---
 run-frontend.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/run-frontend.sh b/run-frontend.sh
index 1c0d625f68..afb65cbf1f 100755
--- a/run-frontend.sh
+++ b/run-frontend.sh
@@ -3,6 +3,4 @@ echo "*******************************************************"
 echo "Launching ThirdEye Dashboard in demo mode"
 echo "*******************************************************"
 
-cd thirdeye-dashboard
-java -Dlog4j.configurationFile=log4j2.xml -cp "./target/thirdeye-dashboard-1.0.0-SNAPSHOT.jar" org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication "./config"
-cd ..
+java -Dlog4j.configurationFile=log4j2.xml -cp "thirdeye-dist/target/thirdeye-dist-1.0.0-SNAPSHOT-dist/thirdeye-dist-1.0.0-SNAPSHOT/lib/*" org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication "thirdeye-dashboard/config"

From c8b178df3fb77714e0e1a7e2f8ef0641644a21ea Mon Sep 17 00:00:00 2001
From: shrechak <shreya.chakraborty@justeattakeaway.com>
Date: Tue, 16 Nov 2021 17:47:09 +0100
Subject: [PATCH 8/9] Add clean to mvn install in install.sh

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 11e37f8aff..161d691676 100755
--- a/install.sh
+++ b/install.sh
@@ -41,4 +41,4 @@ echo "*******************************************************"
 echo "Building ThirdEye"
 echo "*******************************************************"
 
-mvn install -DskipTests ${PROFILES_ARG}|| exit 1
+mvn clean install -DskipTests ${PROFILES_ARG}|| exit 1

From 414217da3a2150bf02a475880c3810a1a8620259 Mon Sep 17 00:00:00 2001
From: "angelina.teneva" <angelina.teneva@gmail.com>
Date: Tue, 16 Nov 2021 18:30:49 +0100
Subject: [PATCH 9/9] remove double logger dependencies

---
 thirdeye-dashboard/pom.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/thirdeye-dashboard/pom.xml b/thirdeye-dashboard/pom.xml
index 7968d225d6..019ed126aa 100644
--- a/thirdeye-dashboard/pom.xml
+++ b/thirdeye-dashboard/pom.xml
@@ -41,20 +41,6 @@
       <artifactId>thirdeye-pinot</artifactId>
       <version>${revision}${sha1}</version>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.12</version>
-      <scope>compile</scope>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12 -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.12</version>
-      <scope>runtime</scope>
-    </dependency>
-
     <!-- test dependencies -->
     <dependency>
       <groupId>org.mockito</groupId>