diff --git a/build.sh b/build.sh index 478f16c96..54d5f79c8 100755 --- 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 index 86079e9a0..3b23051b7 100644 --- a/enme-js/resources-enme-war/pom.xml +++ b/enme-js/resources-enme-war/pom.xml @@ -25,7 +25,7 @@ com.github.eirslett frontend-maven-plugin - 0.0.23 + 0.0.25 src/main/resources/resource @@ -40,13 +40,11 @@ 2.7.6 - npm install npm - install @@ -68,7 +66,7 @@ grunt - --no-color + ${grunt} 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 index 6d0529179..16dfde45d 100644 --- 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 index 7c2b06f27..e7d587424 100644 --- 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 index 61808602a..8e8eecce3 100644 --- a/pom.xml +++ b/pom.xml @@ -33,6 +33,7 @@ development true + default 2.4.0.RELEASE 3.2.6.RELEASE diff --git a/scripts/build.sh b/scripts/build.sh index 478f16c96..54d5f79c8 100755 --- 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