Repository: incubator-griffin Updated Branches: refs/heads/master 7bf1b16d5 -> 81e9b6aee
update build script Author: William Guo <[email protected]> Closes #22 from guoyuepeng/updatebuildscript. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/81e9b6ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/81e9b6ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/81e9b6ae Branch: refs/heads/master Commit: 81e9b6aeef9a551eae1e7484e38a60fd2b8f2fb7 Parents: 7bf1b16 Author: William Guo <[email protected]> Authored: Thu May 11 11:25:08 2017 +0800 Committer: William Guo <[email protected]> Committed: Thu May 11 11:25:08 2017 +0800 ---------------------------------------------------------------------- ui/bower.json | 8 ++++---- ui/pom.xml | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/81e9b6ae/ui/bower.json ---------------------------------------------------------------------- diff --git a/ui/bower.json b/ui/bower.json index 29dff7a..1932e60 100644 --- a/ui/bower.json +++ b/ui/bower.json @@ -5,11 +5,11 @@ "dependencies": { "jquery": "2.1.4", "bootswatch": "3.3.6", - "font-awesome": "4.5.0", - "angular": "1.5.8", - "angular-route": "1.5.8", + "font-awesome": "4.7.0", + "angular": "1.6.4", + "angular-route": "1.6.4", "angular-smart-table": "2.1.7", - "angular-cookies": "1.5.8", + "angular-cookies": "1.6.4", "AngularJS-Toaster": "1.2.0", "requirejs": "2.1.22", "domReady": "2.0.1", http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/81e9b6ae/ui/pom.xml ---------------------------------------------------------------------- diff --git a/ui/pom.xml b/ui/pom.xml index c74092e..8f66039 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -43,6 +43,15 @@ </goals> <configuration> <outputDirectory>${basedir}/../service/src/main/resources/public</outputDirectory> + <nonFilteredFileExtensions> + <nonFilteredFileExtension>otf</nonFilteredFileExtension> + <nonFilteredFileExtension>eot</nonFilteredFileExtension> + <nonFilteredFileExtension>svg</nonFilteredFileExtension> + <nonFilteredFileExtension>ttf</nonFilteredFileExtension> + <nonFilteredFileExtension>woff</nonFilteredFileExtension> + <nonFilteredFileExtension>woff.bak</nonFilteredFileExtension> + <nonFilteredFileExtension>woff2</nonFilteredFileExtension> + </nonFilteredFileExtensions> <resources> <resource> <directory>${basedir}</directory>
