From cae5b109c09be80df77f2d767220b82850178ed5 Mon Sep 17 00:00:00 2001 From: Tony Kurc Date: Fri, 12 Feb 2016 16:58:26 -0500 Subject: [PATCH] NIFI-1507: Update bouncycastle license reference --- 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(-) diff --git a/nifi-assembly/LICENSE b/nifi-assembly/LICENSE index bb3d435363..73c446a2a0 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 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 be85dcb2e0..1d4b537860 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 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 bd97dda289..a38d06b0b1 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