diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java index 57a99913b3e..d1135c052fb 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java @@ -418,4 +418,4 @@ public void testShowAndHideLineNumbers() throws Exception { } -} \ No newline at end of file +} diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json index 4d68ff1af14..330c408085b 100644 --- a/zeppelin-web/bower.json +++ b/zeppelin-web/bower.json @@ -2,16 +2,16 @@ "name": "zeppelin-web", "version": "0.0.0", "dependencies": { - "angular": "1.3.8", + "angular": "1.5.0", "json3": "~3.3.1", "es5-shim": "~3.1.0", "bootstrap": "~3.2.0", - "angular-cookies": "1.3.8", - "angular-sanitize": "1.3.8", - "angular-animate": "1.3.8", - "angular-touch": "1.3.8", - "angular-route": "1.3.8", - "angular-resource": "1.3.8", + "angular-cookies": "1.5.0", + "angular-sanitize": "1.5.0", + "angular-animate": "1.5.0", + "angular-touch": "1.5.0", + "angular-route": "1.5.0", + "angular-resource": "1.5.0", "angular-bootstrap": "~0.13.0", "angular-websocket": "~1.0.13", "ace-builds": "1.1.9", @@ -20,20 +20,20 @@ "nvd3": "~1.7.1", "angular-dragdrop": "~1.0.8", "perfect-scrollbar": "~0.5.4", - "ng-sortable": "~1.1.9", + "ng-sortable": "~1.3.3", "angular-elastic": "~2.4.2", "angular-elastic-input": "~2.2.0", "angular-xeditable": "0.1.8", "highlightjs": "~8.4.0", "lodash": "~3.9.3", "angular-filter": "~0.5.4", - "ngtoast": "~1.5.5", + "ngtoast": "~2.0.0", "ng-focus-if": "~1.0.2", "bootstrap3-dialog": "bootstrap-dialog#~1.34.7", "floatThead": "~1.3.2" }, "devDependencies": { - "angular-mocks": "1.3.8" + "angular-mocks": "1.5.0" }, "appPath": "src", "resolutions": { diff --git a/zeppelin-web/src/app/app.js b/zeppelin-web/src/app/app.js index 33a9daf8527..ff2be77ffd5 100644 --- a/zeppelin-web/src/app/app.js +++ b/zeppelin-web/src/app/app.js @@ -17,14 +17,14 @@ 'use strict'; (function() { var zeppelinWebApp = angular.module('zeppelinWebApp', [ - 'ngAnimate', 'ngCookies', + 'ngAnimate', 'ngRoute', 'ngSanitize', 'angular-websocket', 'ui.ace', 'ui.bootstrap', - 'ui.sortable', + 'as.sortable', 'ngTouch', 'ngDragDrop', 'angular.filter',