This is an automated email from the ASF dual-hosted git repository.
jihao pushed a commit to branch te-remove-shade-plugin
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/te-remove-shade-plugin by this
push:
new b975140 [TE] Remove maven-shade-plugin in thirdeye-dashboard (#6151)
b975140 is described below
commit b9751404af4c1842fe428d85224390c410032af0
Author: Vincent Chen <jianc...@linkedin.com>
AuthorDate: Mon Oct 19 13:07:53 2020 -0700
[TE] Remove maven-shade-plugin in thirdeye-dashboard (#6151)
---
.travis/.travis_set_deploy_build_opts.sh | 8 ++++----
thirdeye/pom.xml | 12 +++++++++++
thirdeye/thirdeye-dashboard/pom.xml | 34 --------------------------------
thirdeye/thirdeye-pinot/pom.xml | 34 ++++++++++++--------------------
thirdeye/thirdeye-spi/pom.xml | 5 -----
5 files changed, 29 insertions(+), 64 deletions(-)
diff --git a/.travis/.travis_set_deploy_build_opts.sh
b/.travis/.travis_set_deploy_build_opts.sh
index 1d5d1a7..f055318 100755
--- a/.travis/.travis_set_deploy_build_opts.sh
+++ b/.travis/.travis_set_deploy_build_opts.sh
@@ -18,10 +18,10 @@
# under the License.
#
-if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then
+# if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then
export DEV_VERSION="-dev-${TRAVIS_BUILD_NUMBER}"
export DEPLOY_BUILD_OPTS="-Dsha1=-dev-${TRAVIS_BUILD_NUMBER}"
npm install -g npm-login-noninteractive
-else
- export DEPLOY_BUILD_OPTS=""
-fi
+# else
+# export DEPLOY_BUILD_OPTS=""
+# fi
diff --git a/thirdeye/pom.xml b/thirdeye/pom.xml
index f019017..fcd8ba1 100644
--- a/thirdeye/pom.xml
+++ b/thirdeye/pom.xml
@@ -151,6 +151,18 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M1</version>
diff --git a/thirdeye/thirdeye-dashboard/pom.xml
b/thirdeye/thirdeye-dashboard/pom.xml
index efc2960..3998c25 100644
--- a/thirdeye/thirdeye-dashboard/pom.xml
+++ b/thirdeye/thirdeye-dashboard/pom.xml
@@ -81,40 +81,6 @@
</testResources>
<plugins>
<plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.1.0</version>
- <configuration>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- <transformers>
- <transformer
-
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
- <transformer
-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>${mainClass}</mainClass>
- </transformer>
- </transformers>
- <!-- exclude signed Manifests -->
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
diff --git a/thirdeye/thirdeye-pinot/pom.xml b/thirdeye/thirdeye-pinot/pom.xml
index 2369e3a..248cef5 100644
--- a/thirdeye/thirdeye-pinot/pom.xml
+++ b/thirdeye/thirdeye-pinot/pom.xml
@@ -11,7 +11,7 @@
<artifactId>thirdeye-pinot</artifactId>
<url>http://maven.apache.org</url>
<properties>
-
+
<mainClass>org.apache.pinot.thirdeye.anomaly.ThirdEyeAnomalyApplication</mainClass>
</properties>
<dependencies>
@@ -367,26 +367,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>${jdk.version}</source>
- <target>${jdk.version}</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.0</version>
<configuration>
@@ -413,6 +393,18 @@
<threadCount>1</threadCount>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <mainClass>${mainClass}</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/thirdeye/thirdeye-spi/pom.xml b/thirdeye/thirdeye-spi/pom.xml
index eeac13a..b2f0244 100644
--- a/thirdeye/thirdeye-spi/pom.xml
+++ b/thirdeye/thirdeye-spi/pom.xml
@@ -97,15 +97,10 @@
<artifactId>commons-math</artifactId>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.modelmapper</groupId>
<artifactId>modelmapper</artifactId>
<version>0.7.6</version>
</dependency>
-
</dependencies>
-
- <build>
- </build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
