From 24b5d3e56d0c40d5c55e54fcc0702a5077b9d8f2 Mon Sep 17 00:00:00 2001
From: gustavo <gu.martinm@gmail.com>
Date: Thu, 31 Mar 2016 01:58:27 +0200
Subject: [PATCH] AngularJS showcase, upgrade dependencies

---
 angularjs/showcase/bower.json              | 17 ++++++++++-------
 angularjs/showcase/package.json            |  2 +-
 angularjs/showcase/src/showcase/index.html | 10 +++++-----
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/angularjs/showcase/bower.json b/angularjs/showcase/bower.json
index ef4f05b..2553d71 100644
--- a/angularjs/showcase/bower.json
+++ b/angularjs/showcase/bower.json
@@ -16,17 +16,17 @@
     "server.js"
   ],
   "dependencies": {
-    "bootstrap": "~4.0.0-alpha.2",
+    "bootstrap": "~3.3.6",
     "font-awesome": "~4.5.0",
     "oclazyload": "~1.0.9",
-    "angular-animate": "~1.5.0",
-    "angular-bootstrap": "~1.1.2",
-    "angular-translate": "~2.9.0",
-    "angular-ui-router": "~0.2.17",
-    "angular": "~1.5.0"
+    "angular-animate": "~1.5.3",
+    "angular-bootstrap": "~1.2.5",
+    "angular-translate": "~2.11.0",
+    "angular-ui-router": "~0.2.18",
+    "angular": "~1.5.3"
   },
   "devDependencies": {
-    "angular-mocks": "~1.5.0",
+    "angular-mocks": "~1.5.3",
     "marked": "~0.3.5"
   },
   "overrides": {
@@ -41,5 +41,8 @@
         "css/font-awesome.css"
       ]
     }
+  },
+  "resolutions": {
+    "angular": "~1.5.3"
   }
 }
diff --git a/angularjs/showcase/package.json b/angularjs/showcase/package.json
index ff21208..7791a79 100644
--- a/angularjs/showcase/package.json
+++ b/angularjs/showcase/package.json
@@ -10,7 +10,7 @@
   "homepage": "http://gumartinm.name",
   "license": "Apache-2.0",
   "devDependencies": {
-    "gulp": "~3.9.0",
+    "gulp": "~3.9.1",
     "gulp-my-tasks": "~0.0.1"
   },
   "scripts": {
diff --git a/angularjs/showcase/src/showcase/index.html b/angularjs/showcase/src/showcase/index.html
index 16f5f5e..53f7bd6 100644
--- a/angularjs/showcase/src/showcase/index.html
+++ b/angularjs/showcase/src/showcase/index.html
@@ -57,11 +57,6 @@
     <script src="/src/showcase/app/widgets/example-controller.directive.js"></script>
     <script src="/src/showcase/app/widgets/example-controller-as.directive.js"></script>
     <script src="/src/showcase/app/widgets/example-child.directive.js"></script>
-    <script src="/src/showcase/app/welcome/welcome.module.js"></script>
-    <script src="/src/showcase/app/welcome/welcome.route.js"></script>
-    <script src="/src/showcase/app/welcome/welcome.controller.js"></script>
-    <script src="/src/showcase/app/welcome/welcome-account.directive.js"></script>
-    <script src="/src/showcase/app/welcome/welcome-account.controller.js"></script>
     <script src="/src/showcase/app/users/users.module.js"></script>
     <script src="/src/showcase/app/users/users.route.js"></script>
     <script src="/src/showcase/app/users/users.controller.js"></script>
@@ -74,6 +69,11 @@
     <script src="/src/showcase/app/cars/cars.controller.js"></script>
     <script src="/src/showcase/app/cars/cars.constants.js"></script>
     <script src="/src/showcase/app/cars/cars-error-modal.controller.js"></script>
+    <script src="/src/showcase/app/welcome/welcome.module.js"></script>
+    <script src="/src/showcase/app/welcome/welcome.route.js"></script>
+    <script src="/src/showcase/app/welcome/welcome.controller.js"></script>
+    <script src="/src/showcase/app/welcome/welcome-account.directive.js"></script>
+    <script src="/src/showcase/app/welcome/welcome-account.controller.js"></script>
     <script src="/src/showcase/app/core/core.module.js"></script>
     <script src="/src/showcase/app/app.module.js"></script>
     <!-- endinject -->
-- 
2.1.4