You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by ra...@apache.org on 2015/10/09 06:17:45 UTC
[40/50] [abbrv] lens git commit: LENS-790: UI Module failing if maven
version is < 3.1
LENS-790: UI Module failing if maven version is < 3.1
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/ebb2c036
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/ebb2c036
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/ebb2c036
Branch: refs/heads/current-release-line
Commit: ebb2c036634b8257ffa007ddeb6c1e2178fc0ae2
Parents: e184881
Author: Ankeet Maini <an...@gmail.com>
Authored: Mon Oct 5 13:36:28 2015 +0530
Committer: Rajat Khandelwal <ra...@gmail.com>
Committed: Mon Oct 5 13:36:28 2015 +0530
----------------------------------------------------------------------
lens-ui/pom.xml | 36 ++++--------------------------------
pom.xml | 21 ++++++++++++++++++---
2 files changed, 22 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/ebb2c036/lens-ui/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ui/pom.xml b/lens-ui/pom.xml
index 69bcee5..b1ad565 100644
--- a/lens-ui/pom.xml
+++ b/lens-ui/pom.xml
@@ -35,42 +35,14 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>${antrun.plugin.version}</version>
- <configuration>
- <target>
- <zip destfile="target/${project.artifactId}-${project.version}" basedir="${project.basedir}" excludes="target/**" />
- </target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>${frontend.maven.plugin}</version>
+ <groupId>io.wcm.maven.plugins</groupId>
+ <artifactId>nodejs-maven-plugin</artifactId>
<executions>
<execution>
- <id>install node and npm</id>
- <goals>
- <goal>install-node-and-npm</goal>
- </goals>
- <configuration>
- <nodeVersion>${nodeVersion}</nodeVersion>
- <npmVersion>${npmVersion}</npmVersion>
- <nodeDownloadRoot>https://nodejs.org/dist/</nodeDownloadRoot>
- <npmDownloadRoot>http://registry.npmjs.org/npm/-/</npmDownloadRoot>
- <installDirectory>node</installDirectory>
- </configuration>
- </execution>
- <execution>
- <id>npm install</id>
+ <phase>compile</phase>
<goals>
- <goal>npm</goal>
+ <goal>run</goal>
</goals>
- <!-- Optional configuration which provides for running any npm command -->
- <configuration>
- <arguments>install</arguments>
- </configuration>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/lens/blob/ebb2c036/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dd26713..3ec5e5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,9 +108,9 @@
<cobertura.plugin.version>2.7</cobertura.plugin.version>
<!-- UI -->
- <frontend.maven.plugin>0.0.23</frontend.maven.plugin>
- <nodeVersion>v4.0.0</nodeVersion>
- <npmVersion>2.7.6</npmVersion>
+ <nodejs.plugin.version>1.0.0</nodejs.plugin.version>
+ <nodeVersion>0.10.32</nodeVersion>
+ <npmVersion>1.4.9</npmVersion>
<!-- debian -->
<mvn.deb.build.dir>${project.build.directory}/debian</mvn.deb.build.dir>
@@ -525,6 +525,21 @@
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs.plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>io.wcm.maven.plugins</groupId>
+ <artifactId>nodejs-maven-plugin</artifactId>
+ <version>${nodejs.plugin.version}</version>
+ <configuration>
+ <npmVersion>${npmVersion}</npmVersion>
+ <nodeJsVersion>${nodeVersion}</nodeJsVersion>
+ <nodeJsDirectory>${project.basedir}/node</nodeJsDirectory>
+ <tasks>
+ <npmInstallTask>
+ <workingDirectory>${project.basedir}</workingDirectory>
+ </npmInstallTask>
+ </tasks>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>