Change grunt task via command line

encuestame · Aug 25, 2015 · 683e19a · 683e19a
1 parent 04e9c5f
commit 683e19a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/build.sh b/build.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-mvn -DMAVEN_OPTS="-Xmx1024m -Xms512m" clean install -Pproduction
+mvn -DMAVEN_OPTS="-Xmx1024m -Xms512m" clean install -Pproduction -DgruntTask=production
diff --git a/enme-js/resources-enme-war/pom.xml b/enme-js/resources-enme-war/pom.xml
@@ -25,7 +25,7 @@
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
-                <version>0.0.23</version>
+                <version>0.0.25</version>
                 <configuration>
                     <workingDirectory>src/main/resources/resource</workingDirectory>
                 </configuration>
@@ -40,13 +40,11 @@
                             <npmVersion>2.7.6</npmVersion>
                         </configuration>
                     </execution>
-
                     <execution>
                         <id>npm install</id>
                         <goals>
                             <goal>npm</goal>
                         </goals>
-                        <!-- Optional configuration which provides for running any npm command -->
                         <configuration>
                             <arguments>install</arguments>
                         </configuration>
@@ -68,7 +66,7 @@
                             <goal>grunt</goal>
                         </goals>
                         <configuration>
-                            <arguments>--no-color</arguments>
+                            <arguments>${grunt}</arguments>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/enme-js/resources-enme-war/src/main/resources/resource/GruntFile.js b/enme-js/resources-enme-war/src/main/resources/resource/GruntFile.js
@@ -109,7 +109,9 @@ grunt.initConfig({
         //embebed
         "<%= dirs.css_src %>/embebed/detail.css": "<%= dirs.less_src %>/embebed/detail.less",
         "<%= dirs.css_src %>/embebed/form.css": "<%= dirs.less_src %>/embebed/form.less",
-        "<%= dirs.css_src %>/embebed/results.css": "<%= dirs.less_src %>/embebed/results.less"
+        "<%= dirs.css_src %>/embebed/results.css": "<%= dirs.less_src %>/embebed/results.less",
+        //bootstrap 3
+        "<%= dirs.css_src %>/bootstrap3.css": "<%= dirs.less_src %>/bootstrap3/bootstrap.less"
       }
     },
     production: {
@@ -262,6 +264,7 @@ grunt.initConfig({
   // this task is defined for remote quick testing
   grunt.registerTask('test-remote', ['intern:remote_local' ]);
   grunt.registerTask('dev', [ 'jshint-all', 'connect:server' ]);
-  grunt.registerTask('default', ['jshint-all', 'css', 'commons', 'widget', 'test-remote' ]);
+  grunt.registerTask('default', ['jshint-all', 'css', 'commons', 'widget']);
+  grunt.registerTask('production', ['jshint-all', 'css', 'commons', 'widget', 'test-remote' ]);
 
 };
diff --git a/enme-js/resources-enme-war/src/main/resources/resource/bower.json b/enme-js/resources-enme-war/src/main/resources/resource/bower.json
@@ -19,7 +19,6 @@
     "dijit": "~1.10.4",
     "util": "dojo-util#~1.10.4",
     "deliteful": "~0.7.1",
-    "dstore": "~1.1.0",
     "deliteful-build": "0.7.x",
     "Font-Awesome": "4.3.x",
     "requirejs": "2.1.x"

diff --git a/pom.xml b/pom.xml
@@ -33,6 +33,7 @@
         <env>development</env>
         <!-- js compress options -->
         <compress.minimize>true</compress.minimize>
+        <grunt>default</grunt>
         <spring.webflow.version>2.4.0.RELEASE</spring.webflow.version>
         <spring.security.version>3.2.6.RELEASE</spring.security.version>
         <!-- 3.1.0.CI-SNAPSHOT once compatible with OAuth -->

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-mvn -DMAVEN_OPTS="-Xmx1024m -Xms512m" clean install -Pproduction
+mvn -DMAVEN_OPTS="-Xmx1024m -Xms512m" clean install -Pproduction -DgruntTask=production