diff --git a/lib/wsdl.js b/lib/wsdl.js index 6e7318468..34b211dd4 100644 --- a/lib/wsdl.js +++ b/lib/wsdl.js @@ -88,7 +88,7 @@ function trim(text) { } function deepMerge(destination, source) { - return _.merge(destination || {}, source, function(a, b) { + return _.mergeWith(destination || {}, source, function(a, b) { return _.isArray(a) ? a.concat(b) : undefined; }); } @@ -1168,7 +1168,7 @@ WSDL.prototype._processNextInclude = function(includes, callback) { self._includesWsdl.push(wsdl); if (wsdl.definitions instanceof DefinitionsElement) { - _.merge(self.definitions, wsdl.definitions, function(a,b) { + _.mergeWith(self.definitions, wsdl.definitions, function(a,b) { return (a instanceof SchemaElement) ? a.merge(b) : undefined; }); } else { diff --git a/package.json b/package.json index d8ce4d99d..c84e4c1d8 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "debug": "~0.7.4", "ejs": "~2.5.5", "finalhandler": "^0.5.0", - "lodash": "^3.10.1", + "lodash": "^4.17.4", "optional": "^0.1.3", "request": ">=2.9.0", "sax": ">=0.6",