Repository: nifi Updated Branches: refs/heads/master 218408953 -> 1624dd8e4
NIFI-2666 This closes #947. updated where it says BSD to say MIT for bcrypt Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/1624dd8e Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/1624dd8e Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/1624dd8e Branch: refs/heads/master Commit: 1624dd8e4da04fdd162b3c0598dd0ffd32552e3b Parents: 2184089 Author: joewitt <joew...@apache.org> Authored: Thu Aug 25 13:55:21 2016 -0400 Committer: joewitt <joew...@apache.org> Committed: Thu Aug 25 14:59:46 2016 -0400 ---------------------------------------------------------------------- LICENSE | 2 +- nifi-assembly/LICENSE | 2 +- .../nifi-standard-nar/src/main/resources/META-INF/LICENSE | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/1624dd8e/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 3db82f6..9c7efe8 100644 --- a/LICENSE +++ b/LICENSE @@ -500,7 +500,7 @@ This product bundles HexViewJS available under an MIT License TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -This product bundles 'jBCrypt' which is available under a BSD license. +This product bundles 'jBCrypt' which is available under an MIT license. For details see https://github.com/svenkubiak/jBCrypt/blob/0.4.1/LICENSE Copyright (c) 2006 Damien Miller <d...@mindrot.org> http://git-wip-us.apache.org/repos/asf/nifi/blob/1624dd8e/nifi-assembly/LICENSE ---------------------------------------------------------------------- diff --git a/nifi-assembly/LICENSE b/nifi-assembly/LICENSE index 346bf94..c257e89 100644 --- a/nifi-assembly/LICENSE +++ b/nifi-assembly/LICENSE @@ -1395,7 +1395,7 @@ information can be found here: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -This product bundles 'jBCrypt' which is available under a BSD license. +This product bundles 'jBCrypt' which is available under an MIT license. For details see https://github.com/svenkubiak/jBCrypt/blob/0.4.1/LICENSE Copyright (c) 2006 Damien Miller <d...@mindrot.org> http://git-wip-us.apache.org/repos/asf/nifi/blob/1624dd8e/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 32b25cf..be296f2 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 @@ -320,7 +320,8 @@ For details see http://asm.ow2.org/asmdex-license.html 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 'jBCrypt' which is available under a BSD license. For details see https://github.com/svenkubiak/jBCrypt/blob/0.4.1/LICENSE +The binary distribution of this product bundles 'jBCrypt' which is available under an MIT + license. For details see https://github.com/svenkubiak/jBCrypt/blob/0.4.1/LICENSE Copyright (c) 2006 Damien Miller <d...@mindrot.org>
