Skip to content

Commit a48dcdf

Browse files
mrhannachiradcortez
mrhannachi
authored and
radcortez
committed
Updated Angular.
Updated jQuery. Updated Grunt dependencies.
1 parent 81ba52c commit a48dcdf

11 files changed

Lines changed: 22 additions & 502 deletions

‎bower.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"description": "javaee7-angular JavaScript dependencies.",
99
"private": true,
1010
"dependencies": {
11-
"angular": "~1.2.20",
12-
"angular-resource": "~1.2.20",
13-
"jquery": "~1.9.1",
11+
"angular": "~1.5.6",
12+
"angular-resource": "~1.5.6",
13+
"jquery": "~2.1.0",
1414
"angular-bootstrap": "~0.11.0",
1515
"bootstrap-css-only": "3.2.0",
1616
"angular-grid": "~2.0.11"

‎package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
"description": "javaee7-angular dependencies for Grunt.",
99
"private": true,
1010
"devDependencies": {
11-
"grunt": "~0.4.5",
12-
"load-grunt-tasks": "~0.6.0",
13-
"time-grunt": "~0.4.0",
14-
"grunt-contrib-clean": "~0.5.0",
15-
"grunt-wiredep": "~1.8.0",
16-
"grunt-contrib-htmlmin": "~0.3.0",
17-
"grunt-usemin": "~2.3.0",
18-
"grunt-contrib-copy": "~0.5.0",
19-
"grunt-contrib-concat": "~0.4.0",
20-
"grunt-contrib-uglify": "~0.5.0",
21-
"grunt-contrib-cssmin": "~0.9.0",
22-
"grunt-bower-install-simple": "~1.1.3"
11+
"grunt": "~1.0.0",
12+
"load-grunt-tasks": "~3.5.0",
13+
"time-grunt": "~1.3.0",
14+
"grunt-contrib-clean": "~1.0.0",
15+
"grunt-wiredep": "~3.0.1",
16+
"grunt-contrib-htmlmin": "~1.4.0",
17+
"grunt-usemin": "~3.1.1",
18+
"grunt-contrib-copy": "~1.0.0",
19+
"grunt-contrib-concat": "~1.0.1",
20+
"grunt-contrib-uglify": "~1.0.1",
21+
"grunt-contrib-cssmin": "~1.0.1",
22+
"grunt-bower-install-simple": "~1.2.3"
2323
},
2424
"engines": {
2525
"node": ">=0.8.0"

‎src/main/webapp/index.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
<!-- build:css css/third-party.css -->
88
<!-- bower:css -->
9-
<link rel="stylesheet" href="lib/dependencies/css/bootstrap.min.css" />
10-
<link rel="stylesheet" href="lib/dependencies/css/ng-grid.min.css" />
9+
<link rel="stylesheet" href="lib/bower/bootstrap-css-only/css/bootstrap.css" />
10+
<link rel="stylesheet" href="lib/bower/angular-grid/ng-grid.css" />
1111
<!-- endbower -->
1212
<!-- endbuild -->
1313

@@ -17,11 +17,11 @@
1717

1818
<!-- build:js lib/third-party.js -->
1919
<!-- bower:js -->
20-
<script src="lib/dependencies/jquery.min.js"></script>
21-
<script src="lib/dependencies/angular.min.js"></script>
22-
<script src="lib/dependencies/angular-resource.min.js"></script>
23-
<script src="lib/dependencies/ng-grid-2.0.11.min.js"></script>
24-
<script src="lib/dependencies/ui-bootstrap-tpls.min.js"></script>
20+
<script src="lib/bower/angular/angular.js"></script>
21+
<script src="lib/bower/angular-resource/angular-resource.js"></script>
22+
<script src="lib/bower/jquery/dist/jquery.js"></script>
23+
<script src="lib/bower/angular-bootstrap/ui-bootstrap-tpls.js"></script>
24+
<script src="lib/bower/angular-grid/build/ng-grid.js"></script>
2525
<!-- endbower -->
2626
<!-- endbuild -->
2727

‎src/main/webapp/lib/dependencies/angular-resource.min.js‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)