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 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" diff --git a/thirdeye-dashboard/pom.xml b/thirdeye-dashboard/pom.xml index 6f82d39840..019ed126aa 100644 --- a/thirdeye-dashboard/pom.xml +++ b/thirdeye-dashboard/pom.xml @@ -23,25 +23,24 @@ 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"> - thirdeye org.apache.pinot.thirdeye + thirdeye ${revision}${sha1} 4.0.0 thirdeye-dashboard - org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication + jar org.apache.pinot.thirdeye thirdeye-pinot - compile + ${revision}${sha1} - org.mockito @@ -58,6 +57,17 @@ hsqldb test + + org.slf4j + slf4j-api + 1.7.32 + + + + org.slf4j + slf4j-simple + 1.7.32 + @@ -69,19 +79,69 @@ ../thirdeye-pinot/src/main/resources - - - maven-jar-plugin - 2.4 - - - - true - ${mainClass} - - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.0 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + + testng.xml + + true + + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + + + + org.apache.maven.plugins + maven-resources-plugin + 3.0.1 + + + org.apache.maven.shared + maven-invoker + 2.2 + + + org.apache.maven.plugins + maven-shade-plugin + 2.4.3 + + + org.apache.maven.plugins + maven-assembly-plugin + 3.3.0 + + + jar-with-dependencies + + + + + assemble-all + package + + single + + + + + + \ 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 { - 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); } - } 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 @@ com.github.eirslett frontend-maven-plugin - 1.9.1 + 1.12.0 install node and npm 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 @@ org.apache.pinot.thirdeye thirdeye-spi + + org.springframework + spring-context + 5.3.13 + org.apache.httpcomponents httpclient