http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d7ccaec/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/readme.md
----------------------------------------------------------------------
diff --git 
a/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/readme.md 
b/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/readme.md
deleted file mode 100644
index f832c44..0000000
--- 
a/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/readme.md
+++ /dev/null
@@ -1,219 +0,0 @@
-# XMLDOM [![Build 
Status](https://secure.travis-ci.org/bigeasy/xmldom.png?branch=master)](http://travis-ci.org/bigeasy/xmldom)
 [![Coverage 
Status](https://coveralls.io/repos/bigeasy/xmldom/badge.png?branch=master)](https://coveralls.io/r/bigeasy/xmldom)
 [![NPM 
version](https://badge.fury.io/js/xmldom.png)](http://badge.fury.io/js/xmldom)
-
-A JavaScript implementation of W3C DOM for Node.js, Rhino and the browser. 
Fully
-compatible with `W3C DOM level2`; and some compatible with `level3`. Supports
-`DOMParser` and `XMLSerializer` interface such as in browser.
-
-Install:
--------
->npm install xmldom
-
-Example:
-====
-```javascript
-var DOMParser = require('xmldom').DOMParser;
-var doc = new DOMParser().parseFromString(
-    '<xml xmlns="a" xmlns:c="./lite">\n'+
-        '\t<child>test</child>\n'+
-        '\t<child></child>\n'+
-        '\t<child/>\n'+
-    '</xml>'
-    ,'text/xml');
-doc.documentElement.setAttribute('x','y');
-doc.documentElement.setAttributeNS('./lite','c:x','y2');
-var nsAttr = doc.documentElement.getAttributeNS('./lite','x')
-console.info(nsAttr)
-console.info(doc)
-```
-API Reference
-=====
-
- * [DOMParser](https://developer.mozilla.org/en/DOMParser):
-
-       ```javascript
-       parseFromString(xmlsource,mimeType)
-       ```
-       * **options extension** _by xmldom_(not BOM standard!!)
-
-       ```javascript
-       //added the options argument
-       new DOMParser(options)
-       
-       //errorHandler is supported
-       new DOMParser({
-               /**
-                * locator is always need for error position info
-                */
-               locator:{},
-               /**
-                * you can override the errorHandler for xml parser
-                * @link 
http://www.saxproject.org/apidoc/org/xml/sax/ErrorHandler.html
-                */
-               
errorHandler:{warning:function(w){console.warn(w)},error:callback,fatalError:callback}
-               //only callback model
-               //errorHandler:function(level,msg){console.log(level,msg)}
-       })
-               
-       ```
-
- * [XMLSerializer](https://developer.mozilla.org/en/XMLSerializer)
- 
-       ```javascript
-       serializeToString(node)
-       ```
-DOM level2 method and attribute:
-------
-
- * 
[Node](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1950641247)
-       
-               attribute:
-                       nodeValue|prefix
-               readonly attribute:
-                       
nodeName|nodeType|parentNode|childNodes|firstChild|lastChild|previousSibling|nextSibling|attributes|ownerDocument|namespaceURI|localName
-               method: 
-                       insertBefore(newChild, refChild)
-                       replaceChild(newChild, oldChild)
-                       removeChild(oldChild)
-                       appendChild(newChild)
-                       hasChildNodes()
-                       cloneNode(deep)
-                       normalize()
-                       isSupported(feature, version)
-                       hasAttributes()
-
- * 
[DOMImplementation](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-102161490)
-               
-               method:
-                       hasFeature(feature, version)
-                       createDocumentType(qualifiedName, publicId, systemId)
-                       createDocument(namespaceURI, qualifiedName, doctype)
-
- * 
[Document](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#i-Document)
 : Node
-               
-               readonly attribute:
-                       doctype|implementation|documentElement
-               method:
-                       createElement(tagName)
-                       createDocumentFragment()
-                       createTextNode(data)
-                       createComment(data)
-                       createCDATASection(data)
-                       createProcessingInstruction(target, data)
-                       createAttribute(name)
-                       createEntityReference(name)
-                       getElementsByTagName(tagname)
-                       importNode(importedNode, deep)
-                       createElementNS(namespaceURI, qualifiedName)
-                       createAttributeNS(namespaceURI, qualifiedName)
-                       getElementsByTagNameNS(namespaceURI, localName)
-                       getElementById(elementId)
-
- * 
[DocumentFragment](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-B63ED1A3)
 : Node
- * 
[Element](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-745549614)
 : Node
-               
-               readonly attribute:
-                       tagName
-               method:
-                       getAttribute(name)
-                       setAttribute(name, value)
-                       removeAttribute(name)
-                       getAttributeNode(name)
-                       setAttributeNode(newAttr)
-                       removeAttributeNode(oldAttr)
-                       getElementsByTagName(name)
-                       getAttributeNS(namespaceURI, localName)
-                       setAttributeNS(namespaceURI, qualifiedName, value)
-                       removeAttributeNS(namespaceURI, localName)
-                       getAttributeNodeNS(namespaceURI, localName)
-                       setAttributeNodeNS(newAttr)
-                       getElementsByTagNameNS(namespaceURI, localName)
-                       hasAttribute(name)
-                       hasAttributeNS(namespaceURI, localName)
-
- * 
[Attr](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-637646024)
 : Node
-       
-               attribute:
-                       value
-               readonly attribute:
-                       name|specified|ownerElement
-
- * 
[NodeList](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-536297177)
-               
-               readonly attribute:
-                       length
-               method:
-                       item(index)
-       
- * 
[NamedNodeMap](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1780488922)
-
-               readonly attribute:
-                       length
-               method:
-                       getNamedItem(name)
-                       setNamedItem(arg)
-                       removeNamedItem(name)
-                       item(index)
-                       getNamedItemNS(namespaceURI, localName)
-                       setNamedItemNS(arg)
-                       removeNamedItemNS(namespaceURI, localName)
-               
- * 
[CharacterData](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-FF21A306)
 : Node
-       
-               method:
-                       substringData(offset, count)
-                       appendData(arg)
-                       insertData(offset, arg)
-                       deleteData(offset, count)
-                       replaceData(offset, count, arg)
-               
- * 
[Text](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1312295772)
 : CharacterData
-       
-               method:
-                       splitText(offset)
-                       
- * 
[CDATASection](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-667469212)
- * 
[Comment](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1728279322)
 : CharacterData
-       
- * 
[DocumentType](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-412266927)
-       
-               readonly attribute:
-                       name|entities|notations|publicId|systemId|internalSubset
-                       
- * Notation : Node
-       
-               readonly attribute:
-                       publicId|systemId
-                       
- * Entity : Node
-       
-               readonly attribute:
-                       publicId|systemId|notationName
-                       
- * EntityReference : Node 
- * ProcessingInstruction : Node 
-       
-               attribute:
-                       data
-               readonly attribute:
-                       target
-               
-DOM level 3 support:
------
-
- * [Node](http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-textContent)
-               
-               attribute:
-                       textContent
-               method:
-                       isDefaultNamespace(namespaceURI){
-                       lookupNamespaceURI(prefix)
-
-DOM extension by xmldom
----
- * [Node] Source position extension; 
-               
-               attribute:
-                       //Numbered starting from '1'
-                       lineNumber
-                       //Numbered starting from '1'
-                       columnNumber

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d7ccaec/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/sax.js
----------------------------------------------------------------------
diff --git 
a/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/sax.js 
b/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/sax.js
deleted file mode 100644
index e11bdfb..0000000
--- a/node_modules/cordova-common/node_modules/plist/node_modules/xmldom/sax.js
+++ /dev/null
@@ -1,586 +0,0 @@
-//[4]          NameStartChar      ::=          ":" | [A-Z] | "_" | [a-z] | 
[#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] | [#x37F-#x1FFF] | 
[#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | 
[#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
-//[4a]         NameChar           ::=          NameStartChar | "-" | "." | 
[0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040]
-//[5]          Name       ::=          NameStartChar (NameChar)*
-var nameStartChar = 
/[A-Z_a-z\xC0-\xD6\xD8-\xF6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]///\u10000-\uEFFFF
-var nameChar = new 
RegExp("[\\-\\.0-9"+nameStartChar.source.slice(1,-1)+"\u00B7\u0300-\u036F\\u203F-\u2040]");
-var tagNamePattern = new 
RegExp('^'+nameStartChar.source+nameChar.source+'*(?:\:'+nameStartChar.source+nameChar.source+'*)?$');
-//var tagNamePattern = /^[a-zA-Z_][\w\-\.]*(?:\:[a-zA-Z_][\w\-\.]*)?$/
-//var handlers = 
'resolveEntity,getExternalSubset,characters,endDocument,endElement,endPrefixMapping,ignorableWhitespace,processingInstruction,setDocumentLocator,skippedEntity,startDocument,startElement,startPrefixMapping,notationDecl,unparsedEntityDecl,error,fatalError,warning,attributeDecl,elementDecl,externalEntityDecl,internalEntityDecl,comment,endCDATA,endDTD,endEntity,startCDATA,startDTD,startEntity'.split(',')
-
-//S_TAG,       S_ATTR, S_EQ,   S_V
-//S_ATTR_S,    S_E,    S_S,    S_C
-var S_TAG = 0;//tag name offerring
-var S_ATTR = 1;//attr name offerring 
-var S_ATTR_S=2;//attr name end and space offer
-var S_EQ = 3;//=space?
-var S_V = 4;//attr value(no quot value only)
-var S_E = 5;//attr value end and no space(quot end)
-var S_S = 6;//(attr value end || tag end ) && (space offer)
-var S_C = 7;//closed el<el />
-
-function XMLReader(){
-       
-}
-
-XMLReader.prototype = {
-       parse:function(source,defaultNSMap,entityMap){
-               var domBuilder = this.domBuilder;
-               domBuilder.startDocument();
-               _copy(defaultNSMap ,defaultNSMap = {})
-               parse(source,defaultNSMap,entityMap,
-                               domBuilder,this.errorHandler);
-               domBuilder.endDocument();
-       }
-}
-function parse(source,defaultNSMapCopy,entityMap,domBuilder,errorHandler){
-  function fixedFromCharCode(code) {
-               // String.prototype.fromCharCode does not supports
-               // > 2 bytes unicode chars directly
-               if (code > 0xffff) {
-                       code -= 0x10000;
-                       var surrogate1 = 0xd800 + (code >> 10)
-                               , surrogate2 = 0xdc00 + (code & 0x3ff);
-
-                       return String.fromCharCode(surrogate1, surrogate2);
-               } else {
-                       return String.fromCharCode(code);
-               }
-       }
-       function entityReplacer(a){
-               var k = a.slice(1,-1);
-               if(k in entityMap){
-                       return entityMap[k]; 
-               }else if(k.charAt(0) === '#'){
-                       return 
fixedFromCharCode(parseInt(k.substr(1).replace('x','0x')))
-               }else{
-                       errorHandler.error('entity not found:'+a);
-                       return a;
-               }
-       }
-       function appendText(end){//has some bugs
-               if(end>start){
-                       var xt = 
source.substring(start,end).replace(/&#?\w+;/g,entityReplacer);
-                       locator&&position(start);
-                       domBuilder.characters(xt,0,end-start);
-                       start = end
-               }
-       }
-       function position(p,m){
-               while(p>=lineEnd && (m = linePattern.exec(source))){
-                       lineStart = m.index;
-                       lineEnd = lineStart + m[0].length;
-                       locator.lineNumber++;
-                       //console.log('line++:',locator,startPos,endPos)
-               }
-               locator.columnNumber = p-lineStart+1;
-       }
-       var lineStart = 0;
-       var lineEnd = 0;
-       var linePattern = /.+(?:\r\n?|\n)|.*$/g
-       var locator = domBuilder.locator;
-       
-       var parseStack = [{currentNSMap:defaultNSMapCopy}]
-       var closeMap = {};
-       var start = 0;
-       while(true){
-               try{
-                       var tagStart = source.indexOf('<',start);
-                       if(tagStart<0){
-                               if(!source.substr(start).match(/^\s*$/)){
-                                       var doc = domBuilder.document;
-                               var text = 
doc.createTextNode(source.substr(start));
-                               doc.appendChild(text);
-                               domBuilder.currentElement = text;
-                               }
-                               return;
-                       }
-                       if(tagStart>start){
-                               appendText(tagStart);
-                       }
-                       switch(source.charAt(tagStart+1)){
-                       case '/':
-                               var end = source.indexOf('>',tagStart+3);
-                               var tagName = source.substring(tagStart+2,end);
-                               var config = parseStack.pop();
-                               var localNSMap = config.localNSMap;
-                       if(config.tagName != tagName){
-                           errorHandler.fatalError("end tag name: "+tagName+' 
is not match the current start tagName:'+config.tagName );
-                       }
-                               
domBuilder.endElement(config.uri,config.localName,tagName);
-                               if(localNSMap){
-                                       for(var prefix in localNSMap){
-                                               
domBuilder.endPrefixMapping(prefix) ;
-                                       }
-                               }
-                               end++;
-                               break;
-                               // end elment
-                       case '?':// <?...?>
-                               locator&&position(tagStart);
-                               end = 
parseInstruction(source,tagStart,domBuilder);
-                               break;
-                       case '!':// <!doctype,<![CDATA,<!--
-                               locator&&position(tagStart);
-                               end = 
parseDCC(source,tagStart,domBuilder,errorHandler);
-                               break;
-                       default:
-                       
-                               locator&&position(tagStart);
-                               
-                               var el = new ElementAttributes();
-                               
-                               //elStartEnd
-                               var end = 
parseElementStartPart(source,tagStart,el,entityReplacer,errorHandler);
-                               var len = el.length;
-                               
-                               if(locator){
-                                       if(len){
-                                               //attribute position fixed
-                                               for(var i = 0;i<len;i++){
-                                                       var a = el[i];
-                                                       position(a.offset);
-                                                       a.offset = 
copyLocator(locator,{});
-                                               }
-                                       }
-                                       position(end);
-                               }
-                               if(!el.closed && 
fixSelfClosed(source,end,el.tagName,closeMap)){
-                                       el.closed = true;
-                                       if(!entityMap.nbsp){
-                                               errorHandler.warning('unclosed 
xml attribute');
-                                       }
-                               }
-                               appendElement(el,domBuilder,parseStack);
-                               
-                               
-                               if(el.uri === 'http://www.w3.org/1999/xhtml' && 
!el.closed){
-                                       end = 
parseHtmlSpecialContent(source,end,el.tagName,entityReplacer,domBuilder)
-                               }else{
-                                       end++;
-                               }
-                       }
-               }catch(e){
-                       errorHandler.error('element parse error: '+e);
-                       end = -1;
-               }
-               if(end>start){
-                       start = end;
-               }else{
-                       //TODO: 这里有可能sax回退,有位置错误风险
-                       appendText(Math.max(tagStart,start)+1);
-               }
-       }
-}
-function copyLocator(f,t){
-       t.lineNumber = f.lineNumber;
-       t.columnNumber = f.columnNumber;
-       return t;
-}
-
-/**
- * @see 
#appendElement(source,elStartEnd,el,selfClosed,entityReplacer,domBuilder,parseStack);
- * @return end of the elementStartPart(end of elementEndPart for selfClosed el)
- */
-function parseElementStartPart(source,start,el,entityReplacer,errorHandler){
-       var attrName;
-       var value;
-       var p = ++start;
-       var s = S_TAG;//status
-       while(true){
-               var c = source.charAt(p);
-               switch(c){
-               case '=':
-                       if(s === S_ATTR){//attrName
-                               attrName = source.slice(start,p);
-                               s = S_EQ;
-                       }else if(s === S_ATTR_S){
-                               s = S_EQ;
-                       }else{
-                               //fatalError: equal must after attrName or 
space after attrName
-                               throw new Error('attribute equal must after 
attrName');
-                       }
-                       break;
-               case '\'':
-               case '"':
-                       if(s === S_EQ){//equal
-                               start = p+1;
-                               p = source.indexOf(c,start)
-                               if(p>0){
-                                       value = 
source.slice(start,p).replace(/&#?\w+;/g,entityReplacer);
-                                       el.add(attrName,value,start-1);
-                                       s = S_E;
-                               }else{
-                                       //fatalError: no end quot match
-                                       throw new Error('attribute value no end 
\''+c+'\' match');
-                               }
-                       }else if(s == S_V){
-                               value = 
source.slice(start,p).replace(/&#?\w+;/g,entityReplacer);
-                               //console.log(attrName,value,start,p)
-                               el.add(attrName,value,start);
-                               //console.dir(el)
-                               errorHandler.warning('attribute "'+attrName+'" 
missed start quot('+c+')!!');
-                               start = p+1;
-                               s = S_E
-                       }else{
-                               //fatalError: no equal before
-                               throw new Error('attribute value must after 
"="');
-                       }
-                       break;
-               case '/':
-                       switch(s){
-                       case S_TAG:
-                               el.setTagName(source.slice(start,p));
-                       case S_E:
-                       case S_S:
-                       case S_C:
-                               s = S_C;
-                               el.closed = true;
-                       case S_V:
-                       case S_ATTR:
-                       case S_ATTR_S:
-                               break;
-                       //case S_EQ:
-                       default:
-                               throw new Error("attribute invalid close 
char('/')")
-                       }
-                       break;
-               case ''://end document
-                       //throw new Error('unexpected end of input')
-                       errorHandler.error('unexpected end of input');
-               case '>':
-                       switch(s){
-                       case S_TAG:
-                               el.setTagName(source.slice(start,p));
-                       case S_E:
-                       case S_S:
-                       case S_C:
-                               break;//normal
-                       case S_V://Compatible state
-                       case S_ATTR:
-                               value = source.slice(start,p);
-                               if(value.slice(-1) === '/'){
-                                       el.closed  = true;
-                                       value = value.slice(0,-1)
-                               }
-                       case S_ATTR_S:
-                               if(s === S_ATTR_S){
-                                       value = attrName;
-                               }
-                               if(s == S_V){
-                                       errorHandler.warning('attribute 
"'+value+'" missed quot(")!!');
-                                       
el.add(attrName,value.replace(/&#?\w+;/g,entityReplacer),start)
-                               }else{
-                                       errorHandler.warning('attribute 
"'+value+'" missed value!! "'+value+'" instead!!')
-                                       el.add(value,value,start)
-                               }
-                               break;
-                       case S_EQ:
-                               throw new Error('attribute value missed!!');
-                       }
-//                     
console.log(tagName,tagNamePattern,tagNamePattern.test(tagName))
-                       return p;
-               /*xml space '\x20' | #x9 | #xD | #xA; */
-               case '\u0080':
-                       c = ' ';
-               default:
-                       if(c<= ' '){//space
-                               switch(s){
-                               case S_TAG:
-                                       
el.setTagName(source.slice(start,p));//tagName
-                                       s = S_S;
-                                       break;
-                               case S_ATTR:
-                                       attrName = source.slice(start,p)
-                                       s = S_ATTR_S;
-                                       break;
-                               case S_V:
-                                       var value = 
source.slice(start,p).replace(/&#?\w+;/g,entityReplacer);
-                                       errorHandler.warning('attribute 
"'+value+'" missed quot(")!!');
-                                       el.add(attrName,value,start)
-                               case S_E:
-                                       s = S_S;
-                                       break;
-                               //case S_S:
-                               //case S_EQ:
-                               //case S_ATTR_S:
-                               //      void();break;
-                               //case S_C:
-                                       //ignore warning
-                               }
-                       }else{//not space
-//S_TAG,       S_ATTR, S_EQ,   S_V
-//S_ATTR_S,    S_E,    S_S,    S_C
-                               switch(s){
-                               //case S_TAG:void();break;
-                               //case S_ATTR:void();break;
-                               //case S_V:void();break;
-                               case S_ATTR_S:
-                                       errorHandler.warning('attribute 
"'+attrName+'" missed value!! "'+attrName+'" instead!!')
-                                       el.add(attrName,attrName,start);
-                                       start = p;
-                                       s = S_ATTR;
-                                       break;
-                               case S_E:
-                                       errorHandler.warning('attribute space 
is required"'+attrName+'"!!')
-                               case S_S:
-                                       s = S_ATTR;
-                                       start = p;
-                                       break;
-                               case S_EQ:
-                                       s = S_V;
-                                       start = p;
-                                       break;
-                               case S_C:
-                                       throw new Error("elements closed 
character '/' and '>' must be connected to");
-                               }
-                       }
-               }
-               p++;
-       }
-}
-/**
- * @return end of the elementStartPart(end of elementEndPart for selfClosed el)
- */
-function appendElement(el,domBuilder,parseStack){
-       var tagName = el.tagName;
-       var localNSMap = null;
-       var currentNSMap = parseStack[parseStack.length-1].currentNSMap;
-       var i = el.length;
-       while(i--){
-               var a = el[i];
-               var qName = a.qName;
-               var value = a.value;
-               var nsp = qName.indexOf(':');
-               if(nsp>0){
-                       var prefix = a.prefix = qName.slice(0,nsp);
-                       var localName = qName.slice(nsp+1);
-                       var nsPrefix = prefix === 'xmlns' && localName
-               }else{
-                       localName = qName;
-                       prefix = null
-                       nsPrefix = qName === 'xmlns' && ''
-               }
-               //can not set prefix,because prefix !== ''
-               a.localName = localName ;
-               //prefix == null for no ns prefix attribute 
-               if(nsPrefix !== false){//hack!!
-                       if(localNSMap == null){
-                               localNSMap = {}
-                               //console.log(currentNSMap,0)
-                               _copy(currentNSMap,currentNSMap={})
-                               //console.log(currentNSMap,1)
-                       }
-                       currentNSMap[nsPrefix] = localNSMap[nsPrefix] = value;
-                       a.uri = 'http://www.w3.org/2000/xmlns/'
-                       domBuilder.startPrefixMapping(nsPrefix, value) 
-               }
-       }
-       var i = el.length;
-       while(i--){
-               a = el[i];
-               var prefix = a.prefix;
-               if(prefix){//no prefix attribute has no namespace
-                       if(prefix === 'xml'){
-                               a.uri = 'http://www.w3.org/XML/1998/namespace';
-                       }if(prefix !== 'xmlns'){
-                               a.uri = currentNSMap[prefix]
-                               
-                               
//{console.log('###'+a.qName,domBuilder.locator.systemId+'',currentNSMap,a.uri)}
-                       }
-               }
-       }
-       var nsp = tagName.indexOf(':');
-       if(nsp>0){
-               prefix = el.prefix = tagName.slice(0,nsp);
-               localName = el.localName = tagName.slice(nsp+1);
-       }else{
-               prefix = null;//important!!
-               localName = el.localName = tagName;
-       }
-       //no prefix element has default namespace
-       var ns = el.uri = currentNSMap[prefix || ''];
-       domBuilder.startElement(ns,localName,tagName,el);
-       //endPrefixMapping and startPrefixMapping have not any help for dom 
builder
-       //localNSMap = null
-       if(el.closed){
-               domBuilder.endElement(ns,localName,tagName);
-               if(localNSMap){
-                       for(prefix in localNSMap){
-                               domBuilder.endPrefixMapping(prefix) 
-                       }
-               }
-       }else{
-               el.currentNSMap = currentNSMap;
-               el.localNSMap = localNSMap;
-               parseStack.push(el);
-       }
-}
-function 
parseHtmlSpecialContent(source,elStartEnd,tagName,entityReplacer,domBuilder){
-       if(/^(?:script|textarea)$/i.test(tagName)){
-               var elEndStart =  source.indexOf('</'+tagName+'>',elStartEnd);
-               var text = source.substring(elStartEnd+1,elEndStart);
-               if(/[&<]/.test(text)){
-                       if(/^script$/i.test(tagName)){
-                               //if(!/\]\]>/.test(text)){
-                                       //lexHandler.startCDATA();
-                                       
domBuilder.characters(text,0,text.length);
-                                       //lexHandler.endCDATA();
-                                       return elEndStart;
-                               //}
-                       }//}else{//text area
-                               text = text.replace(/&#?\w+;/g,entityReplacer);
-                               domBuilder.characters(text,0,text.length);
-                               return elEndStart;
-                       //}
-                       
-               }
-       }
-       return elStartEnd+1;
-}
-function fixSelfClosed(source,elStartEnd,tagName,closeMap){
-       //if(tagName in closeMap){
-       var pos = closeMap[tagName];
-       if(pos == null){
-               //console.log(tagName)
-               pos = closeMap[tagName] = source.lastIndexOf('</'+tagName+'>')
-       }
-       return pos<elStartEnd;
-       //} 
-}
-function _copy(source,target){
-       for(var n in source){target[n] = source[n]}
-}
-function parseDCC(source,start,domBuilder,errorHandler){//sure start with '<!'
-       var next= source.charAt(start+2)
-       switch(next){
-       case '-':
-               if(source.charAt(start + 3) === '-'){
-                       var end = source.indexOf('-->',start+4);
-                       //append comment source.substring(4,end)//<!--
-                       if(end>start){
-                               domBuilder.comment(source,start+4,end-start-4);
-                               return end+3;
-                       }else{
-                               errorHandler.error("Unclosed comment");
-                               return -1;
-                       }
-               }else{
-                       //error
-                       return -1;
-               }
-       default:
-               if(source.substr(start+3,6) == 'CDATA['){
-                       var end = source.indexOf(']]>',start+9);
-                       domBuilder.startCDATA();
-                       domBuilder.characters(source,start+9,end-start-9);
-                       domBuilder.endCDATA() 
-                       return end+3;
-               }
-               //<!DOCTYPE
-               //startDTD(java.lang.String name, java.lang.String publicId, 
java.lang.String systemId) 
-               var matchs = split(source,start);
-               var len = matchs.length;
-               if(len>1 && /!doctype/i.test(matchs[0][0])){
-                       var name = matchs[1][0];
-                       var pubid = len>3 && /^public$/i.test(matchs[2][0]) && 
matchs[3][0]
-                       var sysid = len>4 && matchs[4][0];
-                       var lastMatch = matchs[len-1]
-                       domBuilder.startDTD(name,pubid && 
pubid.replace(/^(['"])(.*?)\1$/,'$2'),
-                                       sysid && 
sysid.replace(/^(['"])(.*?)\1$/,'$2'));
-                       domBuilder.endDTD();
-                       
-                       return lastMatch.index+lastMatch[0].length
-               }
-       }
-       return -1;
-}
-
-
-
-function parseInstruction(source,start,domBuilder){
-       var end = source.indexOf('?>',start);
-       if(end){
-               var match = 
source.substring(start,end).match(/^<\?(\S*)\s*([\s\S]*?)\s*$/);
-               if(match){
-                       var len = match[0].length;
-                       domBuilder.processingInstruction(match[1], match[2]) ;
-                       return end+2;
-               }else{//error
-                       return -1;
-               }
-       }
-       return -1;
-}
-
-/**
- * @param source
- */
-function ElementAttributes(source){
-       
-}
-ElementAttributes.prototype = {
-       setTagName:function(tagName){
-               if(!tagNamePattern.test(tagName)){
-                       throw new Error('invalid tagName:'+tagName)
-               }
-               this.tagName = tagName
-       },
-       add:function(qName,value,offset){
-               if(!tagNamePattern.test(qName)){
-                       throw new Error('invalid attribute:'+qName)
-               }
-               this[this.length++] = {qName:qName,value:value,offset:offset}
-       },
-       length:0,
-       getLocalName:function(i){return this[i].localName},
-       getOffset:function(i){return this[i].offset},
-       getQName:function(i){return this[i].qName},
-       getURI:function(i){return this[i].uri},
-       getValue:function(i){return this[i].value}
-//     ,getIndex:function(uri, localName)){
-//             if(localName){
-//                     
-//             }else{
-//                     var qName = uri
-//             }
-//     },
-//     getValue:function(){return 
this.getValue(this.getIndex.apply(this,arguments))},
-//     getType:function(uri,localName){}
-//     getType:function(i){},
-}
-
-
-
-
-function _set_proto_(thiz,parent){
-       thiz.__proto__ = parent;
-       return thiz;
-}
-if(!(_set_proto_({},_set_proto_.prototype) instanceof _set_proto_)){
-       _set_proto_ = function(thiz,parent){
-               function p(){};
-               p.prototype = parent;
-               p = new p();
-               for(parent in thiz){
-                       p[parent] = thiz[parent];
-               }
-               return p;
-       }
-}
-
-function split(source,start){
-       var match;
-       var buf = [];
-       var reg = /'[^']+'|"[^"]+"|[^\s<>\/=]+=?|(\/?\s*>|<)/g;
-       reg.lastIndex = start;
-       reg.exec(source);//skip <
-       while(match = reg.exec(source)){
-               buf.push(match);
-               if(match[1])return buf;
-       }
-}
-
-if(typeof require == 'function'){
-       exports.XMLReader = XMLReader;
-}
-

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d7ccaec/node_modules/cordova-common/node_modules/plist/package.json
----------------------------------------------------------------------
diff --git a/node_modules/cordova-common/node_modules/plist/package.json 
b/node_modules/cordova-common/node_modules/plist/package.json
deleted file mode 100644
index b6059ad..0000000
--- a/node_modules/cordova-common/node_modules/plist/package.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "name": "plist",
-  "description": "Mac OS X Plist parser/builder for Node.js and browsers",
-  "version": "1.2.0",
-  "author": {
-    "name": "Nathan Rajlich",
-    "email": "nat...@tootallnate.net"
-  },
-  "contributors": [
-    {
-      "name": "Hans Huebner",
-      "email": "hans.hueb...@gmail.com"
-    },
-    {
-      "name": "Pierre Metrailler"
-    },
-    {
-      "name": "Mike Reinstein",
-      "email": "reinstein.m...@gmail.com"
-    },
-    {
-      "name": "Vladimir Tsvang"
-    },
-    {
-      "name": "Mathieu D'Amours"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/TooTallNate/node-plist.git"
-  },
-  "license": "MIT",
-  "keywords": [
-    "apple",
-    "browser",
-    "mac",
-    "plist",
-    "parser",
-    "xml"
-  ],
-  "main": "lib/plist.js",
-  "dependencies": {
-    "base64-js": "0.0.8",
-    "xmlbuilder": "4.0.0",
-    "xmldom": "0.1.x",
-    "util-deprecate": "1.0.2"
-  },
-  "devDependencies": {
-    "browserify": "12.0.1",
-    "mocha": "2.3.3",
-    "multiline": "1.0.2",
-    "zuul": "3.7.2"
-  },
-  "scripts": {
-    "test": "make test"
-  },
-  "gitHead": "69520574f27864145192338b72e608fbe1bda6f7",
-  "bugs": {
-    "url": "https://github.com/TooTallNate/node-plist/issues";
-  },
-  "homepage": "https://github.com/TooTallNate/node-plist#readme";,
-  "_id": "plist@1.2.0",
-  "_shasum": "084b5093ddc92506e259f874b8d9b1afb8c79593",
-  "_from": "plist@>=1.1.0 <2.0.0",
-  "_npmVersion": "3.3.11",
-  "_nodeVersion": "5.0.0",
-  "_npmUser": {
-    "name": "mreinstein",
-    "email": "reinstein.m...@gmail.com"
-  },
-  "dist": {
-    "shasum": "084b5093ddc92506e259f874b8d9b1afb8c79593",
-    "tarball": "http://registry.npmjs.org/plist/-/plist-1.2.0.tgz";
-  },
-  "maintainers": [
-    {
-      "name": "TooTallNate",
-      "email": "nat...@tootallnate.net"
-    },
-    {
-      "name": "tootallnate",
-      "email": "nat...@tootallnate.net"
-    },
-    {
-      "name": "mreinstein",
-      "email": "reinstein.m...@gmail.com"
-    }
-  ],
-  "directories": {},
-  "_resolved": "http://registry.npmjs.org/plist/-/plist-1.2.0.tgz";,
-  "readme": "ERROR: No README data found!"
-}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d7ccaec/node_modules/cordova-common/node_modules/semver/.npmignore
----------------------------------------------------------------------
diff --git a/node_modules/cordova-common/node_modules/semver/.npmignore 
b/node_modules/cordova-common/node_modules/semver/.npmignore
deleted file mode 100644
index 534108e..0000000
--- a/node_modules/cordova-common/node_modules/semver/.npmignore
+++ /dev/null
@@ -1,4 +0,0 @@
-node_modules/
-coverage/
-.nyc_output/
-nyc_output/

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d7ccaec/node_modules/cordova-common/node_modules/semver/.travis.yml
----------------------------------------------------------------------
diff --git a/node_modules/cordova-common/node_modules/semver/.travis.yml 
b/node_modules/cordova-common/node_modules/semver/.travis.yml
deleted file mode 100644
index 991d04b..0000000
--- a/node_modules/cordova-common/node_modules/semver/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: node_js
-node_js:
-  - '0.10'
-  - '0.12'
-  - 'iojs'

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d7ccaec/node_modules/cordova-common/node_modules/semver/LICENSE
----------------------------------------------------------------------
diff --git a/node_modules/cordova-common/node_modules/semver/LICENSE 
b/node_modules/cordova-common/node_modules/semver/LICENSE
deleted file mode 100644
index 19129e3..0000000
--- a/node_modules/cordova-common/node_modules/semver/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d7ccaec/node_modules/cordova-common/node_modules/semver/README.md
----------------------------------------------------------------------
diff --git a/node_modules/cordova-common/node_modules/semver/README.md 
b/node_modules/cordova-common/node_modules/semver/README.md
deleted file mode 100644
index 0b14a7e..0000000
--- a/node_modules/cordova-common/node_modules/semver/README.md
+++ /dev/null
@@ -1,327 +0,0 @@
-semver(1) -- The semantic versioner for npm
-===========================================
-
-## Usage
-
-    $ npm install semver
-
-    semver.valid('1.2.3') // '1.2.3'
-    semver.valid('a.b.c') // null
-    semver.clean('  =v1.2.3   ') // '1.2.3'
-    semver.satisfies('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') // true
-    semver.gt('1.2.3', '9.8.7') // false
-    semver.lt('1.2.3', '9.8.7') // true
-
-As a command-line utility:
-
-    $ semver -h
-
-    Usage: semver <version> [<version> [...]] [-r <range> | -i <inc> | --preid 
<identifier> | -l | -rv]
-    Test if version(s) satisfy the supplied range(s), and sort them.
-
-    Multiple versions or ranges may be supplied, unless increment
-    option is specified.  In that case, only a single version may
-    be used, and it is incremented by the specified level
-
-    Program exits successfully if any valid version satisfies
-    all supplied ranges, and prints all satisfying versions.
-
-    If no versions are valid, or ranges are not satisfied,
-    then exits failure.
-
-    Versions are printed in ascending order, so supplying
-    multiple versions to the utility will just sort them.
-
-## Versions
-
-A "version" is described by the `v2.0.0` specification found at
-<http://semver.org/>.
-
-A leading `"="` or `"v"` character is stripped off and ignored.
-
-## Ranges
-
-A `version range` is a set of `comparators` which specify versions
-that satisfy the range.
-
-A `comparator` is composed of an `operator` and a `version`.  The set
-of primitive `operators` is:
-
-* `<` Less than
-* `<=` Less than or equal to
-* `>` Greater than
-* `>=` Greater than or equal to
-* `=` Equal.  If no operator is specified, then equality is assumed,
-  so this operator is optional, but MAY be included.
-
-For example, the comparator `>=1.2.7` would match the versions
-`1.2.7`, `1.2.8`, `2.5.3`, and `1.3.9`, but not the versions `1.2.6`
-or `1.1.0`.
-
-Comparators can be joined by whitespace to form a `comparator set`,
-which is satisfied by the **intersection** of all of the comparators
-it includes.
-
-A range is composed of one or more comparator sets, joined by `||`.  A
-version matches a range if and only if every comparator in at least
-one of the `||`-separated comparator sets is satisfied by the version.
-
-For example, the range `>=1.2.7 <1.3.0` would match the versions
-`1.2.7`, `1.2.8`, and `1.2.99`, but not the versions `1.2.6`, `1.3.0`,
-or `1.1.0`.
-
-The range `1.2.7 || >=1.2.9 <2.0.0` would match the versions `1.2.7`,
-`1.2.9`, and `1.4.6`, but not the versions `1.2.8` or `2.0.0`.
-
-### Prerelease Tags
-
-If a version has a prerelease tag (for example, `1.2.3-alpha.3`) then
-it will only be allowed to satisfy comparator sets if at least one
-comparator with the same `[major, minor, patch]` tuple also has a
-prerelease tag.
-
-For example, the range `>1.2.3-alpha.3` would be allowed to match the
-version `1.2.3-alpha.7`, but it would *not* be satisfied by
-`3.4.5-alpha.9`, even though `3.4.5-alpha.9` is technically "greater
-than" `1.2.3-alpha.3` according to the SemVer sort rules.  The version
-range only accepts prerelease tags on the `1.2.3` version.  The
-version `3.4.5` *would* satisfy the range, because it does not have a
-prerelease flag, and `3.4.5` is greater than `1.2.3-alpha.7`.
-
-The purpose for this behavior is twofold.  First, prerelease versions
-frequently are updated very quickly, and contain many breaking changes
-that are (by the author's design) not yet fit for public consumption.
-Therefore, by default, they are excluded from range matching
-semantics.
-
-Second, a user who has opted into using a prerelease version has
-clearly indicated the intent to use *that specific* set of
-alpha/beta/rc versions.  By including a prerelease tag in the range,
-the user is indicating that they are aware of the risk.  However, it
-is still not appropriate to assume that they have opted into taking a
-similar risk on the *next* set of prerelease versions.
-
-#### Prerelease Identifiers
-
-The method `.inc` takes an additional `identifier` string argument that
-will append the value of the string as a prerelease identifier:
-
-```javascript
-> semver.inc('1.2.3', 'prerelease', 'beta')
-'1.2.4-beta.0'
-```
-
-command-line example:
-
-```shell
-$ semver 1.2.3 -i prerelease --preid beta
-1.2.4-beta.0
-```
-
-Which then can be used to increment further:
-
-```shell
-$ semver 1.2.4-beta.0 -i prerelease
-1.2.4-beta.1
-```
-
-### Advanced Range Syntax
-
-Advanced range syntax desugars to primitive comparators in
-deterministic ways.
-
-Advanced ranges may be combined in the same way as primitive
-comparators using white space or `||`.
-
-#### Hyphen Ranges `X.Y.Z - A.B.C`
-
-Specifies an inclusive set.
-
-* `1.2.3 - 2.3.4` := `>=1.2.3 <=2.3.4`
-
-If a partial version is provided as the first version in the inclusive
-range, then the missing pieces are replaced with zeroes.
-
-* `1.2 - 2.3.4` := `>=1.2.0 <=2.3.4`
-
-If a partial version is provided as the second version in the
-inclusive range, then all versions that start with the supplied parts
-of the tuple are accepted, but nothing that would be greater than the
-provided tuple parts.
-
-* `1.2.3 - 2.3` := `>=1.2.3 <2.4.0`
-* `1.2.3 - 2` := `>=1.2.3 <3.0.0`
-
-#### X-Ranges `1.2.x` `1.X` `1.2.*` `*`
-
-Any of `X`, `x`, or `*` may be used to "stand in" for one of the
-numeric values in the `[major, minor, patch]` tuple.
-
-* `*` := `>=0.0.0` (Any version satisfies)
-* `1.x` := `>=1.0.0 <2.0.0` (Matching major version)
-* `1.2.x` := `>=1.2.0 <1.3.0` (Matching major and minor versions)
-
-A partial version range is treated as an X-Range, so the special
-character is in fact optional.
-
-* `""` (empty string) := `*` := `>=0.0.0`
-* `1` := `1.x.x` := `>=1.0.0 <2.0.0`
-* `1.2` := `1.2.x` := `>=1.2.0 <1.3.0`
-
-#### Tilde Ranges `~1.2.3` `~1.2` `~1`
-
-Allows patch-level changes if a minor version is specified on the
-comparator.  Allows minor-level changes if not.
-
-* `~1.2.3` := `>=1.2.3 <1.(2+1).0` := `>=1.2.3 <1.3.0`
-* `~1.2` := `>=1.2.0 <1.(2+1).0` := `>=1.2.0 <1.3.0` (Same as `1.2.x`)
-* `~1` := `>=1.0.0 <(1+1).0.0` := `>=1.0.0 <2.0.0` (Same as `1.x`)
-* `~0.2.3` := `>=0.2.3 <0.(2+1).0` := `>=0.2.3 <0.3.0`
-* `~0.2` := `>=0.2.0 <0.(2+1).0` := `>=0.2.0 <0.3.0` (Same as `0.2.x`)
-* `~0` := `>=0.0.0 <(0+1).0.0` := `>=0.0.0 <1.0.0` (Same as `0.x`)
-* `~1.2.3-beta.2` := `>=1.2.3-beta.2 <1.3.0` Note that prereleases in
-  the `1.2.3` version will be allowed, if they are greater than or
-  equal to `beta.2`.  So, `1.2.3-beta.4` would be allowed, but
-  `1.2.4-beta.2` would not, because it is a prerelease of a
-  different `[major, minor, patch]` tuple.
-
-#### Caret Ranges `^1.2.3` `^0.2.5` `^0.0.4`
-
-Allows changes that do not modify the left-most non-zero digit in the
-`[major, minor, patch]` tuple.  In other words, this allows patch and
-minor updates for versions `1.0.0` and above, patch updates for
-versions `0.X >=0.1.0`, and *no* updates for versions `0.0.X`.
-
-Many authors treat a `0.x` version as if the `x` were the major
-"breaking-change" indicator.
-
-Caret ranges are ideal when an author may make breaking changes
-between `0.2.4` and `0.3.0` releases, which is a common practice.
-However, it presumes that there will *not* be breaking changes between
-`0.2.4` and `0.2.5`.  It allows for changes that are presumed to be
-additive (but non-breaking), according to commonly observed practices.
-
-* `^1.2.3` := `>=1.2.3 <2.0.0`
-* `^0.2.3` := `>=0.2.3 <0.3.0`
-* `^0.0.3` := `>=0.0.3 <0.0.4`
-* `^1.2.3-beta.2` := `>=1.2.3-beta.2 <2.0.0` Note that prereleases in
-  the `1.2.3` version will be allowed, if they are greater than or
-  equal to `beta.2`.  So, `1.2.3-beta.4` would be allowed, but
-  `1.2.4-beta.2` would not, because it is a prerelease of a
-  different `[major, minor, patch]` tuple.
-* `^0.0.3-beta` := `>=0.0.3-beta <0.0.4`  Note that prereleases in the
-  `0.0.3` version *only* will be allowed, if they are greater than or
-  equal to `beta`.  So, `0.0.3-pr.2` would be allowed.
-
-When parsing caret ranges, a missing `patch` value desugars to the
-number `0`, but will allow flexibility within that value, even if the
-major and minor versions are both `0`.
-
-* `^1.2.x` := `>=1.2.0 <2.0.0`
-* `^0.0.x` := `>=0.0.0 <0.1.0`
-* `^0.0` := `>=0.0.0 <0.1.0`
-
-A missing `minor` and `patch` values will desugar to zero, but also
-allow flexibility within those values, even if the major version is
-zero.
-
-* `^1.x` := `>=1.0.0 <2.0.0`
-* `^0.x` := `>=0.0.0 <1.0.0`
-
-### Range Grammar
-
-Putting all this together, here is a Backus-Naur grammar for ranges,
-for the benefit of parser authors:
-
-```bnf
-range-set  ::= range ( logical-or range ) *
-logical-or ::= ( ' ' ) * '||' ( ' ' ) *
-range      ::= hyphen | simple ( ' ' simple ) * | ''
-hyphen     ::= partial ' - ' partial
-simple     ::= primitive | partial | tilde | caret
-primitive  ::= ( '<' | '>' | '>=' | '<=' | '=' | ) partial
-partial    ::= xr ( '.' xr ( '.' xr qualifier ? )? )?
-xr         ::= 'x' | 'X' | '*' | nr
-nr         ::= '0' | ['1'-'9']['0'-'9']+
-tilde      ::= '~' partial
-caret      ::= '^' partial
-qualifier  ::= ( '-' pre )? ( '+' build )?
-pre        ::= parts
-build      ::= parts
-parts      ::= part ( '.' part ) *
-part       ::= nr | [-0-9A-Za-z]+
-```
-
-## Functions
-
-All methods and classes take a final `loose` boolean argument that, if
-true, will be more forgiving about not-quite-valid semver strings.
-The resulting output will always be 100% strict, of course.
-
-Strict-mode Comparators and Ranges will be strict about the SemVer
-strings that they parse.
-
-* `valid(v)`: Return the parsed version, or null if it's not valid.
-* `inc(v, release)`: Return the version incremented by the release
-  type (`major`,   `premajor`, `minor`, `preminor`, `patch`,
-  `prepatch`, or `prerelease`), or null if it's not valid
-  * `premajor` in one call will bump the version up to the next major
-    version and down to a prerelease of that major version.
-    `preminor`, and `prepatch` work the same way.
-  * If called from a non-prerelease version, the `prerelease` will work the
-    same as `prepatch`. It increments the patch version, then makes a
-    prerelease. If the input version is already a prerelease it simply
-    increments it.
-* `major(v)`: Return the major version number.
-* `minor(v)`: Return the minor version number.
-* `patch(v)`: Return the patch version number.
-
-### Comparison
-
-* `gt(v1, v2)`: `v1 > v2`
-* `gte(v1, v2)`: `v1 >= v2`
-* `lt(v1, v2)`: `v1 < v2`
-* `lte(v1, v2)`: `v1 <= v2`
-* `eq(v1, v2)`: `v1 == v2` This is true if they're logically equivalent,
-  even if they're not the exact same string.  You already know how to
-  compare strings.
-* `neq(v1, v2)`: `v1 != v2` The opposite of `eq`.
-* `cmp(v1, comparator, v2)`: Pass in a comparison string, and it'll call
-  the corresponding function above.  `"==="` and `"!=="` do simple
-  string comparison, but are included for completeness.  Throws if an
-  invalid comparison string is provided.
-* `compare(v1, v2)`: Return `0` if `v1 == v2`, or `1` if `v1` is greater, or 
`-1` if
-  `v2` is greater.  Sorts in ascending order if passed to `Array.sort()`.
-* `rcompare(v1, v2)`: The reverse of compare.  Sorts an array of versions
-  in descending order when passed to `Array.sort()`.
-* `diff(v1, v2)`: Returns difference between two versions by the release type
-  (`major`, `premajor`, `minor`, `preminor`, `patch`, `prepatch`, or 
`prerelease`),
-  or null if the versions are the same.
-
-
-### Ranges
-
-* `validRange(range)`: Return the valid range or null if it's not valid
-* `satisfies(version, range)`: Return true if the version satisfies the
-  range.
-* `maxSatisfying(versions, range)`: Return the highest version in the list
-  that satisfies the range, or `null` if none of them do.
-* `gtr(version, range)`: Return `true` if version is greater than all the
-  versions possible in the range.
-* `ltr(version, range)`: Return `true` if version is less than all the
-  versions possible in the range.
-* `outside(version, range, hilo)`: Return true if the version is outside
-  the bounds of the range in either the high or low direction.  The
-  `hilo` argument must be either the string `'>'` or `'<'`.  (This is
-  the function called by `gtr` and `ltr`.)
-
-Note that, since ranges may be non-contiguous, a version might not be
-greater than a range, less than a range, *or* satisfy a range!  For
-example, the range `1.2 <1.2.9 || >2.0.0` would have a hole from `1.2.9`
-until `2.0.0`, so the version `1.2.10` would not be greater than the
-range (because `2.0.1` satisfies, which is higher), nor less than the
-range (since `1.2.8` satisfies, which is lower), and it also does not
-satisfy the range.
-
-If you want to know if a version satisfies or does not satisfy a
-range, use the `satisfies(version, range)` function.

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d7ccaec/node_modules/cordova-common/node_modules/semver/bin/semver
----------------------------------------------------------------------
diff --git a/node_modules/cordova-common/node_modules/semver/bin/semver 
b/node_modules/cordova-common/node_modules/semver/bin/semver
deleted file mode 100755
index c5f2e85..0000000
--- a/node_modules/cordova-common/node_modules/semver/bin/semver
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/usr/bin/env node
-// Standalone semver comparison program.
-// Exits successfully and prints matching version(s) if
-// any supplied version is valid and passes all tests.
-
-var argv = process.argv.slice(2)
-  , versions = []
-  , range = []
-  , gt = []
-  , lt = []
-  , eq = []
-  , inc = null
-  , version = require("../package.json").version
-  , loose = false
-  , identifier = undefined
-  , semver = require("../semver")
-  , reverse = false
-
-main()
-
-function main () {
-  if (!argv.length) return help()
-  while (argv.length) {
-    var a = argv.shift()
-    var i = a.indexOf('=')
-    if (i !== -1) {
-      a = a.slice(0, i)
-      argv.unshift(a.slice(i + 1))
-    }
-    switch (a) {
-      case "-rv": case "-rev": case "--rev": case "--reverse":
-        reverse = true
-        break
-      case "-l": case "--loose":
-        loose = true
-        break
-      case "-v": case "--version":
-        versions.push(argv.shift())
-        break
-      case "-i": case "--inc": case "--increment":
-        switch (argv[0]) {
-          case "major": case "minor": case "patch": case "prerelease":
-          case "premajor": case "preminor": case "prepatch":
-            inc = argv.shift()
-            break
-          default:
-            inc = "patch"
-            break
-        }
-        break
-      case "--preid":
-        identifier = argv.shift()
-        break
-      case "-r": case "--range":
-        range.push(argv.shift())
-        break
-      case "-h": case "--help": case "-?":
-        return help()
-      default:
-        versions.push(a)
-        break
-    }
-  }
-
-  versions = versions.filter(function (v) {
-    return semver.valid(v, loose)
-  })
-  if (!versions.length) return fail()
-  if (inc && (versions.length !== 1 || range.length))
-    return failInc()
-
-  for (var i = 0, l = range.length; i < l ; i ++) {
-    versions = versions.filter(function (v) {
-      return semver.satisfies(v, range[i], loose)
-    })
-    if (!versions.length) return fail()
-  }
-  return success(versions)
-}
-
-function failInc () {
-  console.error("--inc can only be used on a single version with no range")
-  fail()
-}
-
-function fail () { process.exit(1) }
-
-function success () {
-  var compare = reverse ? "rcompare" : "compare"
-  versions.sort(function (a, b) {
-    return semver[compare](a, b, loose)
-  }).map(function (v) {
-    return semver.clean(v, loose)
-  }).map(function (v) {
-    return inc ? semver.inc(v, inc, loose, identifier) : v
-  }).forEach(function (v,i,_) { console.log(v) })
-}
-
-function help () {
-  console.log(["SemVer " + version
-              ,""
-              ,"A JavaScript implementation of the http://semver.org/ 
specification"
-              ,"Copyright Isaac Z. Schlueter"
-              ,""
-              ,"Usage: semver [options] <version> [<version> [...]]"
-              ,"Prints valid versions sorted by SemVer precedence"
-              ,""
-              ,"Options:"
-              ,"-r --range <range>"
-              ,"        Print versions that match the specified range."
-              ,""
-              ,"-i --increment [<level>]"
-              ,"        Increment a version by the specified level.  Level can"
-              ,"        be one of: major, minor, patch, premajor, preminor,"
-              ,"        prepatch, or prerelease.  Default level is 'patch'."
-              ,"        Only one version may be specified."
-              ,""
-              ,"--preid <identifier>"
-              ,"        Identifier to be used to prefix premajor, preminor,"
-              ,"        prepatch or prerelease version increments."
-              ,""
-              ,"-l --loose"
-              ,"        Interpret versions and ranges loosely"
-              ,""
-              ,"Program exits successfully if any valid version satisfies"
-              ,"all supplied ranges, and prints all satisfying versions."
-              ,""
-              ,"If no satisfying versions are found, then exits failure."
-              ,""
-              ,"Versions are printed in ascending order, so supplying"
-              ,"multiple versions to the utility will just sort them."
-              ].join("\n"))
-}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d7ccaec/node_modules/cordova-common/node_modules/semver/package.json
----------------------------------------------------------------------
diff --git a/node_modules/cordova-common/node_modules/semver/package.json 
b/node_modules/cordova-common/node_modules/semver/package.json
deleted file mode 100644
index 2a8618b..0000000
--- a/node_modules/cordova-common/node_modules/semver/package.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "name": "semver",
-  "version": "5.1.0",
-  "description": "The semantic version parser used by npm.",
-  "main": "semver.js",
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "devDependencies": {
-    "tap": "^2.0.0"
-  },
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/node-semver.git";
-  },
-  "bin": {
-    "semver": "./bin/semver"
-  },
-  "gitHead": "8e33a30e62e40e4983d1c5f55e794331b861aadc",
-  "bugs": {
-    "url": "https://github.com/npm/node-semver/issues";
-  },
-  "homepage": "https://github.com/npm/node-semver#readme";,
-  "_id": "semver@5.1.0",
-  "_shasum": "85f2cf8550465c4df000cf7d86f6b054106ab9e5",
-  "_from": "semver@>=5.0.1 <6.0.0",
-  "_npmVersion": "3.3.2",
-  "_nodeVersion": "4.0.0",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "i...@izs.me"
-  },
-  "dist": {
-    "shasum": "85f2cf8550465c4df000cf7d86f6b054106ab9e5",
-    "tarball": "http://registry.npmjs.org/semver/-/semver-5.1.0.tgz";
-  },
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "isa...@npmjs.com"
-    },
-    {
-      "name": "othiym23",
-      "email": "o...@aoaioxxysz.net"
-    }
-  ],
-  "directories": {},
-  "_resolved": "http://registry.npmjs.org/semver/-/semver-5.1.0.tgz";,
-  "readme": "ERROR: No README data found!"
-}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d7ccaec/node_modules/cordova-common/node_modules/semver/range.bnf
----------------------------------------------------------------------
diff --git a/node_modules/cordova-common/node_modules/semver/range.bnf 
b/node_modules/cordova-common/node_modules/semver/range.bnf
deleted file mode 100644
index 000df92..0000000
--- a/node_modules/cordova-common/node_modules/semver/range.bnf
+++ /dev/null
@@ -1,16 +0,0 @@
-range-set  ::= range ( logical-or range ) *
-logical-or ::= ( ' ' ) * '||' ( ' ' ) *
-range      ::= hyphen | simple ( ' ' simple ) * | ''
-hyphen     ::= partial ' - ' partial
-simple     ::= primitive | partial | tilde | caret
-primitive  ::= ( '<' | '>' | '>=' | '<=' | '=' | ) partial
-partial    ::= xr ( '.' xr ( '.' xr qualifier ? )? )?
-xr         ::= 'x' | 'X' | '*' | nr
-nr         ::= '0' | ['1'-'9']['0'-'9']+
-tilde      ::= '~' partial
-caret      ::= '^' partial
-qualifier  ::= ( '-' pre )? ( '+' build )?
-pre        ::= parts
-build      ::= parts
-parts      ::= part ( '.' part ) *
-part       ::= nr | [-0-9A-Za-z]+

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d7ccaec/node_modules/cordova-common/node_modules/semver/semver.js
----------------------------------------------------------------------
diff --git a/node_modules/cordova-common/node_modules/semver/semver.js 
b/node_modules/cordova-common/node_modules/semver/semver.js
deleted file mode 100644
index 71795f6..0000000
--- a/node_modules/cordova-common/node_modules/semver/semver.js
+++ /dev/null
@@ -1,1188 +0,0 @@
-exports = module.exports = SemVer;
-
-// The debug function is excluded entirely from the minified version.
-/* nomin */ var debug;
-/* nomin */ if (typeof process === 'object' &&
-    /* nomin */ process.env &&
-    /* nomin */ process.env.NODE_DEBUG &&
-    /* nomin */ /\bsemver\b/i.test(process.env.NODE_DEBUG))
-  /* nomin */ debug = function() {
-    /* nomin */ var args = Array.prototype.slice.call(arguments, 0);
-    /* nomin */ args.unshift('SEMVER');
-    /* nomin */ console.log.apply(console, args);
-    /* nomin */ };
-/* nomin */ else
-  /* nomin */ debug = function() {};
-
-// Note: this is the semver.org version of the spec that it implements
-// Not necessarily the package version of this code.
-exports.SEMVER_SPEC_VERSION = '2.0.0';
-
-var MAX_LENGTH = 256;
-var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
-
-// The actual regexps go on exports.re
-var re = exports.re = [];
-var src = exports.src = [];
-var R = 0;
-
-// The following Regular Expressions can be used for tokenizing,
-// validating, and parsing SemVer version strings.
-
-// ## Numeric Identifier
-// A single `0`, or a non-zero digit followed by zero or more digits.
-
-var NUMERICIDENTIFIER = R++;
-src[NUMERICIDENTIFIER] = '0|[1-9]\\d*';
-var NUMERICIDENTIFIERLOOSE = R++;
-src[NUMERICIDENTIFIERLOOSE] = '[0-9]+';
-
-
-// ## Non-numeric Identifier
-// Zero or more digits, followed by a letter or hyphen, and then zero or
-// more letters, digits, or hyphens.
-
-var NONNUMERICIDENTIFIER = R++;
-src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*';
-
-
-// ## Main Version
-// Three dot-separated numeric identifiers.
-
-var MAINVERSION = R++;
-src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')';
-
-var MAINVERSIONLOOSE = R++;
-src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')';
-
-// ## Pre-release Version Identifier
-// A numeric identifier, or a non-numeric identifier.
-
-var PRERELEASEIDENTIFIER = R++;
-src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
-                            '|' + src[NONNUMERICIDENTIFIER] + ')';
-
-var PRERELEASEIDENTIFIERLOOSE = R++;
-src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
-                                 '|' + src[NONNUMERICIDENTIFIER] + ')';
-
-
-// ## Pre-release Version
-// Hyphen, followed by one or more dot-separated pre-release version
-// identifiers.
-
-var PRERELEASE = R++;
-src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
-                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))';
-
-var PRERELEASELOOSE = R++;
-src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
-                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))';
-
-// ## Build Metadata Identifier
-// Any combination of digits, letters, or hyphens.
-
-var BUILDIDENTIFIER = R++;
-src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+';
-
-// ## Build Metadata
-// Plus sign, followed by one or more period-separated build metadata
-// identifiers.
-
-var BUILD = R++;
-src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
-             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))';
-
-
-// ## Full Version String
-// A main version, followed optionally by a pre-release version and
-// build metadata.
-
-// Note that the only major, minor, patch, and pre-release sections of
-// the version string are capturing groups.  The build metadata is not a
-// capturing group, because it should not ever be used in version
-// comparison.
-
-var FULL = R++;
-var FULLPLAIN = 'v?' + src[MAINVERSION] +
-                src[PRERELEASE] + '?' +
-                src[BUILD] + '?';
-
-src[FULL] = '^' + FULLPLAIN + '$';
-
-// like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
-// also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
-// common in the npm registry.
-var LOOSEPLAIN = '[v=\\s]*' + src[MAINVERSIONLOOSE] +
-                 src[PRERELEASELOOSE] + '?' +
-                 src[BUILD] + '?';
-
-var LOOSE = R++;
-src[LOOSE] = '^' + LOOSEPLAIN + '$';
-
-var GTLT = R++;
-src[GTLT] = '((?:<|>)?=?)';
-
-// Something like "2.*" or "1.2.x".
-// Note that "x.x" is a valid xRange identifer, meaning "any version"
-// Only the first item is strictly required.
-var XRANGEIDENTIFIERLOOSE = R++;
-src[XRANGEIDENTIFIERLOOSE] = src[NUMERICIDENTIFIERLOOSE] + '|x|X|\\*';
-var XRANGEIDENTIFIER = R++;
-src[XRANGEIDENTIFIER] = src[NUMERICIDENTIFIER] + '|x|X|\\*';
-
-var XRANGEPLAIN = R++;
-src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:' + src[PRERELEASE] + ')?' +
-                   src[BUILD] + '?' +
-                   ')?)?';
-
-var XRANGEPLAINLOOSE = R++;
-src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:' + src[PRERELEASELOOSE] + ')?' +
-                        src[BUILD] + '?' +
-                        ')?)?';
-
-var XRANGE = R++;
-src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$';
-var XRANGELOOSE = R++;
-src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$';
-
-// Tilde ranges.
-// Meaning is "reasonably at or greater than"
-var LONETILDE = R++;
-src[LONETILDE] = '(?:~>?)';
-
-var TILDETRIM = R++;
-src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+';
-re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g');
-var tildeTrimReplace = '$1~';
-
-var TILDE = R++;
-src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$';
-var TILDELOOSE = R++;
-src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$';
-
-// Caret ranges.
-// Meaning is "at least and backwards compatible with"
-var LONECARET = R++;
-src[LONECARET] = '(?:\\^)';
-
-var CARETTRIM = R++;
-src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+';
-re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g');
-var caretTrimReplace = '$1^';
-
-var CARET = R++;
-src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$';
-var CARETLOOSE = R++;
-src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$';
-
-// A simple gt/lt/eq thing, or just "" to indicate "any version"
-var COMPARATORLOOSE = R++;
-src[COMPARATORLOOSE] = '^' + src[GTLT] + '\\s*(' + LOOSEPLAIN + ')$|^$';
-var COMPARATOR = R++;
-src[COMPARATOR] = '^' + src[GTLT] + '\\s*(' + FULLPLAIN + ')$|^$';
-
-
-// An expression to strip any whitespace between the gtlt and the thing
-// it modifies, so that `> 1.2.3` ==> `>1.2.3`
-var COMPARATORTRIM = R++;
-src[COMPARATORTRIM] = '(\\s*)' + src[GTLT] +
-                      '\\s*(' + LOOSEPLAIN + '|' + src[XRANGEPLAIN] + ')';
-
-// this one has to use the /g flag
-re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g');
-var comparatorTrimReplace = '$1$2$3';
-
-
-// Something like `1.2.3 - 1.2.4`
-// Note that these all use the loose form, because they'll be
-// checked against either the strict or loose comparator form
-// later.
-var HYPHENRANGE = R++;
-src[HYPHENRANGE] = '^\\s*(' + src[XRANGEPLAIN] + ')' +
-                   '\\s+-\\s+' +
-                   '(' + src[XRANGEPLAIN] + ')' +
-                   '\\s*$';
-
-var HYPHENRANGELOOSE = R++;
-src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s+-\\s+' +
-                        '(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s*$';
-
-// Star ranges basically just allow anything at all.
-var STAR = R++;
-src[STAR] = '(<|>)?=?\\s*\\*';
-
-// Compile to actual regexp objects.
-// All are flag-free, unless they were created above with a flag.
-for (var i = 0; i < R; i++) {
-  debug(i, src[i]);
-  if (!re[i])
-    re[i] = new RegExp(src[i]);
-}
-
-exports.parse = parse;
-function parse(version, loose) {
-  if (version instanceof SemVer)
-    return version;
-
-  if (typeof version !== 'string')
-    return null;
-
-  if (version.length > MAX_LENGTH)
-    return null;
-
-  var r = loose ? re[LOOSE] : re[FULL];
-  if (!r.test(version))
-    return null;
-
-  try {
-    return new SemVer(version, loose);
-  } catch (er) {
-    return null;
-  }
-}
-
-exports.valid = valid;
-function valid(version, loose) {
-  var v = parse(version, loose);
-  return v ? v.version : null;
-}
-
-
-exports.clean = clean;
-function clean(version, loose) {
-  var s = parse(version.trim().replace(/^[=v]+/, ''), loose);
-  return s ? s.version : null;
-}
-
-exports.SemVer = SemVer;
-
-function SemVer(version, loose) {
-  if (version instanceof SemVer) {
-    if (version.loose === loose)
-      return version;
-    else
-      version = version.version;
-  } else if (typeof version !== 'string') {
-    throw new TypeError('Invalid Version: ' + version);
-  }
-
-  if (version.length > MAX_LENGTH)
-    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
-
-  if (!(this instanceof SemVer))
-    return new SemVer(version, loose);
-
-  debug('SemVer', version, loose);
-  this.loose = loose;
-  var m = version.trim().match(loose ? re[LOOSE] : re[FULL]);
-
-  if (!m)
-    throw new TypeError('Invalid Version: ' + version);
-
-  this.raw = version;
-
-  // these are actually numbers
-  this.major = +m[1];
-  this.minor = +m[2];
-  this.patch = +m[3];
-
-  if (this.major > MAX_SAFE_INTEGER || this.major < 0)
-    throw new TypeError('Invalid major version')
-
-  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0)
-    throw new TypeError('Invalid minor version')
-
-  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0)
-    throw new TypeError('Invalid patch version')
-
-  // numberify any prerelease numeric ids
-  if (!m[4])
-    this.prerelease = [];
-  else
-    this.prerelease = m[4].split('.').map(function(id) {
-      if (/^[0-9]+$/.test(id)) {
-        var num = +id
-        if (num >= 0 && num < MAX_SAFE_INTEGER)
-          return num
-      }
-      return id;
-    });
-
-  this.build = m[5] ? m[5].split('.') : [];
-  this.format();
-}
-
-SemVer.prototype.format = function() {
-  this.version = this.major + '.' + this.minor + '.' + this.patch;
-  if (this.prerelease.length)
-    this.version += '-' + this.prerelease.join('.');
-  return this.version;
-};
-
-SemVer.prototype.toString = function() {
-  return this.version;
-};
-
-SemVer.prototype.compare = function(other) {
-  debug('SemVer.compare', this.version, this.loose, other);
-  if (!(other instanceof SemVer))
-    other = new SemVer(other, this.loose);
-
-  return this.compareMain(other) || this.comparePre(other);
-};
-
-SemVer.prototype.compareMain = function(other) {
-  if (!(other instanceof SemVer))
-    other = new SemVer(other, this.loose);
-
-  return compareIdentifiers(this.major, other.major) ||
-         compareIdentifiers(this.minor, other.minor) ||
-         compareIdentifiers(this.patch, other.patch);
-};
-
-SemVer.prototype.comparePre = function(other) {
-  if (!(other instanceof SemVer))
-    other = new SemVer(other, this.loose);
-
-  // NOT having a prerelease is > having one
-  if (this.prerelease.length && !other.prerelease.length)
-    return -1;
-  else if (!this.prerelease.length && other.prerelease.length)
-    return 1;
-  else if (!this.prerelease.length && !other.prerelease.length)
-    return 0;
-
-  var i = 0;
-  do {
-    var a = this.prerelease[i];
-    var b = other.prerelease[i];
-    debug('prerelease compare', i, a, b);
-    if (a === undefined && b === undefined)
-      return 0;
-    else if (b === undefined)
-      return 1;
-    else if (a === undefined)
-      return -1;
-    else if (a === b)
-      continue;
-    else
-      return compareIdentifiers(a, b);
-  } while (++i);
-};
-
-// preminor will bump the version up to the next minor release, and immediately
-// down to pre-release. premajor and prepatch work the same way.
-SemVer.prototype.inc = function(release, identifier) {
-  switch (release) {
-    case 'premajor':
-      this.prerelease.length = 0;
-      this.patch = 0;
-      this.minor = 0;
-      this.major++;
-      this.inc('pre', identifier);
-      break;
-    case 'preminor':
-      this.prerelease.length = 0;
-      this.patch = 0;
-      this.minor++;
-      this.inc('pre', identifier);
-      break;
-    case 'prepatch':
-      // If this is already a prerelease, it will bump to the next version
-      // drop any prereleases that might already exist, since they are not
-      // relevant at this point.
-      this.prerelease.length = 0;
-      this.inc('patch', identifier);
-      this.inc('pre', identifier);
-      break;
-    // If the input is a non-prerelease version, this acts the same as
-    // prepatch.
-    case 'prerelease':
-      if (this.prerelease.length === 0)
-        this.inc('patch', identifier);
-      this.inc('pre', identifier);
-      break;
-
-    case 'major':
-      // If this is a pre-major version, bump up to the same major version.
-      // Otherwise increment major.
-      // 1.0.0-5 bumps to 1.0.0
-      // 1.1.0 bumps to 2.0.0
-      if (this.minor !== 0 || this.patch !== 0 || this.prerelease.length === 0)
-        this.major++;
-      this.minor = 0;
-      this.patch = 0;
-      this.prerelease = [];
-      break;
-    case 'minor':
-      // If this is a pre-minor version, bump up to the same minor version.
-      // Otherwise increment minor.
-      // 1.2.0-5 bumps to 1.2.0
-      // 1.2.1 bumps to 1.3.0
-      if (this.patch !== 0 || this.prerelease.length === 0)
-        this.minor++;
-      this.patch = 0;
-      this.prerelease = [];
-      break;
-    case 'patch':
-      // If this is not a pre-release version, it will increment the patch.
-      // If it is a pre-release it will bump up to the same patch version.
-      // 1.2.0-5 patches to 1.2.0
-      // 1.2.0 patches to 1.2.1
-      if (this.prerelease.length === 0)
-        this.patch++;
-      this.prerelease = [];
-      break;
-    // This probably shouldn't be used publicly.
-    // 1.0.0 "pre" would become 1.0.0-0 which is the wrong direction.
-    case 'pre':
-      if (this.prerelease.length === 0)
-        this.prerelease = [0];
-      else {
-        var i = this.prerelease.length;
-        while (--i >= 0) {
-          if (typeof this.prerelease[i] === 'number') {
-            this.prerelease[i]++;
-            i = -2;
-          }
-        }
-        if (i === -1) // didn't increment anything
-          this.prerelease.push(0);
-      }
-      if (identifier) {
-        // 1.2.0-beta.1 bumps to 1.2.0-beta.2,
-        // 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
-        if (this.prerelease[0] === identifier) {
-          if (isNaN(this.prerelease[1]))
-            this.prerelease = [identifier, 0];
-        } else
-          this.prerelease = [identifier, 0];
-      }
-      break;
-
-    default:
-      throw new Error('invalid increment argument: ' + release);
-  }
-  this.format();
-  this.raw = this.version;
-  return this;
-};
-
-exports.inc = inc;
-function inc(version, release, loose, identifier) {
-  if (typeof(loose) === 'string') {
-    identifier = loose;
-    loose = undefined;
-  }
-
-  try {
-    return new SemVer(version, loose).inc(release, identifier).version;
-  } catch (er) {
-    return null;
-  }
-}
-
-exports.diff = diff;
-function diff(version1, version2) {
-  if (eq(version1, version2)) {
-    return null;
-  } else {
-    var v1 = parse(version1);
-    var v2 = parse(version2);
-    if (v1.prerelease.length || v2.prerelease.length) {
-      for (var key in v1) {
-        if (key === 'major' || key === 'minor' || key === 'patch') {
-          if (v1[key] !== v2[key]) {
-            return 'pre'+key;
-          }
-        }
-      }
-      return 'prerelease';
-    }
-    for (var key in v1) {
-      if (key === 'major' || key === 'minor' || key === 'patch') {
-        if (v1[key] !== v2[key]) {
-          return key;
-        }
-      }
-    }
-  }
-}
-
-exports.compareIdentifiers = compareIdentifiers;
-
-var numeric = /^[0-9]+$/;
-function compareIdentifiers(a, b) {
-  var anum = numeric.test(a);
-  var bnum = numeric.test(b);
-
-  if (anum && bnum) {
-    a = +a;
-    b = +b;
-  }
-
-  return (anum && !bnum) ? -1 :
-         (bnum && !anum) ? 1 :
-         a < b ? -1 :
-         a > b ? 1 :
-         0;
-}
-
-exports.rcompareIdentifiers = rcompareIdentifiers;
-function rcompareIdentifiers(a, b) {
-  return compareIdentifiers(b, a);
-}
-
-exports.major = major;
-function major(a, loose) {
-  return new SemVer(a, loose).major;
-}
-
-exports.minor = minor;
-function minor(a, loose) {
-  return new SemVer(a, loose).minor;
-}
-
-exports.patch = patch;
-function patch(a, loose) {
-  return new SemVer(a, loose).patch;
-}
-
-exports.compare = compare;
-function compare(a, b, loose) {
-  return new SemVer(a, loose).compare(b);
-}
-
-exports.compareLoose = compareLoose;
-function compareLoose(a, b) {
-  return compare(a, b, true);
-}
-
-exports.rcompare = rcompare;
-function rcompare(a, b, loose) {
-  return compare(b, a, loose);
-}
-
-exports.sort = sort;
-function sort(list, loose) {
-  return list.sort(function(a, b) {
-    return exports.compare(a, b, loose);
-  });
-}
-
-exports.rsort = rsort;
-function rsort(list, loose) {
-  return list.sort(function(a, b) {
-    return exports.rcompare(a, b, loose);
-  });
-}
-
-exports.gt = gt;
-function gt(a, b, loose) {
-  return compare(a, b, loose) > 0;
-}
-
-exports.lt = lt;
-function lt(a, b, loose) {
-  return compare(a, b, loose) < 0;
-}
-
-exports.eq = eq;
-function eq(a, b, loose) {
-  return compare(a, b, loose) === 0;
-}
-
-exports.neq = neq;
-function neq(a, b, loose) {
-  return compare(a, b, loose) !== 0;
-}
-
-exports.gte = gte;
-function gte(a, b, loose) {
-  return compare(a, b, loose) >= 0;
-}
-
-exports.lte = lte;
-function lte(a, b, loose) {
-  return compare(a, b, loose) <= 0;
-}
-
-exports.cmp = cmp;
-function cmp(a, op, b, loose) {
-  var ret;
-  switch (op) {
-    case '===':
-      if (typeof a === 'object') a = a.version;
-      if (typeof b === 'object') b = b.version;
-      ret = a === b;
-      break;
-    case '!==':
-      if (typeof a === 'object') a = a.version;
-      if (typeof b === 'object') b = b.version;
-      ret = a !== b;
-      break;
-    case '': case '=': case '==': ret = eq(a, b, loose); break;
-    case '!=': ret = neq(a, b, loose); break;
-    case '>': ret = gt(a, b, loose); break;
-    case '>=': ret = gte(a, b, loose); break;
-    case '<': ret = lt(a, b, loose); break;
-    case '<=': ret = lte(a, b, loose); break;
-    default: throw new TypeError('Invalid operator: ' + op);
-  }
-  return ret;
-}
-
-exports.Comparator = Comparator;
-function Comparator(comp, loose) {
-  if (comp instanceof Comparator) {
-    if (comp.loose === loose)
-      return comp;
-    else
-      comp = comp.value;
-  }
-
-  if (!(this instanceof Comparator))
-    return new Comparator(comp, loose);
-
-  debug('comparator', comp, loose);
-  this.loose = loose;
-  this.parse(comp);
-
-  if (this.semver === ANY)
-    this.value = '';
-  else
-    this.value = this.operator + this.semver.version;
-
-  debug('comp', this);
-}
-
-var ANY = {};
-Comparator.prototype.parse = function(comp) {
-  var r = this.loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
-  var m = comp.match(r);
-
-  if (!m)
-    throw new TypeError('Invalid comparator: ' + comp);
-
-  this.operator = m[1];
-  if (this.operator === '=')
-    this.operator = '';
-
-  // if it literally is just '>' or '' then allow anything.
-  if (!m[2])
-    this.semver = ANY;
-  else
-    this.semver = new SemVer(m[2], this.loose);
-};
-
-Comparator.prototype.toString = function() {
-  return this.value;
-};
-
-Comparator.prototype.test = function(version) {
-  debug('Comparator.test', version, this.loose);
-
-  if (this.semver === ANY)
-    return true;
-
-  if (typeof version === 'string')
-    version = new SemVer(version, this.loose);
-
-  return cmp(version, this.operator, this.semver, this.loose);
-};
-
-
-exports.Range = Range;
-function Range(range, loose) {
-  if ((range instanceof Range) && range.loose === loose)
-    return range;
-
-  if (!(this instanceof Range))
-    return new Range(range, loose);
-
-  this.loose = loose;
-
-  // First, split based on boolean or ||
-  this.raw = range;
-  this.set = range.split(/\s*\|\|\s*/).map(function(range) {
-    return this.parseRange(range.trim());
-  }, this).filter(function(c) {
-    // throw out any that are not relevant for whatever reason
-    return c.length;
-  });
-
-  if (!this.set.length) {
-    throw new TypeError('Invalid SemVer Range: ' + range);
-  }
-
-  this.format();
-}
-
-Range.prototype.format = function() {
-  this.range = this.set.map(function(comps) {
-    return comps.join(' ').trim();
-  }).join('||').trim();
-  return this.range;
-};
-
-Range.prototype.toString = function() {
-  return this.range;
-};
-
-Range.prototype.parseRange = function(range) {
-  var loose = this.loose;
-  range = range.trim();
-  debug('range', range, loose);
-  // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
-  var hr = loose ? re[HYPHENRANGELOOSE] : re[HYPHENRANGE];
-  range = range.replace(hr, hyphenReplace);
-  debug('hyphen replace', range);
-  // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
-  range = range.replace(re[COMPARATORTRIM], comparatorTrimReplace);
-  debug('comparator trim', range, re[COMPARATORTRIM]);
-
-  // `~ 1.2.3` => `~1.2.3`
-  range = range.replace(re[TILDETRIM], tildeTrimReplace);
-
-  // `^ 1.2.3` => `^1.2.3`
-  range = range.replace(re[CARETTRIM], caretTrimReplace);
-
-  // normalize spaces
-  range = range.split(/\s+/).join(' ');
-
-  // At this point, the range is completely trimmed and
-  // ready to be split into comparators.
-
-  var compRe = loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
-  var set = range.split(' ').map(function(comp) {
-    return parseComparator(comp, loose);
-  }).join(' ').split(/\s+/);
-  if (this.loose) {
-    // in loose mode, throw out any that are not valid comparators
-    set = set.filter(function(comp) {
-      return !!comp.match(compRe);
-    });
-  }
-  set = set.map(function(comp) {
-    return new Comparator(comp, loose);
-  });
-
-  return set;
-};
-
-// Mostly just for testing and legacy API reasons
-exports.toComparators = toComparators;
-function toComparators(range, loose) {
-  return new Range(range, loose).set.map(function(comp) {
-    return comp.map(function(c) {
-      return c.value;
-    }).join(' ').trim().split(' ');
-  });
-}
-
-// comprised of xranges, tildes, stars, and gtlt's at this point.
-// already replaced the hyphen ranges
-// turn into a set of JUST comparators.
-function parseComparator(comp, loose) {
-  debug('comp', comp);
-  comp = replaceCarets(comp, loose);
-  debug('caret', comp);
-  comp = replaceTildes(comp, loose);
-  debug('tildes', comp);
-  comp = replaceXRanges(comp, loose);
-  debug('xrange', comp);
-  comp = replaceStars(comp, loose);
-  debug('stars', comp);
-  return comp;
-}
-
-function isX(id) {
-  return !id || id.toLowerCase() === 'x' || id === '*';
-}
-
-// ~, ~> --> * (any, kinda silly)
-// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0
-// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0
-// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0
-// ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0
-// ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0
-function replaceTildes(comp, loose) {
-  return comp.trim().split(/\s+/).map(function(comp) {
-    return replaceTilde(comp, loose);
-  }).join(' ');
-}
-
-function replaceTilde(comp, loose) {
-  var r = loose ? re[TILDELOOSE] : re[TILDE];
-  return comp.replace(r, function(_, M, m, p, pr) {
-    debug('tilde', comp, _, M, m, p, pr);
-    var ret;
-
-    if (isX(M))
-      ret = '';
-    else if (isX(m))
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
-    else if (isX(p))
-      // ~1.2 == >=1.2.0- <1.3.0-
-      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
-    else if (pr) {
-      debug('replaceTilde pr', pr);
-      if (pr.charAt(0) !== '-')
-        pr = '-' + pr;
-      ret = '>=' + M + '.' + m + '.' + p + pr +
-            ' <' + M + '.' + (+m + 1) + '.0';
-    } else
-      // ~1.2.3 == >=1.2.3 <1.3.0
-      ret = '>=' + M + '.' + m + '.' + p +
-            ' <' + M + '.' + (+m + 1) + '.0';
-
-    debug('tilde return', ret);
-    return ret;
-  });
-}
-
-// ^ --> * (any, kinda silly)
-// ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0
-// ^2.0, ^2.0.x --> >=2.0.0 <3.0.0
-// ^1.2, ^1.2.x --> >=1.2.0 <2.0.0
-// ^1.2.3 --> >=1.2.3 <2.0.0
-// ^1.2.0 --> >=1.2.0 <2.0.0
-function replaceCarets(comp, loose) {
-  return comp.trim().split(/\s+/).map(function(comp) {
-    return replaceCaret(comp, loose);
-  }).join(' ');
-}
-
-function replaceCaret(comp, loose) {
-  debug('caret', comp, loose);
-  var r = loose ? re[CARETLOOSE] : re[CARET];
-  return comp.replace(r, function(_, M, m, p, pr) {
-    debug('caret', comp, _, M, m, p, pr);
-    var ret;
-
-    if (isX(M))
-      ret = '';
-    else if (isX(m))
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
-    else if (isX(p)) {
-      if (M === '0')
-        ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
-      else
-        ret = '>=' + M + '.' + m + '.0 <' + (+M + 1) + '.0.0';
-    } else if (pr) {
-      debug('replaceCaret pr', pr);
-      if (pr.charAt(0) !== '-')
-        pr = '-' + pr;
-      if (M === '0') {
-        if (m === '0')
-          ret = '>=' + M + '.' + m + '.' + p + pr +
-                ' <' + M + '.' + m + '.' + (+p + 1);
-        else
-          ret = '>=' + M + '.' + m + '.' + p + pr +
-                ' <' + M + '.' + (+m + 1) + '.0';
-      } else
-        ret = '>=' + M + '.' + m + '.' + p + pr +
-              ' <' + (+M + 1) + '.0.0';
-    } else {
-      debug('no pr');
-      if (M === '0') {
-        if (m === '0')
-          ret = '>=' + M + '.' + m + '.' + p +
-                ' <' + M + '.' + m + '.' + (+p + 1);
-        else
-          ret = '>=' + M + '.' + m + '.' + p +
-                ' <' + M + '.' + (+m + 1) + '.0';
-      } else
-        ret = '>=' + M + '.' + m + '.' + p +
-              ' <' + (+M + 1) + '.0.0';
-    }
-
-    debug('caret return', ret);
-    return ret;
-  });
-}
-
-function replaceXRanges(comp, loose) {
-  debug('replaceXRanges', comp, loose);
-  return comp.split(/\s+/).map(function(comp) {
-    return replaceXRange(comp, loose);
-  }).join(' ');
-}
-
-function replaceXRange(comp, loose) {
-  comp = comp.trim();
-  var r = loose ? re[XRANGELOOSE] : re[XRANGE];
-  return comp.replace(r, function(ret, gtlt, M, m, p, pr) {
-    debug('xRange', comp, ret, gtlt, M, m, p, pr);
-    var xM = isX(M);
-    var xm = xM || isX(m);
-    var xp = xm || isX(p);
-    var anyX = xp;
-
-    if (gtlt === '=' && anyX)
-      gtlt = '';
-
-    if (xM) {
-      if (gtlt === '>' || gtlt === '<') {
-        // nothing is allowed
-        ret = '<0.0.0';
-      } else {
-        // nothing is forbidden
-        ret = '*';
-      }
-    } else if (gtlt && anyX) {
-      // replace X with 0
-      if (xm)
-        m = 0;
-      if (xp)
-        p = 0;
-
-      if (gtlt === '>') {
-        // >1 => >=2.0.0
-        // >1.2 => >=1.3.0
-        // >1.2.3 => >= 1.2.4
-        gtlt = '>=';
-        if (xm) {
-          M = +M + 1;
-          m = 0;
-          p = 0;
-        } else if (xp) {
-          m = +m + 1;
-          p = 0;
-        }
-      } else if (gtlt === '<=') {
-        // <=0.7.x is actually <0.8.0, since any 0.7.x should
-        // pass.  Similarly, <=7.x is actually <8.0.0, etc.
-        gtlt = '<'
-        if (xm)
-          M = +M + 1
-        else
-          m = +m + 1
-      }
-
-      ret = gtlt + M + '.' + m + '.' + p;
-    } else if (xm) {
-      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
-    } else if (xp) {
-      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
-    }
-
-    debug('xRange return', ret);
-
-    return ret;
-  });
-}
-
-// Because * is AND-ed with everything else in the comparator,
-// and '' means "any version", just remove the *s entirely.
-function replaceStars(comp, loose) {
-  debug('replaceStars', comp, loose);
-  // Looseness is ignored here.  star is always as loose as it gets!
-  return comp.trim().replace(re[STAR], '');
-}
-
-// This function is passed to string.replace(re[HYPHENRANGE])
-// M, m, patch, prerelease, build
-// 1.2 - 3.4.5 => >=1.2.0 <=3.4.5
-// 1.2.3 - 3.4 => >=1.2.0 <3.5.0 Any 3.4.x will do
-// 1.2 - 3.4 => >=1.2.0 <3.5.0
-function hyphenReplace($0,
-                       from, fM, fm, fp, fpr, fb,
-                       to, tM, tm, tp, tpr, tb) {
-
-  if (isX(fM))
-    from = '';
-  else if (isX(fm))
-    from = '>=' + fM + '.0.0';
-  else if (isX(fp))
-    from = '>=' + fM + '.' + fm + '.0';
-  else
-    from = '>=' + from;
-
-  if (isX(tM))
-    to = '';
-  else if (isX(tm))
-    to = '<' + (+tM + 1) + '.0.0';
-  else if (isX(tp))
-    to = '<' + tM + '.' + (+tm + 1) + '.0';
-  else if (tpr)
-    to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr;
-  else
-    to = '<=' + to;
-
-  return (from + ' ' + to).trim();
-}
-
-
-// if ANY of the sets match ALL of its comparators, then pass
-Range.prototype.test = function(version) {
-  if (!version)
-    return false;
-
-  if (typeof version === 'string')
-    version = new SemVer(version, this.loose);
-
-  for (var i = 0; i < this.set.length; i++) {
-    if (testSet(this.set[i], version))
-      return true;
-  }
-  return false;
-};
-
-function testSet(set, version) {
-  for (var i = 0; i < set.length; i++) {
-    if (!set[i].test(version))
-      return false;
-  }
-
-  if (version.prerelease.length) {
-    // Find the set of versions that are allowed to have prereleases
-    // For example, ^1.2.3-pr.1 desugars to >=1.2.3-pr.1 <2.0.0
-    // That should allow `1.2.3-pr.2` to pass.
-    // However, `1.2.4-alpha.notready` should NOT be allowed,
-    // even though it's within the range set by the comparators.
-    for (var i = 0; i < set.length; i++) {
-      debug(set[i].semver);
-      if (set[i].semver === ANY)
-        continue;
-
-      if (set[i].semver.prerelease.length > 0) {
-        var allowed = set[i].semver;
-        if (allowed.major === version.major &&
-            allowed.minor === version.minor &&
-            allowed.patch === version.patch)
-          return true;
-      }
-    }
-
-    // Version has a -pre, but it's not one of the ones we like.
-    return false;
-  }
-
-  return true;
-}
-
-exports.satisfies = satisfies;
-function satisfies(version, range, loose) {
-  try {
-    range = new Range(range, loose);
-  } catch (er) {
-    return false;
-  }
-  return range.test(version);
-}
-
-exports.maxSatisfying = maxSatisfying;
-function maxSatisfying(versions, range, loose) {
-  return versions.filter(function(version) {
-    return satisfies(version, range, loose);
-  }).sort(function(a, b) {
-    return rcompare(a, b, loose);
-  })[0] || null;
-}
-
-exports.validRange = validRange;
-function validRange(range, loose) {
-  try {
-    // Return '*' instead of '' so that truthiness works.
-    // This will throw if it's invalid anyway
-    return new Range(range, loose).range || '*';
-  } catch (er) {
-    return null;
-  }
-}
-
-// Determine if version is less than all the versions possible in the range
-exports.ltr = ltr;
-function ltr(version, range, loose) {
-  return outside(version, range, '<', loose);
-}
-
-// Determine if version is greater than all the versions possible in the range.
-exports.gtr = gtr;
-function gtr(version, range, loose) {
-  return outside(version, range, '>', loose);
-}
-
-exports.outside = outside;
-function outside(version, range, hilo, loose) {
-  version = new SemVer(version, loose);
-  range = new Range(range, loose);
-
-  var gtfn, ltefn, ltfn, comp, ecomp;
-  switch (hilo) {
-    case '>':
-      gtfn = gt;
-      ltefn = lte;
-      ltfn = lt;
-      comp = '>';
-      ecomp = '>=';
-      break;
-    case '<':
-      gtfn = lt;
-      ltefn = gte;
-      ltfn = gt;
-      comp = '<';
-      ecomp = '<=';
-      break;
-    default:
-      throw new TypeError('Must provide a hilo val of "<" or ">"');
-  }
-
-  // If it satisifes the range it is not outside
-  if (satisfies(version, range, loose)) {
-    return false;
-  }
-
-  // From now on, variable terms are as if we're in "gtr" mode.
-  // but note that everything is flipped for the "ltr" function.
-
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i];
-
-    var high = null;
-    var low = null;
-
-    comparators.forEach(function(comparator) {
-      if (comparator.semver === ANY) {
-        comparator = new Comparator('>=0.0.0')
-      }
-      high = high || comparator;
-      low = low || comparator;
-      if (gtfn(comparator.semver, high.semver, loose)) {
-        high = comparator;
-      } else if (ltfn(comparator.semver, low.semver, loose)) {
-        low = comparator;
-      }
-    });
-
-    // If the edge version comparator has a operator then our version
-    // isn't outside it
-    if (high.operator === comp || high.operator === ecomp) {
-      return false;
-    }
-
-    // If the lowest version comparator has an operator and our version
-    // is less than it then it isn't higher than the range
-    if ((!low.operator || low.operator === comp) &&
-        ltefn(version, low.semver)) {
-      return false;
-    } else if (low.operator === ecomp && ltfn(version, low.semver)) {
-      return false;
-    }
-  }
-  return true;
-}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d7ccaec/node_modules/cordova-common/node_modules/semver/test/big-numbers.js
----------------------------------------------------------------------
diff --git 
a/node_modules/cordova-common/node_modules/semver/test/big-numbers.js 
b/node_modules/cordova-common/node_modules/semver/test/big-numbers.js
deleted file mode 100644
index c051864..0000000
--- a/node_modules/cordova-common/node_modules/semver/test/big-numbers.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var test = require('tap').test
-var semver = require('../')
-
-test('long version is too long', function (t) {
-  var v = '1.2.' + new Array(256).join('1')
-  t.throws(function () {
-    new semver.SemVer(v)
-  })
-  t.equal(semver.valid(v, false), null)
-  t.equal(semver.valid(v, true), null)
-  t.equal(semver.inc(v, 'patch'), null)
-  t.end()
-})
-
-test('big number is like too long version', function (t) {
-  var v = '1.2.' + new Array(100).join('1')
-  t.throws(function () {
-    new semver.SemVer(v)
-  })
-  t.equal(semver.valid(v, false), null)
-  t.equal(semver.valid(v, true), null)
-  t.equal(semver.inc(v, 'patch'), null)
-  t.end()
-})
-
-test('parsing null does not throw', function (t) {
-  t.equal(semver.parse(null), null)
-  t.equal(semver.parse({}), null)
-  t.equal(semver.parse(new semver.SemVer('1.2.3')).version, '1.2.3')
-  t.end()
-})

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d7ccaec/node_modules/cordova-common/node_modules/semver/test/clean.js
----------------------------------------------------------------------
diff --git a/node_modules/cordova-common/node_modules/semver/test/clean.js 
b/node_modules/cordova-common/node_modules/semver/test/clean.js
deleted file mode 100644
index 9e268de..0000000
--- a/node_modules/cordova-common/node_modules/semver/test/clean.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var tap = require('tap');
-var test = tap.test;
-var semver = require('../semver.js');
-var clean = semver.clean;
-
-test('\nclean tests', function(t) {
-       // [range, version]
-       // Version should be detectable despite extra characters
-       [
-               ['1.2.3', '1.2.3'],
-               [' 1.2.3 ', '1.2.3'],
-               [' 1.2.3-4 ', '1.2.3-4'],
-               [' 1.2.3-pre ', '1.2.3-pre'],
-               ['  =v1.2.3   ', '1.2.3'],
-               ['v1.2.3', '1.2.3'],
-               [' v1.2.3 ', '1.2.3'],
-               ['\t1.2.3', '1.2.3'],
-               ['>1.2.3', null],
-               ['~1.2.3', null],
-               ['<=1.2.3', null],
-               ['1.2.x', null]
-       ].forEach(function(tuple) {
-                       var range = tuple[0];
-                       var version = tuple[1];
-                       var msg = 'clean(' + range + ') = ' + version;
-                       t.equal(clean(range), version, msg);
-               });
-       t.end();
-});


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

Reply via email to