ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: Revert "AMBARI-10303. Install node / brunch and other build dependencies at build time. Additional patch(4). (alexantonenko)"
Date Thu, 02 Apr 2015 07:19:47 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk ce6255033 -> 55bfe3aba


Revert "AMBARI-10303. Install node / brunch and other build dependencies at build time. Additional
patch(4). (alexantonenko)"

This reverts commit ce6255033dd0ee8a8c85d8d46f8d4c0d6bb8ff74.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/55bfe3ab
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/55bfe3ab
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/55bfe3ab

Branch: refs/heads/trunk
Commit: 55bfe3abab084294d7b24651ceb79df8588d3522
Parents: ce62550
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Thu Apr 2 10:19:13 2015 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Thu Apr 2 10:19:13 2015 +0300

----------------------------------------------------------------------
 ambari-web/pom.xml | 74 ++++++++++++-------------------------------------
 pom.xml            | 16 +++++------
 2 files changed, 24 insertions(+), 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/55bfe3ab/ambari-web/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml
index 3746454..04f9b5d 100644
--- a/ambari-web/pom.xml
+++ b/ambari-web/pom.xml
@@ -87,23 +87,6 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>com.github.eirslett</groupId>
-        <artifactId>frontend-maven-plugin</artifactId>
-        <version>0.0.19</version>
-        <executions>
-          <execution>
-            <id>install node and npm</id>
-            <goals>
-              <goal>install-node-and-npm</goal>
-            </goals>
-            <configuration>
-              <nodeVersion>v0.10.31</nodeVersion>
-              <npmVersion>1.4.23</npmVersion>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
         <version>1.2.1</version>
@@ -117,7 +100,7 @@
             <configuration>
               <executable>${executable.rmdir}</executable>
               <workingDirectory>${basedir}</workingDirectory>
-              <commandlineArgs>${args.rm.clean} public node_modules node</commandlineArgs>
+              <commandlineArgs>${args.rm.clean} public node_modules</commandlineArgs>
               <successCodes>
                 <successCode>0</successCode>
                 <successCode>1</successCode>
@@ -134,43 +117,19 @@
             <configuration>
               <executable>${executable.mkdir}</executable>
               <workingDirectory>${basedir}</workingDirectory>
-              <commandlineArgs>${args.mkdir} public node</commandlineArgs>
-            </configuration>
-          </execution>
-          <execution>
-            <id>npm-cache-clean</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>${executable.node}</executable>
-              <workingDirectory>${basedir}</workingDirectory>
-              <commandlineArgs>${args.npm.full.path} cache clean</commandlineArgs>
-            </configuration>
-          </execution>
-          <execution>
-            <id>install-npm</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>${executable.node}</executable>
-              <workingDirectory>${basedir}</workingDirectory>
-              <commandlineArgs>${args.npm.full.path} install</commandlineArgs>
+              <commandlineArgs>${args.mkdir} public</commandlineArgs>
             </configuration>
           </execution>
           <execution>
-            <id>install-brunch</id>
+            <id>compile-npm</id>
             <phase>compile</phase>
             <goals>
               <goal>exec</goal>
             </goals>
             <configuration>
-              <executable>${executable.node}</executable>
+              <executable>${executable.npm}</executable>
               <workingDirectory>${basedir}</workingDirectory>
-              <commandlineArgs>${args.npm.full.path} install brunch@v1.7.20</commandlineArgs>
+              <commandlineArgs>${args.npm} install</commandlineArgs>
             </configuration>
           </execution>
           <execution>
@@ -180,9 +139,9 @@
               <goal>exec</goal>
             </goals>
             <configuration>
-              <executable>${executable.node}</executable>
+              <executable>${executable.brunch}</executable>
               <workingDirectory>${basedir}</workingDirectory>
-              <commandlineArgs>${args.brunch.full.path} build</commandlineArgs>
+              <commandlineArgs>${args.brunch} build</commandlineArgs>
             </configuration>
           </execution>
           <execution>
@@ -232,9 +191,9 @@
             </goals>
             <configuration>
               <skip>${skipTests}</skip>
-              <executable>${executable.node}</executable>
+              <executable>${executable.npm}</executable>
               <workingDirectory>${basedir}</workingDirectory>
-              <commandlineArgs>${args.npm.full.path} test</commandlineArgs>
+              <commandlineArgs>${args.npm} test</commandlineArgs>
             </configuration>
           </execution>
           <execution>
@@ -268,7 +227,6 @@
             <exclude>app/assets/**</exclude>
             <exclude>vendor/**</exclude>
             <exclude>node_modules/**</exclude>
-            <exclude>node/**</exclude>
             <exclude>npm-debug.log</exclude>
           </excludes>
         </configuration>
@@ -311,17 +269,18 @@
       <properties>
         <envClassifier>win</envClassifier>
         <dirsep>\</dirsep>
+        <executable.brunch>cmd</executable.brunch>
+        <args.brunch>/C brunch</args.brunch>
         <executable.gzip>gzip</executable.gzip>
         <executable.mkdir>cmd</executable.mkdir>
         <args.mkdir>/C mkdir</args.mkdir>
+        <executable.npm>cmd</executable.npm>
+        <args.npm>/C npm</args.npm>
         <executable.rmdir>cmd</executable.rmdir>
         <args.rm.clean>/C rmdir /S /Q</args.rm.clean>
         <executable.shell>cmd</executable.shell>
         <fileextension.shell>cmd</fileextension.shell>
         <args.shell>/C</args.shell>
-        <executable.node>node.exe</executable.node>
-        <args.npm.full.path>node/npm/bin/npm-cli.js</args.npm.full.path>
-        <args.brunch.full.path>node_modules/brunch/bin/brunch</args.brunch.full.path>
       </properties>
     </profile>
     <profile>
@@ -334,17 +293,18 @@
       <properties>
         <envClassifier>linux</envClassifier>
         <dirsep>/</dirsep>
+        <executable.brunch>brunch</executable.brunch>
+        <args.brunch></args.brunch>
         <executable.gzip>gzip</executable.gzip>
         <executable.mkdir>mkdir</executable.mkdir>
         <args.mkdir></args.mkdir>
+        <executable.npm>npm</executable.npm>
+        <args.npm></args.npm>
         <executable.rmdir>rm</executable.rmdir>
         <args.rm.clean>-rf</args.rm.clean>
         <executable.shell>sh</executable.shell>
         <fileextension.shell>sh</fileextension.shell>
         <args.shell></args.shell>
-        <executable.node>node/node</executable.node>
-        <args.npm.full.path>node/npm/bin/npm-cli.js</args.npm.full.path>
-        <args.brunch.full.path>node_modules/brunch/bin/brunch</args.brunch.full.path>
       </properties>
     </profile>
   </profiles>

http://git-wip-us.apache.org/repos/asf/ambari/blob/55bfe3ab/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a052e45..c703bcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,8 +198,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.0</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+            <source>1.6</source>
+            <target>1.6</target>
         </configuration>
       </plugin>
       <plugin>
@@ -271,7 +271,7 @@
             <exclude>**/.gitkeep</exclude>
             <exclude>**/.jshintrc</exclude>
             <exclude>**/.editorconfig</exclude>
-            <!--gitignore content-->
+              <!--gitignore content-->
             <exclude>.DS_Store</exclude>
             <exclude>**/*.iml</exclude>
             <exclude>.classpath</exclude>
@@ -283,16 +283,14 @@
             <exclude>.hgignore</exclude>
             <exclude>.hgtags</exclude>
 
-            <!-- Nodejs and npm -->
-            <exclude>ambari-web/node_modules/**</exclude>
-            <exclude>ambari-web/node/**</exclude>
-
             <!--Python Mock library (BSD license)-->
             <exclude>ambari-common/src/test/python/mock/**</exclude>
             <!--Jinja2 library (BSD license)-->
             <exclude>ambari-common/src/main/python/ambari_jinja2/**</exclude>
             <exclude>ambari-common/src/main/python/jinja2/**</exclude>
 
+            <exclude>ambari-web/node_modules/**</exclude>
+
             <!--Contributions-->
             <exclude>contrib/ambari-scom/management-pack/Hadoop_MP/**</exclude>
             <exclude>contrib/addons/test/dataServices/jmx/data/cluster_configuration.json.nohbase</exclude>
@@ -393,10 +391,10 @@
             <fileset>
               <directory>${basedir}</directory>
               <followSymlinks>false</followSymlinks>
-              <includes>
+               <includes>
                 <include>**/*.pyc</include>
               </includes>
-            </fileset>
+             </fileset>
           </filesets>
         </configuration>
       </plugin>


Mime
View raw message