From 6c100a171ea18244d667b369232833933fe4b77f Mon Sep 17 00:00:00 2001
From: kirrg001 <katharina.irrgang@googlemail.com>
Date: Mon, 19 Sep 2016 18:18:52 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=20=20update=20lodash,knex=20and=20?=
 =?UTF-8?q?bookshelf=20to=20latest=20versions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs #7189
- we had a memory leak after upgrading to knex 0.11.x
- knex has published a new version 0.12.x
- the memory leak does not longer exists
- knex has reverted their pool logic, see https://github.com/tgriesser/knex/pull/1665
---
 core/server/overrides.js | 21 ---------------------
 package.json             | 16 +++-------------
 2 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/core/server/overrides.js b/core/server/overrides.js
index 47c09fc186..23449b112f 100644
--- a/core/server/overrides.js
+++ b/core/server/overrides.js
@@ -8,24 +8,3 @@ var moment = require('moment-timezone');
  *   - be careful when you work with date operations, therefor always wrap a date into moment
  */
 moment.tz.setDefault('UTC');
-
-// jscs:disable
-var _ = require('lodash'),
-    toPairs = require('lodash.topairs'),
-    fromPairs = require('lodash.frompairs'),
-    toString = require('lodash.tostring'),
-    pickBy = require('lodash.pickby'),
-    uniqBy = require('lodash.uniqby'),
-    orderBy = require('lodash.orderby'),
-    omitBy = require('lodash.omitby');
-
-/**
- * lodash 4.x functions we use
- */
-_.toPairs = toPairs;
-_.fromPairs = fromPairs;
-_.toString = toString;
-_.omitBy = omitBy;
-_.uniqBy = uniqBy;
-_.pickBy = pickBy;
-_.orderBy = orderBy;
diff --git a/package.json b/package.json
index 0e7ba3d040..205e444f80 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "bcryptjs": "2.3.0",
     "bluebird": "3.4.6",
     "body-parser": "1.15.2",
-    "bookshelf": "0.9.4",
+    "bookshelf": "0.10.1",
     "chalk": "1.1.3",
     "cheerio": "0.22.0",
     "compression": "1.6.2",
@@ -51,15 +51,8 @@
     "intl": "1.2.4",
     "intl-messageformat": "1.3.0",
     "jsonpath": "0.2.7",
-    "knex": "0.10.0",
-    "lodash": "3.10.1",
-    "lodash.frompairs": "4.0.1",
-    "lodash.omitby": "4.6.0",
-    "lodash.orderby": "4.6.0",
-    "lodash.pickby": "4.6.0",
-    "lodash.topairs": "4.3.0",
-    "lodash.tostring": "4.1.4",
-    "lodash.uniqby": "4.7.0",
+    "knex": "0.12.1",
+    "lodash": "4.16.0",
     "moment": "2.15.1",
     "moment-timezone": "0.5.5",
     "morgan": "1.7.0",
@@ -123,9 +116,6 @@
   },
   "greenkeeper": {
     "ignore": [
-      "bookshelf",
-      "knex",
-      "lodash",
       "glob",
       "mysql",
       "nodemailer",