[GitHub] mrutkows closed pull request #265: update notice file

[GitBox <gi...@apache.org>]

mrutkows closed pull request #265: update notice file
URL: https://github.com/apache/incubator-openwhisk-cli/pull/265
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/NOTICE.md b/NOTICE.md
deleted file mode 100644
index 755b1054..00000000
--- a/NOTICE.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache OpenWhisk CLI
-Copyright 2016-2018 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/NOTICE.txt b/NOTICE.txt
new file mode 100644
index 00000000..46ebe969
--- /dev/null
+++ b/NOTICE.txt
@@ -0,0 +1,63 @@
+Apache OpenWhisk CLI
+Copyright 2016-2018 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+========================================================================
+BSD 3-Clause "New" or "Revised" License
+========================================================================
+
+The following components are provided under the BSD 3-Clause "New" or "Revised" License. See project link for details.
+
+
+     (BSD 3-Clause "New" or "Revised" License) go-querystring (google/go-querystring - https://github.com/google/go-querystring)
+     (BSD 3-Clause "New" or "Revised" License) pflag (spf13/pflag - https://github.com/spf13/pflag)
+     (BSD 3-Clause "New" or "Revised" License) sys (golang/sys - https://github.com/golang/sys)
+
+========================================================================
+MIT License
+========================================================================
+
+The following components are provided under the MIT License. See project link for details.
+
+     (MIT License) color (fatih/color - https://github.com/fatih/color)
+     (MIT License) go-colorable (mattn/go-colorable - https://github.com/mattn/go-colorable)
+     (MIT License) go-isatty (mattn/go-isatty - https://github.com/mattn/go-isatty)
+     (MIT License) go-homedir (mitchellh/go-homedir - https://github.com/mitchellh/go-homedir)
+     (MIT License) go-i18n (nicksnyder/go-i18n - https://github.com/nicksnyder/go-i18n)
+     (MIT) go-prettyjson (hokaccha/go-prettyjson - https://github.com/hokaccha/go-prettyjson)
+
+========================================================================
+Both MIT License and BSD 3-Clause "New" or "Revised" License
+========================================================================
+
+The following components are provided under both the MIT License and the BSD 3-Clause "New" or "Revised" License. See project link for details.
+
+     (MIT License) (BSD 3-Clause "New" or "Revised" License) yaml (ghodss/yaml - https://github.com/ghodss/yaml)
+
+========================================================================
+NOTICE files
+========================================================================
+
+The following NOTICEs are pertain to software distributed with this project.
+
+
+// ------------------------------------------------------------------
+// NOTICE file corresponding to the section 4d of The Apache License,
+// Version 2.0, in this case for
+// ------------------------------------------------------------------
+
+// ---------------------------------------------------
+// NOTICE file of apache/incubator-openwhisk-client-go
+// ---------------------------------------------------
+Apache OpenWhisk Client Go
+Copyright 2016-2018 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+// ----------------------------
+// NOTICE file of go-yaml/yaml
+// ----------------------------
+Copyright 2011-2016 Canonical Ltd.
\ No newline at end of file


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services