Repository: incubator-edgent
Updated Branches:
  refs/heads/release1.0.0 c5111e5e3 -> bbe71fadd


Include Sizzle.js license

bundled jquery-ui bundles jquery which bundles sizzle (see our bundled
jquery.js)
update jquery.MIT license with license text from jquery-1.10.2 in github
(version noted in jquery.js)
add licenses/sizzle.MIT for sizzle version bundled by jquery-1.10.2
(jquery-1.10.2 github links to sizzle github version)


Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/f2bdac6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/f2bdac6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/f2bdac6a

Branch: refs/heads/release1.0.0
Commit: f2bdac6aac6df299a5526ca30a04bb868eba1201
Parents: c5111e5
Author: Dale LaBossiere <dlab...@us.ibm.com>
Authored: Thu Dec 1 13:44:59 2016 -0500
Committer: Dale LaBossiere <dlab...@us.ibm.com>
Committed: Thu Dec 1 13:44:59 2016 -0500

----------------------------------------------------------------------
 LICENSE                |  3 +++
 binary-release/LICENSE |  3 +++
 licenses/jquery.MIT    | 43 ++++++++++++++++++++-----------------------
 licenses/sizzle.MIT    | 25 +++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f2bdac6a/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7c57633..25dce2d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -223,4 +223,7 @@ For details, see licenses/jquery-ui.MIT
 This product bundles portions of jquery which is available under a MIT license.
 For details, see licenses/jquery.MIT
 
+The bundled jquery bundles Sizzle which is available under a MIT license.
+For details, see licenses/sizzle.MIT
+
 ======================================

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f2bdac6a/binary-release/LICENSE
----------------------------------------------------------------------
diff --git a/binary-release/LICENSE b/binary-release/LICENSE
index a152d21..8b5b0ed 100644
--- a/binary-release/LICENSE
+++ b/binary-release/LICENSE
@@ -395,4 +395,7 @@ console/webapps
         The file bundles portions of jquery which is available under a MIT 
license.
         For details, see licenses/jquery.MIT
     
+        The bundled jquery bundles Sizzle which is available under a MIT 
license.
+        For details, see licenses/sizzle.MIT
+    
 --------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f2bdac6a/licenses/jquery.MIT
----------------------------------------------------------------------
diff --git a/licenses/jquery.MIT b/licenses/jquery.MIT
index 1837c84..0e8956f 100644
--- a/licenses/jquery.MIT
+++ b/licenses/jquery.MIT
@@ -1,27 +1,24 @@
 
servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom/external/jquery/jquery.js:
 License type: MIT
 
-  Copyright jQuery Foundation and other contributors, https://jquery.org/
-  
-  This software consists of voluntary contributions made by many
-  individuals. For exact contribution history, see the revision history
-  available at https://github.com/jquery/jquery
+Copyright 2013 jQuery Foundation and other contributors
+http://jquery.com/
 
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-  
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f2bdac6a/licenses/sizzle.MIT
----------------------------------------------------------------------
diff --git a/licenses/sizzle.MIT b/licenses/sizzle.MIT
new file mode 100644
index 0000000..7dced1a
--- /dev/null
+++ b/licenses/sizzle.MIT
@@ -0,0 +1,25 @@
+servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom/external/jquery/jquery.js:
+For included Sizzle.js
+License type: MIT
+
+Copyright 2013 jQuery Foundation and other contributors
+http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Reply via email to