You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/10/01 23:40:18 UTC

[5/8] incubator-brooklyn git commit: update raw data of licenses for included software

update raw data of licenses for included software


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

Branch: refs/heads/master
Commit: 10275356e481b8c3853b2d68c4e1d38d4001208a
Parents: 4f88439
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Sun Sep 27 03:05:41 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Sep 28 10:50:59 2015 +0100

----------------------------------------------------------------------
 usage/dist/licensing/overrides.yaml             | 95 +++++++++++++-------
 .../src/main/license/source-inclusions.yaml     | 10 +--
 2 files changed, 68 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/10275356/usage/dist/licensing/overrides.yaml
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/overrides.yaml b/usage/dist/licensing/overrides.yaml
index 6d2cf14..45fbdcc 100644
--- a/usage/dist/licensing/overrides.yaml
+++ b/usage/dist/licensing/overrides.yaml
@@ -25,6 +25,8 @@
 
 - id: org.apache.brooklyn
   url: http://brooklyn.incubator.apache.org/
+  license: ASL2
+  internal: true
 - id: org.apache.jclouds
   url: http://jclouds.apache.org/
 - id: com.fasterxml.jackson
@@ -73,43 +75,53 @@
 
 # info on non-maven projects
 
-- id: jquery.js
+- id: jquery-core
   url: http://jquery.com/
   description: JS library for manipulating HTML and eventing
   name: jQuery JavaScript Library
   files: jquery.js
   version: 1.7.2
   organization: { name: "The jQuery Foundation", url: "http://jquery.org/" }
-  notice: Copyright (c) John Resig (2011)
-  license: MIT
-
-- id: sizzle.js
-  url: http://sizzlejs.com/
-  version: n/a
-  files: included in jquery
-  organization: { name: "The jQuery Foundation", url: "http://jquery.org/" }
-  notice: Copyright (c) jQuery Foundation and other contributors (2011)
   license: MIT
+  notices: 
+  - Copyright (c) John Resig (2011)
+  - "Includes code fragments from sizzle.js:"
+  - "  Copyright (c) jQuery Foundation and other contributors (2011)"
+  - "  Available at http://sizzlejs.com"
+  - "  Used under the MIT license"
 
-- id: Swagger JS
+- id: swagger
+  name: Swagger JS
   files: swagger.js
   version: 1.0.1
   url: https://github.com/wordnik/swagger-js
   license: ASL2
+  notice: Copyright (c) SmartBear Software (2011-2015)
 
-- id: Swagger UI
-  files: swagger-ui.js, swagger.js, jquery.{slideto,wiggle}*.js
+- id: swagger-ui
+  files: swagger-ui.js
+  name: Swagger UI
   version: 1.0.1
   url: https://github.com/wordnik/swagger-ui
   license: ASL2
-  notice: Copyright (c) SmartBear Software (2011-2015), portions WonderGroup and Jordan Thomas (2010)
-  # jquery.wiggle is from WonderGroup/JT, defunct URL http://labs.wondergroup.com/demos/mini-ui/index.html
+  notice: Copyright (c) SmartBear Software (2011-2015)
+  
+- id: jquery.wiggle.min.js
+  name: jQuery Wiggle
+  version: swagger-ui:1.0.1
+  notices: 
+  - Copyright (c) WonderGroup and Jordan Thomas (2010)
+  - Previously online at http://labs.wondergroup.com/demos/mini-ui/index.html.
+  # that is link in copyright but it is no longer valid; url below is same person
+  - The version included here is from the Swagger UI distribution.
+  url: https://github.com/jordanthomas/jquery-wiggle
+  license: MIT
 
 - id: require.js
   name: RequireJS 
   files: require.js, text.js
   version: 2.0.6 
-  url: http://github.com/jrburke/requirejs for details
+  url: http://requirejs.org/
   organization: { name: "The Dojo Foundation", url: "http://dojofoundation.org/" }
   notice: Copyright (c) The Dojo Foundation (2010-2012)
   license: MIT
@@ -119,9 +131,28 @@
   name: RequireJS (r.js maven plugin)
   files: r.js
   version: 2.1.6 
-  url: http://github.com/jrburke/requirejs for details
+  url: http://github.com/jrburke/requirejs
   organization: { name: "The Dojo Foundation", url: "http://dojofoundation.org/" }
-  notice: Copyright (c) The Dojo Foundation (2010-2012)
+  notices:
+  - Copyright (c) The Dojo Foundation (2009-2013)
+  - "Includes code fragments for source-map and other functionality:" 
+  - "  Copyright (c) The Mozilla Foundation and contributors (2011)"
+  - "  Used under the BSD 2-Clause license."
+  - "Includes code fragments for parse-js and other functionality:" 
+  - "  Copyright (c) Mihai Bazon (2010, 2012)"
+  - "  Used under the BSD 2-Clause license."
+  - "Includes code fragments for uglifyjs/consolidator:" 
+  - "  Copyright (c) Robert Gust-Bardon (2012)"
+  - "  Used under the BSD 2-Clause license."
+  - "Includes code fragments for the esprima parser:" 
+  - "  Copyright (c):"
+  - "    Ariya Hidayat (2011, 2012)"
+  - "    Mathias Bynens (2012)"
+  - "    Joost-Wim Boekesteijn (2012)"
+  - "    Kris Kowal (2012)"
+  - "    Yusuke Suzuki (2012)"
+  - "    Arpad Borsos (2012)"
+  - "  Used under the BSD 2-Clause license."
   license: MIT
 
 - id: backbone.js
@@ -146,7 +177,6 @@
   license: MIT
 
 - id: async.js
-  files: async.js
   version: 0.1.1
   url: https://github.com/p15martin/google-maps-hello-world/blob/master/js/libs/async.js
   # ORIGINALLY https://github.com/millermedeiros/requirejs-plugins
@@ -155,14 +185,6 @@
   notice: Copyright (c) Miller Medeiros (2011)
   license: MIT 
 
-# used for CLI to build catalog
-- id: typeahead.js
-  version: 0.10.5
-  url: https://github.com/twitter/typeahead.js
-  organization: { name: "Twitter, Inc", url: "http://twitter.com" }
-  notice: Copyright (c) Twitter, Inc. and other contributors (2013-2014)
-  license: MIT
-
 - id: handlebars.js
   files: handlebars*.js
   version: 1.0-rc1
@@ -177,7 +199,7 @@
   version: 1.2.1
   url: http://benalman.com/projects/jquery-bbq-plugin/
   organization: { name: "\"Cowboy\" Ben Alman", url: "http://benalman.com/" }
-  notice: Copyright (c) "\"Cowboy\" Ben Alman (2010)"
+  notice: Copyright (c) "Cowboy" Ben Alman (2010)"
   license: MIT
 
 - id: moment.js
@@ -195,10 +217,11 @@
   notice: Copyright (c) Jon Rohan, James M. Greene (2014)
   license: MIT
 
-- id: dataTables.js
-  files: jquery.dataTables.js, dataTables.extensions.js
+- id: jquery.dataTables
+  files: jquery.dataTables.{js,css}
+  name: DataTables Table plug-in for jQuery
   version: 1.9.4
-  url: www.datatables.net
+  url: http://www.datatables.net/
   organization: { name: "SpryMedia Ltd", url: "http://sprymedia.co.uk/" }
   notice: Copyright (c) Allan Jardine (2008-2012)
   license: BSD-3-Clause
@@ -223,8 +246,16 @@
   name: jQuery Form Plugin
   version: "3.09"
   url: https://github.com/malsup/form
+  # also http://malsup.com/jquery/form/
   organization: { name: "Mike Alsup", url: "http://malsup.com/" }
   notice: Copyright (c) M. Alsup (2006-2013)
-  # also http://malsup.com/jquery/form/
+  license: MIT
+
+# used for CLI to build catalog
+- id: typeahead.js
+  version: 0.10.5
+  url: https://github.com/twitter/typeahead.js
+  organization: { name: "Twitter, Inc", url: "http://twitter.com" }
+  notice: Copyright (c) Twitter, Inc. and other contributors (2013-2014)
   license: MIT
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/10275356/usage/jsgui/src/main/license/source-inclusions.yaml
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/license/source-inclusions.yaml b/usage/jsgui/src/main/license/source-inclusions.yaml
index 8592477..9534646 100644
--- a/usage/jsgui/src/main/license/source-inclusions.yaml
+++ b/usage/jsgui/src/main/license/source-inclusions.yaml
@@ -20,10 +20,10 @@
 # extras file for org.heneveld.license-audit-maven-plugin
 # listing projects from which *source* files are included
 
-- id: jquery.js
-- id: sizzle.js
-- id: Swagger JS
-- id: Swagger UI
+- id: jquery-core
+- id: swagger
+- id: swagger-ui
+- id: jquery.wiggle.min.js
 - id: require.js
 - id: require.js/r.js
 - id: backbone.js
@@ -34,7 +34,7 @@
 - id: jquery.ba-bbq.js
 - id: moment.js
 - id: ZeroClipboard
-- id: dataTables.js
+- id: jquery.dataTables
 - id: js-uri
 - id: js-yaml.js
 - id: jquery.form.js