Repository: nifi Updated Branches: refs/heads/master f44eb643d -> cae5b109c
NIFI-1507: Update bouncycastle license reference Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/cae5b109 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/cae5b109 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/cae5b109 Branch: refs/heads/master Commit: cae5b109c09be80df77f2d767220b82850178ed5 Parents: f44eb64 Author: Tony Kurc <[email protected]> Authored: Fri Feb 12 16:58:26 2016 -0500 Committer: Tony Kurc <[email protected]> Committed: Fri Feb 12 16:58:26 2016 -0500 ---------------------------------------------------------------------- nifi-assembly/LICENSE | 4 ++-- .../nifi-framework-nar/src/main/resources/META-INF/LICENSE | 4 ++-- .../nifi-standard-nar/src/main/resources/META-INF/LICENSE | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/cae5b109/nifi-assembly/LICENSE ---------------------------------------------------------------------- diff --git a/nifi-assembly/LICENSE b/nifi-assembly/LICENSE index bb3d435..73c446a 100644 --- a/nifi-assembly/LICENSE +++ b/nifi-assembly/LICENSE @@ -586,10 +586,10 @@ This product bundles HexViewJS available under an MIT License ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - The binary distribution of this product bundles 'Bouncy Castle JDK 1.6 Provider' + The binary distribution of this product bundles 'Bouncy Castle JDK 1.5 Provider' under an MIT style license. - Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) + Copyright (c) 2000 - 2015 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal http://git-wip-us.apache.org/repos/asf/nifi/blob/cae5b109/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE index be85dcb..1d4b537 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE @@ -237,10 +237,10 @@ licenses. ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - The binary distribution of this product bundles 'Bouncy Castle JDK 1.6 Provider' + The binary distribution of this product bundles 'Bouncy Castle JDK 1.5 Provider' under an MIT style license. - Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) + Copyright (c) 2000 - 2015 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal http://git-wip-us.apache.org/repos/asf/nifi/blob/cae5b109/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 bd97dda..a38d06b 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 @@ -208,10 +208,10 @@ notices and license terms. Your use of the source code for the these subcomponents is subject to the terms and conditions of the following licenses. -This product bundles 'Bouncycastle JDK Prov 16' which is available under -the MIT license. +The binary distribution of this product bundles 'Bouncy Castle JDK 1.5 Provider' +under an MIT style license. - Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) + Copyright (c) 2000 - 2015 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal
