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 2016/01/30 04:38:53 UTC
[28/29] incubator-brooklyn git commit: update license generation to
put a file in each project root
update license generation to put a file in each project root
and correct some version mismatches
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d8a3873a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d8a3873a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d8a3873a
Branch: refs/heads/master
Commit: d8a3873a701df553e2de7e376f45fd4570250754
Parents: 8a08f7b
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Sat Jan 30 03:32:38 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Sat Jan 30 03:32:38 2016 +0000
----------------------------------------------------------------------
.../dist/licensing/make-all-licenses.sh | 34 +++++++++++---------
brooklyn-dist/dist/licensing/overrides.yaml | 10 +++---
brooklyn-docs/_licensing/README | 24 ++++++++++++++
.../src/main/license/source-inclusions.yaml | 7 ++--
4 files changed, 53 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d8a3873a/brooklyn-dist/dist/licensing/make-all-licenses.sh
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/licensing/make-all-licenses.sh b/brooklyn-dist/dist/licensing/make-all-licenses.sh
index 3b62f96..b08d17f 100755
--- a/brooklyn-dist/dist/licensing/make-all-licenses.sh
+++ b/brooklyn-dist/dist/licensing/make-all-licenses.sh
@@ -29,26 +29,14 @@ unset BROOKLYN_LICENSE_SPECIALS
unset BROOKLYN_LICENSE_EXTRAS_FILES
unset BROOKLYN_LICENSE_MODE
-# individual projects
-for x in `cat projects-with-custom-licenses` ; do
- export BROOKLYN_LICENSE_MODE=`basename $x`
- echo MAKING LICENSES FOR: ${BROOKLYN_LICENSE_MODE}
- export BROOKLYN_LICENSE_SPECIALS=-DonlyExtras=true
- export BROOKLYN_LICENSE_EXTRAS_FILES=$x/src/main/license/source-inclusions.yaml
- cp licenses/`basename $x`/* licenses/source
- ./make-one-license.sh > LICENSE.autogenerated || ( echo FAILED. See details in tmp_stdout/err. && false )
- cp LICENSE.autogenerated ../$x/src/main/license/files/LICENSE
- unset BROOKLYN_LICENSE_SPECIALS
- unset BROOKLYN_LICENSE_EXTRAS_FILES
- unset BROOKLYN_LICENSE_MODE
-done
-
-# source build, at root
+# source build, at root and each sub-project
export BROOKLYN_LICENSE_MODE=source
echo MAKING LICENSES FOR: ${BROOKLYN_LICENSE_MODE}
export BROOKLYN_LICENSE_SPECIALS=-DonlyExtras=true
./make-one-license.sh > LICENSE.autogenerated
cp LICENSE.autogenerated ../../../LICENSE
+# overwrite any existing licenses at root
+for x in ../../../brooklyn-*/LICENSE ; do cp LICENSE.autogenerated $x ; done
unset BROOKLYN_LICENSE_SPECIALS
unset BROOKLYN_LICENSE_MODE
@@ -59,3 +47,19 @@ echo MAKING LICENSES FOR: ${BROOKLYN_LICENSE_MODE}
cp LICENSE.autogenerated ../src/main/license/files/LICENSE
unset BROOKLYN_LICENSE_MODE
+# individual projects
+for x in `cat projects-with-custom-licenses` ; do
+ export BROOKLYN_LICENSE_MODE=`basename $x`
+ echo MAKING LICENSES FOR: ${BROOKLYN_LICENSE_MODE}
+ export BROOKLYN_LICENSE_SPECIALS=-DonlyExtras=true
+ export BROOKLYN_LICENSE_EXTRAS_FILES=$x/src/main/license/source-inclusions.yaml
+ cp licenses/`basename $x`/* licenses/source
+ ./make-one-license.sh > LICENSE.autogenerated || ( echo FAILED. See details in tmp_stdout/err. && false )
+ cp LICENSE.autogenerated ../$x/src/main/license/files/LICENSE
+ # also copy to root of that project *if* there is already a LICENSE file there
+ [ -f ../$x/LICENSE ] && cp LICENSE.autogenerated ../$x/LICENSE || true
+ unset BROOKLYN_LICENSE_SPECIALS
+ unset BROOKLYN_LICENSE_EXTRAS_FILES
+ unset BROOKLYN_LICENSE_MODE
+done
+
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d8a3873a/brooklyn-dist/dist/licensing/overrides.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/licensing/overrides.yaml b/brooklyn-dist/dist/licensing/overrides.yaml
index a2f6107..1285df4 100644
--- a/brooklyn-dist/dist/licensing/overrides.yaml
+++ b/brooklyn-dist/dist/licensing/overrides.yaml
@@ -99,7 +99,8 @@
# info on non-maven projects
-- id: jquery-core
+# used in UI
+- id: jquery-core:1.7.2
url: http://jquery.com/
description: JS library for manipulating HTML and eventing
name: jQuery JavaScript Library
@@ -146,6 +147,7 @@
- " Available at http://sizzlejs.com"
- " Used under the MIT license"
+# not used anymore? swagger-ui includes what it needs, it seems.
- id: swagger:2.1.6
name: Swagger JS
files: swagger-client.js
@@ -154,10 +156,10 @@
license: ASL2
notice: Copyright (c) SmartBear Software (2011-2015)
-- id: swagger-ui:2.1.3
- files: swagger-ui.js
+- id: swagger-ui:2.1.4
+ files: swagger*.{js,css,html}
name: Swagger UI
- version: 2.1.3
+ version: 2.1.4
url: https://github.com/swagger-api/swagger-ui
license: ASL2
notice: Copyright (c) SmartBear Software (2011-2015)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d8a3873a/brooklyn-docs/_licensing/README
----------------------------------------------------------------------
diff --git a/brooklyn-docs/_licensing/README b/brooklyn-docs/_licensing/README
new file mode 100644
index 0000000..2fc5f2e
--- /dev/null
+++ b/brooklyn-docs/_licensing/README
@@ -0,0 +1,24 @@
+
+We don't distribute docs as part of the source build so we're not obliged to report the JS we include
+or generate a special LICENSE file as brooklyn-dist/dist/licensing does for the distributed projects.
+
+(This project just gets the usual brooklyn license.)
+
+However we might consider recording the licenses used in the docs. So we note
+that third-party software bundled by the docs include:
+
+* bloodhound (aka typeahead)
+* glossarizer
+
+And other things used by brooklyn, in style/{deps,js}.
+
+---
+
+This project includes the software: glossarizer
+ Available at: https://github.com/PebbleRoad/glossarizer
+ Developed by: Vinay M, PebbleRoad Pte Ltd (http://www.pebbleroad.com)
+ Version used: 1.5
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) Vinay M, PebbleRoad Pte Ltd (2004-2016)
+
+
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d8a3873a/brooklyn-ui/src/main/license/source-inclusions.yaml
----------------------------------------------------------------------
diff --git a/brooklyn-ui/src/main/license/source-inclusions.yaml b/brooklyn-ui/src/main/license/source-inclusions.yaml
index 2adf949..8c1945c 100644
--- a/brooklyn-ui/src/main/license/source-inclusions.yaml
+++ b/brooklyn-ui/src/main/license/source-inclusions.yaml
@@ -20,9 +20,10 @@
# extras file for org.heneveld.license-audit-maven-plugin
# listing projects from which *source* files are included
-- id: jquery-core
-- id: swagger
-- id: swagger-ui
+- id: jquery-core:1.7.2
+- id: swagger-ui:2.1.4
+# we use other versions of the above in other projs
+
- id: jquery.wiggle.min.js
- id: require.js
- id: require.js/r.js