You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/12/07 21:09:40 UTC
[2/2] nifi git commit: NIFI-1266: - Adding license file for LDAP
provider NAR. - Adding spring security to NOTICE where appropriate.
NIFI-1266:
- Adding license file for LDAP provider NAR.
- Adding spring security to NOTICE where appropriate.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/1f4ef9f5
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/1f4ef9f5
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/1f4ef9f5
Branch: refs/heads/master
Commit: 1f4ef9f5fa38bab9a29102b4a1367063b622ed02
Parents: 4c7894b
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Dec 7 15:04:09 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Dec 7 15:04:09 2015 -0500
----------------------------------------------------------------------
nifi-assembly/NOTICE | 5 +++
.../src/main/resources/META-INF/NOTICE | 5 +++
.../src/main/resources/META-INF/NOTICE | 37 ++++++++++++++++++++
3 files changed, 47 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/1f4ef9f5/nifi-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index 6ec5c31..0a8c2d7 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -112,6 +112,11 @@ The following binary components are provided under the Apache Software License v
Spring Framework 4.1.4.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
+ (ASLv2) Spring Security
+ The following NOTICE information applies:
+ Spring Framework 4.0.3.RELEASE
+ Copyright (c) 2002-2015 Pivotal, Inc.
+
(ASLv2) Apache Flume
The following NOTICE information applies:
Apache Flume
http://git-wip-us.apache.org/repos/asf/nifi/blob/1f4ef9f5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE
index 5703d10..4e71998 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE
@@ -90,6 +90,11 @@ The following binary components are provided under the Apache Software License v
Spring Framework 4.1.6.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
+ (ASLv2) Spring Security
+ The following NOTICE information applies:
+ Spring Framework 4.0.3.RELEASE
+ Copyright (c) 2002-2015 Pivotal, Inc.
+
(ASLv2) Swagger Core
The following NOTICE information applies:
Swagger Core 1.5.3-M1
http://git-wip-us.apache.org/repos/asf/nifi/blob/1f4ef9f5/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers-nar/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers-nar/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..0f675c3
--- /dev/null
+++ b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers-nar/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,37 @@
+nifi-ldap-iaa-providers-nar
+Copyright 2014-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+******************
+Apache Software License v2
+******************
+
+The following binary components are provided under the Apache Software License v2
+
+ (ASLv2) Spring Framework
+ The following NOTICE information applies:
+ Spring Framework 4.1.6.RELEASE
+ Copyright (c) 2002-2015 Pivotal, Inc.
+
+ (ASLv2) Spring Security
+ The following NOTICE information applies:
+ Spring Framework 4.0.3.RELEASE
+ Copyright (c) 2002-2015 Pivotal, Inc.
+
+ (ASLv2) Apache Commons Lang
+ The following NOTICE information applies:
+ Apache Commons Lang
+ Copyright 2001-2015 The Apache Software Foundation
+
+ This product includes software from the Spring Framework,
+ under the Apache License 2.0 (see: StringUtils.containsWhitespace())
+
+*****************
+Public Domain
+*****************
+
+The following binary components are provided to the 'Public Domain'. See project link for details.
+
+ (Public Domain) AOP Alliance 1.0 (http://aopalliance.sourceforge.net/)
\ No newline at end of file