Made sure the mvn install and rat checks were good
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/696bba3c Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/696bba3c Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/696bba3c Branch: refs/heads/apache-blur-0.2 Commit: 696bba3c415fe7139c93b0dd9375cba43cafdc24 Parents: 7e1546d Author: Chris Rohr <[email protected]> Authored: Tue Jul 8 16:15:19 2014 -0400 Committer: Chris Rohr <[email protected]> Committed: Tue Jul 8 16:15:19 2014 -0400 ---------------------------------------------------------------------- blur-console/src/main/scripts/grunt.sh | 20 ++------------------ pom.xml | 3 +-- 2 files changed, 3 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/696bba3c/blur-console/src/main/scripts/grunt.sh ---------------------------------------------------------------------- diff --git a/blur-console/src/main/scripts/grunt.sh b/blur-console/src/main/scripts/grunt.sh index f202477..3f56e00 100755 --- a/blur-console/src/main/scripts/grunt.sh +++ b/blur-console/src/main/scripts/grunt.sh @@ -11,27 +11,11 @@ DIR="$(cd -P "$(dirname "$SOURCE")" && pwd)" # Check for grunt-cli installed: log `npm install -g grunt-cli` command -v grunt >/dev/null 2>&1 || { echo >&2 "[ERROR] grunt not found! install: npm install -g grunt-cli"; exit 1; } -# Check for bower: log `npm install -g bower` -command -v bower >/dev/null 2>&1 || { echo >&2 "[ERROR] bower not found! install: npm install -g bower"; exit 1; } - # run `npm install` in src/main/webapp -cd $DIR/../webapp >/dev/null +cd $DIR/../webapp >/dev/null npm install --quiet -# Run `bower list` for previous `bower list` output -mkdir -p ${DIR}/../../../target -filename=${DIR}/../../../target/.webapp-build.$(id -un) -filename_previous=${DIR}/../../../target/.webapp-build.previous.$(id -un) - -touch $filename -mv $filename $filename_previous -bower list --offline > $filename - -if diff $filename $filename_previous >/dev/null ; then - grunt $1 -else - grunt deps $1 -fi +grunt $1 cd - >/dev/null http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/696bba3c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index eae077e..2a80fed 100644 --- a/pom.xml +++ b/pom.xml @@ -253,12 +253,11 @@ under the License. <exclude>**/src/main/webapp/node_modules/**</exclude> <exclude>**/src/main/webapp/.sass-cache/**</exclude> <exclude>**/src/main/webapp/.tmp/**</exclude> - <exclude>**/.bowerrc</exclude> <exclude>**/.editorconfig</exclude> <exclude>**/.jshintrc</exclude> <exclude>**/package.json</exclude> - <exclude>**/bower.json</exclude> <exclude>**/src/main/scripts/grunt.sh</exclude> + <exclude>**/src/main/webapp/coverage/**</exclude> <!-- Legacy blur console --> <exclude>contrib/blur-console-v1/**</exclude>
