brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geom...@apache.org
Subject [1/2] brooklyn-dist git commit: scripts to help automate license generation for new angular js ui
Date Mon, 30 Jul 2018 10:25:12 GMT
Repository: brooklyn-dist
Updated Branches:
  refs/heads/master 3f876c515 -> 3a30944e2


scripts to help automate license generation for new angular js ui

and tidy of generation routines, update to README


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

Branch: refs/heads/master
Commit: 193a3f2df2d9be060e8852fced0cd878a7f702f6
Parents: 3f876c5
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Sat Jul 28 01:08:52 2018 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Sat Jul 28 02:08:43 2018 +0100

----------------------------------------------------------------------
 dist/licensing/README.md                        |   8 +-
 ...pute-nodejs-license-dependencies.format.json |  10 +
 .../compute-nodejs-license-dependencies.sh      |  73 ++++
 dist/licensing/generate-all.sh                  |  13 +-
 dist/licensing/generate-license-and-notice.sh   |  12 +-
 dist/licensing/generate-one-for-testing.sh      | 146 ++++++++
 ...icense-metadata-manual-1-js-pre-angular.yaml | 366 +++++++++++++++++++
 .../license-metadata-manual-2-angular.yaml      |  30 ++
 dist/licensing/license-metadata-manual-js.yaml  | 366 -------------------
 .../licensing/license-text/Font Awesome License |  34 ++
 dist/licensing/parts/license-deps               |   6 +-
 dist/licensing/parts/yaml-asf-header            |  18 +
 .../update-brooklyn-license-metadata.sh         |  29 ++
 13 files changed, 732 insertions(+), 379 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/193a3f2d/dist/licensing/README.md
----------------------------------------------------------------------
diff --git a/dist/licensing/README.md b/dist/licensing/README.md
index 3011643..1f5323b 100644
--- a/dist/licensing/README.md
+++ b/dist/licensing/README.md
@@ -15,9 +15,11 @@ Then in the `brooklyn-dist/dist/licensing` folder execute:
 This will generate updated LICENSE and NOTICE files everywhere that is needed. 
 Compare the differences across all projects just to be sure and commit them.
 
-* Check that the `license-inclusions-*` files in the various projects are up-to-date.
-  This may need manual verification for Go and JS contents (see glide.yaml for Go and package.json for JS).
-  
+For non-Java project changes there are extra steps.  Go, JS, jpegs, fonts, etc may require
+special attention.  Some automation is available (particularly for modern JS code) in:
+
+    ./update-brooklyn-license-metadata.sh
+
 
 # Detailed Usage
 

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/193a3f2d/dist/licensing/compute-nodejs-license-dependencies.format.json
----------------------------------------------------------------------
diff --git a/dist/licensing/compute-nodejs-license-dependencies.format.json b/dist/licensing/compute-nodejs-license-dependencies.format.json
new file mode 100644
index 0000000..45c4d48
--- /dev/null
+++ b/dist/licensing/compute-nodejs-license-dependencies.format.json
@@ -0,0 +1,10 @@
+{
+	"name": "",
+	"version": "",
+	"description": "",
+        "repository": "",
+        "homepage": "",
+	"licenses": "",
+	"copyright": "",
+	"licenseText": "none"
+}

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/193a3f2d/dist/licensing/compute-nodejs-license-dependencies.sh
----------------------------------------------------------------------
diff --git a/dist/licensing/compute-nodejs-license-dependencies.sh b/dist/licensing/compute-nodejs-license-dependencies.sh
new file mode 100755
index 0000000..9518e72
--- /dev/null
+++ b/dist/licensing/compute-nodejs-license-dependencies.sh
@@ -0,0 +1,73 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# requires:
+#   node js license-checker to generate the list of deps of this project in the format used by brooklyn
+#     (https://github.com/davglass/license-checker)
+#   jq to process json (https://stedolan.github.io/jq/)
+#   node js json2yaml to output yaml for merging (https://www.npmjs.com/package/json2yaml)
+
+if [ "$1" == "--help" ] ; then
+  echo Computes NodeJS dependencies and outputs metadata files in `config/license-`
+  echo Works in current directory, or takes target directory as single argument.
+  exit 0
+fi
+
+EXCLUDE_DEPS=brooklyn
+
+BASE_DIR=$(pushd $(dirname $0) > /dev/null ; pwd -P ; popd > /dev/null)
+
+if [ ! -z "$1" ] ; then pushd $1 > /dev/null ; fi
+OUTDIR=.
+
+if [ -d $OUTDIR/config ] ; then OUTDIR=$OUTDIR/config ; fi
+TEMPFILE=$OUTDIR/license-dependencies.json.tmp
+
+license-checker --production --json --customPath $BASE_DIR/compute-nodejs-license-dependencies.format.json > $TEMPFILE
+
+cp $BASE_DIR/parts/yaml-asf-header $OUTDIR/license-inclusions-binary-autogenerated-js-license-checker.yaml
+cat $TEMPFILE | jq 'keys | .[]' | awk '{ print "- id: "$0 }' | \
+  grep -v "id: \"${EXCLUDE_DEPS}-" >> $OUTDIR/license-inclusions-binary-autogenerated-js-license-checker.yaml
+
+# a few things to note:
+# * we exclude keys with null/empty values in jq
+# * if homepage and repo are the same, or homepage is autogen with #readme appended, we drop homepage
+#   ("unique" changes the order, which we don't want)
+# * json2yaml prepends --- to the file and "  " on every line, which we don't want
+cp $BASE_DIR/parts/yaml-asf-header $OUTDIR/license-metadata-autogenerated-js.yaml
+cat $TEMPFILE | jq 'to_entries | 
+  map({ id: .key } + 
+  .value | { 
+    id, name: (.name + " (NodeJS module)"), version, description, 
+    url: ([ (select(.homepage != .repository+"#readme" and .homepage != .repository) | .homepage), .repository ]
+      | map(select(length > 0))),
+    organization: (. | { name: .publisher, email: .email, url: .url }  | with_entries(select((.value | length) > 0)) ),
+    license: .licenses,
+    copyright_by: .copyright, license_text: .licenseText } 
+  | with_entries(select((.value | length) > 0)) )' \
+  | json2yaml | grep -v ^--- | sed 's/^  //' \
+  >> $OUTDIR/license-metadata-autogenerated-js.yaml
+
+rm $TEMPFILE
+
+echo Reported $(wc $OUTDIR/license-inclusions-binary-autogenerated-js-license-checker.yaml | awk '{print $1}') JS dependencies for $(basename $(pwd))
+
+if [ ! -z "$1" ] ; then popd > /dev/null ; fi
+

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/193a3f2d/dist/licensing/generate-all.sh
----------------------------------------------------------------------
diff --git a/dist/licensing/generate-all.sh b/dist/licensing/generate-all.sh
index 6722129..b8566ad 100755
--- a/dist/licensing/generate-all.sh
+++ b/dist/licensing/generate-all.sh
@@ -114,7 +114,7 @@ make_for() {
 }
 
 
-# build all the projects
+# build licenses for all the projects
 
 # include deps in files pulled in to Go CLI binary builds
 make_for $ROOT_DIR/brooklyn-client/cli/ release/license/files binary-primary
@@ -123,8 +123,14 @@ make_for $ROOT_DIR/brooklyn-client/cli/ . binary-additional
 # Server CLI has embedded JS; gets custom files in sub-project root, also included in JAR
 make_for $ROOT_DIR/brooklyn-server/server-cli/ . binary-additional
 
-# UI gets files at root, also included in WAR
+# UI gets files at root
 make_for $ROOT_DIR/brooklyn-ui/ . binary-additional
+# for UI also do for each standalone module
+for x in $(ls $ROOT_DIR/brooklyn-ui/ui-modules/*/package.json) ; do
+  make_for ${x%package.json} . binary-additional
+  # and in modules which make a WAR/JAR files we embed binaries
+  if [ -d ${x%package.json}/src/main/webapp ] ; then make_for ${x%package.json} src/main/webapp/WEB-INF/classes/META-INF/ binary-primary ; fi
+done
 
 # main projects have their binaries included at root
 make_for $ROOT_DIR/brooklyn-server/ . binary-additional
@@ -141,4 +147,5 @@ make_for $ROOT_DIR/brooklyn-dist/dist src/main/license/files/ binary-primary $RO
 cp $OUT/{NOTICE,LICENSE} $PROJ/../karaf/apache-brooklyn/src/main/resources/
 
 # finally in root project list everything
-make_for $ROOT_DIR/brooklyn-dist/dist ../.. binary-additional $ROOT_DIR
\ No newline at end of file
+make_for $ROOT_DIR/brooklyn-dist/dist ../.. binary-additional $ROOT_DIR
+

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/193a3f2d/dist/licensing/generate-license-and-notice.sh
----------------------------------------------------------------------
diff --git a/dist/licensing/generate-license-and-notice.sh b/dist/licensing/generate-license-and-notice.sh
index 0e6ee57..120cf27 100755
--- a/dist/licensing/generate-license-and-notice.sh
+++ b/dist/licensing/generate-license-and-notice.sh
@@ -131,7 +131,8 @@ TEMP_MVN_OUT=`pwd -P`/temp.license-maven-output.log
 echo > $TEMP_METADATA_FILE
 if [ ! -z "$LIBRARIES" ] ; then
   echo Using metadata libraries $(find "${LIBRARIES[@]}" -name "license-metadata-*")
-  for x in $(find "${LIBRARIES[@]}" -name "license-metadata-*") ; do
+  # sort by filename first, then by path, with later ones alpha being the ones that are ultimately used
+  for x in $(find "${LIBRARIES[@]}" -name "license-metadata-*" | sed 's/\(.*\/\)\(.*\)/\2 --- \1\2/' | sort | sed 's/.* --- //') ; do
     cat $x >> $TEMP_METADATA_FILE
   done
 fi
@@ -179,19 +180,22 @@ cat ${TEMP_LICENSES_}1 | while read x ; do echo $x ; done | sort | uniq > ${TEMP
 MISSING=()
 
 if [ -s ${TEMP_LICENSES_}2 ] ; then
-  echo Adding ${LICENSES[$I]} to $LICENSE_FILE and `cat ${TEMP_LICENSES_}2 | wc -l` licenses
+  echo Adding ${LICENSES[$I]} to $LICENSE_FILE and `cat ${TEMP_LICENSES_}2 | wc -l` licenses:`cat ${TEMP_LICENSES_}2 | sed 's/^/ /' | paste -sd ';' -`
   cat ${LICENSES[${#LICENSES[@]}-1]} >> $LICENSE_FILE
-  
+  LICENSE_TEXT_PATHS=$(find ${LIBRARIES[@]} -name license-text) 
+
   while read x ; do
   
     echo "  "$x": |" >> $LICENSE_FILE
     
     unset FOUND
-    for lp in $(find ${LIBRARIES[@]} -name license-text) ; do
+    for lp in ${LICENSE_TEXT_PATHS} ; do
       if [ -f "$lp/$x" ] ; then
+       if [ -z "$FOUND" ]; then
         cat "$lp/$x" | sed "s/^/    /" >> $LICENSE_FILE
         echo "" >> $LICENSE_FILE
         FOUND=true
+       fi
       fi
     done
     if [ -z "$FOUND" ]; then

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/193a3f2d/dist/licensing/generate-one-for-testing.sh
----------------------------------------------------------------------
diff --git a/dist/licensing/generate-one-for-testing.sh b/dist/licensing/generate-one-for-testing.sh
new file mode 100755
index 0000000..4b20c69
--- /dev/null
+++ b/dist/licensing/generate-one-for-testing.sh
@@ -0,0 +1,146 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+set -e
+
+usage() {
+  cat >&2 << EOF
+
+Usage:  generate-all.sh
+
+Execute generate-license-and-notice.sh to generate LICENSE and NOTICE files for all Brooklyn projects.
+
+EOF
+}
+
+while [ ! -z "$*" ] ; do
+
+  if [ "$1" == "--help" ]; then usage ; exit 0; fi
+
+  usage
+  echo Unexpected argument: $1
+  exit 1 
+
+done
+
+
+REF_DIR=$(pushd $(dirname $0) > /dev/null ; pwd -P ; popd > /dev/null)
+PARTS_DIR=$REF_DIR/parts
+ROOT_DIR=$REF_DIR/../../..
+MVN_OUTFILE=$REF_DIR/notices.autogenerated
+
+prefix_and_join_array() {
+  PREFIX=$2
+  JOIN_BEFORE_PREFIX=$1
+  JOIN_AFTER_PREFIX=$3
+  echo -n ${PREFIX}$4
+  shift 4
+  while (($#  >= 1)) ; do
+    echo -n "${JOIN_BEFORE_PREFIX}${PREFIX}${JOIN_AFTER_PREFIX}$1"
+    shift
+  done
+}
+
+# takes root dir in first arg, then regex expression 
+make_for() {
+  PROJ=$(cd $1 ; pwd -P)
+  OUT=${PROJ}/$2
+  MODE=$3
+  SEARCH_ROOT=$4
+  if [ -z "$SEARCH_ROOT" ] ; then SEARCH_ROOT=$PROJ ; fi
+
+  echo Generating for $PROJ mode $MODE to $2...
+  echo ""
+  
+  pushd $PROJ > /dev/null
+  
+  if [ "$MODE" == "binary-additional" ] ; then
+
+    $REF_DIR/generate-license-and-notice.sh \
+      -o $OUT \
+      --license $PARTS_DIR/license-top \
+      --license $PARTS_DIR/license-deps \
+      --notice $PARTS_DIR/notice-top --notice-compute-with-flags "
+        -DextrasFiles=$(prefix_and_join_array "" ":" "" $(find $SEARCH_ROOT -name "license-inclusions-source-*"))
+        -DonlyExtras=true" \
+      --notice $PARTS_DIR/notice-additional --notice-compute-with-flags "
+        -DextrasFiles=$(prefix_and_join_array "" ":" "" $(find $SEARCH_ROOT -name "license-inclusions-binary-*"))" \
+      --libraries ${REF_DIR} ${SEARCH_ROOT}
+    
+  elif [ "$MODE" == "binary-primary" ] ; then
+
+    $REF_DIR/generate-license-and-notice.sh \
+      -o $OUT \
+      --license $PARTS_DIR/license-top \
+      --license $PARTS_DIR/license-deps \
+      --notice $PARTS_DIR/notice-top --notice-compute-with-flags "
+        -DextrasFiles=$(prefix_and_join_array "" ":" "" $(find $SEARCH_ROOT -name "license-inclusions-source-*" -or -name "license-inclusions-binary-*"))" \
+      --libraries ${REF_DIR} ${SEARCH_ROOT}
+      
+  elif [ "$MODE" == "binary-omitted" ] ; then
+
+    $REF_DIR/generate-license-and-notice.sh \
+      -o $OUT \
+      --license $PARTS_DIR/license-top \
+      --license $PARTS_DIR/license-deps \
+      --notice $PARTS_DIR/notice-top --notice-compute-with-flags "
+        -DextrasFiles=$(prefix_and_join_array "" ":" "" $(find $SEARCH_ROOT -name "license-inclusions-source-*"))
+        -DonlyExtras=true" \
+      --libraries ${REF_DIR} ${SEARCH_ROOT}
+
+  else
+    echo FAILED - unknown mode $MODE
+    exit 1
+  fi
+  echo ""
+  
+  popd > /dev/null
+}
+
+
+# build all the projects
+
+make_for $ROOT_DIR/brooklyn-ui/ui-modules/home . binary-additional
+exit
+
+# include deps in files pulled in to Go CLI binary builds
+make_for $ROOT_DIR/brooklyn-client/cli/ release/license/files binary-primary
+make_for $ROOT_DIR/brooklyn-client/cli/ . binary-additional
+
+# Server CLI has embedded JS; gets custom files in sub-project root, also included in JAR
+make_for $ROOT_DIR/brooklyn-server/server-cli/ . binary-additional
+
+# UI gets files at root, also included in WAR
+
+# main projects have their binaries included at root
+make_for $ROOT_DIR/brooklyn-server/ . binary-additional
+make_for $ROOT_DIR/brooklyn-client/ . binary-additional
+make_for $ROOT_DIR/brooklyn-library/ . binary-additional
+# dist is trickier, just don't mention binaries in the generated items
+make_for $ROOT_DIR/brooklyn-dist/ . binary-omitted
+
+# brooklyn-docs skipped
+# the docs don't make a build and don't include embedded code so no special license there
+
+# and the binary dists; dist/ project which has biggest deps set, but search in all brooklyn projects
+make_for $ROOT_DIR/brooklyn-dist/dist src/main/license/files/ binary-primary $ROOT_DIR
+cp $OUT/{NOTICE,LICENSE} $PROJ/../karaf/apache-brooklyn/src/main/resources/
+
+# finally in root project list everything
+make_for $ROOT_DIR/brooklyn-dist/dist ../.. binary-additional $ROOT_DIR

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/193a3f2d/dist/licensing/license-metadata-manual-1-js-pre-angular.yaml
----------------------------------------------------------------------
diff --git a/dist/licensing/license-metadata-manual-1-js-pre-angular.yaml b/dist/licensing/license-metadata-manual-1-js-pre-angular.yaml
new file mode 100644
index 0000000..832102a
--- /dev/null
+++ b/dist/licensing/license-metadata-manual-1-js-pre-angular.yaml
@@ -0,0 +1,366 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+
+# overrides file for org.heneveld.license-audit-maven-plugin
+# expands/corrects detail needed for generating license notices
+
+# 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
+  files: jquery.js
+  version: 1.7.2
+  organization: { name: "The jQuery Foundation", url: "http://jquery.org/" }
+  license: MIT
+  notice: |
+    Copyright (c) John Resig (2005-2011)
+    Includes code fragments from sizzle.js:
+      Copyright (c) The Dojo Foundation
+      Available at http://sizzlejs.com
+      Used under the MIT license
+
+- id: jquery-core:1.8.0
+  url: http://jquery.com/
+  description: JS library for manipulating HTML and eventing
+  name: jQuery JavaScript Library
+  files: jquery.js
+  version: 1.8.0
+  organization: { name: "The jQuery Foundation", url: "http://jquery.org/" }
+  license: MIT
+  # NB: sizzle copyright changed from Dojo Foundation in 1.7.2
+  notice: |
+    Copyright (c) The jQuery Foundation, Inc. and other contributors (2005-2012)
+    Includes code fragments from sizzle.js:
+      Copyright (c) The jQuery Foundation, Inc. and other contributors (2012)
+      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
+  # NB: sizzle copyright changed from Dojo Foundation in 1.7.2
+  notice: |
+    Copyright (c) The jQuery Foundation, Inc. and other contributors (2005-2012)
+    Includes code fragments from sizzle.js:
+      Copyright (c) The jQuery Foundation, Inc. and other contributors (2012)
+      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 swagger.css
+  version: 2.1.6
+  url: https://github.com/swagger-api/swagger-js
+  license: Apache-2.0
+  notice: Copyright (c) SmartBear Software (2011-2015)
+
+- id: swagger-ui:2.1.4
+  files: swagger*.{js,css,html}
+  name: Swagger UI
+  version: 2.1.4
+  url: https://github.com/swagger-api/swagger-ui
+  license: Apache-2.0
+  notice: Copyright (c) SmartBear Software (2011-2015)
+  
+- id: jquery.wiggle.min.js
+  name: jQuery Wiggle
+  version: swagger-ui:1.0.1
+  notice: | 
+    Copyright (c) WonderGroup and Jordan Thomas (2010)
+    Previously online at http://labs.wondergroup.com/demos/mini-ui/index.html.
+    The version included here is from the Swagger UI distribution.
+  # above is link in copyright but it is no longer valid; url below is same person
+  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://requirejs.org/
+  organization: { name: "The Dojo Foundation", url: "http://dojofoundation.org/" }
+  notice: Copyright (c) The Dojo Foundation (2010-2012)
+  license: MIT
+
+- id: require.js/r.js
+  # new ID because this is a different version to the above
+  name: RequireJS (r.js maven plugin)
+  files: r.js
+  version: 2.1.6 
+  url: http://github.com/jrburke/requirejs
+  organization: { name: "The Dojo Foundation", url: "http://dojofoundation.org/" }
+  notice: |
+    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
+  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)
+  license: MIT
+
+- id: backbone.js:1.1.2
+  version: 1.1.2
+  url: http://backbonejs.org
+  organization: { name: "DocumentCloud Inc.", url: "http://www.documentcloud.org/" }
+  notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2010-2014)
+  license: MIT
+
+- id: bootstrap.js
+  version: 2.0.4
+  url: http://twitter.github.com/bootstrap/javascript.html#transitions
+  notice: Copyright (c) Twitter, Inc. (2012)
+  license: Apache-2.0
+
+- id: codemirror.js
+  files: codemirror.{js,css}, show-hint.{js,css}, placeholder.js, anyword-hint.js, yaml.js
+  version: 5.11.1
+  url: http://codemirror.net/
+  notice: CodeMirror (c) Marijn Haverbeke and others
+  license: MIT
+
+- id: jquery.easy-autocomplete.js
+  version: 1.3.3
+  url: https://github.com/pawelczak/EasyAutocomplete
+  notice: Copyright (c) Łukasz Pawełczak (2015)
+  license: MIT
+
+# 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
+  name: 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)
+  license: MIT
+
+# used in CLI (and in docs)
+- id: underscore.js:1.7.0
+  name: Underscore JS
+  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 and Investigative Reporters & Editors (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
+  # ORIGINALLY https://github.com/millermedeiros/requirejs-plugins
+  organization: { name: "Miller Medeiros", url: "https://github.com/millermedeiros/" }
+  description: RequireJS plugin for async dependency load like JSONP and Google Maps
+  notice: Copyright (c) Miller Medeiros (2011)
+  license: MIT 
+
+- id: handlebars.js
+  files: handlebars*.js
+  version: 1.0-rc1
+  url: https://github.com/wycats/handlebars.js 
+  organization: { name: "Yehuda Katz", url: "https://github.com/wycats/" }
+  notice: Copyright (c) Yehuda Katz (2012)
+  license: MIT
+
+- id: handlebars.js:2.0.0
+  files: handlebars*.js
+  version: 2.0.0
+  url: https://github.com/wycats/handlebars.js
+  organization: { name: "Yehuda Katz", url: "https://github.com/wycats/" }
+  notice: Copyright (c) Yehuda Katz (2014)
+  license: MIT
+
+- id: jquery.ba-bbq.js
+  name: "jQuery BBQ: Back Button & Query Library"
+  files: jquery.ba-bbq*.js
+  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)"
+  license: MIT
+
+- id: jquery.ba-bbq.js-hashchange
+  name: "jQuery hashchange event"
+  files: jquery.ba-bbq*.js
+  version: 1.2
+  url: http://benalman.com/projects/jquery-hashchange-plugin/
+  organization: { name: "\"Cowboy\" Ben Alman", url: "http://benalman.com/" }
+  notice: Copyright (c) "Cowboy" Ben Alman (2010)"
+  license: MIT
+
+- id: moment.js
+  version: 2.1.0
+  url: http://momentjs.com
+  organization: { name: "Tim Wood", url: "http://momentjs.com" }
+  notice: Copyright (c) Tim Wood, Iskren Chernev, Moment.js contributors (2011-2014)
+  license: MIT
+
+- id: ZeroClipboard
+  files: ZeroClipboard.*
+  version: 1.3.1
+  url: http://zeroclipboard.org/
+  organization: { name: "ZeroClipboard contributors", url: "https://github.com/zeroclipboard" }
+  notice: Copyright (c) Jon Rohan, James M. Greene (2014)
+  license: MIT
+
+- id: jquery.dataTables
+  files: jquery.dataTables.{js,css}
+  name: DataTables Table plug-in for jQuery
+  version: 1.9.4
+  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
+
+- id: js-uri
+  files: URI.js
+  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
+  # inferred
+  notice: Copyright (c) js-uri contributors (2013)
+
+- id: js-yaml.js
+  version: 3.5.2
+  organization: { name: "Vitaly Puzrin", url: "https://github.com/nodeca/" }
+  url: https://github.com/nodeca/
+  notice: Copyright (c) Vitaly Puzrin (2011-2015)
+  license: MIT
+
+- id: jquery.form.js
+  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)
+  license: MIT
+
+# used for CLI to build catalog
+- id: typeahead.js
+  name: 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
+
+# used for CLI to build catalog
+- id: marked.js
+  version: 0.3.1
+  url: https://github.com/chjj/marked
+  organization: { name: "Christopher Jeffrey", url: "https://github.com/chjj" }
+  notice: Copyright (c) Christopher Jeffrey (2011-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
+  files: 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) Klaus Hartl (2013)
+  license: MIT
+
+- id: font-awesome-fonts
+  name: Font Awesome (fonts)
+  version: 4.5.0
+  url: http://fontawesome.io/
+  files: "font-awesome/fonts/* cluster.svg"
+  notice: Copyright (c) Dave Gandy (2016)
+  license:
+  - url: "http://scripts.sil.org/OFL"
+    name: SIL OFL 1.1
+
+- id: font-awesome-code
+  name: Font Awesome (code)
+  version: 4.5.0
+  url: http://fontawesome.io/
+  files: "font-awesome/{css,scss,less}/*"
+  notice: Copyright (c) Dave Gandy (2016)
+  license: MIT
+
+- id: tango-project-icons
+  name: Tango Project Icons
+  url: https://commons.wikimedia.org/wiki/File:Network-server.svg
+  notice: Released into the public domain by the people from the Tango! project (The Tango! Desktop Project), via Wikimedia Commons
+  license:
+  - name: Public Domain
+
+- id: noun-project-icons
+  name: The Noun Project (icons)
+  url: https://thenounproject.com/
+  notice: Includes icons by Evan Shuster, Sarah Joy, Jack Zwanenburg
+  files: "service-restarter.png, autoscaler.png, and others"
+  license:
+  - url: https://creativecommons.org/licenses/by/3.0/us/legalcode
+    name: Creative Commons Public License, Attribution 3.0
+
+

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/193a3f2d/dist/licensing/license-metadata-manual-2-angular.yaml
----------------------------------------------------------------------
diff --git a/dist/licensing/license-metadata-manual-2-angular.yaml b/dist/licensing/license-metadata-manual-2-angular.yaml
new file mode 100644
index 0000000..f2b1997
--- /dev/null
+++ b/dist/licensing/license-metadata-manual-2-angular.yaml
@@ -0,0 +1,30 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+
+# overrides file for org.heneveld.license-audit-maven-plugin
+# expands/corrects detail from autogenerated node js metadata files
+
+- id: font-awesome@4.7.0
+  license:
+    name: Font Awesome License
+    url: https://github.com/FortAwesome/Font-Awesome/blob/master/LICENSE.txt
+
+- id: identicon.js@1.3.0
+  license: BSD-2-Clause

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/193a3f2d/dist/licensing/license-metadata-manual-js.yaml
----------------------------------------------------------------------
diff --git a/dist/licensing/license-metadata-manual-js.yaml b/dist/licensing/license-metadata-manual-js.yaml
deleted file mode 100644
index 832102a..0000000
--- a/dist/licensing/license-metadata-manual-js.yaml
+++ /dev/null
@@ -1,366 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-# overrides file for org.heneveld.license-audit-maven-plugin
-# expands/corrects detail needed for generating license notices
-
-# 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
-  files: jquery.js
-  version: 1.7.2
-  organization: { name: "The jQuery Foundation", url: "http://jquery.org/" }
-  license: MIT
-  notice: |
-    Copyright (c) John Resig (2005-2011)
-    Includes code fragments from sizzle.js:
-      Copyright (c) The Dojo Foundation
-      Available at http://sizzlejs.com
-      Used under the MIT license
-
-- id: jquery-core:1.8.0
-  url: http://jquery.com/
-  description: JS library for manipulating HTML and eventing
-  name: jQuery JavaScript Library
-  files: jquery.js
-  version: 1.8.0
-  organization: { name: "The jQuery Foundation", url: "http://jquery.org/" }
-  license: MIT
-  # NB: sizzle copyright changed from Dojo Foundation in 1.7.2
-  notice: |
-    Copyright (c) The jQuery Foundation, Inc. and other contributors (2005-2012)
-    Includes code fragments from sizzle.js:
-      Copyright (c) The jQuery Foundation, Inc. and other contributors (2012)
-      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
-  # NB: sizzle copyright changed from Dojo Foundation in 1.7.2
-  notice: |
-    Copyright (c) The jQuery Foundation, Inc. and other contributors (2005-2012)
-    Includes code fragments from sizzle.js:
-      Copyright (c) The jQuery Foundation, Inc. and other contributors (2012)
-      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 swagger.css
-  version: 2.1.6
-  url: https://github.com/swagger-api/swagger-js
-  license: Apache-2.0
-  notice: Copyright (c) SmartBear Software (2011-2015)
-
-- id: swagger-ui:2.1.4
-  files: swagger*.{js,css,html}
-  name: Swagger UI
-  version: 2.1.4
-  url: https://github.com/swagger-api/swagger-ui
-  license: Apache-2.0
-  notice: Copyright (c) SmartBear Software (2011-2015)
-  
-- id: jquery.wiggle.min.js
-  name: jQuery Wiggle
-  version: swagger-ui:1.0.1
-  notice: | 
-    Copyright (c) WonderGroup and Jordan Thomas (2010)
-    Previously online at http://labs.wondergroup.com/demos/mini-ui/index.html.
-    The version included here is from the Swagger UI distribution.
-  # above is link in copyright but it is no longer valid; url below is same person
-  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://requirejs.org/
-  organization: { name: "The Dojo Foundation", url: "http://dojofoundation.org/" }
-  notice: Copyright (c) The Dojo Foundation (2010-2012)
-  license: MIT
-
-- id: require.js/r.js
-  # new ID because this is a different version to the above
-  name: RequireJS (r.js maven plugin)
-  files: r.js
-  version: 2.1.6 
-  url: http://github.com/jrburke/requirejs
-  organization: { name: "The Dojo Foundation", url: "http://dojofoundation.org/" }
-  notice: |
-    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
-  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)
-  license: MIT
-
-- id: backbone.js:1.1.2
-  version: 1.1.2
-  url: http://backbonejs.org
-  organization: { name: "DocumentCloud Inc.", url: "http://www.documentcloud.org/" }
-  notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2010-2014)
-  license: MIT
-
-- id: bootstrap.js
-  version: 2.0.4
-  url: http://twitter.github.com/bootstrap/javascript.html#transitions
-  notice: Copyright (c) Twitter, Inc. (2012)
-  license: Apache-2.0
-
-- id: codemirror.js
-  files: codemirror.{js,css}, show-hint.{js,css}, placeholder.js, anyword-hint.js, yaml.js
-  version: 5.11.1
-  url: http://codemirror.net/
-  notice: CodeMirror (c) Marijn Haverbeke and others
-  license: MIT
-
-- id: jquery.easy-autocomplete.js
-  version: 1.3.3
-  url: https://github.com/pawelczak/EasyAutocomplete
-  notice: Copyright (c) Łukasz Pawełczak (2015)
-  license: MIT
-
-# 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
-  name: 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)
-  license: MIT
-
-# used in CLI (and in docs)
-- id: underscore.js:1.7.0
-  name: Underscore JS
-  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 and Investigative Reporters & Editors (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
-  # ORIGINALLY https://github.com/millermedeiros/requirejs-plugins
-  organization: { name: "Miller Medeiros", url: "https://github.com/millermedeiros/" }
-  description: RequireJS plugin for async dependency load like JSONP and Google Maps
-  notice: Copyright (c) Miller Medeiros (2011)
-  license: MIT 
-
-- id: handlebars.js
-  files: handlebars*.js
-  version: 1.0-rc1
-  url: https://github.com/wycats/handlebars.js 
-  organization: { name: "Yehuda Katz", url: "https://github.com/wycats/" }
-  notice: Copyright (c) Yehuda Katz (2012)
-  license: MIT
-
-- id: handlebars.js:2.0.0
-  files: handlebars*.js
-  version: 2.0.0
-  url: https://github.com/wycats/handlebars.js
-  organization: { name: "Yehuda Katz", url: "https://github.com/wycats/" }
-  notice: Copyright (c) Yehuda Katz (2014)
-  license: MIT
-
-- id: jquery.ba-bbq.js
-  name: "jQuery BBQ: Back Button & Query Library"
-  files: jquery.ba-bbq*.js
-  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)"
-  license: MIT
-
-- id: jquery.ba-bbq.js-hashchange
-  name: "jQuery hashchange event"
-  files: jquery.ba-bbq*.js
-  version: 1.2
-  url: http://benalman.com/projects/jquery-hashchange-plugin/
-  organization: { name: "\"Cowboy\" Ben Alman", url: "http://benalman.com/" }
-  notice: Copyright (c) "Cowboy" Ben Alman (2010)"
-  license: MIT
-
-- id: moment.js
-  version: 2.1.0
-  url: http://momentjs.com
-  organization: { name: "Tim Wood", url: "http://momentjs.com" }
-  notice: Copyright (c) Tim Wood, Iskren Chernev, Moment.js contributors (2011-2014)
-  license: MIT
-
-- id: ZeroClipboard
-  files: ZeroClipboard.*
-  version: 1.3.1
-  url: http://zeroclipboard.org/
-  organization: { name: "ZeroClipboard contributors", url: "https://github.com/zeroclipboard" }
-  notice: Copyright (c) Jon Rohan, James M. Greene (2014)
-  license: MIT
-
-- id: jquery.dataTables
-  files: jquery.dataTables.{js,css}
-  name: DataTables Table plug-in for jQuery
-  version: 1.9.4
-  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
-
-- id: js-uri
-  files: URI.js
-  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
-  # inferred
-  notice: Copyright (c) js-uri contributors (2013)
-
-- id: js-yaml.js
-  version: 3.5.2
-  organization: { name: "Vitaly Puzrin", url: "https://github.com/nodeca/" }
-  url: https://github.com/nodeca/
-  notice: Copyright (c) Vitaly Puzrin (2011-2015)
-  license: MIT
-
-- id: jquery.form.js
-  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)
-  license: MIT
-
-# used for CLI to build catalog
-- id: typeahead.js
-  name: 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
-
-# used for CLI to build catalog
-- id: marked.js
-  version: 0.3.1
-  url: https://github.com/chjj/marked
-  organization: { name: "Christopher Jeffrey", url: "https://github.com/chjj" }
-  notice: Copyright (c) Christopher Jeffrey (2011-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
-  files: 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) Klaus Hartl (2013)
-  license: MIT
-
-- id: font-awesome-fonts
-  name: Font Awesome (fonts)
-  version: 4.5.0
-  url: http://fontawesome.io/
-  files: "font-awesome/fonts/* cluster.svg"
-  notice: Copyright (c) Dave Gandy (2016)
-  license:
-  - url: "http://scripts.sil.org/OFL"
-    name: SIL OFL 1.1
-
-- id: font-awesome-code
-  name: Font Awesome (code)
-  version: 4.5.0
-  url: http://fontawesome.io/
-  files: "font-awesome/{css,scss,less}/*"
-  notice: Copyright (c) Dave Gandy (2016)
-  license: MIT
-
-- id: tango-project-icons
-  name: Tango Project Icons
-  url: https://commons.wikimedia.org/wiki/File:Network-server.svg
-  notice: Released into the public domain by the people from the Tango! project (The Tango! Desktop Project), via Wikimedia Commons
-  license:
-  - name: Public Domain
-
-- id: noun-project-icons
-  name: The Noun Project (icons)
-  url: https://thenounproject.com/
-  notice: Includes icons by Evan Shuster, Sarah Joy, Jack Zwanenburg
-  files: "service-restarter.png, autoscaler.png, and others"
-  license:
-  - url: https://creativecommons.org/licenses/by/3.0/us/legalcode
-    name: Creative Commons Public License, Attribution 3.0
-
-

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/193a3f2d/dist/licensing/license-text/Font Awesome License
----------------------------------------------------------------------
diff --git a/dist/licensing/license-text/Font Awesome License b/dist/licensing/license-text/Font Awesome License
new file mode 100644
index 0000000..28c1c4b
--- /dev/null
+++ b/dist/licensing/license-text/Font Awesome License	
@@ -0,0 +1,34 @@
+Font Awesome Free License
+-------------------------
+
+Font Awesome Free is free, open source, and GPL friendly. You can use it for
+commercial projects, open source projects, or really almost whatever you want.
+Full Font Awesome Free license: https://fontawesome.com/license.
+
+# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
+In the Font Awesome Free download, the CC BY 4.0 license applies to all icons
+packaged as SVG and JS file types.
+
+# Fonts: SIL OFL 1.1 License (https://scripts.sil.org/OFL)
+In the Font Awesome Free download, the SIL OLF license applies to all icons
+packaged as web and desktop font files.
+
+# Code: MIT License (https://opensource.org/licenses/MIT)
+In the Font Awesome Free download, the MIT license applies to all non-font and
+non-icon files.
+
+# Attribution
+Attribution is required by MIT, SIL OLF, and CC BY licenses. Downloaded Font
+Awesome Free files already contain embedded comments with sufficient
+attribution, so you shouldn't need to do anything additional when using these
+files normally.
+
+We've kept attribution comments terse, so we ask that you do not actively work
+to remove them from files, especially code. They're a great way for folks to 
+learn about Font Awesome.
+
+# Brand Icons
+All brand icons are trademarks of their respective owners. The use of these
+trademarks does not indicate endorsement of the trademark holder by Font
+Awesome, nor vice versa. **Please do not use brand logos for any purpose except
+to represent the company, product, or service to which they refer.**

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/193a3f2d/dist/licensing/parts/license-deps
----------------------------------------------------------------------
diff --git a/dist/licensing/parts/license-deps b/dist/licensing/parts/license-deps
index 483b985..c534e67 100644
--- a/dist/licensing/parts/license-deps
+++ b/dist/licensing/parts/license-deps
@@ -1,8 +1,8 @@
    
 Dependency licenses:
 
-   # This software includes dependencies released under other licenses.
-   # These other licenses are compatible with the Apache License above.
+   # This software includes dependencies released under their licenses.
+   # These licenses are compatible with the Apache License above.
    # Details of these dependencies can be found in the accompanying NOTICE file.
-   # These other licenses are included below with their full text.
+   # These licenses are included below with their full text.
 

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/193a3f2d/dist/licensing/parts/yaml-asf-header
----------------------------------------------------------------------
diff --git a/dist/licensing/parts/yaml-asf-header b/dist/licensing/parts/yaml-asf-header
new file mode 100644
index 0000000..30097ef
--- /dev/null
+++ b/dist/licensing/parts/yaml-asf-header
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/193a3f2d/dist/licensing/update-brooklyn-license-metadata.sh
----------------------------------------------------------------------
diff --git a/dist/licensing/update-brooklyn-license-metadata.sh b/dist/licensing/update-brooklyn-license-metadata.sh
new file mode 100755
index 0000000..d795e53
--- /dev/null
+++ b/dist/licensing/update-brooklyn-license-metadata.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+
+# for Go code, see the glide.yaml in those projects; you'll have to manually update
+
+
+# for new JS UI we have good automation:
+
+for x in $(ls ../../../brooklyn-ui/ui-modules/*/package.json) ; do
+  ./compute-nodejs-license-dependencies.sh ${x%package.json}
+done


Mime
View raw message