Skip to content

Commit 8254e87

Browse files
committed
Merge branch 'release/3.5'
2 parents 6f0133c + bfe63ce commit 8254e87

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

Gruntfile.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,17 @@ module.exports = function (grunt) {
4040
// From grunt-bower-install-simple. Downloads the web dependencies.
4141
"bower-install-simple": {
4242
options: {
43-
color: true,
44-
production: false
43+
color: true
44+
},
45+
"prod": {
46+
options: {
47+
production: true
48+
}
49+
},
50+
"dev": {
51+
options: {
52+
production: false
53+
}
4554
}
4655
},
4756

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"description": "javaee7-angular dependencies for Grunt.",
99
"private": true,
1010
"devDependencies": {
11+
"grunt": "~0.4.5",
1112
"load-grunt-tasks": "~0.6.0",
1213
"time-grunt": "~0.4.0",
1314
"grunt-contrib-clean": "~0.5.0",
@@ -18,7 +19,7 @@
1819
"grunt-contrib-concat": "~0.4.0",
1920
"grunt-contrib-uglify": "~0.5.0",
2021
"grunt-contrib-cssmin": "~0.9.0",
21-
"grunt-bower-install-simple": "~0.9.3"
22+
"grunt-bower-install-simple": "~1.1.3"
2223
},
2324
"engines": {
2425
"node": ">=0.8.0"

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>com.cortez.samples</groupId>
55
<artifactId>javaee7-angular</artifactId>
6-
<version>3.4</version>
6+
<version>3.5</version>
77
<packaging>war</packaging>
88

99
<name>javaee7-angular</name>

0 commit comments

Comments
 (0)