Skip to content

Commit dd2a6ba

Browse files
radcortezradcortez
committed
Merge branch 'release/3.1'
2 parents 7d2471c + cc84c54 commit dd2a6ba

13 files changed

Lines changed: 488 additions & 8 deletions

‎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.0</version>
6+
<version>3.1</version>
77
<packaging>war</packaging>
88

99
<name>javaee7-angular</name>

‎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/bower/bootstrap-css-only/css/bootstrap.css" />
10-
<link rel="stylesheet" href="lib/bower/angular-grid/ng-grid.css" />
9+
<link rel="stylesheet" href="lib/dependencies/css/bootstrap.min.css" />
10+
<link rel="stylesheet" href="lib/dependencies/css/ng-grid.min.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/bower/jquery/jquery.js"></script>
21-
<script src="lib/bower/angular/angular.js"></script>
22-
<script src="lib/bower/angular-resource/angular-resource.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>
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>
2525
<!-- endbower -->
2626
<!-- endbuild -->
2727

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

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)