You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/10/01 23:40:19 UTC
[6/8] incubator-brooklyn git commit: update license/notice gen script
to show better errors
update license/notice gen script to show better errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4f88439c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4f88439c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4f88439c
Branch: refs/heads/master
Commit: 4f88439cc5460954ec8573d091702e9dd51dec77
Parents: a4a14f9
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Sun Sep 27 03:06:40 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Sep 28 10:50:59 2015 +0100
----------------------------------------------------------------------
.../dist/licensing/licenses/jsgui/BSD-2-Clause | 23 ++++++++++++++++++++
.../dist/licensing/licenses/source/BSD-2-Clause | 23 ++++++++++++++++++++
usage/dist/licensing/make-all-licenses.sh | 2 +-
usage/dist/licensing/make-one-license.sh | 4 +++-
4 files changed, 50 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4f88439c/usage/dist/licensing/licenses/jsgui/BSD-2-Clause
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/licenses/jsgui/BSD-2-Clause b/usage/dist/licensing/licenses/jsgui/BSD-2-Clause
new file mode 100644
index 0000000..832c10e
--- /dev/null
+++ b/usage/dist/licensing/licenses/jsgui/BSD-2-Clause
@@ -0,0 +1,23 @@
+The BSD 2-Clause License
+
+ 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, this
+ list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4f88439c/usage/dist/licensing/licenses/source/BSD-2-Clause
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/licenses/source/BSD-2-Clause b/usage/dist/licensing/licenses/source/BSD-2-Clause
new file mode 100644
index 0000000..832c10e
--- /dev/null
+++ b/usage/dist/licensing/licenses/source/BSD-2-Clause
@@ -0,0 +1,23 @@
+The BSD 2-Clause License
+
+ 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, this
+ list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4f88439c/usage/dist/licensing/make-all-licenses.sh
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/make-all-licenses.sh b/usage/dist/licensing/make-all-licenses.sh
index 81c0fd8..3b62f96 100755
--- a/usage/dist/licensing/make-all-licenses.sh
+++ b/usage/dist/licensing/make-all-licenses.sh
@@ -36,7 +36,7 @@ for x in `cat projects-with-custom-licenses` ; do
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
+ ./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
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4f88439c/usage/dist/licensing/make-one-license.sh
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/make-one-license.sh b/usage/dist/licensing/make-one-license.sh
index 325afa3..5bcb35b 100755
--- a/usage/dist/licensing/make-one-license.sh
+++ b/usage/dist/licensing/make-one-license.sh
@@ -53,13 +53,15 @@ echo
echo "(2) Notices for bundled software"
echo
pushd .. > /dev/null
+# add -X on next line to get debug info
mvn org.heneveld.maven:license-audit-maven-plugin:notices \
-DlicensesPreferred=ASL2,ASL,EPL1,BSD-2-Clause,BSD-3-Clause,CDDL1.1,CDDL1,CDDL \
-DoverridesFile=licensing/overrides.yaml \
-DextrasFiles=${BROOKLYN_LICENSE_EXTRAS_FILES:-`cat licensing/extras-files`} \
${BROOKLYN_LICENSE_SPECIALS} \
-DoutputFile=licensing/notices.autogenerated \
- > /dev/null 2> /dev/null
+ > tmp_stdout 2> tmp_stderr
+rm tmp_std*
popd > /dev/null
cat notices.autogenerated