Repository: nifi Updated Branches: refs/heads/master 3e7fe93fd -> a837fa5f3
NIFI-801 fixed reference to BSD and name of NOTICE Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a837fa5f Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a837fa5f Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a837fa5f Branch: refs/heads/master Commit: a837fa5f38973896b225dde07aefa2f44ed6a50c Parents: 3e7fe93 Author: joewitt <[email protected]> Authored: Sun Aug 16 22:42:28 2015 -0400 Committer: joewitt <[email protected]> Committed: Sun Aug 16 22:42:28 2015 -0400 ---------------------------------------------------------------------- LICENSE | 3 ++- nifi-assembly/LICENSE | 2 +- nifi-assembly/NOTICE | 4 ++-- .../nifi-standard-nar/src/main/resources/META-INF/LICENSE | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/a837fa5f/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 59075cd..59741e6 100644 --- a/LICENSE +++ b/LICENSE @@ -476,4 +476,5 @@ This product bundles HexViewJS available under an MIT License IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + http://git-wip-us.apache.org/repos/asf/nifi/blob/a837fa5f/nifi-assembly/LICENSE ---------------------------------------------------------------------- diff --git a/nifi-assembly/LICENSE b/nifi-assembly/LICENSE index a3a5fdb..5e6b490 100644 --- a/nifi-assembly/LICENSE +++ b/nifi-assembly/LICENSE @@ -821,7 +821,7 @@ This product bundles 'JCraft Jzlib' which is available under a 3-Clause BSD Lice NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -This product bundles 'asm' which is available under an MIT style license. +This product bundles 'asm' which is available under a 3-Clause BSD style license. For details see http://asm.ow2.org/asmdex-license.html Copyright (c) 2012 France Télécom http://git-wip-us.apache.org/repos/asf/nifi/blob/a837fa5f/nifi-assembly/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index 118ab49..f972952 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -1,4 +1,4 @@ -nifi-assembly +Apache NiFi Copyright 2014-2015 The Apache Software Foundation This product includes software developed at @@ -785,4 +785,4 @@ Public Domain The following binary components are provided to the 'Public Domain'. See project link for details. (Public Domain) XZ for Java (org.tukaani:xz:jar:1.5 - http://tukaani.org/xz/java.html - (Public Domain) AOP Alliance 1.0 (http://aopalliance.sourceforge.net/) \ No newline at end of file + (Public Domain) AOP Alliance 1.0 (http://aopalliance.sourceforge.net/) http://git-wip-us.apache.org/repos/asf/nifi/blob/a837fa5f/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/LICENSE index 0a127d9..45a1bcc 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/LICENSE +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/LICENSE @@ -290,7 +290,7 @@ This product bundles 'JCraft Jzlib' which is available under a 3-Clause BSD Lice NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -This product bundles 'asm' which is available under an MIT style license. +This product bundles 'asm' which is available under a 3-Clause BSD style license. For details see http://asm.ow2.org/asmdex-license.html Copyright (c) 2012 France Télécom
