You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by bz...@apache.org on 2015/05/13 09:26:29 UTC
incubator-zeppelin git commit: ZEPPELIN-69 frontend webapp built once
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master dcb03a9fe -> b4b5d7c75
ZEPPELIN-69 frontend webapp built once
https://issues.apache.org/jira/browse/ZEPPELIN-69
Disabling test report generation for ```zeppelin-web``` using [cobertura plugin](http://mojo.codehaus.org/cobertura-maven-plugin/check-mojo.html) as it forks the lifecycle and makes everything run twice
Author: Alexander Bezzubov <bz...@apache.org>
Closes #67 from bzz/ZEPPELIN-69-fix-frontend-webapp-built-twice and squashes the following commits:
4870b6d [Alexander Bezzubov] ZEPPELIN-69: cobertura-maven-plugin disabled for web
a46bdec [Alexander Bezzubov] ZEPPELIN-69: cobertura-maven-plugin version moved to pluginManagement
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/b4b5d7c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/b4b5d7c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/b4b5d7c7
Branch: refs/heads/master
Commit: b4b5d7c755cbc3aeb06cce3377d02ac672e8ace1
Parents: dcb03a9
Author: Alexander Bezzubov <bz...@apache.org>
Authored: Sun May 10 17:28:44 2015 +0900
Committer: Alexander Bezzubov <bz...@apache.org>
Committed: Wed May 13 16:26:15 2015 +0900
----------------------------------------------------------------------
pom.xml | 13 +++++++++++--
zeppelin-web/pom.xml | 28 +++++++++++++++++++++-------
2 files changed, 32 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/b4b5d7c7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c1b6b94..b4f78df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -888,7 +888,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.7</version>
<configuration>
<formats>
<format>html</format>
@@ -1098,15 +1097,18 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.13</version>
</plugin>
+
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
</plugin>
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
@@ -1122,10 +1124,12 @@
</excludes> <includes> <include>**/itest/**</include> </includes> </configuration>
</execution> </executions> -->
</plugin>
+
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
@@ -1133,6 +1137,12 @@
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.4.1</version>
@@ -1146,7 +1156,6 @@
</configuration>
</plugin>
-
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/b4b5d7c7/zeppelin-web/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml
index 52e62b8..4c0d3a8 100644
--- a/zeppelin-web/pom.xml
+++ b/zeppelin-web/pom.xml
@@ -74,6 +74,7 @@
<artifactId>frontend-maven-plugin</artifactId>
<version>0.0.23</version>
<executions>
+
<execution>
<id>install node and npm</id>
<goals>
@@ -90,10 +91,6 @@
<goals>
<goal>npm</goal>
</goals>
- <phase>generate-resources</phase>
- <configuration>
- <arguments>install</arguments>
- </configuration>
</execution>
<execution>
@@ -101,7 +98,6 @@
<goals>
<goal>bower</goal>
</goals>
- <phase>generate-resources</phase>
<configuration>
<arguments>--allow-root install</arguments>
</configuration>
@@ -112,15 +108,33 @@
<goals>
<goal>grunt</goal>
</goals>
- <phase>generate-resources</phase>
+
<configuration>
<!-- TODO(anthonycorbacho): remove force once all JSHint are fixed! -->
<arguments>--no-color --force</arguments>
</configuration>
</execution>
-
</executions>
</plugin>
+
+ <!--
+ Disabling test report generation as it forks the lifecycle
+ and results in https://issues.apache.org/jira/browse/ZEPPELIN-69
+
+ There is no better way to do it, as per
+ http://jira.codehaus.org/browse/MCOBERTURA-154
+ -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>cobertura</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>