You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/10/28 13:11:58 UTC
[1/7] incubator-brooklyn git commit: note where different JS versions
are used in cli build and docs as compared with js gui
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 404b7e02b -> 6d0089086
note where different JS versions are used in cli build and docs as compared with js gui
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ae89710e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ae89710e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ae89710e
Branch: refs/heads/master
Commit: ae89710ece477d6212d250a0752edca66ed9ac67
Parents: ed2e1e7
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Oct 26 21:50:13 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 28 12:05:21 2015 +0000
----------------------------------------------------------------------
.../cli/src/main/license/source-inclusions.yaml | 2 +-
usage/dist/licensing/overrides.yaml | 60 +++++++++++++++++++-
2 files changed, 60 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ae89710e/usage/cli/src/main/license/source-inclusions.yaml
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/license/source-inclusions.yaml b/usage/cli/src/main/license/source-inclusions.yaml
index 93c9d25..aab3212 100644
--- a/usage/cli/src/main/license/source-inclusions.yaml
+++ b/usage/cli/src/main/license/source-inclusions.yaml
@@ -20,5 +20,5 @@
# extras file for org.heneveld.license-audit-maven-plugin
# listing projects from which *source* files are included
-- id: underscore.js
+- id: underscore.js:1.7.0
- id: typeahead.js
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ae89710e/usage/dist/licensing/overrides.yaml
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/overrides.yaml b/usage/dist/licensing/overrides.yaml
index ec57f4e..4975587 100644
--- a/usage/dist/licensing/overrides.yaml
+++ b/usage/dist/licensing/overrides.yaml
@@ -84,12 +84,28 @@
organization: { name: "The jQuery Foundation", url: "http://jquery.org/" }
license: MIT
notices:
- - Copyright (c) John Resig (2011)
+ - Copyright (c) John Resig (2005-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"
+# used in docs (not reported)
+- id: jquery-core:2.1.1
+ url: http://jquery.com/
+ description: JS library for manipulating HTML and eventing
+ name: jQuery JavaScript Library
+ files: jquery.js
+ version: 2.1.1
+ organization: { name: "The jQuery Foundation", url: "http://jquery.org/" }
+ license: MIT
+ notices:
+ - Copyright (c) John Resig (2005-2014)
+ - "Includes code fragments from sizzle.js:"
+ - " Copyright (c) jQuery Foundation and other contributors (2013)"
+ - " Available at http://sizzlejs.com"
+ - " Used under the MIT license"
+
- id: swagger
name: Swagger JS
files: swagger.js
@@ -167,6 +183,13 @@
url: http://twitter.github.com/bootstrap/javascript.html#transitions
notice: Copyright (c) Twitter, Inc (2012)
license: ASL2
+
+# used in docs (not needed for licensing)
+- id: bootstrap.js:3.1.1
+ version: 3.1.1
+ url: http://getbootstrap.com/
+ notice: Copyright (c) Twitter, Inc (2011-2014)
+ license: MIT
- id: underscore.js
version: 1.4.4
@@ -176,6 +199,15 @@
notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2009-2013)
license: MIT
+# used in CLI (and in docs)
+- id: underscore.js:1.7.0
+ version: 1.7.0
+ files: underscore*.{js,map}
+ url: http://underscorejs.org
+ organization: { name: "DocumentCloud Inc", url: "http://www.documentcloud.org/" }
+ notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2009-2014)
+ license: MIT
+
- id: async.js
version: 0.1.1
url: https://github.com/p15martin/google-maps-hello-world/blob/master/js/libs/async.js
@@ -259,3 +291,29 @@
notice: Copyright (c) Twitter, Inc. and other contributors (2013-2014)
license: MIT
+# DOCS files
+#
+# we don't do a distributable docs build -- they are just online.
+# (docs are excluded from the source build, and not bundled with the binary build.)
+# so these are not used currently; but for completeness and in case we change our minds,
+# here they are:
+
+# * different versions of jquery, bootstrap, and underscore noted above,
+# * media items github octicons and font-awesome fonts, not listed
+# * plus the below:
+
+- id: jquery.superfish.js
+ name: Superfish jQuery Menu Widget
+ version: 1.4.8
+ url: http://users.tpg.com.au/j_birch/plugins/superfish/
+ notice: Copyright (c) Joel Birch (2008)
+ license: MIT
+
+- id: jquery.cookie.js
+ name: jQuery Cookie Plugin
+ version: 1.3.1
+ url: https://github.com/carhartl/jquery-cookie
+ notice: Copyright (c) 2013 Klaus Hartl
+ license: MIT
+
+
[6/7] incubator-brooklyn git commit: updated LICENSE files w latest
versions
Posted by he...@apache.org.
updated LICENSE files w latest versions
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4b56a84d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4b56a84d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4b56a84d
Branch: refs/heads/master
Commit: 4b56a84d80098b7bfb715f895579761f894aa3c3
Parents: dfb88a3
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Oct 28 12:11:13 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 28 12:11:13 2015 +0000
----------------------------------------------------------------------
LICENSE | 24 +++++++++++++-------
usage/cli/src/main/license/files/LICENSE | 8 +++----
usage/dist/src/main/license/files/LICENSE | 30 +++++++++++++------------
usage/jsgui/src/main/license/files/LICENSE | 16 ++++++-------
4 files changed, 44 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4b56a84d/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 56b9305..ca60394 100644
--- a/LICENSE
+++ b/LICENSE
@@ -203,16 +203,16 @@ This project includes the software: async.js
This project includes the software: backbone.js
Available at: http://backbonejs.org
- Developed by: DocumentCloud Inc (http://www.documentcloud.org/)
+ Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
Version used: 1.0.0
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2010-2013)
+ Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2010-2013)
This project includes the software: bootstrap.js
Available at: http://twitter.github.com/bootstrap/javascript.html#transitions
Version used: 2.0.4
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- Copyright (c) Twitter, Inc (2012)
+ Copyright (c) Twitter, Inc. (2012)
This project includes the software: handlebars.js
Available at: https://github.com/wycats/handlebars.js
@@ -228,9 +228,9 @@ This project includes the software: jQuery JavaScript Library
Inclusive of: jquery.js
Version used: 1.7.2
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) John Resig (2011)
+ Copyright (c) John Resig (2005-2011)
Includes code fragments from sizzle.js:
- Copyright (c) jQuery Foundation and other contributors (2011)
+ Copyright (c) The Dojo Foundation
Available at http://sizzlejs.com
Used under the MIT license
@@ -271,7 +271,7 @@ This project includes the software: js-uri
Available at: http://code.google.com/p/js-uri/
Developed by: js-uri contributors (https://code.google.com/js-uri)
Inclusive of: URI.js
- Version used: r29
+ Version used: 0.1
Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
Copyright (c) js-uri contributors (2013)
@@ -346,11 +346,19 @@ This project includes the software: typeahead.js
This project includes the software: underscore.js
Available at: http://underscorejs.org
- Developed by: DocumentCloud Inc (http://www.documentcloud.org/)
+ Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
Inclusive of: underscore*.{js,map}
Version used: 1.4.4
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2009-2013)
+ Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2009-2013)
+
+This project includes the software: underscore.js:1.7.0
+ Available at: http://underscorejs.org
+ Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
+ Inclusive of: underscore*.{js,map}
+ Version used: 1.7.0
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors (2009-2014)
This project includes the software: ZeroClipboard
Available at: http://zeroclipboard.org/
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4b56a84d/usage/cli/src/main/license/files/LICENSE
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/license/files/LICENSE b/usage/cli/src/main/license/files/LICENSE
index 5443ac6..2a36072 100644
--- a/usage/cli/src/main/license/files/LICENSE
+++ b/usage/cli/src/main/license/files/LICENSE
@@ -201,13 +201,13 @@ This project includes the software: typeahead.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Twitter, Inc. and other contributors (2013-2014)
-This project includes the software: underscore.js
+This project includes the software: underscore.js:1.7.0
Available at: http://underscorejs.org
- Developed by: DocumentCloud Inc (http://www.documentcloud.org/)
+ Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
Inclusive of: underscore*.{js,map}
- Version used: 1.4.4
+ Version used: 1.7.0
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2009-2013)
+ Copyright (c) Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors (2009-2014)
---------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4b56a84d/usage/dist/src/main/license/files/LICENSE
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/license/files/LICENSE b/usage/dist/src/main/license/files/LICENSE
index d1fd1ae..17500ba 100644
--- a/usage/dist/src/main/license/files/LICENSE
+++ b/usage/dist/src/main/license/files/LICENSE
@@ -214,16 +214,16 @@ This project includes the software: async.js
This project includes the software: backbone.js
Available at: http://backbonejs.org
- Developed by: DocumentCloud Inc (http://www.documentcloud.org/)
+ Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
Version used: 1.0.0
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2010-2013)
+ Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2010-2013)
This project includes the software: bootstrap.js
Available at: http://twitter.github.com/bootstrap/javascript.html#transitions
Version used: 2.0.4
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- Copyright (c) Twitter, Inc (2012)
+ Copyright (c) Twitter, Inc. (2012)
This project includes the software: ch.qos.logback
Available at: http://logback.qos.ch
@@ -423,9 +423,9 @@ This project includes the software: jQuery JavaScript Library
Inclusive of: jquery.js
Version used: 1.7.2
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) John Resig (2011)
+ Copyright (c) John Resig (2005-2011)
Includes code fragments from sizzle.js:
- Copyright (c) jQuery Foundation and other contributors (2011)
+ Copyright (c) The Dojo Foundation
Available at http://sizzlejs.com
Used under the MIT license
@@ -466,7 +466,7 @@ This project includes the software: js-uri
Available at: http://code.google.com/p/js-uri/
Developed by: js-uri contributors (https://code.google.com/js-uri)
Inclusive of: URI.js
- Version used: r29
+ Version used: 0.1
Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
Copyright (c) js-uri contributors (2013)
@@ -543,7 +543,7 @@ This project includes the software: org.bouncycastle
This project includes the software: org.codehaus.groovy
Available at: http://groovy.codehaus.org/
Developed by: The Codehaus (http://codehaus.org)
- Version used: 2.3.4
+ Version used: 2.3.7
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
This project includes the software: org.codehaus.jackson
@@ -687,17 +687,19 @@ This project includes the software: typeahead.js
This project includes the software: underscore.js
Available at: http://underscorejs.org
- Developed by: DocumentCloud Inc (http://www.documentcloud.org/)
+ Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
Inclusive of: underscore*.{js,map}
Version used: 1.4.4
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2009-2013)
+ Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2009-2013)
-This project includes the software: xml-apis
- Available at: http://xml.apache.org/commons/#external
- Developed by: Apache Software Foundation (http://www.apache.org/)
- Version used: 1.0.b2
- Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+This project includes the software: underscore.js:1.7.0
+ Available at: http://underscorejs.org
+ Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
+ Inclusive of: underscore*.{js,map}
+ Version used: 1.7.0
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors (2009-2014)
This project includes the software: xmlpull
Available at: http://www.xmlpull.org
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4b56a84d/usage/jsgui/src/main/license/files/LICENSE
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/license/files/LICENSE b/usage/jsgui/src/main/license/files/LICENSE
index e4ad943..b1e94b8 100644
--- a/usage/jsgui/src/main/license/files/LICENSE
+++ b/usage/jsgui/src/main/license/files/LICENSE
@@ -203,16 +203,16 @@ This project includes the software: async.js
This project includes the software: backbone.js
Available at: http://backbonejs.org
- Developed by: DocumentCloud Inc (http://www.documentcloud.org/)
+ Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
Version used: 1.0.0
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2010-2013)
+ Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2010-2013)
This project includes the software: bootstrap.js
Available at: http://twitter.github.com/bootstrap/javascript.html#transitions
Version used: 2.0.4
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- Copyright (c) Twitter, Inc (2012)
+ Copyright (c) Twitter, Inc. (2012)
This project includes the software: handlebars.js
Available at: https://github.com/wycats/handlebars.js
@@ -228,9 +228,9 @@ This project includes the software: jQuery JavaScript Library
Inclusive of: jquery.js
Version used: 1.7.2
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) John Resig (2011)
+ Copyright (c) John Resig (2005-2011)
Includes code fragments from sizzle.js:
- Copyright (c) jQuery Foundation and other contributors (2011)
+ Copyright (c) The Dojo Foundation
Available at http://sizzlejs.com
Used under the MIT license
@@ -271,7 +271,7 @@ This project includes the software: js-uri
Available at: http://code.google.com/p/js-uri/
Developed by: js-uri contributors (https://code.google.com/js-uri)
Inclusive of: URI.js
- Version used: r29
+ Version used: 0.1
Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
Copyright (c) js-uri contributors (2013)
@@ -339,11 +339,11 @@ This project includes the software: Swagger UI
This project includes the software: underscore.js
Available at: http://underscorejs.org
- Developed by: DocumentCloud Inc (http://www.documentcloud.org/)
+ Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
Inclusive of: underscore*.{js,map}
Version used: 1.4.4
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2009-2013)
+ Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2009-2013)
This project includes the software: ZeroClipboard
Available at: http://zeroclipboard.org/
[3/7] incubator-brooklyn git commit: update license metadata esp for
docs following code review
Posted by he...@apache.org.
update license metadata esp for docs following code review
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0218ee91
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0218ee91
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0218ee91
Branch: refs/heads/master
Commit: 0218ee913eb396aaf25fc04e45e725479d6d9fa3
Parents: ae89710
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Oct 28 11:29:09 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 28 12:08:41 2015 +0000
----------------------------------------------------------------------
usage/dist/licensing/overrides.yaml | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0218ee91/usage/dist/licensing/overrides.yaml
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/overrides.yaml b/usage/dist/licensing/overrides.yaml
index 4975587..b37d5d6 100644
--- a/usage/dist/licensing/overrides.yaml
+++ b/usage/dist/licensing/overrides.yaml
@@ -86,7 +86,7 @@
notices:
- Copyright (c) John Resig (2005-2011)
- "Includes code fragments from sizzle.js:"
- - " Copyright (c) jQuery Foundation and other contributors (2011)"
+ - " Copyright (c) The Dojo Foundation"
- " Available at http://sizzlejs.com"
- " Used under the MIT license"
@@ -100,9 +100,10 @@
organization: { name: "The jQuery Foundation", url: "http://jquery.org/" }
license: MIT
notices:
- - Copyright (c) John Resig (2005-2014)
+ - Copyright (c) The jQuery Foundation, Inc. and other contributors (2005-2014)
- "Includes code fragments from sizzle.js:"
- - " Copyright (c) jQuery Foundation and other contributors (2013)"
+ # NB: sizzle copyright changed from Dojo Foundation in 1.7.2
+ - " Copyright (c) The jQuery Foundation, Inc. and other contributors (2013)"
- " Available at http://sizzlejs.com"
- " Used under the MIT license"
@@ -174,29 +175,29 @@
- id: backbone.js
version: 1.0.0
url: http://backbonejs.org
- organization: { name: "DocumentCloud Inc", url: "http://www.documentcloud.org/" }
- notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2010-2013)
+ organization: { name: "DocumentCloud Inc.", url: "http://www.documentcloud.org/" }
+ notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2010-2013)
license: MIT
- id: bootstrap.js
version: 2.0.4
url: http://twitter.github.com/bootstrap/javascript.html#transitions
- notice: Copyright (c) Twitter, Inc (2012)
+ notice: Copyright (c) Twitter, Inc. (2012)
license: ASL2
# used in docs (not needed for licensing)
- id: bootstrap.js:3.1.1
version: 3.1.1
url: http://getbootstrap.com/
- notice: Copyright (c) Twitter, Inc (2011-2014)
+ notice: Copyright (c) Twitter, Inc. (2011-2014)
license: MIT
- id: underscore.js
version: 1.4.4
files: underscore*.{js,map}
url: http://underscorejs.org
- organization: { name: "DocumentCloud Inc", url: "http://www.documentcloud.org/" }
- notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2009-2013)
+ organization: { name: "DocumentCloud Inc.", url: "http://www.documentcloud.org/" }
+ notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2009-2013)
license: MIT
# used in CLI (and in docs)
@@ -204,8 +205,8 @@
version: 1.7.0
files: underscore*.{js,map}
url: http://underscorejs.org
- organization: { name: "DocumentCloud Inc", url: "http://www.documentcloud.org/" }
- notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2009-2014)
+ organization: { name: "DocumentCloud Inc.", url: "http://www.documentcloud.org/" }
+ notice: "Copyright (c) Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors (2009-2014)"
license: MIT
- id: async.js
@@ -303,6 +304,7 @@
# * plus the below:
- id: jquery.superfish.js
+ files: superfish.js
name: Superfish jQuery Menu Widget
version: 1.4.8
url: http://users.tpg.com.au/j_birch/plugins/superfish/
[4/7] incubator-brooklyn git commit: update readme to describe
generate-notices
Posted by he...@apache.org.
update readme to describe generate-notices
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/dfb88a39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/dfb88a39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/dfb88a39
Branch: refs/heads/master
Commit: dfb88a3953c945e0dbdae723dc64b97c0723b010
Parents: a918548
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Oct 28 11:50:46 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 28 12:08:42 2015 +0000
----------------------------------------------------------------------
usage/dist/licensing/README.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dfb88a39/usage/dist/licensing/README.md
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/README.md b/usage/dist/licensing/README.md
index 636677c..94ae070 100644
--- a/usage/dist/licensing/README.md
+++ b/usage/dist/licensing/README.md
@@ -25,8 +25,9 @@ and in `projects-with-custom-licenses` for those JARs which include other source
./make-all-licenses.sh || ( echo 'FAILED!!!' && rm LICENSE.autogenerated )
popd
-If you need to add a new project to those which require custom LICENSE files,
-see below.
+This combines the relevant `source-inclusions.yaml` files to create `extrasFile` files
+for `license-audit-maven-plugin` then runs the `notices` target for the various dists we make.
+If you need to add a new project to those which require custom LICENSE files, see below.
# CSV License Report
[2/7] incubator-brooklyn git commit: note that the version of URI.js
is 0.1
Posted by he...@apache.org.
note that the version of URI.js is 0.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ed2e1e79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ed2e1e79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ed2e1e79
Branch: refs/heads/master
Commit: ed2e1e7961357c52109051c38872e2ac7bd508c7
Parents: 404b7e0
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Oct 26 21:35:24 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 28 12:05:21 2015 +0000
----------------------------------------------------------------------
usage/dist/licensing/overrides.yaml | 2 +-
usage/jsgui/src/main/webapp/assets/js/libs/URI.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ed2e1e79/usage/dist/licensing/overrides.yaml
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/overrides.yaml b/usage/dist/licensing/overrides.yaml
index 45fbdcc..ec57f4e 100644
--- a/usage/dist/licensing/overrides.yaml
+++ b/usage/dist/licensing/overrides.yaml
@@ -228,7 +228,7 @@
- id: js-uri
files: URI.js
- version: r29
+ version: 0.1
url: http://code.google.com/p/js-uri/
organization: { name: "js-uri contributors", url: "https://code.google.com/js-uri" }
license: BSD-3-Clause
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ed2e1e79/usage/jsgui/src/main/webapp/assets/js/libs/URI.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/libs/URI.js b/usage/jsgui/src/main/webapp/assets/js/libs/URI.js
index 3246034..e621a06 100644
--- a/usage/jsgui/src/main/webapp/assets/js/libs/URI.js
+++ b/usage/jsgui/src/main/webapp/assets/js/libs/URI.js
@@ -1,5 +1,5 @@
/*
- * Taken from http://code.google.com/p/js-uri/ r29. BSD license.
+ * Taken from http://code.google.com/p/js-uri/ v0.1. BSD license.
* No changes in this Brooklyn copy, apart from these header lines.
* TODO Consider switching to http://medialize.github.io/URI.js/ which appears more modern.
*
[5/7] incubator-brooklyn git commit: tidy message for code we have
based on code elsewhere
Posted by he...@apache.org.
tidy message for code we have based on code elsewhere
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a918548e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a918548e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a918548e
Branch: refs/heads/master
Commit: a918548e6beb68f7ad73ae0236fa3bdf4f7284a8
Parents: 0218ee9
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Oct 28 11:39:17 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 28 12:08:42 2015 +0000
----------------------------------------------------------------------
.../assets/js/util/dataTables.extensions.js | 10 ++++++--
.../webapp/assets/js/util/jquery.slideto.js | 24 ++++++++++++--------
2 files changed, 23 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a918548e/usage/jsgui/src/main/webapp/assets/js/util/dataTables.extensions.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/util/dataTables.extensions.js b/usage/jsgui/src/main/webapp/assets/js/util/dataTables.extensions.js
index 17dc782..74a548e 100644
--- a/usage/jsgui/src/main/webapp/assets/js/util/dataTables.extensions.js
+++ b/usage/jsgui/src/main/webapp/assets/js/util/dataTables.extensions.js
@@ -16,14 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*
+ * ---
+ *
+ * This code has been created by the Apache Brooklyn contributors.
+ * It is heavily based on earlier software but rewritten for clarity
+ * and to preserve license integrity.
+ *
+ * This work is based on the existing jQuery DataTables plug-ins for:
*
- * Based on jQuery DataTables plug-ins for:
* * fnStandingRedraw by Jonathan Hoguet,
* http://www.datatables.net/plug-ins/api/fnStandingRedraw
+ *
* * fnProcessingIndicator by Allan Chappell
* https://www.datatables.net/plug-ins/api/fnProcessingIndicator
*
- * Both rewritten for clarity and to preserve license integrity.
*/
define([
"jquery", "jquery-datatables"
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a918548e/usage/jsgui/src/main/webapp/assets/js/util/jquery.slideto.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/util/jquery.slideto.js b/usage/jsgui/src/main/webapp/assets/js/util/jquery.slideto.js
index 4dd69a2..17afeed 100644
--- a/usage/jsgui/src/main/webapp/assets/js/util/jquery.slideto.js
+++ b/usage/jsgui/src/main/webapp/assets/js/util/jquery.slideto.js
@@ -16,19 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*
- *
- * Based on jquery.slideto.min.js in Swagger UI, added in:
- * https://github.com/wordnik/swagger-ui/commit/d2eb882e5262e135dfa3f5919796bbc3785880b8#diff-bd86720650a2ebd1ab11e870dc475564
+ * ---
*
- * Swagger UI is distributed under ASL but it is not clear that this code originated in that project.
- * No other original author could be identified.
+ * This code has been created by the Apache Brooklyn contributors.
+ * It is heavily based on earlier software but rewritten for readability
+ * and to preserve license integrity.
*
- * Nearly identical code is referenced here:
- * http://stackoverflow.com/questions/12375440/scrolling-works-in-chrome-but-not-in-firefox-or-ie
+ * Our influences are:
*
- * The project https://github.com/Sleavely/jQuery-slideto is NOT this.
+ * * jquery.slideto.min.js in Swagger UI, provenance unknown, added in:
+ * https://github.com/wordnik/swagger-ui/commit/d2eb882e5262e135dfa3f5919796bbc3785880b8#diff-bd86720650a2ebd1ab11e870dc475564
+ *
+ * Swagger UI is distributed under ASL but it is not clear that this code originated in that project.
+ * No other original author could be identified.
+ *
+ * * Nearly identical code referenced here:
+ * http://stackoverflow.com/questions/12375440/scrolling-works-in-chrome-but-not-in-firefox-or-ie
+ *
+ * Note that the project https://github.com/Sleavely/jQuery-slideto is NOT this.
*
- * Rewritten for readability and to preserve license integrity.
*/
(function(jquery){
jquery.fn.slideto=function(opts) {
[7/7] incubator-brooklyn git commit: This closes #990
Posted by he...@apache.org.
This closes #990
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6d008908
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6d008908
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6d008908
Branch: refs/heads/master
Commit: 6d0089086469513bd4c0f6729e6ca024e413cd72
Parents: 404b7e0 4b56a84
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Oct 28 12:11:44 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 28 12:11:44 2015 +0000
----------------------------------------------------------------------
LICENSE | 24 ++++---
usage/cli/src/main/license/files/LICENSE | 8 +--
.../cli/src/main/license/source-inclusions.yaml | 2 +-
usage/dist/licensing/README.md | 5 +-
usage/dist/licensing/overrides.yaml | 76 +++++++++++++++++---
usage/dist/src/main/license/files/LICENSE | 30 ++++----
usage/jsgui/src/main/license/files/LICENSE | 16 ++---
.../jsgui/src/main/webapp/assets/js/libs/URI.js | 2 +-
.../assets/js/util/dataTables.extensions.js | 10 ++-
.../webapp/assets/js/util/jquery.slideto.js | 24 ++++---
10 files changed, 140 insertions(+), 57 deletions(-)
----------------------------------------------------------------------