Merge pull request #49 from mitre/update_dependencies

Update dependencies, apply a bugfix patch to the proper location, and update license information

Author: Amndeep7

LICENSE

@@ -1,10 +1,57 @@
-Licensed under the apache-2.0 license, except as noted below.  
+NOTE: The Apache-2.0 License applies to all contributions from MITRE and any further contributions from outside parties.  The BSD-2-Clause License applies to all contributions from Alexey Valikov and all contributions prior to the creation of this fork.
+
+© 2022 The MITRE Corporation.
+
+Approved for Public Release; Distribution Unlimited. Case Number 18-3678.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright/ digital rights legend, this list of conditions and the following Notice.
+- Redistributions of source code must retain the above copyright/ digital rights legend, this list of conditions and the following Notice.
+
+- Redistributions in binary form must reproduce the above copyright copyright/ digital rights legend, this list of conditions and the following Notice in the documentation and/or other materials provided with the distribution.
+
+- Neither the name of The MITRE Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+NOTICE
+
+MITRE grants permission to reproduce, distribute, modify, and otherwise use this software to the extent permitted by the licensed terms provided in the LICENSE file included with this project.
+
+This software was produced by The MITRE Corporation for the U. S. Government under contract. As such the U.S. Government has certain use and data rights in this software. No use other than those granted to the U. S. Government, or to those acting on behalf of the U. S. Government, under these contract arrangements is authorized without the express written permission of The MITRE Corporation.
+
+For further information, please contact The MITRE Corporation, Contracts Management Office, 7515 Colshire Drive, McLean, VA 22102-7539, (703) 983-6000.
+
+Copyright (c) 2014, Alexey Valikov.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-* Redistributions in binary form must reproduce the above copyright copyright/ digital rights legend, this list of conditions and the following Notice in the documentation and/or other materials provided with the distribution.
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-* Neither the name of The MITRE Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

NOTICE.md

@@ -110,12 +110,11 @@ You can also `marshalString`.
 
 ## Documentation
 
-* [Jsonix GitHub Project](https://github.com/highsource/jsonix)
-* [Jsonix Wiki](https://github.com/highsource/jsonix/wiki)
+* [Original Jsonix GitHub Project](https://github.com/highsource/jsonix)
+* [Original Jsonix Wiki](https://github.com/highsource/jsonix/wiki)
+* [MITRE Jsonix GitHub Project](https://github.com/mitre/jsonix)
+* [MITRE Jsonix Wiki](https://github.com/mitre/jsonix/wiki)
 
-## Credits
+## Acknowledgements
 
-![Logo WebStorm](images/logo_WebStorm.png)
-
-Jsonix is developed with [WebStorm](https://www.jetbrains.com/webstorm/), the smartest JavaScript IDE.  
-Many thanks to [JetBrains](https://www.jetbrains.com) for providing a free open-source license for Jsonix development.
+This library is a fork of https://github.com/highsource/jsonix originally created by [Dr. Alexey Valikov](https://good-bye.org/alexey-valikov/).

README.md

@@ -2378,7 +2378,7 @@ this.scopedElementInfosMap={};
 if(Jsonix.Util.Type.exists(l)){Jsonix.Util.Ensure.ensureObject(l);
 if(Jsonix.Util.Type.isObject(l.namespacePrefixes)){this.namespacePrefixes=Jsonix.Util.Type.cloneObject(l.namespacePrefixes,{})
 }if(Jsonix.Util.Type.isBoolean(l.supportXsiType)){this.supportXsiType=l.supportXsiType
-}}for(var j in this.namespacePrefixes){if(this.namespacePrefixes.hasOwnProperty(j)){p=this.namespacePrefixes[j];
+}}for(var j in this.namespacePrefixes){if(this.namespacePrefixes.hasOwnProperty(j)){var p=this.namespacePrefixes[j];
 this.prefixNamespaces[p]=j
 }}if(Jsonix.Util.Type.exists(i)){Jsonix.Util.Ensure.ensureArray(i);
 var g,h,k;

dist/Jsonix-min.js

@@ -5719,7 +5719,7 @@ var _jsonix_factory = function (_jsonix_xmldom, _jsonix_xmlhttprequest, _jsonix_
 				// Initialize prefix/namespace mapping
 				for (var ns in this.namespacePrefixes) {
 					if (this.namespacePrefixes.hasOwnProperty(ns)) {
-						p = this.namespacePrefixes[ns];
+						var p = this.namespacePrefixes[ns];
 						this.prefixNamespaces[p] = ns;
 					}
 				}

images/logo_WebStorm.png

@@ -1,6 +1,6 @@
 {
 	"name": "@mitre/jsonix",
-	"version": "3.0.9",
+	"version": "3.0.10",
 	"description": "Jsonix (JSON interfaces for XML) is a JavaScript library which allows converting between XML and JSON structures.",
 	"keywords": [
 		"json",
@@ -26,8 +26,8 @@
 	},
 	"licenses": [
 		{
-			"type": "BSD-3-Clause",
-			"url": "http://github.com/highsource/jsonix/raw/master/LICENSE"
+			"type": "(Apache-2.0 AND BSD-2-Clause)",
+			"url": "https://github.com/mitre/jsonix/raw/master/LICENSE"
 		}
 	],
 	"author": {
@@ -38,6 +38,10 @@
 		{
 			"name": "Conrad Pankoff",
 			"url": "https://github.com/deoxxa"
+		},
+		{
+			"name": "MITRE SAF (C)",
+			"url": "https://saf.mitre.org"
 		}
 	],
 	"main": "jsonix.js",