You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/12/13 00:32:26 UTC
[1/2] incubator-brooklyn git commit: Revise LICENSE and NOTICE
following mentor feedback
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 985b351c7 -> b61dbaa18
Revise LICENSE and NOTICE following mentor feedback
See:
https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201412.mbox/%3C20141211165910.GG36553%40Chips-MacBook-Air.local%3E
MIT/BSD licensed subcomponents now credited in LICENSE instead of
NOTICE. Reviewed ASL2 credits in NOTICE; determined that they do not
have their own NOTICE file, and therefore there is no need to mention
them, per https://www.apache.org/dev/licensing-howto.html#alv2-dep.
This meant that there were no credits remaining in NOTICE; replaced
NOTICE with boilerplate recommended by
https://www.apache.org/dev/licensing-howto.html#simple.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/21829768
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/21829768
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/21829768
Branch: refs/heads/master
Commit: 21829768bd1f193d8ff2056b6026a6d2f509e2de
Parents: 67d05d6
Author: Richard Downer <ri...@apache.org>
Authored: Fri Dec 12 14:45:39 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Fri Dec 12 14:45:39 2014 +0000
----------------------------------------------------------------------
LICENSE | 72 +++++++++++++++++++++++++++++++++++++++++++++--------
NOTICE | 81 ++----------------------------------------------------------
2 files changed, 64 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/21829768/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7694da5..df7b30f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -177,18 +177,73 @@ http://www.apache.org/licenses/
+---------------------------------------------------
-OTHER LICENSES
+This distribution contains third party resources.
-This software incorporates minor components developed elsewhere, as described in
-the accompanying NOTICE file. In addition to the Apache License 2.0 (above),
-the other licenses referenced there under which those components are used are:
+This product includes software developed at The jQuery Foundation (http://jquery.org/):
+jquery.js, selected jquery*.js.
+Copyright (c) John Resig (2011).
+Licensed under the MIT license (see below).
+This product includes software developed at The Dojo Foundation (http://dojofoundation.org/):
+require.js, text.js, sizzle.js in jquery.js.
+Copyright (c) The Dojo Foundation (2011, 2012).
+Licensed under the MIT license (see below).
+This product includes software developed at DocumentCloud Inc (http://www.documentcloud.org/):
+backbone.js, underscore.js.
+Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2010-2013).
+Licensed under the MIT license (see below).
-The MIT License ("MIT")
+This product includes software developed by Miller Medeiros (https://github.com/millermedeiros/):
+async.js.
+Copyright (c) Miller Medeiros (2011).
+Licensed under the MIT license (see below).
+
+This product includes software developed at Twitter, Inc (http://twitter.com):
+typeahead.js, bloodhound.js
+Copyright (c) Twitter, Inc (2013).
+Licensed under the MIT license (see below).
+
+This product includes software developed by Yehuda Katz (https://github.com/wycats/):
+handlebars*.js.
+Copyright (c) Yehuda Katz (2012).
+Licensed under the MIT license (see below).
+
+This product includes software developed by "Cowboy" Ben Alman (http://benalman.com/).
+jquery.ba-bbq*.js
+Copyright (c) "Cowboy" Ben Alman (2010).
+Licensed under the MIT license (see below).
+
+This product includes software developed by WonderGroup and Jordan Thomas (http://labs.wondergroup.com/demos/mini-ui/index.html):
+jquery.wiggle.js.
+Copyright (c) WonderGroup and Jordan Thomas (2010).
+Licensed under the MIT license (see below).
+
+This product includes software developed by Tim Wood (http://momentjs.com):
+moment.js
+Copyright (c) Tim Wood, Iskren Chernev, Moment.js contributors (2011-2014).
+Licensed under the MIT license (see below).
+
+This product includes software developed by ZeroClipboard contributors (https://github.com/zeroclipboard):
+ZeroClipboard.js
+Copyright (c) Jon Rohan, James M. Greene (2014).
+Licensed under the MIT license (see below).
-Copyright (c) <year> <copyright holders>
+
+This product includes software developed at SpryMedia Ltd (http://sprymedia.co.uk/):
+jquery.dataTables.js, dataTables.extensions.js.
+Copyright (c) Allan Jardine (2008-2012).
+Licensed under the New BSD license (see below).
+
+This product includes software developed by js-uri contributors (https://code.google.com/js-uri):
+URI.js.
+Copyright (c) js-uri contributors (2013).
+Licensed under the New BSD license (see below).
+
+
+The MIT License ("MIT")
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -212,10 +267,7 @@ THE SOFTWARE.
The BSD 3-Clause License ("New BSD")
-Copyright (c) <YEAR>, <OWNER>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
+Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/21829768/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 08039f7..6f99615 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,82 +1,5 @@
Apache Brooklyn
Copyright 2014 The Apache Software Foundation
-
-This product includes software developed at The Apache Software Foundation (http://www.apache.org/):
-All code unless otherwise specified.
-Copyright (c) The Apache Software Foundation
-Licensed under the Apache License 2.0.
-
-This product includes software developed at The OSGi Alliance (http://www.osgi.org/):
-Java sources in org.osgi.*.
-Copyright (c) The OSGi Alliance (2000, 2010).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at The jQuery Foundation (http://jquery.org/):
-jquery.js, selected jquery*.js.
-Copyright (c) John Resig (2011).
-Licensed under the MIT license (also available under GPLv2).
-
-This product includes software developed at The Dojo Foundation (http://dojofoundation.org/):
-require.js, text.js, sizzle.js in jquery.js.
-Copyright (c) The Dojo Foundation (2011, 2012).
-require.js and text.js licensed under the MIT license (also available under New BSD).
-sizzle.js portions of jquery.js licensed under the MIT license (also available under New BSD and GPL).
-
-This product includes software developed at SpryMedia Ltd (http://sprymedia.co.uk/):
-jquery.dataTables.js, dataTables.extensions.js.
-Copyright (c) Allan Jardine (2008-2012).
-Licensed under the New BSD license (also available under GPLv2 and newer versions under Apache License 2.0).
-
-This product includes software developed at DocumentCloud Inc (http://www.documentcloud.org/):
-backbone.js, underscore.js.
-Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2010-2013).
-Licensed under the MIT license.
-
-This product includes software developed by Miller Medeiros (https://github.com/millermedeiros/):
-async.js.
-Copyright (c) Miller Medeiros (2011).
-Licensed under the MIT license.
-
-This product includes software developed at Twitter, Inc (http://twitter.com):
-bootstrap.js.
-Copyright (c) Twitter, Inc (2012).
-Licensed under the Apache License 2.0.
-typeahead.js, bloodhound.js
-Copyright (c) Twitter, Inc (2013).
-Licensed under the MIT License.
-
-This product includes software developed by Yehuda Katz (https://github.com/wycats/):
-handlebars*.js.
-Copyright (c) Yehuda Katz (2012).
-Licensed under the MIT license.
-
-This product includes software developed by "Cowboy" Ben Alman (http://benalman.com/).
-jquery.ba-bbq*.js
-Copyright (c) "Cowboy" Ben Alman (2010).
-Licensed under the MIT license (also available under GPL).
-
-This product includes software developed by WonderGroup and Jordan Thomas (http://labs.wondergroup.com/demos/mini-ui/index.html):
-jquery.wiggle.js.
-Copyright (c) WonderGroup and Jordan Thomas (2010).
-Licensed under the MIT license.
-
-This product includes software developed by Tim Wood (http://momentjs.com):
-moment.js
-Copyright (c) Tim Wood, Iskren Chernev, Moment.js contributors (2011-2014).
-Licensed under the MIT license.
-
-This product includes software developed at Wordnik, Inc (https://github.com/wordnik/):
-swagger*.js.
-Copyright (c) Wordnik, Inc (2011-2014).
-Licensed under the Apache License 2.0.
-
-This product includes software developed by js-uri contributors (https://code.google.com/js-uri):
-URI.js.
-Copyright (c) js-uri contributors (2013).
-Licensed under the New BSD License.
-
-This product includes software developed by ZeroClipboard contributors (https://github.com/zeroclipboard):
-ZeroClipboard.{js,swf}
-Copyright (c) Jon Rohan, James M. Greene (2014).
-Licensed under the MIT license.
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
[2/2] incubator-brooklyn git commit: This closes #390
Posted by gr...@apache.org.
This closes #390
* github/pr/390:
Revise LICENSE and NOTICE following mentor feedback
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b61dbaa1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b61dbaa1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b61dbaa1
Branch: refs/heads/master
Commit: b61dbaa18f18ac1e42394099b6ae80dcf35b4ef8
Parents: 985b351 2182976
Author: Andrew Kennedy <gr...@apache.org>
Authored: Fri Dec 12 23:32:17 2014 +0000
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Fri Dec 12 23:32:17 2014 +0000
----------------------------------------------------------------------
LICENSE | 72 +++++++++++++++++++++++++++++++++++++++++++++--------
NOTICE | 81 ++----------------------------------------------------------
2 files changed, 64 insertions(+), 89 deletions(-)
----------------------------------------------------------------------