Skip to content
This repository was archived by the owner on Oct 18, 2022. It is now read-only.

Update Maven dependencies #11

Open
shrechak wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Update Maven dependencies #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b0731ba
Update package version for eirslett
shrechakjet Nov 15, 2021
f951b93
Update dependency for sprinkframework
shrechakjet Nov 15, 2021
f18cd05
Update dependency and move main class from being exported
shrechakjet Nov 16, 2021
4773739
add slf4j logger dependency
ateneva Nov 16, 2021
848c4ae
update slf4j-api-version
ateneva Nov 16, 2021
9ccd8bc
Move block away from test dependencies block
shrechakjet Nov 16, 2021
2aaf834
Update script to run thirdeye application
shrechakjet Nov 16, 2021
c8b178d
Add clean to mvn install in install.sh
shrechakjet Nov 16, 2021
414217d
remove double logger dependencies
ateneva Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ echo "*******************************************************"
echo "Building ThirdEye"
echo "*******************************************************"

mvn install -DskipTests ${PROFILES_ARG}|| exit 1
mvn clean install -DskipTests ${PROFILES_ARG}|| exit 1
4 changes: 1 addition & 3 deletions run-frontend.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
96 changes: 78 additions & 18 deletions thirdeye-dashboard/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<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>
<scope>compile</scope>
<version>${revision}${sha1}</version>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>org.mockito</groupId>
Expand All @@ -58,6 +57,17 @@
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.32</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>
Expand All @@ -69,19 +79,69 @@
<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>
<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>
</project>
14 changes: 9 additions & 5 deletions ...board/src/main/java/org/apache/pinot/thirdeye/dashboard/ThirdEyeDashboardApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -185,23 +185,27 @@ public void stop() {
};
}

}


public class ThirdEyeDashboardApplication {

private static final Logger LOG = LoggerFactory.getLogger(ThirdEyeDashboardApplication.class);
/**
* The entry point of application.
*
* @param args the input arguments
* @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];
}
LOG.info("Using config path '{}'", thirdEyeConfigDir);

System.setProperty("dw.rootDir", thirdEyeConfigDir);
String dashboardApplicationConfigFile = thirdEyeConfigDir + "/" + "dashboard.yml";
new ThirdEyeDashboardApplication().run("server", dashboardApplicationConfigFile);
new ThirdEyeDashboardBaseApplication().run("server", dashboardApplicationConfigFile);
}

}
2 changes: 1 addition & 1 deletion thirdeye-frontend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions thirdeye-pinot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down